diff -Nru geany-0.18/aclocal.m4 geany-0.19/aclocal.m4 --- geany-0.18/aclocal.m4 2009-08-16 18:29:18.000000000 +0100 +++ geany-0.19/aclocal.m4 2010-06-12 13:14:26.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 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. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -[m4_warning([this file was generated for autoconf 2.64. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. 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'.])]) @@ -603,7 +603,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -3087,7 +3087,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -3726,7 +3726,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4347,7 +4347,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4631,7 +4631,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4927,6 +4927,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -5018,7 +5019,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -6498,7 +6499,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -8505,15 +8506,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -8644,6 +8645,7 @@ ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -8671,7 +8673,10 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -8684,7 +8689,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -8693,34 +8697,31 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8762,16 +8763,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8779,25 +8781,24 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [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. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES @@ -8813,10 +8814,10 @@ # 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.10' +[am__api_version='1.11' 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.10.2], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8832,7 +8833,7 @@ # 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.10.2])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -8892,14 +8893,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -8912,6 +8913,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -8925,14 +8927,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # 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 +# serial 10 # 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, @@ -8989,6 +8991,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -9006,7 +9018,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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 + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -9016,19 +9038,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # 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} + am__minus_obj= + ;; none) break ;; esac - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -9092,59 +9118,61 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 4 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[# Autoconf 2.62 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 -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # 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 - # 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. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # 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 - 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 - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 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 + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # 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 + # 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. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # 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 + 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 + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -9176,13 +9204,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 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 13 +# 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. @@ -9199,7 +9227,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.60])dnl +[AC_PREREQ([2.62])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 @@ -9250,8 +9278,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -9259,23 +9287,36 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_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)], + [define([AC_PROG_CC], + 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)], + [define([AC_PROG_CXX], + 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)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +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 +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. @@ -9299,7 +9340,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9310,7 +9351,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -9336,13 +9384,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -9351,7 +9399,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -9361,24 +9409,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# 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 + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -9388,14 +9436,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -9412,7 +9460,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -9483,14 +9538,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -9499,16 +9554,29 @@ # 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=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # 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` + 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` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -9533,6 +9601,33 @@ fi AC_MSG_RESULT(yes)]) +# Copyright (C) 2009 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_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`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]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -9561,18 +9656,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru geany-0.18/autogen.sh geany-0.19/autogen.sh --- geany-0.18/autogen.sh 2009-01-29 16:29:59.000000000 +0000 +++ geany-0.19/autogen.sh 2009-12-31 15:47:25.000000000 +0000 @@ -6,7 +6,7 @@ DIE=0 -(test -f $srcdir/configure.in) || { +(test -f $srcdir/configure.ac) || { echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level package directory" exit 1 } diff -Nru geany-0.18/ChangeLog geany-0.19/ChangeLog --- geany-0.18/ChangeLog 2009-08-16 18:27:01.000000000 +0100 +++ geany-0.19/ChangeLog 2010-06-12 13:03:50.000000000 +0100 @@ -1,3 +1,2686 @@ +2010-06-12 Enrico Tröger + + * po/POTFILES.skip: + Add doc/stash-example.c to fix 'make distcheck'. + * geany.nsi: + Change the RequestExecutionLevel for the Windows installer to + 'highest'. + * New release: Geany 0.19 "Vellam". + + +2010-06-10 Nick Treleaven + + * src/editor.c: + Group undo action for Insert Multiline Comment. + + +2010-06-08 Nick Treleaven + + * Makefile.am: + Don't individually install data/*.tags as all data/* files will be + installed anyway. + + +2010-06-07 Frank Lanitz + + * tagmanager/tm_project.c: + Fix a double free. (patch by Daniel Marjamaki, thanks). + + +2010-06-06 Enrico Tröger + + * tagmanager/tm_workspace.c: + Fix two memory leaks (patch by Daniel Marjamaki, thanks). + * src/sidebar.c: + Fix reducing paths to project name in the Documents list + (patch by Eugene Arshinov, thanks). + * src/symbols.c: + Fix crash when trying to sort NULL pointers as tags in the Symbols + list (closes #3011986). + * NEWS, scintilla/*, scintilla/include/*, src/plugindata.h: + Update Scintilla to version 2.12. + * wscript, scintilla/Makefile.am, scintilla/makefile.win32, + scintilla/LexCrontab.cxx: + Remove unused Crontab lexer. + * data/filetypes.css, src/highlighting.c: + Add new style "media" for filetype CSS. + + +2010-06-04 Nick Treleaven + + * doc/geany.txt, doc/geany.html: + Build section: minor rewording, formatting fixes; move some + sentences. + + +2010-06-03 Enrico Tröger + + * src/build.c: + Explicitly try to localise build menu item labels with + gettext to enforce getting default labels translated. + * tagmanager/tm_workspace.c: + Fix not closed FILE pointer on early exit + (patch by Daniel Marjamaki, thanks). + * doc/images/*.png: + Update images for Geany 0.19. + * src/sidebar.c: + Destroy the default symbol list treeview only once + (fixes gtk_widget_destroy warning on exit). + + +2010-05-30 Enrico Tröger + + * tagmanager/sort.c: + Replace free() by g_free() (patch by Daniel Marjamaki, thanks). + * tagmanager/c.c: + Fix parsing of C++ classes contain attributes with bitfields + (patch by Lex Trotman, thanks). + * src/plugindata.h, src/plugins.c: + Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so + plugins' meta information can be translated already in the + plugin manager dialog (patch by Colomban Wendling, thanks). + + +2010-05-29 Enrico Tröger + + * src/main.c: + Print locale information in debug output. + * src/build.c: + Fix some labels which were marked as translatable but were not + handled properly by gettext(). + Add a missing const. + * src/msgwindow.c: + Try to convert text into UTF-8 before adding it to the Compiler and + Messages Window (closes #3007919). + + +2010-05-25 Enrico Tröger + + * plugins/Makefile.am, src/Makefile.am, tagmanager/Makefile.am, + wscript: + Pass G_LOG_DOMAIN to source files for better logging. + + +2010-05-24 Frank Lanitz + + * THANKS, src/about.c: + Update of translation credits to reflect a change on Spanish + translation team better. + + +2010-05-23 Lex Trotman + + * src/build.c: + Fix infinite loop reading build command output + + +2010-05-23 Enrico Tröger + + * src/msgwindow.c: + Fix duplicate accelerators for Clear and Copy in the + Messages Window popup menu. + * src/pluginutils.c: + Expand child widgets in the Plugin Preferences dialog + (patch by Colomban Wendling, thanks). + + +2010-05-22 Enrico Tröger + + * src/ui_utils.c: + Fix Undo/Redo button state after the last document has been closed. + Add Print and Replace toolbar items to the list of document + sensitive widgets. + * src/toolbar.c: + Fix crash when the toolbar is reloaded without any open documents. + * src/build.c: + Fix Run toolbar item sensitivity after the last document has been + closed. + * plugins/classbuilder.c: + Remove two unnecessary g_strdups(). + * doc/geany.html, doc/geany.txt, src/keyfile.c, src/msgwindow.c, + src/plugindata.h, src/ui_utils.h: + Add hidden preference to disable automatic scrolling in the + Compiler tab (closes #3004714). + + +2010-05-19 Frank Lanitz + + * plugins/classbuilder.c: + Fix a memory leak. (patch by Daniel Marjamaki, thanks) + + +2010-05-16 Enrico Tröger + + * src/prefs.c, src/project.c: + win32.h can be included unconditionally. + * src/sidebar.c: + Fix project base_path detection if the path has a trailing slash. + * src/document.c, src/editor.c, src/project.c: + Small improvements to speed up quit process with many open documents. + Avoid calling gtk_notebook_remove_page() on exit as it takes + a lot of time. + * src/geanymenubuttonaction.c: + Explicitly check for the type when iterating the action's proxies. + For some reason on Windows, a GtkImageMenuItem proxy is created. + * geany.pc.in, wscript, plugins/Makefile.am, src/Makefile.am, + src/plugindata.h, scintilla/*, scintilla/include/*: + Update Scintilla to version 2.11. + * plugins/Makefile.am, plugins/makefile.win32, src/Makefile.am, + src/makefile.win32: + Add new GTK define also for Mingw cross compilation and + makefile.win32 based Windows builds. + * plugins/filebrowser.c: + Implement reading and evaluating hidden file attribute on Windows. + Fix broken "Go Up" if the current path ends with a slash. + * THANKS, src/about.c, src/prefix.c: + Replace free() by g_free() (patch by Daniel Marjamaki, thanks). + * geany.glade, src/document.h, src/interface.c, src/keyfile.c, + src/main.c, src/notebook.c, src/prefs.c: + Add preference to add new document tabs beside the current one + (patch by Colomban Wendling, thanks). + * geany.glade, src/dialogs.c, src/geany.h, src/interface.c, + src/keyfile.c, src/prefs.c, src/ui_utils.h: + Add a preference for choosing between GTK and native + File Open/Save dialogs (only available on Windows). + * doc/geany.html, doc/geany.txt: + Update documentation. + + +2010-05-15 Enrico Tröger + + * src/win32.c: + Sort file filters for the native Windows file open dialog by name. + Don't use file filters for the native Windows Save As dialog. + * src/dialogs.c, src/win32.c, src/win32.h: + Remove old code. + Pass and use also parent and title arguments to + win32_show_document_open_dialog(). + * src/dialogs.c: + Call handle_save_as() only when the Save As dialog was not cancelled. + * src/toolbar.c: + Improve adding/removing of the special separator between menubar and + toolbar when the toolbar is appended to the menubar. + * src/toolbar.c, src/templates.c: + Explicitly disconnect menus from GeanyMenuButtonAction on quit to + not trigger updating the menus on each item removal. + + +2010-05-15 Frank Lanitz + + * src/support.h: + Replace one non breaking space by normal space. Patch by + Daniel Marjamaki. + + +2010-05-14 Enrico Tröger + + * plugins/classbuilder.c: + Don't make the 'Create Class' menu item document-sensitive + (patch by Colomban Wendling, thanks). + Add namespace support for GTK+ classes. + Add GET_CLASS() macro for GTK+ classes. + Add typedef of the private structure in the header file instead + of declaring it + (all the above from a patch by Colomban Wendling, thanks). + * src/highlighting.c: + Set common default "fold.comment" to 0 to disable it. This can + be overridden if desired. + * src/sidebar.c: + Improve sorting of document list items + (patch by Colomban Wendling, thanks). + * src/main.c: + Remove unnecessary textdomain() call. + + +2010-05-11 Nick Treleaven + + * src/search.c: + Fix search_find_text not returning -1 when match is out of range. + This fixes invalid memory reads and wrong template filename + wildcard replacement. + * src/search.c, src/document.c: + Only replace template filename matching start of word on saving. + * plugins/filebrowser.c: + Add 'Refresh' popup menu item (part of geany-plugins #2999858). + * src/build.c, src/build.h, src/project.c: + Make some ugly build.h global variables static. + * src/build.c, src/build.h, src/project.c: + Add Build prefix for TableFields, TableData. + + +2010-05-10 Enrico Tröger + + * src/dialogs.c: + Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks). + * src/dialogs.c, src/win32.c, src/win32.h: + (Re-)Implement a (still basic) native Windows Save As dialog when + compiled with GEANY_USE_WIN32_DIALOG. + + +2010-05-09 Enrico Tröger + + * THANKS, src/about.c, plugins/classbuilder.c: + Add support for creating PHP classes (patch by Ondrej Donek, thanks). + * src/ui_utils.h, src/ui_utils.c: + Add public, generic callback ui_editable_insert_text_callback() + to restrict GtkEntry text inputs to +/- and numeric values only. + * src/dialogs.h, src/dialogs.c: + Add special variant dialogs_show_input_goto_line() to use a normal + GtkEntry together with dialogs_show_input_goto_line() for text input. + * src/geanyentryaction.c, src/callbacks.c, src/editor.c, src/editor.h: + Allow '+' as values for Goto Line inputs + to jump relative to the current line (closes #2997238). + + +2010-05-08 Enrico Tröger + + * src/highlighting.c: + Apply foreground and background colours of the folding margin + style properly (closes #2998347). + * src/utils.c: + Don't auto-close short XML tags (closes #2994852). + * THANKS, src/about.c, src/keybindings.c: + Improve jumping to matching braces by consistently position the + cursor before or after the matching brace dependent where it + was before (patch by Dimitar Zhekov, thanks). + * src/main.c: + Fix crash when generating global tags files (patch by Colomban + Wendling, thanks). + + +2010-05-07 Nick Treleaven + + * src/templates.c: + Avoid connecting signals more than once. + + +2010-05-06 Enrico Tröger + + * wscript: + Don't ignore the 'intltool' check on non-Windows systems, instead + raise a configure error. + + +2010-05-06 Nick Treleaven + + * src/build.c: + Fix marking some strings as translatable (cannot be done in the + ASSIGNIF macro). + * src/templates.c, doc/geany.txt, doc/geany.html: + Reload templates if saving a document in the templates config dir. + + +2010-05-05 Nick Treleaven + + * src/search.c, src/search.h, src/document.c, doc/geany.txt, + doc/geany.html: + Fix replacing {filename} template wildcard for custom file + templates with non-default file extension. + Add search_find_text() for POSIX regex searches. + * src/templates.c, doc/geany.txt, doc/geany.html: + Add {project}, {description} template wildcards (#2954737). + * doc/geany.txt, doc/geany.html: + Divide template wildcards into groups. + * src/plugindata.h, src/plugins.c, src/symbols.c, + plugins/geanyfunctions.h: + Add symbols_get_context_separator() to plugin API (patch by Colomban + Wendling, thanks). + + +2010-05-03 Nick Treleaven + + * src/keybindings.c: + Fix setting wrong accelerator for 2 Edit->Commands items (patch by + Anonymous, thanks; #2995593). + * src/sciwrappers.c, src/plugindata.h, src/plugins.c, + plugins/geanyfunctions.h: + Add sci_set_line_indentation(), sci_get_line_indentation() to API + (patch by Colomban Wendling, thanks). + + +2010-04-30 Nick Treleaven + + * src/editor.c: + Warn user if hidden hard tab width setting is not 8. + + +2010-04-28 Nick Treleaven + + * src/interface.c, src/project.c, src/keyfile.c, geany.glade, + doc/geany.txt, doc/geany.html: + Hide 'Tabs and Spaces: Hard tab width' preference - it should + always be 8. (Hidden setting kept in case users have modified it). + + +2010-04-28 Nick Treleaven + + * doc/geany.txt, doc/geany.html: + Add Folding section link to filetypes.common custom settings. + + +2010-04-27 Enrico Tröger + + * src/callbacks.c: + When switching documents, don't call document_set_text_changed() + as this does much more than necessary. Instead call the necessary + UI update functions explicitly. + + +2010-04-27 Nick Treleaven + + * tagmanager/vstring.c: + Fix invalid memory read (patch by Colomban Wendling, thanks). + + +2010-04-25 Enrico Tröger + + * src/build.c, src/dialogs.c, src/msgwindow.c, src/ui_utils.c: + Replace g_vsnprintf() by g_strdup_vprintf() to avoid truncated + strings in case of reaching the buffer size limit (part of #2979697). + * src/win32.c: + Change the limit for the command line length when executing commands + to a maximum of 32768 characters (closes #2979697). + Fix broken opening URLs e.g. when using the 'builtin' Run command. + * tagmanager/ctags.c: + Change eFree() to simply ignore NULL pointers instead of asserting. + * src/main.c: + Remove malloc() fallback since we completely rely on g_malloc() + nowadays. + * plugins/export.c, plugins/filebrowser.c, plugins/htmlchars.c, + plugins/saveactions.c: + Make string arguments const where appropriate (patch by + Colomban Wendling, thanks). + * src/build.c, src/build.h, src/callbacks.c, src/editor.c, + src/encodings.c, src/encodings.h, src/gb.c, src/geanyentryaction.c, + src/geanymenubuttonaction.c, src/geanyobject.c, src/geanywraplabel.c, + src/keyfile.c, src/project.c, src/sidebar.c, src/socket.c, + src/symbols.c, src/templates.c, src/ui_utils.c: + Make string arguments const where appropriate (patch by + Colomban Wendling, thanks). + + +2010-04-22 Nick Treleaven + + * src/plugindata.h, src/pluginutils.c, src/pluginutils.h, THANKS: + Make plugin_signal_connect() string argument const (patch by + Colomban Wendling, thanks). + * src/keybindings.c, src/keybindings.h, src/plugindata.h: + Constify some more string pointers in the API (patch by + Colomban Wendling, thanks). + * src/templates.c, src/templates.h, src/editor.c, doc/geany.txt, + doc/geany.html: + Support {pc} wildcard in snippets to escape percent char. + * src/editor.c: + Recalculate line margin width when zooming (fixes #2990553). + * src/highlighting.c, doc/geany.txt, doc/geany.html, + data/filetypes.common: + Support more folding icon styles: arrows, +/- and no lines + (#2935059). + + +2010-04-21 Enrico Tröger + + * src/socket.c: + Fix Windows build by properly guarding Unix-only code. + + +2010-04-21 Nick Treleaven + + * src/templates.c, doc/geany.txt, doc/geany.html: + Support {ob} and {cb} in fileheader and file templates; they are + replaced last with { and }. This allows 'escaping' of wildcard + strings. + * src/editor.c, plugins/classbuilder.c: + Fix Class Builder plugin to use correct indentation instead of + always tabs. + Make editor_insert_text_block() only replace leading tabs for the + 'Tabs' indent type; also group edits for undo. + * src/templates.c, src/templates.h, src/editor.c, doc/geany.txt, + doc/geany.html: + Support {ob} and {cb} wildcards for snippets too (fixes #2937008). + + +2010-04-19 Enrico Tröger + + * tagmanager/pascal.c: + More fixes to prevent possible crashes by trying to free NULL + pointers. + * src/sidebar.c: + Automatically show and hide the sidebar notebook tabs according + to the amount of visible pages (patch by Adrian Dimitrov, thanks). + * src/editor.c: + Add a static global variable to monitor autocompletion mode in order + to prevent cancellation of the struct/class (C/C++) auto completion + list (patch by Thomas Martitz, thanks). + * src/socket.c: + When starting and trying to access the Unix Domain socket of a + potentially running instance, first compare file ownership with the + user id of the running process to prevent accessing a wrong socket + file (part of #2985463, this might not yet be the final solution). + + +2010-04-19 Nick Treleaven + + * plugins/filebrowser.c: + Synchronize popup menu and plugin preferences dialog 'Show Hidden + Files' option (fixes #2989288). + + +2010-04-18 Enrico Tröger + + * tagmanager/entry.c, tagmanager/entry.h, + tagmanager/include/tm_source_file.h, tagmanager/parse.c, + tagmanager/parse.h, tagmanager/tm_source_file.c: + Add tm_source_file_set_tag_arglist() to manually set the argument + list of a tag. + * tagmanager/python.c: + Use tm_source_file_set_tag_arglist() to set the argument list + field of Python class tags to the argument list of their + __init__() methods. + Backport a fix from CTags SVN to prevent possible crashes by trying + to free NULL pointers. + + +2010-04-17 Enrico Tröger + + * tagmanager/txt2tags.c: + Remove duplicate code from Txt2Tags parser. + Remove the title control characters ('=') when parsing titles. + Also parse numbered titles (closes #2984703). + * doc/geany.html, doc/geany.txt, src/keybindings.c, src/keybindings.h, + src/plugindata.h: + Add 'Remove Markers' and 'Remove Error Indicators' keybindings. + Add missing documentation for 'Reset Zoom' keybinding. + * tagmanager/php.c: + Another attempt to fix the PHP parser regexp for parsing functions. + Fix wrong parsing of function arguments when those contain nested + brackets (as reported by Harold Aling). + * src/notebook.c: + Fix Ctrl-Click on notebook tab if Numpad is active. + + +2010-04-11 Enrico Tröger + + * geany.glade, doc/geany.txt, plugins/geanyfunctions.h, + src/callbacks.c, src/interface.c, src/keyfile.c, src/plugindata.h, + src/plugins.c, src/prefs.c, src/toolbar.c, src/toolbar.h, + src/ui_utils.c, src/ui_utils.h: + Add option 'System Default' for toolbar icon style and size to + use the GTK default value. + * geany.glade, src/callbacks.c, src/callbacks.h, src/interface.c, + src/toolbar.c, src/toolbar.h: + Shorten the toolbar popup menu, only provide items for Toolbar + Preferences and to Hide the toolbar. + * src/toolbar.c: + Instantly update the toolbar icon size and style when the + corresponding global GTK settings are changed. + * doc/geany.1.in, doc/geany.txt, src/main.c, src/main.h, + src/plugindata.h, src/socket.c: + Add new command line option --list-documents to return a list + of currently opened documents (closes #2979933). + + +2010-04-09 Frank Lanitz + + * plugins/htmlchars.c: + Make plugin remember whether replacement of special characters was + activated even after restart of Geany or reloading of plugin. + + +2010-04-09 Nick Treleaven + + * src/editor.c: + Fix inserting snippets with an indent when using Mac CR line + endings. + * src/callbacks.c: + Update status bar after using Document->Set Line Endings. + * src/editor.c: + Improve API docs for editor_insert_text_block(). + + +2010-04-08 Nick Treleaven + + * src/editor.c: + Refactor snippets_complete_constructs(). + Remove an unnecessary TODO. + * src/editor.c: + Fix indenting a snippet when there is whitespace after the + snippet key name. + + +2010-04-07 Enrico Tröger + + * doc/geany.txt, doc/geany.html: + Improve wording. + * src/build.c, src/msgwindow.c: + Fix disabled compiler message tracking if using indicators to + show build errors is disabled (closes #2982834). + + +2010-04-07 Nick Treleaven + + * scintilla/Editor.cxx: + Backport fix from Scintilla CVS to fix using SCI_GETSELECTIONSTART + and SCI_GETSELECTIONEND with rectangular selections. This fixes + replacing in a rectangular selection. + + +2010-04-06 Nick Treleaven + + * src/filetypes.c: + Re-detect any document filetypes set to None after reloading + filetype extensions (closes #2979661). + * src/editor.c: + Fix showing '...' item last instead of first for document word + completion. + + +2010-04-05 Enrico Tröger + + * data/filetypes.perl: + Adjust Perl Compile command to use the -c command + line option to perform a syntax check instead of using the + deprecated ByteCompile module. + Add error_regex to parse error messages and warnings when performing + syntax checks on Perl files. + + +2010-04-05 Nick Treleaven + + * src/keybindings.c, src/keybindings.h, doc/plugins.dox: + Add API docs for keybinding enums. + * src/notebook.c, doc/geany.txt, doc/geany.html: + Make Ctrl-click on any notebook tab switch to the last used + document. + + +2010-04-01 Nick Treleaven + + * src/geanymenubuttonaction.c, src/geanymenubuttonaction.h, + src/geanyentryaction.c, src/geanyentryaction.h, + src/geanywraplabel.c: + Cache G_TYPE_INSTANCE_GET_PRIVATE() result when initializing an + object for efficiency. + + +2010-03-31 Nick Treleaven + + * plugins/classbuilder.c: + Beep if the user hasn't entered a class name on pressing OK. + * src/search.c: + Fix replacing '^' regex. + * src/plugindata.h, src/stash.c, src/stash.h, src/plugins.c, + plugins/geanyfunctions.h: + Add Stash widget functions to API. + * configure.ac: + Revert commit to use AC_PATH_PROG instead of 'which' (fixes + #2973764). + + +2010-03-30 Nick Treleaven + + * THANKS, src/vte.c: + Apply patch from Yoann Le Montagner to set VTE bold color (thanks, + fixes #2976905). + * wscript, src/plugindata.h, src/stash.c, src/stash.h, src/plugins.c, + src/Makefile.am, doc/plugins.dox, doc/stash-example.c, + plugins/geanyfunctions.h, plugins/geanyplugin.h: + Add Stash setting functions to API. + Remove unnecessary argument to stash_group_load_from_file(). + * src/geanyobject.c, plugins/classbuilder.c: + Don't generate FOO_GET_PRIVATE() macro because caching the result + in Foo::priv can be much more efficient. + + +2010-03-25 Enrico Tröger + + * src/editor.c: + Fix cursor positioning when toggling comments + (patch by Thomas Martitz, thanks). + + +2010-03-25 Peter Scholtens + + * src/keybindings.[hc]: + Added Control+0 for zoom reset, see suggestion from #2969886. + + +2010-03-25 Nick Treleaven + + * src/search.c, src/document.c: + Fix wrong selection range after Replace in Selection. + + +2010-03-20 Enrico Tröger + + * src/win32.c: + Make CreateChildProcess() working with Unicode strings, e.g. + directory names (closes #2972606). + * geany.nsi: + Remove reference to already removed latex.tags file. + Future releases probably still depend on GTK 2.16. + * scintilla/ScintillaGTK.cxx: + Backport fix from Scintilla CVS to not paste text beyond the end + of lines (closes #2969096). + * plugins/htmlchars.c, src/geany.h, src/keybindings.c, src/main.c, + src/plugindata.h: + Deprecate GEANY_WINDOW_MINIMAL_WIDTH/GEANY_WINDOW_MINIMAL_HEIGHT + to not set Geany's minimum window size anymore (closes #2972992). + As replacement, add GEANY_DEFAULT_DIALOG_HEIGHT. + + +2010-03-19 Nick Treleaven + + * src/stash.c: + Make adding string and string vector settings initialise the setting + to NULL for safety. + * src/utils.c, src/stash.c, src/stash.h, doc/stash-example.c: + Add stash_group_load_from_file() and stash_group_save_to_file(). + + +2010-03-18 Nick Treleaven + + * data/filetypes.common: + Set default for wrapped lines to show marker at end of line only + (more expected and doesn't change line alignment - closes #2972386). + * src/toolbar.c, src/toolbar.h, src/prefs.c, src/prefs.h, + src/pluginutils.c, doc/plugins.dox: + Improve API docs contents page by listing all commonly-used files. + Fix 'Date' appearing twice on the date line. + Don't generate API docs for prefs.h, toolbar.h (unused). + Move some '@file' doc-comments to the .c file. + * src/interface.c, geany.glade: + Add frame for 'Printing' prefs dialog page. + * src/sidebar.c, src/project.c, src/prefs.c, src/stash.c, src/stash.h, + src/keyfile.c, src/keyfile.h, src/search.c, src/plugins.c, + doc/stash-example.c: + Rename Stash data types to be independently named from Geany (so + Stash can be reused for other projects). + Rename GeanyPrefGroup to StashGroup. + + +2010-03-17 Nick Treleaven + + * tagmanager/python.c: + Apply patch from Colomban Wendling to parse Python lambda functions + (thanks) - modified to only parse toplevel or class member lambdas. + * src/stash.c, src/stash.h, doc/Doxyfile.in, doc/Makefile.am, + doc/stash-example.c: + Add doc-comments for Stash setting functions. + Add an example file showing usage of Stash. + (Not enabled yet until added to the plugin API). + + +2010-03-17 Lex Trotman + + * src/build.c: + Fix using return value without checking return status, caused + incorrect sensitivity settings on build dialog. + + +2010-03-16 Nick Treleaven + + * HACKING: + Add tip about gcc optimization & warnings/debugging. + Add Testing section. + Update Libraries section about synchronizing with other projects. + + +2010-03-15 Enrico Tröger + + * src/ui_utils.c: + For now revert the recent patch which set real_path of newly + open non-existent configuration files as this seems hackish and + causes 'file not found' warnings. + * wscript: + Fix/Improve GIT repository detection + (patch by Thomas Martitz, thanks). + * plugins/geanyfunctions.h, src/plugindata.h, src/plugins.c, + src/utils.c: + Add utils_copy_environment() to the plugin API. + + +2010-03-15 Nick Treleaven + + * src/utils.c, src/utils.h, src/sciwrappers.c, src/dialogs.c, + src/navqueue.c, src/msgwindow.c, src/filetypes.c, src/document.c, + src/main.c: + Use 3rd person for more API dox. + Change 'This is a wrapper function for...' to 'Wraps...' in brief + descriptions. + Change 'After all...' to 'Afterwards...'. + * src/interface.c, geany.glade: + Apply patch from Eugene Arshinov to make frame packing/alignment + more consistent (thanks). + + +2010-03-12 Nick Treleaven + + * src/ui_utils.c: + Fix ui_button_new_with_image() to call gtk_button_set_image() so + that gtk_button_[sg]et_label() work as expected. + * src/build.c, src/dialogs.c, src/dialogs.h, src/callbacks.c: + Make Build Commands dialog show menu item labels as a button (to + help show that menu labels don't normally need to be edited & + display the mnemonic correctly). Clicking shows an input dialog to + set a new menu item label. + Split dialogs_show_input() into 2 functions: one simple, one for + a persistent dialog. + Fix possible double-destroy of input dialog when closed by user. + * src/dialogs.c: + Fix not destroying 'Make Custom Target' input dialog after first + use (oops). + * src/project.c: + Make Long Line Marker settings for existing projects default to + general settings instead of 0 (thanks to Eugene Arshinov). + * src/utils.c, src/ui_utils.h, src/utils.h, src/highlighting.c, + src/keybindings.c, src/sciwrappers.c, src/plugindata.h, + src/filetypes.c, src/filetypes.h, src/document.c, src/pluginutils.c, + src/document.h, src/editor.c, src/editor.h, src/ui_utils.c: + Use 3rd person (gets not get) for API function brief descriptions. + Avoid using 'convenience function' in API brief descriptions. + + +2010-03-10 Nick Treleaven + + * doc/geany.txt, doc/geany.html: + Warn about some GNU extensions for regular expressions & clarify + some points. + * src/interface.c, src/keybindings.c, src/project.c, src/project.h, + src/prefs.c, src/plugindata.h, src/keyfile.c, src/editor.c, + src/editor.h, geany.glade: + Apply patch from Eugene Arshinov to add project long line marker + customisation (thanks). + * src/interface.c, geany.glade: + Edit/tidy 'Long line marker' labels. + + +2010-03-10 Lex Trotman + + * src/build.c, src/project.c: + Fix crash due to NULL in project build preferences (thanks to + Wolfgang Ocker). + + +2010-03-09 Nick Treleaven + + * src/utils.c, src/utils.h, src/search.c, src/search.h, + src/document.c, doc/geany.txt, doc/geany.html: + Merge gnu-regex branch: + Use POSIX system/GNU regex engine for find & replace 'Use regular + expressions' option. This alters regex syntax a bit - see the docs + for details; we now support '?' operator and replacement backslash + escaping is more standard. + Make regex search imply replacing escaped chars. + Allow \0 backreference replacement for the whole match. + Note: Replace All may be slower; if this is a problem please let me + know. + - code: + Add argument to utils_str_replace_escape() for keeping + uninterpreted backslash escapes e.g. '\\', '\e'. + * scintilla/LexMarkdown.cxx: + Backport minor formatting/style changes from Scintilla project. + * doc/geany.txt, doc/geany.html: + Remove warning about no visual indication for zero-column-mode + editing. + + +2010-03-09 Enrico Tröger + + * wscript: + Skip unavailable languages in LINGUAS (thanks to Christian Dywan). + + +2010-03-07 Enrico Tröger + + * wscript, scintilla/*, scintilla/include/*: + Update Scintilla to version 2.03. + * geany.glade, doc/geany.txt, doc/geany.html, src/editor.c, + src/editor.h, src/interface.c, src/keyfile.c, src/plugindata.h: + Add preference for virtual spaces. + * src/log.c: + Fix wrong default response for the Debug Messages dialog. + * src/dialogs.c: + Fix crashes when using Save As with no open files (closes #2964406). + * src/document.c: + Fix duplicate mnemonics on 'Resave missing file' dialog, also + move the question from the secondary to the main text to be + more compatible with the Gnome HIG. + Fix broken 'Save' action in 'Resave missing file' dialog. + * tagmanager/php.c: + Improve PHP parser to parse also the argument lists of PHP functions. + * src/prefs.c: + Correctly set the parent widget for the keybinding overwrite + confirmation dialog. + * src/dialog.c: + Fix setting the icon for some dialogs if the parent itself is also + a dialog. + * src/ui_utils.c: + When editing non-existent config files using the Tools->Configuration + Files menu, explicitly set the real_path to avoid presenting the Save + As dialog when saving the file (patch by Tony Rick, thanks). + * src/callbacks.c: + Focus the editor widget after hiding the sidebar when it had the + input focus (patch by Can Koy, thanks). + Properly show/hide the mesages window when using the View menu item + (closes #2961282). + * plugins/filebrowser.c: + After opening files, focus the editor widget + (based on a patch by Can Koy, thanks). + * plugins/filebrowser.c, plugins/geanyfunctions.h, src/msgwindow.c, + src/plugindata.h, src/plugins.c, src/sidebar.c, src/ui_utils.c, + src/ui_utils.h, src/vte.c: + Add and use convenience function ui_is_keyval_enter_or_return() and + add it to the plugin API. + + +2010-03-05 Frank Lanitz + + * src/about.c, THANKS, po/ast.po: + Added Asturian translation. Thanks to Marcos Costales for providing. + + +2010-02-28 Dominic Hopf + + * src/log.c: + Fix keyboard accelerators in debug messages window + (Thanks Can Koy). + + +2010-02-28 Enrico Tröger + + * scintilla/LexR.cxx: + Backport R lexer from Scintilla CVS to fix case sensitive keywords + (Scintilla bug #2956543). + * src/sidebar.c, src/about.c, THANKS: + Make Space on the symbol and document list not focus the editor + widget while Enter does (closes #2919444, patch by Can Koy, thanks). + * src/document.c, src/document.h: + Fix document_try_focus() to make it work with the sidebar document + list as well. + * src/msgwindow.c, src/msgwindow.h, src/ui_utils.c, src/ui_utils.h: + Make Space on the compiler and messages widgets not focus the editor + widget while Enter does (patch by Can Koy, thanks). + * src/editor.c: + Fix wrongly auto-detected multiline comments + (patch by Eugene Arshinov, thanks). + + +2010-02-28 Frank Lanitz + + * src/ui_utils.c: + Show number of lines of current document inside statusbar. Thanks to + Can Koy for providing the patch. + + +2010-02-24 Nick Treleaven + + * src/keybindings.c, doc/geany.txt, doc/geany.html: + Make Switch to Editor keybinding reshow the document statistics + line, so user doesn't have to move the cursor. + + +2010-02-22 Enrico Tröger + + * data/filetypes.r: + Update keywords for the R language (patch by Jon Senior, thanks). + + +2010-02-21 Dominic Hopf + + * doc/geany.txt: + Fix the instruction how to insert unicode characters + (thanks Tony Rick). + + +2010-02-21 Enrico Tröger + + * scripts/create_py_tags.py: + Minor fixes. + Replace tabs by spaces. + * plugins/genapi.py: + Minor fixes. + Replace tabs by spaces. + * tagmanager/r.c, plugins/geanyfunctions.h, src/about.c, + src/filetypes.c, src/symbols.c, tagmanager/Makefile.am, + tagmanager/makefile.win32, tagmanager/parsers.h, wscript, THANKS: + Add R tagmanager symbol parser (patch by Jon Senior, thanks). + * doc/geany.html, doc/geany.txt, src/keybindings.c, src/keybindings.h, + src/plugindata.h, src/sidebar.c, src/sidebar.h: + Add keybindings to switch to the sidebar's Document and Symbol list + as well as to the Message Window's current tab + (patch by Eugene Arshinov, thanks). + * data/filetypes.r: + Update primary keywords for the R language + (patch by Jon Senior, thanks). + + +2010-02-20 Dominic Hopf + + * doc/geany.txt: + Add more detailed hints about reloading configuration + (thanks to Tony Rick). + * data/filetypes.javascript: + Correct the keyword list for JavaScript (thanks to Jonas). + + +2010-02-14 Enrico Tröger + + * New release: Geany 0.18.1 "Balfour". + + +2010-02-13 Enrico Tröger + + * src/keybindings.c: + Add special cases for handling the Select All keybinding (Ctrl-A) in + the toolbar search and goto line text entries (closes #2948040). + Strip trailing spaces after reflowing a paragraph, patch by + Dominik Wagenfuehr, thanks (closes #2945497). + + +2010-02-07 Enrico Tröger + + * src/geanymenubuttonaction.c, src/templates.c: + Partly revert last commit: + Unref the new files toolbar menu when freeing templates as it + was done before but unref it *after* the menu has been removed + from the GeanyMenuButtonAction. + * src/encodings.c: + Fix possible endless loop when trying to detect the encoding of + non-text files (patch by Alexey Antipov, thanks). + + +2010-02-06 Enrico Tröger + + * src/document.c: + Allow saving remote files using g_file_set_contents() as well + (patch by Алексей Антипов, thanks). + * data/filetypes.python: + Adjust style for secondary keywords to be less aggressive. + Add Python 2.5 builtins keywords. + * src/geanymenubuttonaction.c, src/templates.c: + Unref the new files toolbar menu when setting a new menu to fix + possible crashes when reloading configuration. + * src/filetypes.c: + When reloading configuration, process the current document at last + so the symbol list will be updated correctly. + + +2010-02-01 Enrico Tröger + + * src/symbols.c: + Explicitly read filetype configuration files before generating + global tags to get settings for custom filetypes. + + +2010-02-01 Nick Treleaven + + * src/plugins.c: + Fix GLib warning when toggling 'no plugins available' item. + + +2010-01-31 Enrico Tröger + + * icons/Makefile.am: + Include geany.ico in the distribution tarball. + * Makefile.am: + Fix 'make distcheck' by removing data/latex.tags from EXTRA_DIST. + * scripts/create_py_tags.py: + Make the script a bit more robust with newer Python versions. + * src/templates.c: + Use utils_spawn_sync() instead of g_spawn_sync(). + + +2010-01-31 Frank Lanitz + + * plugins/export.c: + Close meta tag for export date properly. + + +2010-01-28 Enrico Tröger + + * geany.spec.in: + Update RPM Spec file (patch by Dominic Hopf, thanks). + + +2010-01-28 Nick Treleaven + + * src/plugindata.h: + Fix renaming sci_send_message(), sci_send_command() function + pointers. + + +2010-01-25 Nick Treleaven + + * src/highlighting.c, src/highlighting.h, src/sciwrappers.c, + src/plugindata.h, doc/Doxyfile.in, doc/pluginsymbols.c, + plugins/geanyfunctions.h, plugins/Makefile.am, + plugins/pluginmacros.h, plugins/genapi.py, ChangeLog, wscript: + Use full function name for GeanyFunctions function pointers. This + avoids naming conflicts e.g. with C++'s 'new' keyword. + Remove deprecated header pluginmacros.h - use geanyfunctions.h + instead. + + +2010-01-24 Enrico Tröger + + * src/utils.c, src/utils.h, src/vte.c: + Add utils_copy_environment() and make use of it. + * data/snippets.conf, doc/geany.html, doc/geany.txt, src/callbacks.c, + src/editor.c, src/templates.c, src/templates.h: + Add new special template wildcard "{command:...}" to use the + output of a command in templates. + Adjust template functions to mostly work with GeanyDocuments. + Minor cleanups in the template code. + * src/gb.c: + Replace the old icons with smiley icons from the Rodent icon theme. + Fix showing the same icon for two or more slots. + Minor cleanups. + * src/editor.c, src/editor.h, src/keybindings.c: + Rename fold_symbol_click() to editor_toggle_fold(). + Use editor_toggle_fold() when the 'Toggle current fold' keybinding + was used to respect the 'Fold/unfold all children' preference + (closes #2935053). + + +2010-01-22 Nick Treleaven + + * src/build.c: + Prevent possible segfault in get_build_group(). + * src/callbacks.c: + Fix GLib warning & beep if trying to insert multiline comment for a + filetype that doesn't support it. + + +2010-01-18 Nick Treleaven + + * doc/plugins.dox: + Add gcc commands to build a plugin to the HowTo. + * src/search.c, src/document.c, src/document.h: + Show 'Replaced X matches in Y documents' message when using + Replace in Session. + + +2010-01-17 Enrico Tröger + + * scripts/plugin_test.c: + Add a little test program which can load and test Geany plugins to + verify it is loadable at runtime and all necessary symbols are + defined. + * doc/plugins.dox, src/geanyobject.c, src/geanyobject.h, src/main.c, + src/plugindata.h: + Add new signal: "geany-startup-complete" which is sent once all + initialization and startup tasks has been done. + * README.I18N, configure.ac, wscript, po/LINGUAS: + Remove po/LINGUAS from the repository. + Generate it automatically if needed by reading available + message catalogs from the po directory. + Also respect the LINGUAS environment variable properly. + + +2010-01-16 Frank Lanitz + + * src/editor.c: + Remove editor_auto_latex() from Geany core and move it to geanyLaTeX + plugin. + + +2010-01-12 Enrico Tröger + + * src/editor.c, src/templates.c, src/templates.h: + Refactor templates_replace_all() into templates_replace_valist() + to save some code duplication. + + +2010-01-11 Frank Lanitz + + * plugins/geanyfunctions.h, src/editor.c, src/editor.h, + src/plugindata.h, src/plugins.c: + Add editor_insert_text_block() to plugin API. + + +2010-01-01 Enrico Tröger + + * *.*: + Update copyright information. + * src/keybindings.c, src/keybindings.h, src/plugindata.h, + doc/geany.txt, doc/geany.html: + Add keybinding to open the last closed tab (closes #2912692). + + +2009-12-31 Enrico Tröger + + * autogen.sh, configure.in, configure.ac: + Rename configure.in to configure.ac. + * plugins/geanyfunctions.h, src/plugins.c, src/plugindata.h, + src/sciwrappers.c: + Add sci_find_text() to the plugin API. + * doc/geany.html, doc/geany.txt, geany.glade, src/callbacks.c, + src/interface.c, src/prefs.c: + Add a checkbox in the preferences dialog to explicitly toggle + the visibility of the sidebar (closes #2923340). + + +2009-12-29 Enrico Tröger + + * src/editor.c, src/plugins.c, src/plugindata.h, + plugins/geanyfunctions.h: + Add editor_get_eol_char_name(), editor_get_eol_char_len() and + editor_get_eol_char() to the plugin API. + * src/callbacks.c, src/plugins.c, src/plugins.h: + Fix sensitivity of the Edit->Plugin Preferences menu item + if plugins are loaded which do not provide a configuration dialog. + * scripts/create_py_tags.py: + Rewrite and extend the Python tags parsing script to use + Python's inspect module to read symbols from Python modules + including scope information. + * data/filetypes.restructuredtext: + Add the default comment character sequence for reStructuredText. + * src/callbacks.c: + Show the Find/Goto dialogs if the corresponding toolbar buttons are + clicked but their text fields are not part of the toolbar (#2920807). + * data/filetypes.common, doc/geany.html, doc/geany.txt, + src/highlighting.c: + Add new style to change foreground and background colours for + calltips (patch by Dimitar Zhekov, thanks, closes #2919229). + * src/search.c: + Remember the window position of the Find, Replace and Find in Files + dialogs (closes #2877988). + + +2009-12-26 Frank Lanitz + + * doc/plugins.dox: + Fix a minor typo inside plugin API reference. + + +2009-12-20 Enrico Tröger + + * src/dialog.c, src/dialogs.h, src/document.c, src/prefs.c: + Make dialogs_show_prompt() more flexible to take up to three + button/response code pairs to be shown. + Add a close button to the dialog when asking to Re-Save a + deleted file + (closes #2916954, based on a patch by Dominik Stadler, thanks). + * src/editor.c: + Fix LaTeX environment auto completion with CR/LF line endings. + Add some sanity checks. + * src/document.c: + When closing a document after it was deleted from the filesystem, + don't ask whether it should be saved first. + Mark the document only as changed if it is not closed afterwards. + Prevent possible segfaults if the document was closed when it is + missing from the filesystem. + * src/keybindings.c, src/keyfile.c, src/main.c, src/msgwindow.c, + src/msgwindow.h, src/prefs.c: + Add MessageWindow::scribble and use it instead of searching the + widget pointer everytime. + * src/keyfile.c, src/msgwindow.c, src/msgwindow.h, src/ui_utils.h: + Add preferences for hiding single tabs from the messages window + (no GUI preferences yet, still to be implemented). + * src/callbacks.c, src/prefs.c, src/toolbar.c, src/toolbar.h: + Set the correct parent window for the toolbar editor + dialog (closes #2913334). + * src/win32.c, src/win32.h, src/ui_utils.c: + Rename win32_show_project_folder_dialog() to + win32_show_folder_dialog() as it is not related and not used by any + project management related code. + * src/ui_utils.c, src/win32.c, src/win32.h, src/dialogs.c: + Rename win32_show_file_dialog() to win32_show_document_open_dialog() + as it is specialised for opening documents. + Implement win32_show_file_dialog() as a generic file open dialog and + use it with ui_path_box_new(). + + +2009-12-20 Frank Lanitz + + * src/editor.c: + Extend auto_latex() function to check whether an environment has been + closed within the next lines to avoid auto adding double \end{}. + * data/latex.tags: + Remove LaTeX tags from SVN. Can be found at + http://download.geany.org/contrib/tags/ if needed. + + +2009-12-19 Enrico Tröger + + * src/callbacks.c, src/dialogs.c, src/document.c, src/document.h: + Add document_need_save_as(). + Show the Save As also for documents created from filetype templates + instead of saving them directly with the untitled filename. + + +2009-12-09 Nick Treleaven + + * geany.glade, src/interface.c: + Move 'Send Selection to Terminal' menu item from Format to Commands + submenu. + * src/msgwindow.c: + When going to a build error, try the current document's path if + the parsed filename doesn't exist. (This can happen when we receive + build messages in the wrong order - after the 'Leaving directory' + messages). + * src/msgwindow.c: + Refactor msgwin_goto_compiler_file_line(). + * src/interface.c, src/keybindings.c, geany.glade: + Capitalize, add mnemonics, sync with kb.c the Edit->Commands menu + item labels. + * src/search.c: + Refactor/reformat on_replace_dialog_response(). + + +2009-12-08 Enrico Tröger + + * geany.spec.in: + Improve geany.spec (split the package into a binary and devel + package, update BuildRequires and other minor improvements). + Patch by Dominic Hopf, thanks. + + +2009-12-08 Nick Treleaven + + * src/filetypes.c, src/filetypes.h: + Make group for custom filetypes. + * data/filetypes.Genie.conf, data/filetype_extensions.conf: + Add custom filetype Genie. + + +2009-12-07 Nick Treleaven + + * src/highlighting.c: + Highlight D & Java types from a global tags file. + * src/highlighting.c, doc/geany.txt, doc/geany.html: + Add debug message warning if recursive lexer_filetype is set. + * src/highlighting.c, src/sciwrappers.c, src/sciwrappers.h: + Remove duplicate sci_set_keywords(), make argument const. + * src/highlighting.c: + Only show debug message once if recursive lexer_filetype is set. + Tidy highlighting_init_styles code for filetype None handling. + * scintilla/makefile.win32, scintilla/KeyWords.cxx, + scintilla/LexVerilog.cxx, scintilla/Makefile.am, src/highlighting.c, + src/filetypes.c, src/filetypes.h, src/symbols.c, THANKS, + tagmanager/parsers.h, tagmanager/makefile.win32, + tagmanager/verilog.c, tagmanager/Makefile.am, + data/filetypes.verilog, data/filetype_extensions.conf, wscript: + Apply patch from Kelvin Gardiner to add Verilog filetype (thanks). + * src/highlighting.c: + Fix segfault on startup (oops). + * data/filetypes.verilog: + Fix using common style colours for Verilog. + + +2009-12-03 Nick Treleaven + + * src/highlighting.c, data/filetypes.cpp, data/filetypes.vala, + data/filetypes.glsl, data/filetypes.cs, data/filetypes.c: + Move C-like filetype properties into configuration files. + * src/highlighting.c, data/filetypes.cpp, data/filetypes.cs, + data/filetypes.c: + Remove now unnecessary "styling_within_preprocessor" C style key. + * src/highlighting.c, data/filetypes.cpp, data/filetypes.vala, + data/filetypes.glsl, data/filetypes.cs: + Use lexer_filetype=C configuration file key instead of duplicate + styleset functions for C++, C#, GLSL, Vala. + + +2009-12-02 Nick Treleaven + + * doc/geany.txt, doc/geany.html: + Warn about not using BOM for configuration files (confuses GKeyFile + parser, at least on my system). + * src/filetypes.c: + Add/improve debug messages for custom filetypes. + + +2009-11-30 Frank Lanitz + + * data/latex.tags: + Add a couple of further latex-beamer commands to list of LaTeX tags. + + +2009-11-30 Enrico Tröger + + * plugins/filebrowser.c: + Add an in-entry clear icon to the filebrowser plugin's filter + entry (patch by Dominic Hopf, thanks). + * src/prefs.c, src/ui_utils.c: + Fix two compiler warnings about possibly uninitialised variables. + + +2009-11-29 Enrico Tröger + + * src/main.c, src/main.h, src/plugins.c, src/plugindata.h, + plugins/geanyfunctions.h: + Add main_is_realized() to the plugin API. + * tagmanager/include/tm_tagmanager.h: + Update partly outdated and wrong doc comment. + * src/main.c, src/main.h, src/socket.c: + Allow opening Geany projects remotely. + * doc/geany.txt, doc/geany.html, src/vte.c, src/vte.h, src/keyfile.c: + Add a hidden pref to allow executing text which was sent to the + terminal directly, i.e. do not strip trailing newline characters. + Also fix the stripping of trailing newline characters if there was + more than one. + + +2009-11-26 Frank Lanitz + + * src/about.c, THANKS: + Add Peter Scholtens and Ayke van Laethem to list of translators. Move + Kurt de Bree into section of previous translators. + + +2009-11-26 Nick Treleaven + + * src/about.c, src/symbols.c, THANKS, tagmanager/vhdl.c: + Fix VHDL symbol list to display all tags (patch from Kelvin Gardiner, + thanks). + + +2009-11-24 Nick Treleaven + + * src/highlighting.c: + Make stylesets take a ft_id argument so they can be reused fully with + custom filetypes, so custom styles and keywords can be set. + * src/highlighting.c: + Fix setting filetype properties when both the system and the user + file have properties set. + * src/symbols.c, tagmanager/vhdl.c: + Parse VHDL signals. + * src/highlighting.c: + Fix lexer settings for custom filetypes. + + +2009-11-23 Enrico Tröger + + * tagmanager/php.c: + Remove duplicate regular expression for parsing classes. + Fix and improve parsing of constants (patch by Harold Aling, thanks). + * doc/geany.1.in, doc/geany.html, doc/geany.txt, src/main.c, + src/main.h, THANKS, src/about.c: + Add new command line option "--socket-file" to be able to specify + separate socket filenames for instances + (closes #2896027, patch by Jörn Reder, thanks). + * src/keybindings.c, src/keybindings.h: + Add keybindings_check_event() to manually check GdkKeyEvents against + Geany's keybindings. + * src/callbacks.c, src/utils.c, src/utils.h: + Add and use utils_get_help_url(). + * geany.glade, src/interface.c, src/prefs.c: + Add a Help button to the preferences dialog. + Handle Help keybinding events for the preferences dialog especially + and open the manual with the corresponding anchor link to the current + preferences page (same goes for the new Help button). + + +2009-11-22 Enrico Tröger + + * src/toolbar.c, src/geanymenubuttonaction.c, + src/geanymenubuttonaction.h: + Use separate tooltips for toolbar menu buttons and their attached + drop-down arrows. + * tagmanager/latex.c: + Improve parsing of sections and chapters by ignoring shortnames + like \section[shortname]{label} (closes #2890477). + + +2009-11-19 Nick Treleaven + + * src/geanymenubuttonaction.c: + Try to fix Gtk warning when using Tools->Reload Configuration. + + +2009-11-18 Nick Treleaven + + * src/highlighting.c, doc/geany.txt, doc/geany.html, + data/filetypes.nsis, data/filetypes.php, data/filetypes.perl, + data/filetypes.pascal, data/filetypes.docbook, + data/filetypes.python, data/filetypes.conf: + Use filetypes.foo [lexer_properties] group instead of hardcoding + lexer properties (more flexible e.g. for custom filetypes). + * src/highlighting.c, data/filetypes.xml, data/filetypes.html: + Replace filetypes.xml html_asp_default_language key with + filetypes.html asp.default.language property in [lexer_properties] + group. + + +2009-11-17 Enrico Tröger + + * doc/geany.txt, doc/geany.html: + Fix slightly wrong description of how to insert Unicode characters. + * src/ui_utils.c: + Implement GTK_FILE_CHOOSER_ACTION_OPEN mode in + ui_setup_open_button_callback(). + * src/prefs.c, src/prefs.c, src/vte.c: + Refactor color and font button callback functions in the + preferences dialog. Move the VTE related callback functions + into vte.c. + Make use of ui_setup_open_button_callback(). + * src/printing.c: + Improve printing status texts (patch by Dominic Hopf, thanks). + * src/prefs.c, src/vte.c: + Use the default dialog title set by ui_setup_open_button_callback() + to be more consistent and to save one string. + + +2009-11-16 Nick Treleaven + + * tagmanager/c.c: + Separate DKinds from CKinds. + Don't generate macro tags for D, Java. + + +2009-11-12 Nick Treleaven + + * tagmanager/ctags.c, tagmanager/general.h: + Make TagManager Assert statements cause g_warning on failure. + * src/keybindings.c: + Fix reflow paragraph command when cursor < anchor using + sci_fix_selection(). + + +2009-11-10 Nick Treleaven + + * tagmanager/perl.c: + Fix Geany segfault with constant tags (#2895168). + * src/symbols.c: + Fix invalid tree iter access when using tv_iters.tag_other but not + using tv_iters.tag_variable. + * HACKING, tagmanager/perl.c: + Fix parsing Perl format statements ("other" type doesn't seem + to work). + * tagmanager/tm_tag.c, tagmanager/perl.c, HACKING: + Fix using "other" tag type. + + +2009-11-09 Enrico Tröger + + * src/vte.c: + Remove useless comment about applying settings only when libvte.so + could be loaded which is only displayed *if* libvte.so is loaded. + * src/editor.c: + Allow autocompletion for HTML entities even within a word. + * src/geanymenubuttonaction.c: + Only set the menu of the button if a non-empty GtkMenu is passed to + geany_menu_button_action_set_menu() so the menu arrow keeps + insensitive. + + +2009-11-07 Nick Treleaven + + * tagmanager/c.c: + Fix parsing some Java code (e.g. filetypes.java) after r4407. + + +2009-11-06 Nick Treleaven + + * tagmanager/c.c: + Parse D functions with contracts (fixes #1885480). + Parse D alias statement like typedef. + (Ignore some more D keywords). + * tagmanager/c.c: + Fix creating D interface tags properly. + * tagmanager/c.c: + Parse contents of D extern{} and version{} blocks. + + +2009-11-05 Enrico Tröger + + * src/main.c: + Remove old code. + + +2009-11-05 Nick Treleaven + + * src/plugindata.h, HACKING: + Deprecate PLUGIN_KEY_GROUP() macro - use plugin_set_key_group() + instead. + * src/callbacks.c: + Show number of files saved on status bar when using Save All. + * src/highlighting.c: + Use default color scheme if pref color scheme file doesn't exist. + * src/keybindings.c: + Fix moving correct lines after selecting whole line(s). + + +2009-11-04 Enrico Tröger + + * tagmanager/makefile.win32: + Fix broken build on Windows because of a typo + (patch by Timothy Boronczyk, thanks). + + +2009-11-04 Nick Treleaven + + * src/highlighting.c, src/highlighting.h, src/keyfile.c, src/main.c, + src/editor.h: + Add 'View->Editor->Color Schemes' menu, for now only shown if color + scheme files exist in a colorschemes config directory. Color scheme + files must end in ".conf" and currently only the [named_styles] + section is read. + * src/templates.c, src/utils.c, src/highlighting.c, src/utils.h: + Add utils_get_config_files(). + * src/highlighting.c: + Fix issue with default color not being reset if overridden with a + system default color. + * src/highlighting.c: + Only reload filetype files when changing color scheme, not all + configuration files. + * src/filetypes.c, src/document.c, src/document.h, doc/Doxyfile.in: + Deprecate documents_foreach() as it looks more like a function; use + foreach_document() instead. + Generate dox even for GEANY_DISABLE_DEPRECATED declarations. + + +2009-10-30 Nick Treleaven + + * src/stash.c, src/stash.h: + Use typedef instead of pointer for widget_id function arguments. + + +2009-10-29 Nick Treleaven + + * src/pluginutils.c: + Don't expand Plugin Preferences page spacing vertically to fill the + height of the dialog. + * src/interface.c, src/keybindings.c, src/keybindings.h, src/prefs.c, + geany.glade, plugins/splitwindow.c: + Allow GeanyKeyBinding label field to contain underscores, which won't + be displayed by Geany. This saves adding near-duplicate translation + strings. + Add mnemonics for 3 Edit->Format menu items. + Add keybindings_get_label(). + * src/interface.c, geany.glade: + Use GtkVBoxes for Encoding prefs combo boxes to reduce width of prefs + dialog. + + +2009-10-28 Nick Treleaven + + * src/ui_utils.c: + Desensitize Edit->Commands menu item when no docs are open. + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, geany.glade: + Add 'Reflow, Transpose, Smart line indent' Edit->Format menu items. + * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: + Add general function sci_get_string() that works with any string + buffer messages that follow the Windows message convention. + * src/pluginprivate.h, src/interface.c, src/keybindings.c, + src/keybindings.h, src/callbacks.c, src/callbacks.h, + src/pluginutils.c, src/pluginutils.h, geany.glade: + Add 'Edit->Plugin Preferences' menu item and keybinding. + Don't include plugindata.h in pluginutils.h because it redefines the + GEANY() macro for plugin use. + * doc/geany.txt, doc/geany.html: + Update for Plugin Preferences keybinding. + + +2009-10-27 Nick Treleaven + + * src/editor.c: + Sort document word completion list. + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, geany.glade: + Add some useful commands to editor popup menu under "Commands" + submenu (thanks to Lex). + Move 'Duplicate line or selection' from Format -> Commands submenu. + * src/prefs.c, src/ui_utils.c, doc/geany.txt, doc/geany.html: + Enable switching the sidebar to the right on Windows again, as it + apparently works after all. + * src/editor.c: + Fix using tab to autocomplete in some other situations that word part + completion doesn't apply in. + * src/templates.c, src/interface.c, src/ui_utils.c, geany.glade: + Add Edit->Commands submenu which is shared with the editor popup + menu. + * src/interface.c, src/keybindings.c, src/ui_utils.c, geany.glade: + Change editor popup Commands submenu to start as child of menubar + Edit menu, as this is more usual e.g. for keybindings initialization. + * src/interface.c, src/keybindings.c, src/tools.c, src/ui_utils.c, + geany.glade: + Share a single Format submenu for menubar Edit and popup menu. + + +2009-10-26 Enrico Tröger + + * src/build.c: + Fix a compiler warning about an uninitialised variable. + * wscript: + Don't install unnecessary headers: dialogs.h, main.h, plugins.h, + sciwrappers.h, build.h (for the Waf build system, + accordingly to r4366). + + +2009-10-26 Nick Treleaven + + * src/prefs.h, src/search.h, src/support.h, src/templates.h, + src/toolbar.c, src/toolbar.h: + Add missing dox for types/files in the API. + * src/filetypes.h, src/Makefile.am, plugins/geanyplugin.h: + Don't install unnecessary headers: dialogs.h, main.h, plugins.h, + sciwrappers.h, build.h. (This helps to get compiler warnings for uses + of functions not in the API). + Warning: any plugins that include these headers should remove them. + * src/build.c, src/build.h: + Move function doc-comments to build.c so they stay in sync. Note: + these functions are still not in the API. + * HACKING: + Add 'Doc-comments' plugin API subsection. + * plugins/filebrowser.c: + Fix packing configure widgets equally. + Use spacing multiples of 6 as recommended by Gnome HIG. + * src/prefs.c, src/ui_utils.c, doc/geany.txt, doc/geany.html: + Disable switching the sidebar to the right on Windows as it will + probably fail like the Split Window plugin. + * src/document.c: + Improve 'Detect from file' indentation pref by ignoring lines with + indentation wider than 24 characters as this is more likely to be + alignment than indentation. + + +2009-10-25 Enrico Tröger + + * plugins/saveactions.c: + Fix adding the filetype's default extension when using the + Instant Save plugin (closes #2885142). + * src/main.c: + Before looking for line and column numbers specified as part + of a filename, ensure the file doesn't exist on disk. This allows + opening of files like "test:0". + * src/sidebar.c: + Rename "select" variables into "selection" to avoid shadowed names. + * plugins/geanyfunctions.h, src/plugins.c, src/plugindata.h: + Add ui_widget_modify_font_from_string() and sci_goto_line() + to the plugin API. + * plugins/filebrowser.c: + Rename "select" variables into "selection" to avoid shadowed names. + Make use of ui_widget_modify_font_from_string(). + + +2009-10-23 Nick Treleaven + + * src/interface.c, src/ui_utils.h, src/prefs.c, src/keyfile.c, + src/main.c, src/ui_utils.c, doc/geany.txt, doc/geany.html, + geany.glade: + Add sidebar position interface pref. + + +2009-10-23 Lex Trotman + + * doc/geany.txt, doc/geany.html: + Add missing underscores to links. + + +2009-10-22 Nick Treleaven + + * src/keybindings.c, src/keybindings.h, doc/geany.txt, doc/geany.html: + Add 'Move line(s) up/down' keybindings. + + +2009-10-22 Lex Trotman + + * src/build.c, src/build.h, src/filetypes.h: + Include code for project filetype execute commands and fix bug in + saving project filetypes list. + * src/project.c, src/build.c, doc/geany.txt: + Make non-project execute configuration save to filetypes not + geany.conf. + Fix closing of project failing to remove build commands dialog entry. + + +2009-10-21 Nick Treleaven + + * src/project.c, src/ui_utils.c: + Set border width for project properties build table. + * geany.glade, src/interface.c: + Don't expand hard tab width alignment. + + +2009-10-20 Nick Treleaven + + * src/highlighting.c, src/filetypes.c, src/document.c, src/symbols.c, + doc/geany.txt, doc/geany.html: + Support loading global tags files for custom filetypes. + * src/keybindings.c, src/keybindings.h, src/editor.c, src/editor.h, + doc/geany.txt, doc/geany.html: + Add 'Word part completion' keybinding so keys other than Tab can be + used, or to clear/change the combination so Tab does full completion + like before. + * src/keybindings.c, src/keybindings.h, doc/geany.txt, doc/geany.html: + Add 'Select to previous/next word part' keybindings. + * src/keybindings.c, src/keybindings.h, doc/geany.txt, doc/geany.html: + Add 'Switch to Messages' focus keybinding. + + +2009-10-19 Nick Treleaven + + * doc/geany.txt, doc/geany.html: + Add 'Custom filetypes' section. + * src/filetypes.c, src/filetypes.h, src/document.c, + doc/geany.txt, doc/geany.html, tagmanager/tm_source_file.c, + tagmanager/include/tm_source_file.h: + Add filetype "tag_parser" key so custom filetypes can use an existing + tag parser. + Add tm_source_file_get_named_lang(). + * src/highlighting.c, src/filetypes.c, src/filetypes.h, doc/geany.txt, + doc/geany.html: + Add filetype "lexer_filetype" key so custom filetypes can use an + existing lexer. + + +2009-10-19 Frank Lanitz + + * THANKS, src/about.c: + Add Xhacker Liu for his work at zh_CN translation to long list of + translators. + + +2009-10-16 Nick Treleaven + + * src/sciwrappers.c: + Remove unnecessary line number margin padding. + * scintilla/include/Scintilla.h, scintilla/include/Scintilla.iface, + scintilla/ScintillaBase.h, scintilla/ScintillaBase.cxx, + src/editor.c: + Improve word part autocompletion so AC list is not cancelled and + reshown (this also stops the selection changing). + Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream). + * src/editor.c: + Improve CamelCase word part autocompletion for runs of capital + letters. + * src/editor.c: + Don't complete snippets if there's a selection. + + +2009-10-16 Lex Trotman + + * src/build.c: + Fix crash opening project when Geany started with no geany.conf. + + +2009-10-15 Nick Treleaven + + * scintilla/ScintillaBase.h, scintilla/ScintillaBase.cxx, src/utils.c, + src/utils.h, src/sciwrappers.c, src/editor.c, doc/geany.txt, + doc/geany.html: + Add word part autocompletion for the current selected item when + pressing Tab - Enter still completes normally. + Add foreach_str() API macro. + Temporarily modify scintilla to say if tab was used for + autocompletion. + * src/templates.c, src/build.c, src/utils.c, src/utils.h, + src/project.c, src/search.c, src/editor.c, src/ui_utils.c, + plugins/classbuilder.c: + Revert r4301 - utils_free_pointers() taking 4 arguments. + * src/highlighting.c, src/highlighting.h, src/plugindata.h, + src/document.c, src/plugins.c, plugins/geanyfunctions.h, + plugins/splitwindow.c: + Add highlighting_set_styles() to API, use for Split Window plugin so + filetypes.common settings get set too. + Make highlighting_set_styles() take GeanyFiletype pointer instead of + filetype id. + * src/document.c, src/editor.c, plugins/splitwindow.c: + Call editor_apply_update_prefs() from editor_create_widget() so + correct tab width and other settings are applied for Split Window + plugin. + + +2009-10-14 Nick Treleaven + + * src/keybindings.c: + Don't include trailing newlines when using reflow command. + * src/notebook.c: + Add stock close buttons to notebook tab popup menu. + * src/plugindata.h, src/document.c, src/plugins.c, src/ui_utils.c, + plugins/geanyfunctions.h: + Add document_get_notebook_page() to API. + Minor edits of dox. + * data/templates/files/file.html, data/templates/files/file.php: + Fix wrong escaping (patch by dmaphy, thanks - closes #2878138). + * src/interface.c, src/ui_utils.c, geany.glade: + Move Tools configuration items to top of menu. + * src/keybindings.c, src/search.c: + Fix warning when using Find in Files with no documents open; make + keybinding work in this case. + + +2009-10-13 Nick Treleaven + + * src/notebook.c, src/plugindata.h, src/plugins.c, src/ui_utils.c, + src/ui_utils.h, plugins/geanyfunctions.h, plugins/splitwindow.c: + Make Split Window 'Show current document' button have a drop-down + menu to select the other documents. + Add new API function ui_menu_add_document_items(). + + +2009-10-13 Lex Trotman + + * src/build.c: + Fix sensitivity settings for compile and build toolbar items. + + +2009-10-12 Nick Treleaven + + * src/templates.c: + Don't use filetype submenus for templates (slower to navigate, often + only 1 per-filetype anyway). + * src/templates.c: + Put old filetype template menu items in 'Old' submenu as they should + be removed after the 0.19 release. + * src/keybindings.c, src/keybindings.h, src/pluginutils.c: + Add GeanyKeyGroup callback support, which allow keybinding callbacks + to be ignored if inappropriate so a later keybinding with the same + key combination can intercept it. (Also group callbacks are usually + tidier than separate callbacks). + Remove special handling for GEANY_KEYS_EDIT_COMPLETESNIPPET. + * src/templates.c, src/build.c, src/utils.c, src/utils.h, + src/project.c, src/search.c, src/editor.c, src/ui_utils.c, + plugins/classbuilder.c: + Make utils_free_pointers() take 4 arguments, add to API. + * src/templates.c, src/tools.c, src/ui_utils.c: + Fix memory leaks with gtk_container_get_children(). + + +2009-10-12 Lex Trotman + + * src/build.c: + Ensure that old style build config is not loaded if it does + not exist. + + +2009-10-12 Frank Lanitz + + * THANKS, src/about.c, po/LINGUAS, po/gl.po: + Added Galician translation. + Thanks to José Manuel Castroagudín Silva. + + +2009-10-11 Enrico Tröger + + * geany.glade, THANKS, src/about.c, src/document.c, src/encodings.c, + src/interface.c: + Apply set default encoding for existing files only if the files are + non-Unicode (patch by Alexey Antipov, thanks). + + +2009-10-04 Nick Treleaven + + * src/highlighting.c: + Move new_styleset() and preprocessor setup code into + styleset_c_like(). + * src/highlighting.c: + Call apply_filetype_properties() from styleset_c_like(). + + +2009-10-03 Enrico Tröger + + * doc/geany.txt, doc/geany.html: + Improve information about predefined keybindings which are + commonly used across applications (patch by Lex Trotman, thanks). + * src/printing.c: + Enable embedded page setup properties in the (Unix) Print dialog + on newer GTK versions (closes #2870596). + * src/highlighting.c: + Map global types (read from tags files) to keyword style for + filetype Java. + + +2009-10-01 Nick Treleaven + + * src/templates.c: + Fix wrong creation of filetype template menu items for custom + filetypes. + * src/highlighting.c: + Use jscript_keyword for SCE_HB[A]_WORD markup styles. + * src/templates.c: + Group 'New with template' items by filetype submenu (currently only + for toolbar menu). + Show custom file template items before filetype template items. + * src/templates.c, src/interface.c, src/geanymenubuttonaction.c, + geany.glade: + Only use one 'New with template' submenu - reparent as needed. + * src/templates.c: + Don't create templates/filetype.none either. + * src/templates.c: + Warn if custom template file no longer exists. + + +2009-09-30 Enrico Tröger + + * src/symbols.c: + Add missing icon for Java packages in the Symbol List. + + +2009-09-30 Nick Treleaven + + * src/highlighting.c, data/filetypes.vala: + Add Vala keywords to conf file. + * src/templates.c, doc/geany.txt, doc/geany.html: + Read custom file templates from $prefix/share/geany/templates/files + as well as user dir. + * src/templates.c, data/templates, data/templates/files, + data/templates/files/file.rb, data/templates/files/file.html, + data/templates/files/main.java, data/templates/files/main.c, + data/templates/files/main.cxx, data/templates/files/file.php, + data/templates/files/main.d, data/templates/files/program.pas, + data/templates/files/main.py, data/templates/files/file.tex, + wscript, Makefile.am: + Move filetype template defaults into custom file template files. + + +2009-09-29 Nick Treleaven + + * src/symbols.c, tagmanager/perl.c: + Change Perl tag parser to ctags SVN r601. This removes support for + buggy local/my/our but it parses constant/format/labels and should + be less buggy overall (closes #2861232). + * src/templates.c, src/utils.c, src/utils.h, src/symbols.c: + Add utils_get_file_list_full() which can optionally sort or include + a full path for each list item. + * src/utils.c, src/plugindata.h, src/plugins.c: + Add utils_get_file_list_full() to API. + + +2009-09-28 Nick Treleaven + + * src/keybindings.c, src/sidebar.c, src/sidebar.h, + src/makefile.win32, src/project.c, src/prefs.c, src/treeviews.c, + src/callbacks.c, src/notebook.c, src/treeviews.h, src/document.c, + src/main.c, src/symbols.c, src/Makefile.am, src/ui_utils.c, + po/POTFILES.in, wscript: + Rename treeviews.[hc] -> sidebar.[hc]. + * data/filetypes.common: + Remove unused [styling] arguments. + * src/highlighting.c, data/filetypes.markdown, + data/filetypes.restructuredtext: + Remove style defaults from the code - just read them from + configuration files. + * src/highlighting.c, HACKING: + Add apply_style_entries() to simplify implementing styleset_foo(). + * src/highlighting.c: + Remove filetype keyword defaults from the code - just read them from + configuration files. + * src/highlighting.c: + Add sci_set_keywords() wrapper. + + +2009-09-27 Enrico Tröger + + * scripts/create_py_tags.py: + Make the code a bit more pythonic. + * doc/images/build_menu_commands_dialog.png, + doc/images/main_window.png: + Add new images referenced in the documentation. + * doc/geany.html, doc/geany.txt: + Several documentation improvements (patch by Lex Trotman, thanks). + * src/pluginutils.c: + Fix setting the appropriate page of the combined plugins + preferences dialog. + + +2009-09-27 Nick Treleaven + + * src/keybindings.c: + Only focus toolbar goto line entry when pressing keybinding if it's + visible (patch by Eugene Arshinov, thanks). + * src/callbacks.c: + Focus editor after entering a number in the goto line toolbar entry. + * configure.in: + Use AC_PATH_PROG instead of which for portability (patch by Erik + Southworth, thanks). + * src/plugins.c: + Show plugins that only implement plugin_configure_single() in the + multiple-configure dialog as a page with a configure button on it. + Add padding for multiple-configure dialog. + Make the multiple-configure dialog notebook tabs scrollable. + * src/pluginutils.c, src/pluginutils.h: + Don't build pluginutils.o if HAVE_PLUGINS is not defined. + * src/pluginprivate.h, src/plugindata.h, src/pluginutils.c, + src/plugins.c, src/pluginutils.h, src/plugins.h, po/POTFILES.in, + plugins/geanyfunctions.h, plugins/filebrowser.c: + Add plugin_show_configure() API utility function. + Add File Browser popup menu 'Preferences' item. + * src/highlighting.c: + Add get_keyfile_ints() instead of using tmp_style hack. + * src/highlighting.c, data/filetypes.xml: + Change new html_asp_default_language markup pref to use integer, + not hex in config file. + Fix minor issue with changing pref back to 0. + * src/highlighting.c: + Fix possible segfault in get_keyfile_int() if key value is malformed. + + +2009-09-24 Enrico Tröger + + * THANKS, src/about.c, src/highlighting.c, data/filetypes.xml: + Add "html_asp_default_language" pseudo style to filetypes.xml + to allow setting the used language in embedded ASP code + (patch by Ross McKay, thanks). + * src/filetypes.xml: + Update VBScript keywords (patch by Ross McKay, thanks). + + +2009-09-24 Nick Treleaven + + * src/keybindings.c, THANKS: + Apply patch from Lex Trotman to make 'Reflow block/lines(s)' + keybinding use line breaking column when enabled. + * src/document.c: + Fix showing the document before reload dialog when opening an + already-open file. + * src/pluginprivate.h, src/plugins.c, doc/pluginsymbols.c: + Add plugin_configure_single() plugin symbol which is easier to + implement than plugin_configure() but won't support a + multiple-plugin configure dialog. + * src/plugins.c: + Show multiple plugins in the 'Configure Plugins' dialog. + + +2009-09-22 Nick Treleaven + + * doc/geany.txt, doc/geany.html: + Change 'Foo tab in preferences dialog' titles to 'Foo preferences'. + Minor edits. + * doc/geany.txt, doc/geany.html: + Add 'Toolbar entries' section. + * doc/geany.txt, doc/geany.html: + Update 'Go to line' keybinding description. + * doc/geany.txt, doc/geany.html: + Split keybinding table into group tables; update KB links. + + +2009-09-21 Enrico Tröger + + * src/build.c: + Fix compiler warnings about uninitialised variables. + * src/callbacks.c, src/document.c: + When reloading files, use the previously set encoding instead of + detecting it again (closes #2862041). + * configure.in: + Turn on automake silent rules if supported. + + +2009-09-21 Nick Treleaven + + * src/utils.c: + Speed up sorting in utils_get_file_list(). This reduces the file + browser delay on displaying a big directory, e.g. /usr/bin. + * src/build.c: + Expand command entry width when expanding Build Commands dialog. + * src/build.c: + Split Build Commands dialog notes label and edit text. + * src/build.c: + Add padding for Build Commands dialog separators. + Add colons for regex field labels; fix 1 capitalisation. + * src/build.c: + Fix none filetype Build Commands dialog label. + Make group labels bold. + * src/build.c, src/ui_utils.h, src/dialogs.c, src/notebook.c, + src/ui_utils.c: + Add & use ui_label_set_markup(), ui_label_new_bold(). + * src/ui_utils.h, src/printing.c, src/tools.c, src/project.c, + src/prefs.c, src/dialogs.c, src/geanyentryaction.c, + src/plugindata.h, src/vte.c, src/search.c, src/ui_utils.c: + Make ui_entry_add_clear_icon() take a GtkEntry, not GtkWidget. + * src/keybindings.c: + Make 'Go to Line' keybinding focus the toolbar entry if visible. + + +2009-09-20 Enrico Tröger + + * src/filetypes.c, src/filetypes.h, src/symbols.c, + tagmanager/parsers.h, tagmanager/makefile.win32, + tagmanager/abc.c, tagmanager/Makefile.am, data/filetypes.abc, + data/filetype_extensions.conf, wscript: + Add new filetype: Abc (patch by Eric Forgeot, thanks). + * tagmanager/php.c: + Merge recent changes from the CTags project to further improve + PHP symbol parsing. + + +2009-09-17 Enrico Tröger + + * src/printing.c: + Fix wrong alignment of printed pages when page headers are + disabled (closes #2856822). + Plug a small memory leak and improve function signature of + add_page_header(). + * src/keyfile.c: + Save an if expression. + * src/ui_utils.c: + After clearing a text field using the embedded clear icon, put the + input focus into this text field. + + +2009-09-17 Nick Treleaven + + * plugins/filebrowser.c: + Free file list memory whilst iterating the list. + Minor formatting fixes. + * src/utils.c, src/utils.h: + Add foreach_dir() API macro. + Update API docs for utils_get_file_list(). + * wscript, src/queue.c, src/editor.c, src/Makefile.am, src/queue.h, + po/POTFILES.in: + Remove queue.[hc] - use GQueue instead of GeanyQueue. + Beep if there are no more snippet positions. + Limit length of snippet positions queue to 20. + + +2009-09-16 Nick Treleaven + + * src/keybindings.c, src/callbacks.c, src/search.c: + Make Goto Tag commands use the current selection if present (useful + for selecting part of a tag or for ReST section names with spaces + in). + * src/document.c: + Don't move the cursor when reloading. + * src/plugindata.h, src/editor.c, src/editor.h: + Make editor_prefs.snippets hash table private (not a pref). + + +2009-09-15 Frank Lanitz + + * src/main.c: + Remove deprecated --debug flag. Please use --verbose/-v instead. + + +2009-09-15 Nick Treleaven + + * src/search.c: + Show Find in Files stderr output in messages window instead of + debug window so that invalid regex messages can be seen easily. + Combine FIF stdout and stderr callback code. + + +2009-09-14 Nick Treleaven + + * src/utils.c: + Fix opening filenames beginning with two dots (closes #2858487). + * src/interface.c, src/highlighting.c, src/prefs.c, src/filetypes.c, + src/filetypes.h, src/main.c, doc/geany.txt, doc/geany.html, + data/filetypes.common, geany.glade: + Update syntax highlighting after changing the 'Invert syntax + highlighting colors' pref, instead of requiring a restart. + Remove filetypes.common invert_all option - use 'Invert syntax + highlighting colors' pref instead (closes #2854525). + * src/prefs.c, src/dialogs.c, src/dialogs.h: + Add 'Allow' button when showing the conflicting keybinding dialog. + Make dialogs_show_question_full() use GTK dialog on Windows if + button text is not the stock yes/no items. + Add dialogs_show_prompt() which also has an 'Apply' button. + * src/queue.c, src/queue.h: + Add warning that GeanyQueue may be removed. + * src/keybindings.c, src/editor.c, src/editor.h: + Change snippet_goto_next_cursor() to + editor_goto_next_snippet_cursor() as it's in editor.h. + Avoid using GPOINTER_TO_INT macro. + + +2009-09-13 Nick Treleaven + + * src/keybindings.c: + Fix 'Reflow block' command when at the last paragraph and there's + no last newline (patch by Eugene Arshinov, thanks). + * HACKING: + Add 'Compiler options & warnings' section. + Update Style section to be clearer about code alignment and show + some example code. + Other minor edits. + + +2009-09-12 Nick Treleaven + + * src/keybindings.c, src/sciwrappers.c, src/sciwrappers.h, + src/plugindata.h, src/plugins.c, src/editor.c, + plugins/geanyfunctions.h: + Add sci_set_marker_at_line(), sci_delete_marker_at_line(), + sci_is_marker_set_at_line() to the plugin API (thanks to Yura + Siamashka). + Add sci_toggle_marker_at_line(). + Fix SciFuncs alignment. + + +2009-09-11 Lex Trotman + + * src/build.c: + Fix erroneous free of returned string in prepare_run_script. + + +2009-09-10 Frank Lanitz + + * data/filetypes.latex: + Changing default value for showing pdf and dvi to ensure to take + *.pdf and *.dvi file. + + +2009-09-07 Frank Lanitz + + * src/about.c, THANKS: + Change language string for Slovenian translation. + + +2009-09-07 Nick Treleaven + + * tagmanager/txt2tags.c: + Fix multi-byte character constant comparison. + * src/treeviews.c: + Fix Gtk warning when trying to update documents popup menu item + sensitivity before they exist. + + +2009-09-06 Enrico Tröger + + * src/plugins.c: + Improve the opening string in the plugin manager dialog. + * doc/geany.css: + Use "max-width" to set the document width of the generated + HTML documentation to let the text be auto-wrapped. + * src/prefs.c, src/tagmanager/include/guregex.h, + src/tagmanager/include/tm_tagmanager.h: + Remove trailing spaces (patch by André Hentschel, thanks). + * src/treeviews.c: + Fix a compiler warning. + * src/document.c: + Fix crash when opening documents. + * src/build.c, src/build.h, src/project.c: + Adjust coding style (no code changes). + * src/build.c, src/project.c: + Use NZV() macro instead of strlen() to check for empty strings. + Remove the FOREACH_GEANYBUILDCMD_ENTRY() macro. + * doc/plugins.dox, plugins/geanyfunctions.h, src/document.c, + src/geanyobject.c, src/geanyobject.h, src/plugindata.h, + src/plugins.c, THANKS: + Add new plugin signal: "document-before-save". + Add get_line_end_position(), set_target_start(), set_target_end(), + replace_target() to the plugin API + (patch by Eugene Arshinov, thanks). + Add new plugin signal: "document-filetype-set" (closes #2852286). + * data/filetype_extensions.conf, data/filetypes.txt2tags, src/about.c, + src/filetypes.c, src/filetypes.h, src/plugindata.h, src/symbols.c, + tagmanager/Makefile.am, tagmanager/makefile.win32, + tagmanager/parsers.h, tagmanager/txt2tags.c, tagmanager/txt2tags.c, + wscript, THANKS: + Add new filetype: Txt2Tags (patch by Eric Forgeot, thanks). + + +2009-09-04 Nick Treleaven + + * src/treeviews.c, src/document.c: + Apply patch from Thomas Martitz to improve sidebar type-ahead code: + Use gtk_notebook_set_current_page() instead of + document_open_file_full() when choosing an item from the documents + list. + Avoid using goto in document_open_file_full(). + + +2009-09-03 Nick Treleaven + + * src/treeviews.c, src/document.c, src/document.h, THANKS: + Enable type-ahead find for sidebar symbols and documents tabs + (patch by Thomas Martitz, thanks). + * src/build.c: + Fix 2 free's of possibly uninitialized pointers. + + +2009-09-03 Lex Trotman + + * src/build.c, src/filetypes.h, src/filetypes.c: + Only write filetype config files when build command or regex is + actually changed. Removed commented code in src/filetypes.c. + * src/build.c: + Ensure uses of filename are protected against nulls when running + a build command and give status message if not. + + +2009-09-01 Nick Treleaven + + * src/plugins.c: + Remove plugin from plugin manager dialog on unloading if it no + longer exists or is incompatible. + + +2009-08-31 Nick Treleaven + + * src/plugins.c: + Add warning if only one of the plugin_key_group[_info] symbols is + defined for a plugin. + * src/templates.c, src/highlighting.c, src/dialogs.c, src/filetypes.c, + src/filetypes.h, src/document.c, src/main.c, src/symbols.c, + TODO: + Merge custom-filetypes branch: + Support adding custom filetype files e.g. filetypes.Foo.conf. + - Code: + Allow GeanyFiletype::extension to be NULL. + Add note about using GeanyFiletype pointer instead of filetype_id + for filetypes.c function arguments. + Replace styleset_none() with styleset_default(). + + +2009-08-30 Enrico Tröger + + * src/prefs.c: + Show the sidebar if either the documents or the symbols list are + enabled (related to #1876107). + + +2009-08-29 Enrico Tröger + + * src/build.c, src/filetypes.c: + Fix compiler warnings. + * src/utils.c: + Fix removing leading double slashes in filenames which are used for + network resources on Windows (closes #2844085). + + +2009-08-27 Nick Treleaven + + * src/keybindings.c: + Fix Make keybindings (patch by Lex Trotman, thanks). + * src/geany.h: + Define G_GNUC_WARN_UNUSED_RESULT if GLib < 2.10. + * doc/plugins.dox: + Mention Files link at top for header files; demoplugin.c. + Minor edits; remove 'far from being complete'. + * src/keyfile.c, src/keyfile.h, src/main.c, + data/filetype_extensions.conf, HACKING: + Remove --generate-data-files argument & code - just edit + filetype_extensions.conf by hand (filetype order was broken + anyway). + Add *.H extension for C++ (useful for non-Windows systems). + + +2009-08-27 Lex Trotman + + * src/build.c: + Fix implementation of loading old project files with base + directories. Use project_make_base_path instead of re- + implementing. Now depends on project.c reading base dir + prior to calling load_build_menu. + * src/build.c: + Change usage of project base directory to conform with + previous documented behavior when loading old project files. + * src/build.c: + Change make custom and make object to ignore make in base path + when reading old project file settings. Changed some indent + spaces to tabs. Fix missing compile menu accelerator. + + +2009-08-26 Nick Treleaven + + * doc/plugins.dox: + Add warning about not using undocumented features. + Add reference to HACKING for plugin API development. + * HACKING: + Add section 'Plugin API/ABI design'. + * src/keybindings.h, src/makefile.win32, src/project.h, + src/filetypes.h, src/Makefile.am, wscript: + Use GEANY_PRIVATE to hide some fields from plugins. + * src/build.c: + Fix invalid memory read (#2844632, patch by Lex Trotman, thanks). + * src/build.c, src/build.h, src/project.c: + Use build_ prefix for 3 functions in build.h; add a static modifier. + + +2009-08-25 Enrico Tröger + + * tagmanager/php.c: + Improve parsing of PHP functions by requiring a valid modifier or + whitespace before the 'function' keyword to ignore some false + positives like function tags inside comments + (patch by Harold Aling, thanks). + * tagmanager/python.c: + Don't parse comments after import statements and other tags + (closes #2838938, patch by Huandari Lopez, thanks). + + +2009-08-25 Nick Treleaven + + * data/filetypes.markdown: + Add filetypes.markdown for configuration (thanks to Jon Strait). + * src/build.c, src/keybindings.c, src/keybindings.h, src/plugindata.h, + src/pluginutils.c, src/plugins.c, src/pluginutils.h, + plugins/geanyfunctions.h: + Remove GeanyKeyGroup struct from the API - plugins should not set + these fields. + Make keybindings_set_item() duplicate the name and label fields + (needed by GeanyLua) and return a keybinding pointer. + Add keybindings_get_item() to the API (in case it's useful). + Move some keybinding code out of plugin source files. + + +2009-08-24 Nick Treleaven + + * src/build.h, src/project.h, src/plugindata.h, src/filetypes.h: + Don't generate build.h API docs until everything is approved and + functions are actually in geany_functions. + Move new GeanyFiletype and GeanyProject field(s) to end of struct + as they may be changed or made private later. + Break ABI for fields removed. + + +2009-07-30 Lex Trotman + + * src/build.h, src/build.c, src/keybindings.c, src/filetypes.c + src/keyfile.c, src/project.c: + Changed names of symbols visible in build API to GEANY_xxx. + + +2009-07-29 Lex Trotman + + * src/project.h, src/project.c, src/build.c: + Remove make_in_base_dir and run_cmd fields from project structure. + Replaced by build functionality. Remove incorrect use in src/build.c + build_run_cmd function. + + +2009-07-28 Lex Trotman + + * src/project.h, src/project.c: + Removed unused project_get_make_dir function, this is now per + command. + + +2009-07-28 Lex Trotman + + * src/build.c, src/build.h, src/project.c, src/keyfile.c, + src/filetypes.c: + Fix some more warnings. + Fix commented out execute/stop toolbar code in build.c. + Add extra plugins documentation for GBO_TO_CMD and GBO_TO_GBG macros. + Changed build.h api so all functions prefixed with build_. + + +2009-07-27 Nick Treleaven + + * src/build.c, src/build.h, src/project.c: + Fix some gcc warnings with '-Wall -W -ansi' enabled. + + +2009-07-25 Lex Trotman + + * src/build.c: + Fixed leaks and crashes due to inconsistent use of static vs dynamic + strings when reading old format configuration & project files. + * src/build.c, src/project.c: + Fixed GLib array assertion warnings when no project filetypes are + available to be saved. + +2009-07-24 Lex Trotman + + * src/build.c: + Fix build warnings. + + +2009-07-22 Lex Trotman + + * src/build.h, src/build.c, src/project.c: + Created and documented plugins interface to build menu. + Factored out new get_cmd_group function. + Changed name of remove_command function to be consistent with the + rest of the interface & changed calls in project.c. + * src/Makefile.am, wscript: + Added build.h to installed files lists. + +2009-07-20 Lex Trotman + + * doc/geany.txt: + Updated manual to match build-menu capability. + + +2009-07-19 Lex Trotman + + * src/build.c, src/build.h: + Added set_build_non_ft_wd_to_proj() for use by project dialog. + Improved interpretation of run_in_base_dir from old [build-settings] + Added spacing to build commands dialog + * src/project.c: + Removed run in base path option from project dialog and added button + to set working directories to d the same. + + +2009-07-18 Lex Trotman + + * src/build.c: + Re-incorporated toolbar changes in trunk accidently excluded in merge + +2009-07-17 Lex Trotman + + * src/build.c: + Fixed substitute %f etc in commands + Fixed potential leak in build_replace_placeholder + Fixed leak in prepare_run_script (Thanks for patch Thomas) + Fixed build_replace_placeholder to not require document. + +2009-07-17 Lex Trotman + + * src/build.c, src/build.h, src/filetypes.h, src/filetypes.c: + Fixed crash and lots of warnings, deleted some commented out code. + * geany.glade, src/keyfile.c, src/prefs.c, src/prefs.h, src/project.c: + Removed make command from preferences and associated code + +2009-07-16 Lex Trotman + + * src/build.c, src/build.h: + Incorporated patch for working directory field (thanks Thomas) + Removed run_in_base_dir option and associated code that it replaces + Improved handling of old config files and mapping to new ones. + +2009-07-15 Lex Trotman + + * src/build.h, src/build.c: + Changed to itterate over entries in build commands dialog to allow + additional fields to be added + Implement support for multiple run commands + * data/filetypes.latex: + Implement configured commands and labels for latex. + + +2009-07-14 Lex Trotman + + * src/build.h, src/build.c: + added dialog support for error regular expressions from multiple + sources and storing and loading them fixed some typos and memory + leaks + * src/filetypes.c, src/filetypes.h, project.c: + added support for using error regexes from multiple sources + + +2009-07-11 Lex Trotman + + * src/filetypes.h, src/filetypes.c, src/build.c, src/build.h, + src/project.c: + Removal of build menu item source made redundant by the following fix + * src/build.c: + Corrected priority oreder and loading of filetype dependent build + menu items saved in the project file. Added print routine for + debugging command sources and priorities set compile symbol + PRINTBUILDCMDS true to enable + +2009-07-10 Lex Trotman + + * src/build.c: + fixed problem loading old format filetype files, some formatting + fixes fixed saving new format files + added operation for clear button on build commands dialog + * src/filetypes.c: + fixed loading and saving filetype files + + +2009-07-09 Lex Trotman + +Configurable Build Menu Changes + + * doc/geany.html, doc/geany.txt: + Updated build menu section to new functionality + * src/build.h, src/build.c: + Largly re-written, configurability added, Latex code removed + * src/filetypes.h, src/filetypes.c: + Filetype structure updated to add new command pointers, configuration + load and store changed + * src/keybindings.h, src/keybindings.c: + Changed to address new command storage structure. + * src/keyfile.c: + Changed to load/store new configuration. + * src/main.c: + Minor change to initialisation order. + * src/msgwindow.c: + Changed to address new menu item storage structure. + * src/project.h, src/project.c: + Changed to load/store the new configuration info. + +2009-08-24 Nick Treleaven + + * src/keybindings.c, src/keybindings.h, src/plugindata.h, + src/pluginutils.c, src/plugins.c, src/pluginutils.h, + doc/pluginsymbols.c, plugins/geanyfunctions.h, + plugins/splitwindow.c: + Update PLUGIN_KEY_GROUP() macro so it doesn't allocate any + GeanyKeyBinding or GeanyKeyGroup structs, so we don't need to break + the ABI when adding fields to them. + Add plugin_set_key_group() for plugins to dynamically set a + keybinding group (e.g. for the Lua script plugin). Used in Split + Window plugin as an example. + Improve keybinding docs a little. + + +2009-08-20 Nick Treleaven + + * doc/Doxyfile.in, plugins/geanyfunctions.h, plugins/genapi.py: + Add geanyfunctions.h to API docs. + * plugins/splitwindow.c: + Set the cursor color for the split window. + + +2009-08-18 Nick Treleaven + + * src/callbacks.c: + Fix 'Open Selected File' for unsaved new documents. + * src/keybindings.c, src/keybindings.h, src/prefs.c: + Fix updating main menu accelerators after changing keybindings + (thanks to Lex Trotman). + * src/callbacks.c: + Fix using 'Insert date' keybinding when a custom date string has + not been set. + * src/pluginprivate.h, src/pluginutils.c, src/plugins.c: + Merge Plugin and GeanyPluginPrivate structs. + + +2009-08-18 Enrico Tröger + + * src/keybindings.c: + Fix non-working Home and End keys on numpads. + + +2009-08-17 Nick Treleaven + + * doc/geany.txt, doc/geany.html, NEWS: + Add 'Scope autocompletion' section. + Add 'Tools menu items' section to explain configuration files + submenu, reload configuration item. + Minor updates/fixes. + + 2009-08-16 Enrico Tröger * src/document.c: @@ -7,6 +2690,9 @@ * src/win32.c: Fix opening of local files in the browser on Windows. * New release: Geany 0.18 "Kaine". + * configure.in, geany.nsi, geany_private.rc, win32-config.h, wscript, + src/geany.h, doc/geany.html, doc/geany.txt: + Post-release version bump. 2009-08-15 Enrico Tröger @@ -152,7 +2838,6 @@ Reshow calltips also when the autocompletion list was closed implicitly by not choosing an item. - 2009-07-23 Nick Treleaven * src/utils.c, src/utils.h, src/toolbar.c, src/plugindata.h, @@ -260,7 +2945,6 @@ notices. The comment information are now read from the filetype configuration files. - 2009-07-16 Enrico Tröger * src/document.c: diff -Nru geany-0.18/config.guess geany-0.19/config.guess --- geany-0.18/config.guess 2009-08-16 18:29:20.000000000 +0100 +++ geany-0.19/config.guess 2010-06-12 13:14:28.000000000 +0100 @@ -1,10 +1,10 @@ #! /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 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2009-12-30' # 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 @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # 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. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# 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 me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +56,9 @@ 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 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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." @@ -333,6 +334,9 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -807,12 +811,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -854,6 +858,20 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + 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} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -876,6 +894,17 @@ frv:Linux:*:*) echo frv-unknown-linux-gnu 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}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -901,39 +930,18 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - 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} - exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -942,8 +950,11 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -966,58 +977,6 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1247,6 +1206,16 @@ *: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 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nru geany-0.18/config.h.in geany-0.19/config.h.in --- geany-0.18/config.h.in 2009-08-16 18:29:19.000000000 +0100 +++ geany-0.19/config.h.in 2010-06-12 13:14:27.000000000 +0100 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Use AutoPackage? */ #undef ENABLE_BINRELOC diff -Nru geany-0.18/config.sub geany-0.19/config.sub --- geany-0.18/config.sub 2009-08-16 18:29:20.000000000 +0100 +++ geany-0.19/config.sub 2010-06-12 13:14:28.000000000 +0100 @@ -1,10 +1,10 @@ #! /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 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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." @@ -149,7 +153,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) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; @@ -284,6 +288,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -291,13 +296,14 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -340,7 +346,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -368,15 +374,17 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -726,6 +734,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1076,6 +1087,11 @@ basic_machine=tic6x-unknown os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1247,6 +1263,9 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1268,8 +1287,8 @@ # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1290,7 +1309,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1423,6 +1442,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) diff -Nru geany-0.18/configure geany-0.19/configure --- geany-0.18/configure 2009-08-16 18:29:22.000000000 +0100 +++ geany-0.19/configure 2010-06-12 13:14:30.000000000 +0100 @@ -1,10 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64. +# Generated by GNU Autoconf 2.65. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -673,7 +675,8 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -700,7 +703,7 @@ PACKAGE_BUGREPORT= PACKAGE_URL= -ac_unique_file="configure.in" +ac_unique_file="configure.ac" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -737,7 +740,9 @@ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS GEANY_DATA_DIR MKINSTALLDIRS @@ -762,6 +767,8 @@ GIO_CFLAGS GTK_LIBS GTK_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG CXXCPP OTOOL64 @@ -844,6 +851,8 @@ LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -908,6 +917,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_nls enable_static @@ -939,6 +949,8 @@ CCC CXXCPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR GTK_CFLAGS GTK_LIBS GIO_CFLAGS @@ -1560,6 +1572,8 @@ --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 --disable-nls do not use Native Language Support @@ -1573,11 +1587,11 @@ --disable-plugins compile without plugin support [default=no] --enable-gnu-regex compile with included GNU regex library [default=no] --enable-socket enable if you want to detect a running instance - [default=yes] + [[default=yes]] --enable-vte enable if you want virtual terminal support - [default=yes] + [[default=yes]] --enable-the-force enable if you are Luke Skywalker and the force is - with you [default=no] + with you [[default=no]] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1586,7 +1600,7 @@ both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-vte-module-path=PATH - Path to a loadable libvte [default=None] + Path to a loadable libvte [[default=None]] Some influential environment variables: CC C compiler command @@ -1594,13 +1608,17 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config GIO_CFLAGS C compiler flags for GIO, overriding pkg-config @@ -1673,7 +1691,7 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.64 +generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1720,7 +1738,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1757,7 +1775,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1886,7 +1904,7 @@ fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1955,7 +1973,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -2001,7 +2019,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -2105,7 +2123,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_cxx_try_cpp @@ -2151,7 +2169,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_cxx_try_link @@ -2213,7 +2231,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.64. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2466,7 +2484,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 @@ -2475,9 +2493,9 @@ done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -2559,7 +2577,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.10' +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2682,16 +2700,29 @@ # 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=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + # 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` + 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` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2729,7 +2760,14 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -2739,6 +2777,115 @@ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# 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. +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. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $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 + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $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 + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then @@ -2767,6 +2914,7 @@ fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2774,7 +2922,6 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi @@ -2891,7 +3038,7 @@ # Define the identity of the package. PACKAGE=geany - VERSION=0.18 + VERSION=0.19 cat >>confdefs.h <<_ACEOF @@ -2919,108 +3066,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# 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. -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. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $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 - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $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 - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -3034,6 +3079,19 @@ +# 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;; +esac +AM_BACKSLASH='\' + + ac_config_headers="$ac_config_headers config.h" @@ -3045,7 +3103,7 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -3056,24 +3114,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# 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 + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi @@ -3421,32 +3479,30 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + int main () { -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3508,10 +3564,10 @@ else ac_file='' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -3519,51 +3575,18 @@ { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" @@ -3596,13 +3619,72 @@ as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi -rm -f conftest$ac_cv_exeext +rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : @@ -3896,6 +3978,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3913,7 +4000,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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 + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3923,19 +4020,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # 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} + am__minus_obj= + ;; none) break ;; esac - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -4760,8 +4861,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -5008,6 +5109,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -5025,7 +5131,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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 + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -5035,19 +5151,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # 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} + am__minus_obj= + ;; none) break ;; esac - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5217,8 +5337,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -5374,6 +5494,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -5391,7 +5516,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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 + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -5401,19 +5536,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # 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} + am__minus_obj= + ;; none) break ;; esac - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5456,7 +5595,7 @@ # after AC_PROG_CXX has set the CXX environment variable which $CXX >/dev/null 2>&1 if test "x$?" != "x0"; then - as_fn_error "No C++ compiler not found. Please install a C++ compiler." "$LINENO" 5 + as_fn_error "No C++ compiler found. Please install a C++ compiler." "$LINENO" 5 fi #AC_PROG_RANLIB @@ -6071,8 +6210,8 @@ -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -6613,13 +6752,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6616: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6755: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6619: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6758: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6622: output\"" >&5) + (eval echo "\"\$as_me:6761: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7074,7 +7213,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7813,7 +7952,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7816 "configure"' > conftest.$ac_ext + echo '#line 7955 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8705,8 +8844,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -8862,6 +9001,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -8879,7 +9023,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # 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 + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -8889,19 +9043,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # 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} + am__minus_obj= + ;; none) break ;; esac - # 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. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -9549,11 +9707,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9552: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9710: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9556: \$? = $ac_status" >&5 + echo "$as_me:9714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9718,7 +9876,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9888,11 +10046,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9891: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10049: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9895: \$? = $ac_status" >&5 + echo "$as_me:10053: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9993,11 +10151,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9996: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10154: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10000: \$? = $ac_status" >&5 + echo "$as_me:10158: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10048,11 +10206,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10209: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10055: \$? = $ac_status" >&5 + echo "$as_me:10213: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10191,6 +10349,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -10282,7 +10441,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -11744,7 +11903,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -12431,7 +12590,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12434 "configure" +#line 12593 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12527,7 +12686,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12530 "configure" +#line 12689 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13467,7 +13626,7 @@ inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -14295,7 +14454,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14483,11 +14642,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14486: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14645: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14490: \$? = $ac_status" >&5 + echo "$as_me:14649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14582,11 +14741,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14585: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14744: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14589: \$? = $ac_status" >&5 + echo "$as_me:14748: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14634,11 +14793,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14637: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14796: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14641: \$? = $ac_status" >&5 + echo "$as_me:14800: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15212,7 +15371,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -15806,6 +15965,10 @@ gtk_modules="gtk+-2.0 >= 2.8.0" + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -15918,18 +16081,16 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi - fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_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_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? @@ -15939,15 +16100,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_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_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? @@ -15957,14 +16116,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + 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 @@ -15972,9 +16132,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtk_modules"` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gtk_modules" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtk_modules"` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gtk_modules" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -15988,9 +16148,10 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +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 @@ -16008,7 +16169,7 @@ GTK_LIBS=$pkg_cv_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -16019,11 +16180,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5 $as_echo_n "checking for GIO... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GIO_CFLAGS"; then - pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GIO_CFLAGS"; then + pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gio_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gio_modules") 2>&5 ac_status=$? @@ -16033,15 +16193,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GIO_LIBS"; then - pkg_cv_GIO_LIBS="$GIO_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GIO_LIBS"; then + pkg_cv_GIO_LIBS="$GIO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gio_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gio_modules") 2>&5 ac_status=$? @@ -16051,14 +16209,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + 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 @@ -16066,17 +16225,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gio_modules"` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gio_modules" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gio_modules"` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gio_modules" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_gio=0 + have_gio=0 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } have_gio=0 else GIO_CFLAGS=$pkg_cv_GIO_CFLAGS @@ -16389,7 +16548,15 @@ _ACEOF -ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS +if test -n "${LINGUAS}" +then + ALL_LINGUAS="${LINGUAS}" +else + if test -z "$conf_dir" ; then + conf_dir="." + fi + ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'` +fi for ac_header in locale.h @@ -17222,6 +17389,14 @@ LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17679,7 +17854,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.64. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17719,6 +17894,7 @@ -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -17741,10 +17917,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -17782,6 +17959,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -18340,7 +18519,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -18354,7 +18533,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -18821,27 +19000,28 @@ 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 -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # 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 - # 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. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 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 + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # 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 + # 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. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ @@ -18864,28 +19044,28 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # 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 - 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 - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # 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 + 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 + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ @@ -18908,11 +19088,12 @@ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ;; "libtool":C) diff -Nru geany-0.18/configure.ac geany-0.19/configure.ac --- geany-0.18/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/configure.ac 2010-03-31 17:36:36.000000000 +0100 @@ -0,0 +1,319 @@ +dnl Process this file with autoconf to produce a configure script. +dnl $Id: configure.ac 4796 2010-03-31 16:36:36Z ntrel $ + +AC_INIT(configure.ac) +AM_INIT_AUTOMAKE(geany, 0.19) + +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + +AM_CONFIG_HEADER(config.h) + +AC_GNU_SOURCE +AC_AIX +AC_MINIX + +AC_PROG_CC + +AC_PROG_CXX +# check for C++ compiler explicitly and fail if none is found, do this check +# after AC_PROG_CXX has set the CXX environment variable +which $CXX >/dev/null 2>&1 +if test "x$?" != "x0"; then + AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.]) +fi + +#AC_PROG_RANLIB +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_INTLTOOL + +# for plugins +AC_DISABLE_STATIC +AM_PROG_LIBTOOL +LIBTOOL="$LIBTOOL --silent" + +# autoscan start + +# Checks for header files. +AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_OFF_T +AC_TYPE_SIZE_T +AC_STRUCT_TM + +# Checks for library functions. +AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr]) + +# autoscan end + + +# get svn revision (try GIT first, then check for SVN) +REVISION="r0" +GIT=`which git 2>/dev/null` +if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}" +then + REVISION=r`git svn find-rev origin/trunk 2>/dev/null || + git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null || + git svn find-rev master 2>/dev/null || echo 0` +fi +if test "x${REVISION}" = "xr0" +then + SVN=`which svn 2>/dev/null` + if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" + then + REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` + fi +fi +if test "x${REVISION}" != "xr0" +then + # force debug mode for a SVN working copy + CFLAGS="-g -DGEANY_DEBUG $CFLAGS" +else + REVISION="-1" +fi +AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number]) + + +dnl Check for binary relocation support +dnl taken from Inkscape (Hongli Lai ) + +AC_ARG_ENABLE(binreloc, + [ --enable-binreloc compile with binary relocation support], + enable_binreloc=$enableval,enable_binreloc=no) + +AC_MSG_CHECKING(whether binary relocation support should be enabled) +if test "$enable_binreloc" = "yes"; then + AC_MSG_RESULT(yes) + AC_MSG_CHECKING(for linker mappings at /proc/self/maps) + if test -e /proc/self/maps; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(/proc/self/maps is not available. Binary relocation cannot be enabled.) + enable_binreloc="no" + fi + +elif test "$enable_binreloc" = "auto"; then + AC_MSG_RESULT(yes when available) + AC_MSG_CHECKING(for linker mappings at /proc/self/maps) + if test -e /proc/self/maps; then + AC_MSG_RESULT(yes) + enable_binreloc=yes + + AC_MSG_CHECKING(whether everything is installed to the same prefix) + if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ + "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ + "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' + then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + AC_MSG_NOTICE(Binary relocation support will be disabled.) + enable_binreloc=no + fi + + else + AC_MSG_RESULT(no) + enable_binreloc=no + fi + +elif test "$enable_binreloc" = "no"; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(no (unknown value "$enable_binreloc")) + enable_binreloc=no +fi +if test "$enable_binreloc" = "yes"; then + AC_DEFINE(ENABLE_BINRELOC,,[Use AutoPackage?]) +fi + + +# GTK checks +gtk_modules="gtk+-2.0 >= 2.8.0" +PKG_CHECK_MODULES(GTK, [$gtk_modules]) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) +# GIO checks +gio_modules="gio-2.0 >= 2.16" +PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) +if test $have_gio = 1 ; then + AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) +fi + +# --disable-deprecated switch for GTK2 purification +AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], + [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) + +# Plugins support +AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])], , enable_plugins=yes) + +if test "x$enable_plugins" = "xyes" ; then + AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled.]) + AM_CONDITIONAL(PLUGINS, true) +else + AM_CONDITIONAL(PLUGINS, false) +fi + +# Use included GNU regex library +AC_ARG_ENABLE(gnu-regex, [AC_HELP_STRING([--enable-gnu-regex], [compile with included GNU regex library [default=no]])], , enable_gnu_regex=no) + +if test "x$enable_gnu_regex" = "xyes" ; then + AC_DEFINE(USE_INCLUDED_REGEX, 1, [Define if included GNU regex code should be used.]) + AC_DEFINE(HAVE_REGCOMP, 1, [Define if you have the 'regcomp' function.]) + AM_CONDITIONAL(USE_INCLUDED_REGEX, true) +else + AM_CONDITIONAL(USE_INCLUDED_REGEX, false) +fi + +case "${host}" in + *mingw*) + AC_CHECK_LIB(iberty, fnmatch, [], [ + AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.]) + ]) + AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32]) + want_vte="no" + want_socket="yes" + AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance]) + AC_EXEEXT + AM_CONDITIONAL(MINGW, true) + ;; + *) + AM_CONDITIONAL(MINGW, false) + ;; +esac + +dnl skip check if already decided +if test "x$want_socket" = "x"; then + # socket support + AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]), + [want_socket="$enableval"], [want_socket="yes"]) + + if test "x$want_socket" = "xyes"; then + AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance]) + # this should bring in libsocket on Solaris: + AC_SEARCH_LIBS([connect],[socket],[],[],[]) + fi +fi + +dnl skip check if already decided +if test "x$want_vte" = "x"; then + # VTE support + AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte], + [enable if you want virtual terminal support [[default=yes]]]), + [want_vte="$enableval"], [want_vte="yes"]) + if test "x$want_vte" = "xyes"; then + AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) + fi + AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH], + [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH], + ["$withval"], [Path to a loadable libvte])]) +fi + +GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` + + +# GTK 2.10 printing support +$PKG_CONFIG --exists 'gtk+-2.0 >= 2.10.0' +if test "x$?" = "x0" ; then + enable_printing="yes" +else + enable_printing="no (GTK >= 2.10 necessary)" +fi + + +# just for a laugh (it has absolutely no effect) +AC_ARG_ENABLE(the-force, AC_HELP_STRING([--enable-the-force], + [enable if you are Luke Skywalker and the force is with you [[default=no]]]), [be_luke="$enableval"], [be_luke="no"]) +AC_MSG_CHECKING([whether the force is with you]) +if test "x$be_luke" = "xyes"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + +# i18n +GETTEXT_PACKAGE=geany +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + +if test -n "${LINGUAS}" +then + ALL_LINGUAS="${LINGUAS}" +else + if test -z "$conf_dir" ; then + conf_dir="." + fi + ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'` +fi + +AM_GLIB_GNU_GETTEXT +# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) +if test "x$MSGFMT" = "xno"; then + AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) +fi + + +# Set ${datadir} +if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then + if test "x${prefix}" = "xNONE"; then + prefix=${ac_default_prefix} + fi +fi + +# Set ${docdir} if it is empty +if test -z "${docdir}"; then + docdir='${datadir}/doc/${PACKAGE}' + AC_SUBST(docdir) +fi + +GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` +AC_SUBST(GEANY_DATA_DIR) + +# intltool hack to define install_sh on Debian/Ubuntu systems +if test "x$install_sh" = "x"; then + install_sh="`pwd`/install-sh" + AC_SUBST(install_sh) +fi + +AC_OUTPUT([ +Makefile +icons/Makefile +icons/16x16/Makefile +icons/48x48/Makefile +icons/scalable/Makefile +tagmanager/Makefile +tagmanager/include/Makefile +scintilla/Makefile +scintilla/include/Makefile +src/Makefile +plugins/Makefile +po/Makefile.in +doc/Makefile +doc/geany.1 +geany.spec +geany.pc +doc/Doxyfile +]) + +echo "----------------------------------------" +echo "Install Geany in : ${prefix}" +if test "x${build}" != "x" -a "x${target}" != "x" +then + echo "Building Geany on : ${build}" + echo "Building Geany for : ${target}" +fi +echo "Using GTK version : ${GTK_VERSION}" +echo "Build with GTK printing support : ${enable_printing}" +echo "Build with plugin support : ${enable_plugins}" +echo "Use virtual terminal support : ${want_vte}" +echo "Use (UNIX domain) socket support : ${want_socket}" +if test "${REVISION}" != "-1" +then + echo "Compiling Subversion revision : ${REVISION}" +fi +echo "" +echo "Configuration is done OK." +echo "" diff -Nru geany-0.18/configure.in geany-0.19/configure.in --- geany-0.18/configure.in 2009-05-26 21:45:36.000000000 +0100 +++ geany-0.19/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,309 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in 3816 2009-05-26 20:45:36Z eht16 $ - -AC_INIT(configure.in) -AM_INIT_AUTOMAKE(geany, 0.18) - -AM_CONFIG_HEADER(config.h) - -AC_GNU_SOURCE -AC_AIX -AC_MINIX - -AC_PROG_CC - -AC_PROG_CXX -# check for C++ compiler explicitly and fail if none is found, do this check -# after AC_PROG_CXX has set the CXX environment variable -which $CXX >/dev/null 2>&1 -if test "x$?" != "x0"; then - AC_MSG_ERROR([No C++ compiler not found. Please install a C++ compiler.]) -fi - -#AC_PROG_RANLIB -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_INTLTOOL - -# for plugins -AC_DISABLE_STATIC -AM_PROG_LIBTOOL -LIBTOOL="$LIBTOOL --silent" - -# autoscan start - -# Checks for header files. -AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_OFF_T -AC_TYPE_SIZE_T -AC_STRUCT_TM - -# Checks for library functions. -AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr]) - -# autoscan end - - -# get svn revision (try GIT first, then check for SVN) -REVISION="r0" -GIT=`which git 2>/dev/null` -if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}" -then - REVISION=r`git svn find-rev origin/trunk 2>/dev/null || - git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null || - git svn find-rev master 2>/dev/null || echo 0` -fi -if test "x${REVISION}" = "xr0" -then - SVN=`which svn 2>/dev/null` - if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" - then - REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` - fi -fi -if test "x${REVISION}" != "xr0" -then - # force debug mode for a SVN working copy - CFLAGS="-g -DGEANY_DEBUG $CFLAGS" -else - REVISION="-1" -fi -AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number]) - - -dnl Check for binary relocation support -dnl taken from Inkscape (Hongli Lai ) - -AC_ARG_ENABLE(binreloc, - [ --enable-binreloc compile with binary relocation support], - enable_binreloc=$enableval,enable_binreloc=no) - -AC_MSG_CHECKING(whether binary relocation support should be enabled) -if test "$enable_binreloc" = "yes"; then - AC_MSG_RESULT(yes) - AC_MSG_CHECKING(for linker mappings at /proc/self/maps) - if test -e /proc/self/maps; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(/proc/self/maps is not available. Binary relocation cannot be enabled.) - enable_binreloc="no" - fi - -elif test "$enable_binreloc" = "auto"; then - AC_MSG_RESULT(yes when available) - AC_MSG_CHECKING(for linker mappings at /proc/self/maps) - if test -e /proc/self/maps; then - AC_MSG_RESULT(yes) - enable_binreloc=yes - - AC_MSG_CHECKING(whether everything is installed to the same prefix) - if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ - "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ - "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' - then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - AC_MSG_NOTICE(Binary relocation support will be disabled.) - enable_binreloc=no - fi - - else - AC_MSG_RESULT(no) - enable_binreloc=no - fi - -elif test "$enable_binreloc" = "no"; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(no (unknown value "$enable_binreloc")) - enable_binreloc=no -fi -if test "$enable_binreloc" = "yes"; then - AC_DEFINE(ENABLE_BINRELOC,,[Use AutoPackage?]) -fi - - -# GTK checks -gtk_modules="gtk+-2.0 >= 2.8.0" -PKG_CHECK_MODULES(GTK, [$gtk_modules]) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) -# GIO checks -gio_modules="gio-2.0 >= 2.16" -PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) -AC_SUBST(GIO_CFLAGS) -AC_SUBST(GIO_LIBS) -if test $have_gio = 1 ; then - AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) -fi - -# --disable-deprecated switch for GTK2 purification -AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], - [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) - -# Plugins support -AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])], , enable_plugins=yes) - -if test "x$enable_plugins" = "xyes" ; then - AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled.]) - AM_CONDITIONAL(PLUGINS, true) -else - AM_CONDITIONAL(PLUGINS, false) -fi - -# Use included GNU regex library -AC_ARG_ENABLE(gnu-regex, [AC_HELP_STRING([--enable-gnu-regex], [compile with included GNU regex library [default=no]])], , enable_gnu_regex=no) - -if test "x$enable_gnu_regex" = "xyes" ; then - AC_DEFINE(USE_INCLUDED_REGEX, 1, [Define if included GNU regex code should be used.]) - AC_DEFINE(HAVE_REGCOMP, 1, [Define if you have the 'regcomp' function.]) - AM_CONDITIONAL(USE_INCLUDED_REGEX, true) -else - AM_CONDITIONAL(USE_INCLUDED_REGEX, false) -fi - -case "${host}" in - *mingw*) - AC_CHECK_LIB(iberty, fnmatch, [], [ - AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.]) - ]) - AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32]) - want_vte="no" - want_socket="yes" - AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance]) - AC_EXEEXT - AM_CONDITIONAL(MINGW, true) - ;; - *) - AM_CONDITIONAL(MINGW, false) - ;; -esac - -dnl skip check if already decided -if test "x$want_socket" = "x"; then - # socket support - AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]), - [want_socket="$enableval"], [want_socket="yes"]) - - if test "x$want_socket" = "xyes"; then - AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance]) - # this should bring in libsocket on Solaris: - AC_SEARCH_LIBS([connect],[socket],[],[],[]) - fi -fi - -dnl skip check if already decided -if test "x$want_vte" = "x"; then - # VTE support - AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte], - [enable if you want virtual terminal support [[default=yes]]]), - [want_vte="$enableval"], [want_vte="yes"]) - if test "x$want_vte" = "xyes"; then - AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) - fi - AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH], - [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH], - ["$withval"], [Path to a loadable libvte])]) -fi - -GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` - - -# GTK 2.10 printing support -$PKG_CONFIG --exists 'gtk+-2.0 >= 2.10.0' -if test "x$?" = "x0" ; then - enable_printing="yes" -else - enable_printing="no (GTK >= 2.10 necessary)" -fi - - -# just for a laugh (it has absolutely no effect) -AC_ARG_ENABLE(the-force, AC_HELP_STRING([--enable-the-force], - [enable if you are Luke Skywalker and the force is with you [[default=no]]]), [be_luke="$enableval"], [be_luke="no"]) -AC_MSG_CHECKING([whether the force is with you]) -if test "x$be_luke" = "xyes"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -# i18n -GETTEXT_PACKAGE=geany -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) - -ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS - -AM_GLIB_GNU_GETTEXT -# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) -if test "x$MSGFMT" = "xno"; then - AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) -fi - - -# Set ${datadir} -if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then - prefix=${ac_default_prefix} - fi -fi - -# Set ${docdir} if it is empty -if test -z "${docdir}"; then - docdir='${datadir}/doc/${PACKAGE}' - AC_SUBST(docdir) -fi - -GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` -AC_SUBST(GEANY_DATA_DIR) - -# intltool hack to define install_sh on Debian/Ubuntu systems -if test "x$install_sh" = "x"; then - install_sh="`pwd`/install-sh" - AC_SUBST(install_sh) -fi - -AC_OUTPUT([ -Makefile -icons/Makefile -icons/16x16/Makefile -icons/48x48/Makefile -icons/scalable/Makefile -tagmanager/Makefile -tagmanager/include/Makefile -scintilla/Makefile -scintilla/include/Makefile -src/Makefile -plugins/Makefile -po/Makefile.in -doc/Makefile -doc/geany.1 -geany.spec -geany.pc -doc/Doxyfile -]) - -echo "----------------------------------------" -echo "Install Geany in : ${prefix}" -if test "x${build}" != "x" -a "x${target}" != "x" -then - echo "Building Geany on : ${build}" - echo "Building Geany for : ${target}" -fi -echo "Using GTK version : ${GTK_VERSION}" -echo "Build with GTK printing support : ${enable_printing}" -echo "Build with plugin support : ${enable_plugins}" -echo "Use virtual terminal support : ${want_vte}" -echo "Use (UNIX domain) socket support : ${want_socket}" -if test "${REVISION}" != "-1" -then - echo "Compiling Subversion revision : ${REVISION}" -fi -echo "" -echo "Configuration is done OK." -echo "" diff -Nru geany-0.18/data/filetype_extensions.conf geany-0.19/data/filetype_extensions.conf --- geany-0.18/data/filetype_extensions.conf 2009-06-23 13:53:18.000000000 +0100 +++ geany-0.19/data/filetype_extensions.conf 2009-12-08 12:51:10.000000000 +0000 @@ -1,19 +1,19 @@ -#*** This file generated by: geany --generate-data-files *** - -#Filetype extension configuration file for Geany -#Insert as many items as you want, seperate them with a ";". -#See Geany's main documentation for details. +# Filetype extension configuration file for Geany +# Insert as many items as you want, seperate them with a ";". +# See Geany's main documentation for details. [Extensions] ASM=*.asm; +Abc=*.abc;*.abp; Ada=*.adb;*.ads; C=*.c;*.h; -C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; +C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; C#=*.cs; CAML=*.ml;*.mli; D=*.d;*.di; F77=*.f;*.for;*.ftn;*.f77; Fortran=*.f90;*.f95;*.f03; FreeBasic=*.bas;*.bi; +Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; Haskell=*.hs;*.lhs; Haxe=*.hx; @@ -22,6 +22,7 @@ Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Vala=*.vala;*.vapi; VHDL=*.vhd;*.vhdl; +Verilog=*.v; Ferite=*.fe; Javascript=*.js; Lua=*.lua; @@ -45,6 +46,7 @@ Po=*.po;*.pot; LaTeX=*.tex;*.sty;*.idx;*.ltx; reStructuredText=*.rest;*.reST;*.rst; +txt2tags=*.t2t; SQL=*.sql; YAML=*.yaml;*.yml; None=*; diff -Nru geany-0.18/data/filetypes.abc geany-0.19/data/filetypes.abc --- geany-0.18/data/filetypes.abc 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/filetypes.abc 2009-09-20 19:46:56.000000000 +0100 @@ -0,0 +1,9 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# no syntax highlighting yet + +[settings] +# default extension used when saving files +extension=abc + + diff -Nru geany-0.18/data/filetypes.c geany-0.19/data/filetypes.c --- geany-0.18/data/filetypes.c 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.c 2009-12-03 16:08:06.000000000 +0000 @@ -23,9 +23,6 @@ commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc globalclass=type -# whether arguments of preprocessor commands should be styled (only first argument is used) -# 1 to enable, 0 to disable -styling_within_preprocessor=1;0;false;false [keywords] # all items must be in one line @@ -34,6 +31,13 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +[lexer_properties] +styling.within.preprocessor=1 +preprocessor.symbol.$(file.patterns.cpp)=# +preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef +preprocessor.middle.$(file.patterns.cpp)=else elif +preprocessor.end.$(file.patterns.cpp)=endif + [settings] # default extension used when saving files #extension=c diff -Nru geany-0.18/data/filetypes.common geany-0.19/data/filetypes.common --- geany-0.18/data/filetypes.common 2009-07-16 16:54:45.000000000 +0100 +++ geany-0.19/data/filetypes.common 2010-04-22 18:16:46.000000000 +0100 @@ -15,75 +15,66 @@ brace_bad=0xff0000;0xFFFFFF;true;false # the following settings define the colours of the margins on the left side -margin_linenumber=0x000000;0xd0d0d0;false;false -margin_folding=0x000000;0xdfdfdf;false;false +margin_linenumber=0x000000;0xd0d0d0; +margin_folding=0x000000;0xdfdfdf; # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) -current_line=0x000000;0xf0f0f0;true;false +current_line=0x000000;0xf0f0f0;true; # translucency for the current line(first argument) and the selection (second argument) # values between 0 and 256 are accepted. Note for Windows 95, 98 and ME users: # keep this value at 256 to disable translucency otherwise Geany might crash -# only the first and second argument is interpreted -translucency=256;256;false;false +translucency=256;256 # style for a highlighted line (e.g when using Goto line or goto tag) -# only the first and second argument is interpreted -marker_line=0x000000;0xffff00;false;false +marker_line=0x000000;0xffff00; # style for a marked search results (when using "Mark" in Search dialogs) # the second argument sets the background colour for the drawn rectangle # only the second argument is interpreted -marker_search=0x000000;0x0000f0;false;false +marker_search=0x000000;0x0000f0; # style for a marked line (e.g when using the "Toggle Marker" keybinding (Ctrl-M)) -# only the first and second argument is interpreted -marker_mark=0x000000;0xb8f4b8;false;false +marker_mark=0x000000;0xb8f4b8; # translucency for the line marker(first argument) and the search marker (second argument) -# only the first and second argument is interpreted -marker_translucency=256;256;false;false +marker_translucency=256;256 # colour of the caret(the blinking cursor), only first and third argument is interpreted # set the third argument to true to change the caret into a block caret -caret=0x000000;0x000000;false;false +caret=0x000000;0x000000;false; -# width of the caret(the blinking cursor), only first argument is interpreted +# width of the caret(the blinking cursor) # width in pixels, use 0 to make it invisible, maximum width is 3 -caret_width=1;0;false;false +caret_width=1 # set foreground and background colour of indentation guides -indent_guide=0xc0c0c0;;false;false +indent_guide=0xc0c0c0;; # third argument: if true, use this foreground color. If false, use the default value defined by the filetypes. # fourth argument: if true, use this background color. If false, use the default value defined by the filetypes. white_space=0xc0c0c0;0xffffff;true;false -# style of folding icons, only first and second arguments are used, valid values are: -# first argument: 1 for boxes, 2 for circles -# second argument: 1 for straight lines, 2 for curved lines -folding_style=1;1;false;false +# style of folding icons, valid values are: +# first argument: 1 for boxes, 2 for circles, 3 for arrows, 4 for +/- +# second argument: 1 for straight lines, 2 for curved lines or 0 for none +folding_style=1;1; -# should an horizontal line be drawn at the line where text is folded (only first argument is interpreted) +# should an horizontal line be drawn at the line where text is folded # 0 to disable # 1 to draw the line above folded text # 2 to draw the line below folded text -folding_horiz_line=2;0;false;false +folding_horiz_line=2 -# only first argument is interpreted, sets whether all defined colours should be inverted -invert_all=0;0;false;false - -# only first and second argument is interpreted # first argument: drawing of visual flags to indicate a line is wrapped. This is a bitmask of the # values: 0 - No visual flags, 1 - Visual flag at end of subline of a wrapped line, 2 - Visual flag # at begin of subline of a wrapped line, Subline is indented by at least 1 to make room for the flag. -# second argument: wether the visual flags to indicate a line is wrapped are drawn near the border +# second argument: whether the visual flags to indicate a line is wrapped are drawn near the border # or near the text. This is a bitmask of the values: 0 - Visual flags drawn near border, # 1 - Visual flag at end of subline drawn near text, 2 - Visual flag at begin of subline drawn near text -line_wrap_visuals=3;0;false;false +line_wrap_visuals=1;0; -# only first and second argument is interpreted # first argument: sets the size of indentation of sublines for wrapped lines in terms of # the width of a space, only used when the second argument is 0 # second argument: wrapped sublines can be indented to the position of their first subline or @@ -91,12 +82,15 @@ # 0 - Wrapped sublines aligned to left of window plus amount set by the first argument # 1 - Wrapped sublines are aligned to first subline indent (use the same indentation) # 2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation -line_wrap_indent=0;1;false;false +line_wrap_indent=0;1; -# only first and second argument is interpreted # first argument: amount of space to be drawn above the line's baseline # second argument: amount of space to be drawn below the line's baseline -line_height=0;0;false;false +line_height=0;0; + +# 3rd argument is true to override default foreground of calltips +# 4th argument is true to override default background of calltips +calltips=0xc0c0c0;0xffffff;false;false [settings] # which characters should be skipped when moving (or included when deleting) to word boundaries diff -Nru geany-0.18/data/filetypes.conf geany-0.19/data/filetypes.conf --- geany-0.18/data/filetypes.conf 2007-11-01 16:33:06.000000000 +0000 +++ geany-0.19/data/filetypes.conf 2009-11-18 16:48:17.000000000 +0000 @@ -8,8 +8,10 @@ assignment=0x000000;0xffffff;false;false defval=0x00007f;0xffffff;false;false -# the lexer don't support keywords +# the lexer doesn't support keywords +[lexer_properties] +lexer.props.allow.initial.spaces=0 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.cpp geany-0.19/data/filetypes.cpp --- geany-0.18/data/filetypes.cpp 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.cpp 2009-12-03 16:22:33.000000000 +0000 @@ -23,9 +23,6 @@ commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc globalclass=type -# whether arguments of preprocessor commands should be styled (only first argument is used) -# 1 to enable, 0 to disable -styling_within_preprocessor=1;0;false;false [keywords] # all items must be in one line @@ -34,7 +31,16 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +[lexer_properties] +styling.within.preprocessor=1 +preprocessor.symbol.$(file.patterns.cpp)=# +preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef +preprocessor.middle.$(file.patterns.cpp)=else elif +preprocessor.end.$(file.patterns.cpp)=endif + [settings] +lexer_filetype=C + # default extension used when saving files #extension=cpp diff -Nru geany-0.18/data/filetypes.cs geany-0.19/data/filetypes.cs --- geany-0.18/data/filetypes.cs 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.cs 2009-12-03 16:22:33.000000000 +0000 @@ -23,9 +23,6 @@ commentdockeyword=commentdoc,bold,italic commentdockeyworderror=commentdoc globalclass=type -# whether arguments of preprocessor commands should be styled (only first argument is used) -# 1 to enable, 0 to disable -styling_within_preprocessor=1;0;false;false [keywords] # all items must be in one line @@ -34,7 +31,16 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +[lexer_properties] +styling.within.preprocessor=1 +preprocessor.symbol.$(file.patterns.cpp)=# +preprocessor.start.$(file.patterns.cpp)=if +preprocessor.middle.$(file.patterns.cpp)=else elif +preprocessor.end.$(file.patterns.cpp)=endif + [settings] +lexer_filetype=C + # default extension used when saving files #extension=cs diff -Nru geany-0.18/data/filetypes.css geany-0.19/data/filetypes.css --- geany-0.18/data/filetypes.css 2008-10-22 16:35:51.000000000 +0100 +++ geany-0.19/data/filetypes.css 2010-06-06 19:40:35.000000000 +0100 @@ -23,6 +23,7 @@ extended_identifier=0x9090a0;0xffffff;true;false extended_pseudoclass=0x907080;0xffffff;true;true extended_pseudoelement=0x909080;0xffffff;true;true +media=0x006bff;0xffffff;false;true [keywords] # CSS 1 properties diff -Nru geany-0.18/data/filetypes.docbook geany-0.19/data/filetypes.docbook --- geany-0.18/data/filetypes.docbook 2007-11-01 16:33:06.000000000 +0000 +++ geany-0.19/data/filetypes.docbook 2009-11-18 16:48:17.000000000 +0000 @@ -36,6 +36,9 @@ elements=abbrev abstract accel ackno acronym action address affiliation alt anchor answer appendix appendixinfo application area areaset areaspec arg article articleinfo artpagenums attribution audiodata audioobject author authorblurb authorgroup authorinitials beginpage bibliocoverage bibliodiv biblioentry bibliography bibliographyinfo biblioid bibliomisc bibliomixed bibliomset bibliorelation biblioset bibliosource blockinfo blockquote book bookinfo bridgehead callout calloutlist caption caution chapter chapterinfo citation citebiblioid citerefentry citetitle city classname classsynopsis classsynopsisinfo cmdsynopsis co collab cols colnum nameend namest align spanname colname collabname colophon colspec command computeroutput confdates confgroup confnum confsponsor conftitle constant constraint constraintdef constructorsynopsis contractnum contractsponsor contrib copyright coref corpauthor corpname country database date dedication destructorsynopsis edition editor email emphasis entry entrytbl envar epigraph equation errorcode errorname errortext errortype example exceptionname fax fieldsynopsis figure filename fileref firstname firstterm footnote footnoteref foreignphrase formalpara frame funcdef funcparams funcprototype funcsynopsis funcsynopsisinfo function glossary glossaryinfo glossdef glossdiv glossentry glosslist glosssee glossseealso glossterm graphic graphicco group guibutton guiicon guilabel guimenu guimenuitem guisubmenu hardware highlights holder honorific htm imagedata imageobject imageobjectco important index indexdiv indexentry indexinfo indexterm informalequation informalexample informalfigure informaltable initializer inlineequation inlinegraphic inlinemediaobject interface interfacename invpartnumber isbn issn issuenum itemizedlist itermset jobtitle keycap keycode keycombo keysym keyword keywordset label legalnotice lhs lineage lineannotation link listitem iteral literallayout lot lotentry manvolnum markup medialabel mediaobject mediaobjectco member menuchoice methodname methodparam methodsynopsis mm modespec modifier ousebutton msg msgaud msgentry msgexplan msginfo msglevel msgmain msgorig msgrel msgset msgsub msgtext nonterminal note objectinfo olink ooclass ooexception oointerface option optional orderedlist orgdiv orgname otheraddr othercredit othername pagenums para paramdef parameter part partinfo partintro personblurb personname phone phrase pob postcode preface prefaceinfo primary primaryie printhistory procedure production productionrecap productionset productname productnumber programlisting programlistingco prompt property pubdate publisher publishername pubsnumber qandadiv qandaentry qandaset question quote refclass refdescriptor refentry refentryinfo refentrytitle reference referenceinfo refmeta refmiscinfo refname refnamediv refpurpose refsect1 refsect1info refsect2 refsect2info refsect3 refsect3info refsection refsectioninfo refsynopsisdiv refsynopsisdivinfo releaseinfo remark replaceable returnvalue revdescription revhistory revision revnumber revremark rhs row sbr screen screenco screeninfo screenshot secondary secondaryie sect1 sect1info sect2 sect2info sect3 sect3info sect4 sect4info sect5 sect5info section sectioninfo see seealso seealsoie seeie seg seglistitem segmentedlist segtitle seriesvolnums set setindex setindexinfo setinfo sgmltag shortaffil shortcut sidebar sidebarinfo simpara simplelist simplemsgentry simplesect spanspec state step street structfield structname subject subjectset subjectterm subscript substeps subtitle superscript surname sv symbol synopfragment synopfragmentref synopsis systemitem table tbody term tertiary tertiaryie textdata textobject tfoot tgroup thead tip title titleabbrev toc tocback tocchap tocentry tocfront toclevel1 toclevel2 toclevel3 toclevel4 toclevel5 tocpart token trademark type ulink userinput varargs variablelist varlistentry varname videodata videoobject void volumenum warning wordasword xref year arch condition conformance id lang os remap role revision revisionflag security userlevel url vendor xreflabel status label endterm linkend space width dtd=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION +[lexer_properties] +fold.html=1 +fold.html.preprocessor=1 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.Genie.conf geany-0.19/data/filetypes.Genie.conf --- geany-0.18/data/filetypes.Genie.conf 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/filetypes.Genie.conf 2009-12-08 12:40:42.000000000 +0000 @@ -0,0 +1,58 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +number=number +word=word +word2=word2 +string=string +character=string +uuid=0x404080 +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +# @"verbatim" +verbatim=0x101030 +# (/regex/) +regex=0x105090 +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc +globalclass=type + +[keywords] +# all items must be in one line +primary=abstract and array as assert async bool break byte case cast char class const construct continue date datetime decimal dedent def default delegate delete dict div do double downto dynamic else ensures enum errordomain event except exception extern false final finally float for foreach get hash identifier if implements implements in init inline int int16 int32 int64 int8 interface internal is isa list lock long max min namespace namespace new not null object of or otherwise out override owned params pass print private prop protected public raise raises readonly ref requires return sbyte self set short single sizeof size_t ssize_t static string struct super to true try typeof uint uint32 uint64 uint8 ulong unichar unit16 unless unowned uses uses ushort var virtual void volatile weak when while writeonly yield +#secondary= +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +# Vala uses the C lexer +lexer_filetype=C +tag_parser=Python + +# default extension used when saving files +extension=gs + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +#comment_open=// +#comment_close= +# this is an alternative way, so multiline comments are used +comment_open=/* +comment_close=*/ + +[build-menu] +FT_00_LB=_Compile +FT_00_CM=valac -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=valac "%f" +FT_01_WD= diff -Nru geany-0.18/data/filetypes.glsl geany-0.19/data/filetypes.glsl --- geany-0.18/data/filetypes.glsl 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.glsl 2009-12-03 16:22:33.000000000 +0000 @@ -34,7 +34,16 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return returns see since struct throw todo typedef var version warning union +[lexer_properties] +styling.within.preprocessor=1 +preprocessor.symbol.$(file.patterns.cpp)=# +preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef +preprocessor.middle.$(file.patterns.cpp)=else elif +preprocessor.end.$(file.patterns.cpp)=endif + [settings] +lexer_filetype=C + # default extension used when saving files #extension=glsl diff -Nru geany-0.18/data/filetypes.html geany-0.19/data/filetypes.html --- geany-0.18/data/filetypes.html 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.19/data/filetypes.html 2009-11-18 17:07:12.000000000 +0000 @@ -2,6 +2,12 @@ [styling] # styling for PHP/HTML is done in filetypes.xml +[lexer_properties] +# default scripting language for ASP +# 1 = JavaScript (or leave blank for default) +# 2 = VBScript +# 3 = Python +# asp.default.language=2 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.java geany-0.19/data/filetypes.java --- geany-0.18/data/filetypes.java 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.java 2010-05-11 12:57:52.000000000 +0100 @@ -26,7 +26,7 @@ [keywords] primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null -secondary=boolean byte char double float int long null short void +secondary=boolean byte char double float int long short void # documentation keywords for javadoc doccomment=author deprecated exception param return see serial serialData serialField since throws todo version typedefs= diff -Nru geany-0.18/data/filetypes.javascript geany-0.19/data/filetypes.javascript --- geany-0.18/data/filetypes.javascript 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.javascript 2010-02-20 14:19:50.000000000 +0000 @@ -26,7 +26,8 @@ [keywords] # all items must be in one line -primary=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with +primary=break case catch const continue delete else eval false finally for function if in try instanceof isFinite isNaN NaN new null return switch this throw true typeof undefined var while with default let +secondary=Object Function Array prototype [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.latex geany-0.19/data/filetypes.latex --- geany-0.18/data/filetypes.latex 2008-11-13 16:42:51.000000000 +0000 +++ geany-0.19/data/filetypes.latex 2009-09-10 21:05:59.000000000 +0100 @@ -41,5 +41,19 @@ compiler=latex --file-line-error-style "%f" # it is called linker, but here it is an alternative compiler command linker=pdflatex --file-line-error-style "%f" -run_cmd=xdvi "%f" -run_cmd2=xpdf "%f" +run_cmd=xdvi "%e.dvi" +run_cmd2=xpdf "%e.pdf" + +[build-menu] +FT_00_LB=LaTeX -> _DVI +FT_00_CM=latex --file-line-error-style "%f" +FT_00_BD=false +FT_01_LB=LaTeX -> _PDF +FT_01_CM=pdflatex --file-line-error-style "%f" +FT_01_BD=false +EX_00_LB=V_iew PDF File +EX_00_CM=xpdf "%e.pdf" +EX_00_BD=false +EX_01_LB=_View DVI File +EX_01_CM=xdvi "%e.dvi" +EX_01_BD=false diff -Nru geany-0.18/data/filetypes.markdown geany-0.19/data/filetypes.markdown --- geany-0.18/data/filetypes.markdown 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/filetypes.markdown 2009-09-28 16:33:05.000000000 +0100 @@ -0,0 +1,26 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +strong=0xff0000;0xffffff;false;false +emphasis=0xff0000;0xffffff;false;false +header1=0x0000bb;0xffffff;false;false +header2=0x0000bb;0xffffff;false;false +header3=0x0000bb;0xffffff;false;false +header4=0x0000bb;0xffffff;false;false +header5=0x0000bb;0xffffff;false;false +header6=0x0000bb;0xffffff;false;false +ulist_item=0x007f00;0xffffff;false;false +olist_item=0x007f00;0xffffff;false;false +blockquote=0xff0000;0xffffff;false;false +strikeout=0xaa00ff;0xffffff;false;false +hrule=0xff901e;0xffffff;false;false +link=0x0000ff;0xffffff;false;false +code=0x009f00;0xffffff;false;false +codebk=0x005f00;0xffffff;false;false + +[settings] +# default extension used when saving files +extension=mdml + + diff -Nru geany-0.18/data/filetypes.nsis geany-0.19/data/filetypes.nsis --- geany-0.18/data/filetypes.nsis 2009-01-17 13:11:06.000000000 +0000 +++ geany-0.19/data/filetypes.nsis 2009-11-18 16:48:17.000000000 +0000 @@ -29,6 +29,9 @@ lables=all alt alwaysoff archive auto both bottom bzip2 center colored components control current custom directory dlg_id ext false file_attribute_archive file_attribute_hidden file_attribute_normal file_attribute_offline file_attribute_readonly file_attribute_system file_attribute_temporary filesonly force hidden hide hkcc hkcr hkcu hkdd hkey_classes_root hkey_current_config hkey_current_user hkey_dyn_data hkey_local_machine hkey_performance_data hkey_users hklm hkpd hku idabort idcancel idignore idno idok idretry idyes ifdiff ifnewer instfiles italic lastused leave left license listonly lzma manual mb_abortretryignore mb_defbutton1 mb_defbutton2 mb_defbutton3 mb_defbutton4 mb_iconexclamation mb_iconinformation mb_iconquestion mb_iconstop mb_ok mb_okcancel mb_retrycancel mb_right mb_setforeground mb_topmost mb_yesno mb_yesnocancel nevershow none nonfatal normal of off offline on open print readonly rebootok right shctx shift show silent silentlog smooth strike sw_hide sw_showmaximized sw_showmaximized sw_showminimized sw_showminimized sw_showminnoactive sw_showna sw_shownoactivate sw_shownormal sw_shownormal system temporary textonly top trim true try underline uninstconfirm zlib userdefined= +[lexer_properties] +nsis.uservars=1 +nsis.ignorecase=1 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.pascal geany-0.19/data/filetypes.pascal --- geany-0.18/data/filetypes.pascal 2009-05-03 19:13:34.000000000 +0100 +++ geany-0.19/data/filetypes.pascal 2009-11-18 16:48:17.000000000 +0000 @@ -22,6 +22,9 @@ # all items must be in one line primary=absolute abstract add and array as asm assembler automated begin byte case cdecl char class const constructor contains default deprecated destructor dispid dispinterface div do downto dynamic else end except export exports external far file final finalization finally for forward function goto if implementation implements in index inherited initialization inline integer interface is label library message mod name near nil nodefault not object of on or out overload override package packed pascal platform private procedure program property protected public published raise read readonly real record register reintroduce remove repeat requires resourcestring safecall sealed set shl shr static stdcall stored strict string then threadvar to try type unit unsafe until uses var varargs virtual while with word write writeonly xor +[lexer_properties] +# only highlight keywords like read,write if in appropriate context +lexer.pascal.smart.highlighting=1 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.perl geany-0.19/data/filetypes.perl --- geany-0.18/data/filetypes.perl 2008-09-28 19:07:08.000000000 +0100 +++ geany-0.19/data/filetypes.perl 2010-04-05 23:03:49.000000000 +0100 @@ -42,6 +42,8 @@ [keywords] primary=NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode bless caller chdir chmod chomp chop chown chr chroot close closedir cmp connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eq eval exec exists exit exp fcntl fileno flock for foreach fork format formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst le length link listen local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q qq qr quotemeta qu qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir s scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn while write x xor y +[lexer_properties] +styling.within.preprocessor=1 [settings] # default extension used when saving files @@ -70,13 +72,14 @@ # %e will be replaced by the filename without extension # (use only one of it at one time) -# B - The Perl Bytecode Compiler (requires Perl 5.8 or higher) -compiler=perl -MO=Bytecode,-H,-o"%f"c "%f" +compiler=perl -cw "%f" # alternatively use perlcc #compiler=perlcc -o "%e" "%f" -# instead of actual compiling, just run a nice syntax check -#compiler=perl -c "%f" - run_cmd=perl "%f" + +# Parse syntax check error messages and warnings, examples: +# syntax error at test.pl line 7, near "{ +# Unknown warnings category '1' at test.pl line 13 +error_regex=.+ at (.+) line ([0-9]+).* diff -Nru geany-0.18/data/filetypes.php geany-0.19/data/filetypes.php --- geany-0.18/data/filetypes.php 2007-11-01 16:33:06.000000000 +0000 +++ geany-0.19/data/filetypes.php 2009-11-18 16:48:17.000000000 +0000 @@ -2,6 +2,8 @@ [styling] # styling for PHP/HTML is done in filetypes.xml +[lexer_properties] +phpscript.mode=1 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.python geany-0.19/data/filetypes.python --- geany-0.18/data/filetypes.python 2008-03-17 17:22:24.000000000 +0000 +++ geany-0.19/data/filetypes.python 2010-02-06 16:14:41.000000000 +0000 @@ -15,15 +15,19 @@ identifier=0x000000;0xffffff;false;false commentblock=0x808080;0xffffff;false;false stringeol=0x000000;0xe0c0e0;false;false -word2=0xdd00a6;0xffffff;true;false +word2=0x9f0200;0xffffff;false;false decorator=0x808000;0xffffff;false;false [keywords] # all items must be in one line primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True # additional keywords, will be highlighted with style "word2" -identifiers= +# these are the builtins for Python 2.5 created with ' '.join(dir(__builtins__)) +identifiers=ArithmeticError AssertionError AttributeError BaseException DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError _ __debug__ __doc__ __import__ __name__ abs all any apply basestring bool buffer callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min object oct open ord pow property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip +[lexer_properties] +fold.comment.python=1 +fold.quotes.python=1 [settings] # default extension used when saving files diff -Nru geany-0.18/data/filetypes.r geany-0.19/data/filetypes.r --- geany-0.18/data/filetypes.r 2008-09-29 19:10:42.000000000 +0100 +++ geany-0.19/data/filetypes.r 2010-02-22 22:29:20.000000000 +0000 @@ -14,15 +14,15 @@ # "blah" string string=0xff901e;0xffffff;false;false # 'blah' string -string2=0x008000;0xffffff;false;false +string2=0xff901e;0xffffff;false;false identifier=0x000000;0xffffff;false;false infix=0x008000;0xffffff;false;false infixeol=0x000000;0xe0c0e0;false;false [keywords] # all items must be in one line -primary=abs array break data.frame diag else FALSE for function if in Inf matrix NA NaN NCOL next NROW NULL print read.table repeat require return solve source sqrt sum TRUE while -package=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote break browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable function gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol next nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep repeat replace replicate replications require reshape resid residuals restart return rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort source spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system t table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which while window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall +primary=break else F FALSE for function if in Inf NA NaN next NULL repeat require return source T TRUE while +package=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep replace replicate replications reshape resid residuals restart rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall package_other=acme aids aircondit amis aml banking barchart barley beaver bigcity boot brambles breslow bs bwplot calcium cane capability cav censboot channing city claridge cloth cloud coal condense contourplot control corr darwin densityplot dogs dotplot ducks empinf envelope environmental ethanol fir frets gpar grav gravity grob hirose histogram islay knn larrows levelplot llines logit lpoints lsegments lset ltext lvqinit lvqtest manaus melanoma melanoma motor multiedit neuro nitrofen nodal ns nuclear oneway parallel paulsen poisons polar qq qqmath remission rfs saddle salinity shingle simplex singer somgrid splom stripplot survival tau tmd tsboot tuna unit urine viewport wireframe wool xyplot [settings] diff -Nru geany-0.18/data/filetypes.restructuredtext geany-0.19/data/filetypes.restructuredtext --- geany-0.18/data/filetypes.restructuredtext 2007-11-06 17:22:25.000000000 +0000 +++ geany-0.19/data/filetypes.restructuredtext 2009-12-29 18:40:39.000000000 +0000 @@ -1,4 +1,7 @@ # For complete documentation of this file, please see Geany's main documentation +[styling] +# no syntax highlighting yet + [settings] # default extension used when saving files #extension=rst @@ -7,7 +10,7 @@ #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # if only single comment char is supported like # in this file, leave comment_close blank -#comment_open=# +comment_open=.. #comment_close= # this is an alternative way, so multiline comments are used #comment_open=/* diff -Nru geany-0.18/data/filetypes.txt2tags geany-0.19/data/filetypes.txt2tags --- geany-0.18/data/filetypes.txt2tags 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/filetypes.txt2tags 2009-09-06 21:57:42.000000000 +0100 @@ -0,0 +1,9 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# no syntax highlighting yet + +[settings] +# default extension used when saving files +extension=txt2tags + + diff -Nru geany-0.18/data/filetypes.vala geany-0.19/data/filetypes.vala --- geany-0.18/data/filetypes.vala 2009-06-17 12:17:07.000000000 +0100 +++ geany-0.19/data/filetypes.vala 2009-12-03 16:22:33.000000000 +0000 @@ -26,12 +26,21 @@ [keywords] # all items must be in one line -#primary= +primary=else if switch case default break continue return for foreach in do while is try catch finally throw namespace interface class struct enum signal errordomain construct callback get set base const static var weak virtual abstract override inline extern public protected private delegate out ref lock using true false null generic new delete base this value typeof sizeof throws requires ensures void bool char uchar int uint short ushort long ulong size_t ssize_t int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string constpointer time_t #secondary= # these are some doxygen keywords (incomplete) -#docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[lexer_properties] +styling.within.preprocessor=1 +preprocessor.symbol.$(file.patterns.cpp)=# +preprocessor.start.$(file.patterns.cpp)=if +preprocessor.middle.$(file.patterns.cpp)=else elif +preprocessor.end.$(file.patterns.cpp)=endif [settings] +lexer_filetype=C + # default extension used when saving files #extension=vala diff -Nru geany-0.18/data/filetypes.verilog geany-0.19/data/filetypes.verilog --- geany-0.18/data/filetypes.verilog 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/filetypes.verilog 2009-12-07 18:10:39.000000000 +0000 @@ -0,0 +1,47 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=default +comment=comment +comment_line=comment +comment_line_bang=comment +number=number +word=word +word2=word2 +word3=0x5ea01f;;true +string=string +preprocessor=preprocessor +operator=operator +identifier=default +stringeol=stringeol +userword=type + +[keywords] +# all items must be in one line +word=always and assign attribute begin buf bufif0 bufif1 case casex casez cmos deassign default defparam disable edge else end endattribute endcase endfunction endmodule endprimitive endspecify endtable endtask event for force forever fork function highz0 highz1 if ifnone initial join medium module large macromodule nand negedge nmos nor not notif0 notif1 or parameter pmos posedge primitive pull0 pull1 pulldown pullup rcmos realtime release repeat rnmos rpmos rtran rtranif0 rtranif1 scalared signed small specify specparam strength strong0 strong1 supply0 supply1 table task tran tranif0 tranif1 tri tri0 tri1 triand trior trireg unsigned vectored wait wand weak0 weak1 while wor xnor xor @ +word2=$display $write $fdisplay $fwrite $strobe $fstrobe $monitor $fmonitor $time $realtime $finish $stop $setup $hold $width $setuphold $readmemb $readmemh $sreadmemb $sreadmemh $getpattern $history $save $restart $incsave $shm_open $shm_probe $shm_close $scale $showscopes $showvars +word3=real integer time reg wire input output inout + +[settings] +# default extension used when saving files +extension=v + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + + diff -Nru geany-0.18/data/filetypes.xml geany-0.19/data/filetypes.xml --- geany-0.18/data/filetypes.xml 2009-06-17 20:04:17.000000000 +0100 +++ geany-0.19/data/filetypes.xml 2009-11-18 17:07:12.000000000 +0000 @@ -71,10 +71,11 @@ # for embedded Python script (), Python styles from # filetypes.python are used + [keywords] html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml xml:lang javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with -vbscript=and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant +vbscript=and as boolean byref byte byval call case class const continue currency date dim do double each else elseif empty end error exit false for function get global goto if in integer long loop me new next not nothing object on optional or private property public put redim rem resume select set single string sub then to true type until variant wend while with python=and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor sgml=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION diff -Nru geany-0.18/data/latex.tags geany-0.19/data/latex.tags --- geany-0.18/data/latex.tags 2009-05-13 18:11:41.000000000 +0100 +++ geany-0.19/data/latex.tags 1970-01-01 01:00:00.000000000 +0100 @@ -1,1343 +0,0 @@ -# format=pipe -\above||| -\abovecaptionskip||| -\abovedisplayshortskip||| -\abovedisplayskip||| -\abovewithdelims||| -\abstractname||{name}| -\accent||| -\active||| -\acute||{a}| -\addcontentsline||{file}{secunit}{entry}| -\addpenalty||| -\address||{returnaddress}| -\addto||| -\addtocontents||{file}{text}| -\addtocounter||{counter}{value}| -\addtolength||{\gnat}{length}| -\addtoversion||| -\addvspace||{length}| -\adjdemerits||| -\advance||| -\advancepageno||| -\afterassignment||| -\aftergroup||| -\aleph||| -\allowbreak||| -\allowhyphens||| -\alph||{counter}| -\Alph||{counter}| -\alpha||| -\amalg||| -\and||| -\angle||| -\annotations||| -\appendix||| -\appendixname||{name}| -\approx||| -\arabic||{counter}| -\arccos||| -\arcsin||| -\arctan||| -\arg||| -\arraycolsep||| -\arrayrulewidth||| -\arraystretch||| -\arrowvert||| -\Arrowvert||| -\ast||| -\asymp||| -\AtBeginDocument||{code}| -\AtEndDocument||{code}| -\AtEndOfClass||{code}| -\AtEndOfPackage||{code}| -\atop||| -\atopwithdelims||| -\author||{names}| -\backslash||| -\badness||| -\bar||{a}| -\baselineskip||| -\baselinestretch||| -\batchmode||| -\begin||{abstract}| -\begin||{appendix}| -\begin||{array}[pos]{cols}| -\begin||{array}{cols}| -\begin||{block}{title}| -\begin||{center}| -\begin||{description}\item| -\begin||{displaymath}| -\begin||{document}| -\begin||{enumerate}\item| -\begin||{eqnarray}| -\begin||{eqnarray*}| -\begin||{equation}| -\begin||{figure}| -\begin||{figure}[placement]| -\begin||{figure*}| -\begin||{figure*}[placement]| -\begin||{filecontents}| -\begin||{flushleft}| -\begin||{flushright}| -\begin||{frame}| -\begin||{fussypar}| -\begin||{itemize}\item| -\begin||{letter}{name}| -\begin||{list}{label}{spacing}| -\begin||{lrbox}| -\begin||{math}| -\begin||{minipage}[position]{width}| -\begin||{minipage}{width}| -\begin||{picture}(width,height)| -\begin||{picture}(width,height)(xoffset,yoffset)| -\begin||{quotation}| -\begin||{quote}| -\begin||{sloppypar}| -\begin||{tabbing}| -\begin||{table}| -\begin||{table}[placement]| -\begin||{table*}| -\begin||{table*}[placement]| -\begin||{tabular}[pos]{cols}| -\begin||{tabular}{cols}| -\begin||{tabular*}{width}[pos]{cols}| -\begin||{tabular*}{width}{cols}| -\begin||{thebibliography}{widestlabel}| -\begin||{theindex}| -\begin||{theorem}| -\begin||{theorem}[optional]| -\begin||{titlepage}| -\begin||{trivlist}| -\begin||{verbatim}| -\begin||{verbatim*}| -\begin||{verse}| -\begingroup||| -\begingroup..\endgroup||| -\belowcaptionskip||| -\belowdisplayshortskip||| -\belowdisplayskip||| -\beta||| -\bezier||{n}(x1,y1)(x2,y2)(x3,y3)| -\bfseries||| -\bgroup||| -\bgroup..\egroup||| -\bibitem||[label]{citekey}| -\bibitem||{citekey}| -\bibliography||{file}| -\bibliographystyle||{style}| -\big||| -\Big||| -\bigcap||| -\bigcirc||| -\bigcup||| -\bigg||| -\Bigg||| -\Biggl||| -\biggl||| -\Biggl..\Biggr||| -\biggl..\biggr||| -\biggm||| -\Biggm||| -\biggr||| -\Biggr||| -\Bigl||| -\bigl||| -\bigl..bigr||| -\Bigl..Bigr||| -\bigm||| -\Bigm||| -\bigodot||| -\bigoplus||| -\bigotimes||| -\Bigr||| -\bigr||| -\bigskip||| -\bigskipamount||| -\bigsqcup||| -\bigtriangledown||| -\bigtriangleup||| -\biguplus||| -\bigvee||| -\bigwedge||| -\binoppenalty||| -\boldmath||| -\boptie||| -\bordermatrix||| -\bot||| -\botfigrule||| -\botmark||| -\bottomfraction||| -\bottomnumber||| -\Box||| -\box||| -\boxmaxdepth||| -\bracevert||| -\breve||{a}| -\brokenpenalty||| -\buildrel||| -\bullet||| -\bye||| -\cal||| -\cap||| -\caption||[short]{title}| -\caption||{title}| -\cases||| -\catcode||| -\cdot||| -\cdots||| -\centering||| -\centerline||{text}| -\chapter||[short]{title}| -\chapter||{title}| -\chapter*||{title}| -\chaptermark||{code}| -\chaptername||{name}| -\char||| -\chardef||| -\check||{a}| -\CheckCommand||{cmd}[args][default]{def}| -\CheckCommand||{cmd}[args]{def}| -\CheckCommand||{cmd}{def}| -\chi||| -\choose||| -\circ||| -\circle||{diameter}| -\circle*||{diameter}| -\cite||[text]{keylist}| -\cite||{keylist}| -\cleaders||| -\cleardoublepage||| -\clearpage||| -\cleartabs||| -\cline||{i-j}| -\closein||| -\closeout||| -\closing||| -\closing||{text}| -\clubpenalty||| -\clubsuit||| -\columns||| -\columnsep||| -\columnseprule||| -\columnwidth||| -\cong||| -\contentsline||{type}{text}{page}| -\contentsname||{name}| -\coprod||| -\copy||| -\copyright||| -\cos||| -\cosh||| -\cot||| -\coth||| -\count||| -\countdef||| -\crcr||| -\csc||| -\csname||| -\cup||| -\CurrentOption||| -\cvcomputer||{param1}{param2}{param3}{param4}| -\cventry||{param1}{param2}{param3}{param4}{param5}{param6}| -\cvitem||{param1}{param2}| -\cvlanguage||{param1}{param2}{param3}| -\cvlistitem||{param1}| -\cvlistitemsymbol||| -\cvline||{param1}{param2}| -\dagger||| -\danger||| -\dash||| -\dashbox||{dashlength}(width,height)[position]{text}| -\dashbox||{dashlength}(width,height){text}| -\dashv||| -\date||{text}| -\day||| -\dblfigrule||| -\dblfloatpagefraction||| -\dblfloatsep||| -\dbltextfloatsep||| -\dbltopfraction||| -\dbltopnumber||| -\ddagger||| -\ddot||{a}| -\ddots||| -\deadcycles||| -\DeclareOption||{option}{code}| -\DeclareOption*||{code}| -\DeclareRobustCommand||| -\def||| -\defaulthyphenchar||| -\defaultscriptratio||| -\defaultscriptscriptratio||| -\defaultskewchar||| -\deffootnote||| -\deg||| -\delcode||| -\delimiter||| -\delimiterfactor||| -\delimitershortfall||| -\Delta||| -\delta||| -\depth||| -\descriptionlabel||{code}| -\det||| -\Diamond||| -\diamond||| -\diamondsuit||| -\dim||| -\dimen||| -\dimendef||| -\discretionary||| -\displayindent||| -\displaylimits||| -\displaylines||| -\displaywidowpenalty||| -\displaywidth||| -\div||| -\divide||| -\documentclass||[options]{style}| -\documentclass||{style}| -\documentstyle||[options]{style}| -\documentstyle||{style}| -\dot||{x}| -\doteq||| -\dotfill||| -\dots||| -\doublehyphendemerits||| -\doublerulesep||| -\downarrow||| -\Downarrow||| -\edef||| -\egroup||| -\eject||| -\ell||| -\else||| -\emergencystretch||| -\emph||{text}| -\empty||| -\emptyset||| -\encl||{text}| -\end||| -\end||{abstract}| -\end||{appendix}| -\end||{array}| -\end||{block}| -\end||{center}| -\end||{description}| -\end||{displaymath}| -\end||{document}| -\end||{enumerate}| -\end||{eqnarray}| -\end||{eqnarray*}| -\end||{equation}| -\end||{figure}| -\end||{figure*}| -\end||{filecontents}| -\end||{flushleft}| -\end||{flushright}| -\end||{frame}| -\end||{fussypar}| -\end||{itemize}| -\end||{letter}| -\end||{list}| -\end||{lrbox}| -\end||{math}| -\end||{minipage}| -\end||{picture}| -\end||{quotation}| -\end||{quote}| -\end||{sloppy}| -\end||{sloppypar}| -\end||{tabbing}| -\end||{table}| -\end||{table*}| -\end||{tabular}| -\end||{tabular*}| -\end||{thebibliography}| -\end||{theindex}| -\end||{theorem}| -\end||{titlepage}| -\end||{trivlist}| -\end||{verbatim}| -\end||{verbatim*}| -\end||{verse}| -\endcsname||| -\endgraf||| -\endgroup||| -\endinput||| -\endlinechar||| -\enlargethispage||{size}| -\enlargethispage*||{size}| -\enskip||| -\enspace||| -\ensuremath||{stuff}| -\epsilon||| -\eqalign||| -\eqalignno||| -\eqno||| -\equiv||| -\errhelp||| -\errmessage||| -\errorstopmode||| -\escapechar||| -\eta||| -\evensidemargin||| -\everycr||| -\everydisplay||| -\everyhbox||| -\everyjob||| -\everymath||| -\everypar||| -\everyvbox||| -\ExecuteOptions||{optionlist}| -\exhyphenpenalty||| -\exists||| -\exp||| -\expandafter||| -\extracolsep||| -\fam||| -\family||| -\fbox||{text}| -\fboxrule||| -\fboxsep||| -\figurename||{name}| -\fill||| -\finalhypendemerits||| -\firstmark||| -\firstname||{firstname}| -\flat||| -\floatingpenalty||| -\floatpagefraction||| -\floatsep||| -\flq||| -\flqq||| -\flushbottom||| -\fnsymbol||{counter}| -\folio||| -\font||| -\fontdimen||| -\fontencoding||{enc}| -\fontfamily||{family}| -\fontname||| -\fontseries||{series}| -\fontshape||{shape}| -\fontsize||{size}{skip}| -\fontsubfuzz||| -\footheight||| -\footins||| -\footnote||| -\footnote||[number]{text}| -\footnote||{text}| -\footnotemark||| -\footnotemark||[number]| -\footnoterule||| -\footnotesep||| -\footnotesize||| -\footnotetext||[number]{text}| -\footnotetext||{text}| -\footskip||| -\forall||| -\frac||{num}{den}| -\frame||{text}| -\framebox||(xdimen,ydimen)[position]{text}| -\framebox||(xdimen,ydimen){text}| -\framebox||[width][position]{text}| -\framebox||[width]{text}| -\frametitle||{Inhalt}| -\frenchspacing||| -\frown||| -\frq||| -\frqq||| -\fussy||| -\futurelet||| -\gamma||| -\Gamma||| -\gcd||| -\gdef||| -\ge||| -\geq||| -\gets||| -\gg||| -\global||| -\globaldefs||| -\glossary||{text}| -\glossaryentry||{text}{pagenum}| -\glq||| -\glqq||| -\grave||{a}| -\grq||| -\grqq||| -\halign||| -\hangafter||| -\hangindent||| -\hat||{a}| -\hbadness||| -\hbar||| -\hbox||| -\headheight||| -\headsep||| -\heartsuit||| -\height||| -\hfil||| -\hfill||| -\hfilneg||| -\hfuzz||| -\hline||| -\hlinefill||| -\hoffset||| -\hom||| -\hookleftarrow||| -\hookrightarrow||| -\hrule||| -\hrulefill||| -\hsize||| -\hskip||| -\hspace||{length}| -\hspace*||{length}| -\hss||| -\HUGE||| -\Huge||| -\huge||| -\hyphenation||{words}| -\hyphenchar||| -\hyphenpenalty||| -\if||| -\if..\else..\fi||| -\if..\fi||| -\ifcase||| -\ifcase..\else..\fi||| -\ifcase..\fi||| -\ifcat||| -\ifcat..\else..\fi||| -\ifcat..\fi||| -\ifdim||| -\ifdim..\else..\fi||| -\ifdim..\fi||| -\ifeof||| -\ifeof..\else..\fi||| -\ifeof..\fi||| -\iffalse||| -\iffalse..\else..\fi||| -\iffalse..\fi||| -\IfFileExists||{file}{then}{else}| -\ifhbox||| -\ifhbox..\else..\fi||| -\ifhbox..\fi||| -\ifhmode||| -\ifhmode..\else..\fi||| -\ifhmode..\fi||| -\ifinner||| -\ifinner..\else..\fi||| -\ifinner..\fi||| -\ifmmode||| -\ifmmode..\else..\fi||| -\ifmmode..\fi||| -\ifnum||| -\ifnum..\else..\fi||| -\ifnum..\fi||| -\ifodd||| -\ifodd..\else..\fi||| -\ifodd..\fi||| -\iftrue||| -\iftrue..\else..\fi||| -\iftrue..\fi||| -\ifundefined||| -\ifvbox||| -\ifvbox..\else..\fi||| -\ifvbox..\fi||| -\ifvmode||| -\ifvmode..\else..\fi||| -\ifvmode..\fi||| -\ifvoid||| -\ifvoid..\else..\fi||| -\ifvoid..\fi||| -\ifx||| -\ifx..\else..\fi||| -\ifx..\fi||| -\ignorespaces||| -\Im||| -\imath||| -\immediate||| -\in||| -\include||{file}| -\includegraphics||[options]{name}| -\includegraphics||{name}| -\includeonly||{filelist}| -\includepdf||[options]{filelist}| -\indent||| -\index||{entry}| -\indexname||{name}| -\indexspace||| -\inf||| -\infty||| -\input||{file}| -\InputIfFileExists||{file}{then}{else}| -\inputlineno||| -\insert||| -\insertpenalties||| -\int||| -\interdisplaylinepenalty||| -\interfootnotelinepenalty||| -\interlinepenalty||| -\intextsep||| -\iota||| -\item||| -\item||[label]| -\itemindent||| -\itemsep||| -\iterate||| -\itshape||| -\jmath||| -\jobname||| -\Join||| -\joinrel||| -\kappa||| -\ker||| -\kern||| -\kill||| -\label||{key}| -\labelenumi||| -\labelitemi||| -\labelitemii||| -\labelitemiii||| -\labelitemiv||| -\labelsep||| -\labelwidth||| -\Lambda||| -\lambda||| -\langle||| -\language||| -\large||| -\Large||| -\LARGE||| -\lastbox||| -\lastkern||| -\lastpenalty||| -\lastskip||| -\lastname||{lastname}| -\LaTeX||| -\LaTeXe||| -\lbrace||| -\lbrack||| -\lccode||| -\lceil||| -\ldots||| -\le||| -\leaders||| -\leadsto||| -\leavevmode||| -\left||| -\left..\right||| -\Leftarrow||| -\leftarrow||| -\lefteqn||| -\leftharpoondown||| -\leftharpoonup||| -\lefthyphenmin||| -\leftmargin||| -\leftmargini||| -\leftmarginii||| -\leftmarginiii||| -\leftmarginiv||| -\leftmarginv||| -\leftmarginvi||| -\leftmark||| -\Leftrightarrow||| -\leftrightarrow||| -\leftskip||| -\leq||| -\leqno||| -\let||| -\lfloor||| -\lg||| -\lgroup||| -\lhd||| -\lim||| -\liminf||| -\limits||| -\limsup||| -\line||| -\line||(xslope,yslope){length}| -\linebreak||| -\linebreak||[number]| -\linepenalty||| -\lineskip||| -\lineskiplimit||| -\lineskiplimits||| -\linethickness||{dimension}| -\linewidth||| -\listfigurename||{name}| -\listfiles||| -\listoffigures||| -\listoftables||| -\listparindent||| -\listtablename||{name}| -\ll||| -\llap||| -\lmoustache||| -\ln||| -\LoadClass||[optionlist]{class}| -\LoadClass||[optionlist]{class}[release]| -\LoadClass||{class}| -\LoadClass||{class}[release]| -\location||{address}| -\log||| -\long||| -\Longleftarrow||| -\longleftarrow||| -\longleftrightarrow||| -\Longlettrightarrow||| -\longmapsto||| -\longrightarrow||| -\Longrightarrow||| -\looseness||| -\lower||| -\lowercase||| -\mag||| -\magnification||| -\magstep||| -\makeatletter||| -\makeatother||| -\makebox||(width,height)[position]{text}| -\makebox||(width,height){text}| -\makebox||[width][position]{text}| -\makebox||[width]{text}| -\makeglossary||| -\makeindex||| -\makelabel||| -\makelabels||{number}| -\MakeLowercase||{text}| -\maketitle||| -\MakeUppercase||{text}| -\mapsto||| -\margin||| -\marginpar||[left]{right}| -\\marginpar||{right}| -\marginparpush||| -\marginparsep||| -\marginparwidth||| -\mark||| -\markboth||{lefthead}{righthead}| -\markright||{righthead}| -\mathaccent||| -\mathbf||| -\mathbin||| -\mathcal||| -\mathchar||| -\mathchardef||| -\mathchoice||| -\mathclose||| -\mathcode||| -\mathellipsis||| -\mathgroup||| -\mathinner||| -\mathit||| -\mathnormal||| -\mathop||| -\mathopen||| -\mathord||| -\mathpunct||| -\mathrel||| -\mathrm||| -\mathsf||| -\mathsterling||| -\mathstrut||| -\mathsurround||| -\mathtt||| -\mathunderscore||| -\mathversion||| -\matrix||| -\max||| -\maxdeadcycles||| -\maxdepth||| -\maxdimen||| -\mbox||{text}| -\mdseries||| -\meaning||| -\medmuskip||| -\medskip||| -\medskipamount||| -\message||| -\mho||| -\mid||| -\min||| -\mkern||| -\models||| -\month||| -\moveleft||| -\moveright||| -\mp||| -\mskip||| -\mu||| -\multicolumn||{cols}{pos}{text}| -\multiply||| -\multiput||(xcoord,ycoord)(xdelta,ydelta){copies}{object}| -\multispan||| -\muskip||| -\muskipdef||| -\nabla||| -\name||{name}| -\natural||| -\nearrow||| -\NeedsTeXFormat||{format}| -\NeedsTeXFormat||{format}[release]| -\neg||| -\negthinspace||| -\newbox||| -\newcommand||{cmd}[args][default]{def}| -\newcommand||{cmd}[args]{def}| -\newcommand||{cmd}{def}| -\newcount||| -\newcounter||{foo}| -\newcounter||{foo}[counter]| -\newdimen||| -\newenvironment||{nam}[args][default]{begdef}{enddef}| -\newenvironment||{nam}[args]{begdef}{enddef}| -\newenvironment||{nam}{begdef}{enddef}| -\newfont||{cmd}{fontname}| -\newhelp||| -\newif||| -\newlabel||| -\newlength||{\length}| -\newline||| -\newlinechar||| -\newmuskip||| -\newpage||| -\newread||| -\newsavebox||{\box}| -\newskip||| -\newtheorem||{envname}[numberedlike]{caption}[within]| -\newtheorem||{envname}{caption}| -\newtheorem||{envname}{caption}[within]| -\newtoks||| -\newwrite||| -\ni||| -\nicefrac||[value]{numerator}{denominator}| -\noalign||| -\nocite||{keylist}| -\nocorr||| -\nocorrlist||{charlist}| -\noexpand||| -\nofiles||| -\noindent||| -\nointerlineskip||| -\nolimits||| -\nolinebreak||| -\nolinebreak||[number]| -\nonfrenchspacing||| -\nonscript||| -\nonstopmode||| -\nonumber||| -\nopagebreak||| -\nopagebreak||[number]| -\nopagenumbers||| -\normalcolor||| -\normalfont||| -\normalmarginpar||| -\normalsize||| -\not||| -\notin||| -\nouppercase||| -\nu||| -\null||| -\nulldelimiterspace||| -\nullfont||| -\number||| -\nwarrow||| -\obeycr||| -\obeylines||| -\obeyspaces||| -\oddsidemargin||| -\odot||| -\offinterlineskip||| -\oint||| -\oldstylenums||| -\Omega||| -\omega||| -\ominus||| -\omit||| -\onecolumn||| -\openin||| -\opening||{text}| -\openout||| -\oplus||| -\OptionNotUsed||| -\oslash||| -\otimes||| -\outer||| -\output||| -\outputpenalty||| -\oval||(width,height)| -\oval||(width,height)[portion]| -\over||| -\overbrace||{text}| -\overfullrule||| -\overleftarrow||| -\overline||{text}| -\overrightarrow||| -\overwithdelims||| -\PackageError||| -\PackageInfo||| -\PackageWarning||| -\PackageWarningNoLine||| -\pagebreak||| -\pagebreak||[number]| -\pagedepth||| -\pagefilllstretch||| -\pagefillstretch||| -\pagefilstretch||| -\pagegoal||| -\pageinsert||| -\pagename||| -\pageno||| -\pagenumbering||{numstyle}| -\pageref||{key}| -\pageshrink||| -\pagestretch||| -\pagestyle||{option}| -\pagetotal||| -\paperheight||| -\paperwidth||| -\par||| -\paragraph||[short]{title}| -\paragraph||{title}| -\paragraph*||{title}| -\paragraphmark||| -\parallel||| -\parbox||[position]{width}{text}| -\parbox||{width}{text}| -\parfillskip||| -\parindent||| -\parsep||| -\parshape||| -\parskip||| -\part||[short]{title}| -\part||{title}| -\part*||{title}| -\partial||| -\partname||{name}| -\partopsep||| -\PassOptionsToClass||{optionlist}{class}| -\PassOptionsToPackage||{optionlist}{package}| -\patterns||| -\pause||| -\pausing||| -\penalty||| -\perp||| -\phantom||| -\phi||| -\Phi||| -\pi||| -\Pi||| -\place||{location}| -\plus||| -\pm||| -\pmatrix||| -\poptabs||| -\postdisplaypenalty||| -\pounds||| -\Pr||| -\prec||| -\preceq||| -\predisplaypenalty||| -\predisplaysize||| -\pretolerance||| -\prevdepth||| -\prevgraf||| -\prime||| -\ProcessOptions||| -\ProcessOptions*||| -\proclaim||| -\prod||| -\propto||| -\protect||| -\ProvidesClass||{name}| -\ProvidesClass||{name}[release]| -\ProvidesFile||{ma,e}| -\ProvidesFile||{name}{release}| -\ProvidesPackage||{name}| -\ProvidesPackage||{name}[release]| -\Psi||| -\psi||| -\put||(xcoord,ycoord){text}| -\qquad||| -\quad||| -\radical||| -\raggedbottom||| -\raggedcenter||| -\raggedleft||| -\raggedright||| -\raise||| -\raisebox||{distance}[extendabove][extendbelow]{text}| -\raisebox||{distance}[extendabove]{text}| -\raisebox||{distance}{text}| -\rangle||| -\rbrace||| -\rbrack||| -\rceil||| -\Re||| -\read||| -\ref||{key}| -\refname||{name}| -\refstepcounter||{counter}| -\relax||| -\relpenalty||| -\removelastskip||| -\renewcommand||{cmd}[args][default]{def}| -\renewcommand||{cmd}[args]{def}| -\renewcommand||{cmd}{def}| -\renewenvironment||{nam}[args][default]{begdef}{enddef}| -\renewenvironment||{nam}[args]{begdef}{enddef}| -\renewenvironment||{nam}{begdef}{enddef}| -\repeat||| -\RequirePackage||[optionlist]{package}| -\RequirePackage||[optionlist]{package}[release]| -\RequirePackage||{package}| -\RequirePackage||{package}[release]| -\restorecr||| -\reversemarginpar||| -\rfloor||| -\rgroup||| -\rhd||| -\rho||| -\right||| -\rightarrow||| -\Rightarrow||| -\rightharpoondown||| -\rightharpoonup||| -\righthyphenmin||| -\rightleftharpoons||| -\rightmargin||| -\rightmark||| -\rightskip||| -\rlap||| -\rmfamily||| -\rmoustache||| -\roman||{counter}| -\Roman||{counter}| -\romannumeral||| -\rule||[lift]{width}{thickness}| -\rule||{width}{thickness}| -\samepage||| -\savebox||{cmd}[width][pos]{text}| -\savebox||{cmd}[width]{text}| -\savebox||{cmd}{text}| -\sbox||{cmd}[text]| -\scriptfont||| -\scriptscriptfont||| -\scriptscriptstyle||| -\scriptsize||| -\scriptspace||| -\scriptstyle||| -\scrollmode||| -\scshape||| -\searrow||| -\sec||| -\section||[short]{title}| -\section||{title}| -\section*||{title}| -\sectionmark||{code}| -\selectfont||| -\selectlanguage||{language}| -\setbox||| -\setcounter||{counter}{value}| -\setlanguage||| -\setlength||{\gnat}{length}| -\setminus||| -\setpapersize||{layout}| -\settodepth||{\gnat}{text}| -\settoheight||{\gnat}{text}| -\settowidth||{\gnat}{text}| -\sfcode||| -\sffamily||| -\sharp||| -\shipout||| -\shortstack||[position]{text\\text}| -\shortstack||{text\\text}| -\show||| -\showbox||| -\showboxbreadth||| -\showboxdepth||| -\showhyphens||| -\showlists||| -\showthe||| -\sigma||| -\Sigma||| -\signature||{name}| -\signature||{name}| -\sim||| -\simeq||| -\sin||| -\sinh||| -\skew||| -\skewchar||| -\skip||| -\skipdef||| -\slash||| -\sloppy||| -\slshape||| -\small||| -\smallskip||| -\smallskipamount||| -\smash||| -\smile||| -\space||| -\spacefactor||| -\spaceskip||| -\spadesuit||| -\span||| -\special||| -\splitbotmark||| -\splitfirstmark||| -\splitmaxdepth||| -\splittopskip||| -\sqcup||| -\sqrt||[root]{arg}| -\sqrt||{arg}| -\sqsupset||| -\sqsupseteq||| -\stackrel||{above}{under}| -\star||| -\stepcounter||{counter}| -\stop||| -\stretch||{number}| -\string||| -\strut||| -\subitem||| -\subject||{text}| -\subparagraph||[short]{title}| -\subparagraph||{title}| -\subparagraph*||{title}| -\subparagraphmark||{code}| -\subsection||[short]{title}| -\subsection||{title}| -\subsection*||{title}| -\subsectionmark||{code}| -\subset||| -\subseteq||| -\subsubitem||| -\subsubsection||[short]{title}| -\subsubsection||{title}| -\subsubsection*||{title}| -\subsubsectionmark||{code}| -\succ||| -\succeq||| -\sum||| -\sup||| -\suppressfloats||| -\suppressfloats||[placement]| -\supset||| -\supseteq||| -\surd||| -\swarrow||| -\symbol||{n}| -\tabbingsep||| -\tabcolsep||| -\tablename||{name}| -\tableofcontents||| -\tabskip||| -\tabularnewline||| -\tan||| -\tanh||| -\tau||| -\telephone||{number}| -\TeX||| -\textasciicircum||| -\textasciitilde||| -\textasteriskcentered||| -\textbackslash||| -\textbar||| -\textbf||{text}| -\textbraceleft||| -\textbraceright||| -\textbullet||| -\textcircled||| -\textcompwordmark||| -\textdagger||| -\textdaggerdbl||| -\textdollar||| -\textellipsis||| -\textemdash||| -\textexclamdown||| -\textfloatsep||| -\textfont||| -\textfraction||| -\textgreater||| -\textheight||| -\textindent||| -\textit||{text}| -\textless||| -\textmd||{text}| -\textnormal||| -\textparagraph||| -\textperiodcentered||| -\textquestiondown||| -\textquotedblleft||| -\textquotedblright||| -\textquoteleft||| -\textquoteright||| -\textregistered||| -\textrm||{text}| -\textsc||{text}| -\textsection||| -\textsf||{text}| -\textsl||{text}| -\textsterling||| -\textstyle||| -\textsuperscript||| -\texttrademark||| -\texttt||{text}| -\textunderscore||| -\textup||{text}| -\textvisiblespace||| -\textwidth||| -\thanks||{text}| -\the||| -\thechapter||| -\theenumi||| -\theenumiv||| -\theequation||| -\thefigure||| -\thefootnote||| -\thefootnotemark||| -\thehours||| -\theminutes||| -\thempfn||| -\thempfootnote||| -\thepage||| -\theparagraph||| -\thepart||| -\thesection||| -\thesubparagraph||| -\thesubsection||| -\thesubsubsection||| -\theta||| -\Theta||| -\thetable||| -\thicklines||| -\thickmuskip||| -\thinlines||| -\thinmuskip||| -\thinspace||| -\thispagestyle||{option}| -\tilde||{a}| -\time||| -\times||| -\tiny||| -\title||{text}| -\to||| -\today||| -\toks||| -\toksdef||| -\tolerance||| -\top||| -\topfigrule||| -\topfraction||| -\topins||| -\topmargin||| -\topmark||| -\topnumber||| -\topsep||| -\topskip||| -\totalheight||| -\totalnumber||| -\tracingcommands||| -\tracingfonts||| -\tracinglostchars||| -\tracingmacros||| -\tracingonline||| -\tracingoutput||| -\tracingpages||| -\tracingparagraphs||| -\tracingrestores||| -\tracingstats||| -\triangle||| -\triangleleft||| -\triangleright||| -\ttfamily||| -\twocolumn||[text]| -\typein||[cmd]{msg}| -\typein||{msg}| -\typeout||{msg}| -\uccode||| -\uchyph||| -\unboldmath||| -\underbar||| -\underbrace||{text}| -\underline||{text}| -\unhbox||| -\unhcopy||| -\unit||[value]{dimension}| -\unitfrac||[value]{numerator}{denominator}| -\unitlength||| -\unkern||| -\unlhd||| -\unpenalty||| -\unrhd||| -\unskip||| -\unvbox||| -\unvcopy||| -\uparrow||| -\Uparrow||| -\updownarrow||| -\Updownarrow||| -\uplus||| -\uppercase||| -\upshape||| -\Upsilon||| -\upsilon||| -\usebox||{\box}| -\usecolortheme||{Name}| -\usecounter||{counter}| -\usefont||{enc}{family}{series}{shape}| -\usepackage||[options]{package}| -\usetheme||{Name}| -\vadjust||| -\valign||| -\value||{counter}| -\varepsilon||| -\varphi||| -\varpi||| -\varrho||| -\varsigma||| -\vartheta||| -\vbadness||| -\vbox||| -\vcenter||| -\vdash||| -\vdots||| -\vdots||| -\vec||{a}| -\vector||(xslope,yslope){length}| -\vee||| -\verb||| -\vert||| -\vfil||| -\vfill||| -\vfilll||| -\vfilneg||| -\vfuzz||| -\vline||| -\voffset||| -\vphantom||| -\vrule||| -\vsize||| -\vskip||| -\vspace||{length}| -\vspace*||{length}| -\vsplit||| -\vss||| -\vtop||| -\wedge||| -\widowpenalty||| -\width||| -\wp||| -\wr||| -\write||| -\xdef||| -\Xi||| -\xleaders||| -\xspaceskip||| -\year||| -\zeta||| diff -Nru geany-0.18/data/snippets.conf geany-0.19/data/snippets.conf --- geany-0.18/data/snippets.conf 2009-02-05 20:16:35.000000000 +0000 +++ geany-0.19/data/snippets.conf 2010-03-25 13:51:07.000000000 +0000 @@ -10,13 +10,12 @@ # You can define a section for each supported filetype to overwrite default settings, the section # name must match exactly the internal filetype name, run 'geany --ft-names' for a full list. # -# Additionally, you can use most of the template wildcards like {developer} or {date} in the snippets. +# Additionally, you can use most of the template wildcards like {developer}, {command:...}, +# or {date} in the snippets. # See the documentation for details. -# filetype names: -# ASM, C, C++, C#, CAML, D, Fortran, FreeBasic, Haskell, Haxe, Java, Pascal, VHDL, Ferite, Javascript, -# Lua, Make, O-Matrix, Perl, PHP, Python, Ruby, Sh, Tcl, CSS, Docbook, HTML, XML, Conf, Diff, LaTeX, -# reStructuredText, SQL, None +# For a list of available filetype names, execute: +# geany --ft-names # Default is used for all filetypes and keys can be overwritten by [filetype] sections [Default] @@ -24,7 +23,7 @@ else=else%block_cursor% for=for (i = 0; i < %cursor%; i++)%block_cursor% while=while (%cursor%)%block_cursor% -do=do\n{\n\t%cursor%\n} while(%cursor%)\n%cursor% +do=do\n{\n\t%cursor%\n} while (%cursor%)\n%cursor% switch=switch (%cursor%)%brace_open%case %cursor%:\n\t\t%cursor%\n\t\tbreak;\n\tdefault:\n\t\t%cursor%\n%brace_close%%cursor% try=try%block%\ncatch (%cursor%)%block_cursor% diff -Nru geany-0.18/data/templates/files/file.html geany-0.19/data/templates/files/file.html --- geany-0.18/data/templates/files/file.html 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/file.html 2009-10-14 13:43:51.000000000 +0100 @@ -0,0 +1,16 @@ +{fileheader} + + + + + {untitled} + + + + + + + + + diff -Nru geany-0.18/data/templates/files/file.php geany-0.19/data/templates/files/file.php --- geany-0.18/data/templates/files/file.php 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/file.php 2009-10-14 13:45:06.000000000 +0100 @@ -0,0 +1,18 @@ + + + + + + {untitled} + + + + + + + + + diff -Nru geany-0.18/data/templates/files/file.rb geany-0.19/data/templates/files/file.rb --- geany-0.18/data/templates/files/file.rb 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/file.rb 2009-10-01 12:18:26.000000000 +0100 @@ -0,0 +1,10 @@ +{fileheader} + +class StdClass + def initialize + + end +end + +x = StdClass.new + diff -Nru geany-0.18/data/templates/files/file.tex geany-0.19/data/templates/files/file.tex --- geany-0.18/data/templates/files/file.tex 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/file.tex 2009-10-15 20:20:12.000000000 +0100 @@ -0,0 +1,8 @@ +\documentclass[a4paper]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{lmodern} +\usepackage[english]{babel} +\begin{document} + +\end{document} diff -Nru geany-0.18/data/templates/files/main.c geany-0.19/data/templates/files/main.c --- geany-0.18/data/templates/files/main.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/main.c 2009-10-01 12:18:26.000000000 +0100 @@ -0,0 +1,10 @@ +{fileheader} + +#include + +int main(int argc, char **argv) +{ + + return 0; +} + diff -Nru geany-0.18/data/templates/files/main.cxx geany-0.19/data/templates/files/main.cxx --- geany-0.18/data/templates/files/main.cxx 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/main.cxx 2009-10-01 12:18:26.000000000 +0100 @@ -0,0 +1,10 @@ +{fileheader} + +#include + +int main(int argc, char **argv) +{ + + return 0; +} + diff -Nru geany-0.18/data/templates/files/main.d geany-0.19/data/templates/files/main.d --- geany-0.18/data/templates/files/main.d 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/main.d 2009-10-01 12:18:26.000000000 +0100 @@ -0,0 +1,10 @@ +{fileheader} + +import std.stdio; + +int main(char[][] args) +{ + + return 0; +} + diff -Nru geany-0.18/data/templates/files/main.java geany-0.19/data/templates/files/main.java --- geany-0.18/data/templates/files/main.java 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/main.java 2009-10-12 12:13:39.000000000 +0100 @@ -0,0 +1,9 @@ +{fileheader} + +public class {untitled} { + + public static void main (String args[]) { + + } +} + diff -Nru geany-0.18/data/templates/files/main.py geany-0.19/data/templates/files/main.py --- geany-0.18/data/templates/files/main.py 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/main.py 2009-10-01 12:18:26.000000000 +0100 @@ -0,0 +1,13 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +{fileheader} + + +def main(): + + return 0 + +if __name__ == '__main__': + main() + diff -Nru geany-0.18/data/templates/files/program.pas geany-0.19/data/templates/files/program.pas --- geany-0.18/data/templates/files/program.pas 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/data/templates/files/program.pas 2009-10-01 12:18:26.000000000 +0100 @@ -0,0 +1,12 @@ +{fileheader} + +program {untitled}; + +uses crt; +var i : byte; + +BEGIN + + +END. + diff -Nru geany-0.18/debian/changelog geany-0.19/debian/changelog --- geany-0.18/debian/changelog 2010-08-26 19:36:15.000000000 +0100 +++ geany-0.19/debian/changelog 2010-08-26 19:36:16.000000000 +0100 @@ -1,3 +1,23 @@ +geany (0.19-1ubuntu1~lucid~ppa1) lucid; urgency=low + + * Backport to Lucid -- No source changes + + -- Micah Gersten Thu, 26 Aug 2010 13:22:41 -0500 + +geany (0.19-1ubuntu1) maverick; urgency=low + + * debian/control: Breaks geany-plugins-common (<< 0.19), as they are + incompatible + + -- Chow Loong Jin Sat, 07 Aug 2010 03:23:12 +0800 + +geany (0.19-1) unstable; urgency=low + + * New upstream release (Closes: #585849, #580911, #542785) + * add 20_use_sensible_browser to change the default browser (Closes: #573454) + + -- Damián Viano Thu, 24 Jun 2010 21:35:05 -0300 + geany (0.18-1) unstable; urgency=low * New upstream release diff -Nru geany-0.18/debian/control geany-0.19/debian/control --- geany-0.18/debian/control 2010-08-26 19:36:15.000000000 +0100 +++ geany-0.19/debian/control 2010-08-26 19:36:16.000000000 +0100 @@ -1,17 +1,19 @@ Source: geany Section: devel Priority: optional -Maintainer: Damián Viano +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Damián Viano Homepage: http://www.geany.org Vcs-Svn: http://geany.svn.sourceforge.net/svnroot/geany/trunk/ Vcs-Browser: http://geany.svn.sourceforge.net/viewvc/geany/ Build-Depends: debhelper (>= 5.0.0), dpatch, libgtk2.0-dev (>= 2.10), libglib2.0-dev, libatk1.0-dev, libpango1.0-dev, intltool -Standards-Version: 3.8.1 +Standards-Version: 3.8.4 Package: geany Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libvte9, doc-base +Breaks: geany-plugins-common (<< 0.19) Description: A fast and lightweight IDE Geany is a small and lightweight integrated development environment. It was developed to provide a small and fast IDE, which has only a diff -Nru geany-0.18/debian/patches/00list geany-0.19/debian/patches/00list --- geany-0.18/debian/patches/00list 2010-08-26 19:36:15.000000000 +0100 +++ geany-0.19/debian/patches/00list 2010-08-26 19:36:16.000000000 +0100 @@ -1,3 +1,4 @@ 20_change_gpl_location 20_add_debian_specific_filetypes 20_debian_control_tags +20_use_sensible_browser diff -Nru geany-0.18/debian/patches/20_debian_control_tags.dpatch geany-0.19/debian/patches/20_debian_control_tags.dpatch --- geany-0.18/debian/patches/20_debian_control_tags.dpatch 2010-08-26 19:36:15.000000000 +0100 +++ geany-0.19/debian/patches/20_debian_control_tags.dpatch 2010-08-26 19:36:16.000000000 +0100 @@ -1,5 +1,5 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 20_debian_control_tags.dpatch by Damián Viano > +## 20_debian_control_tags.dpatch by Damián Viano ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Add support for having 'Source:' and 'Package:' as tags in a diff -Nru geany-0.18/debian/patches/20_use_sensible_browser.dpatch geany-0.19/debian/patches/20_use_sensible_browser.dpatch --- geany-0.18/debian/patches/20_use_sensible_browser.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/debian/patches/20_use_sensible_browser.dpatch 2010-08-26 19:36:16.000000000 +0100 @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## use_sensible_browser.dpatch by Damián Viano +## +## DP: change default browser to sensible-browser to be more debian integrated + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' geany-0.19~/src/keyfile.c geany-0.19/src/keyfile.c +--- geany-0.19~/src/keyfile.c 2010-05-22 16:40:12.000000000 -0300 ++++ geany-0.19/src/keyfile.c 2010-06-24 21:31:34.000000000 -0300 +@@ -74,7 +74,7 @@ + #else + #define GEANY_DEFAULT_TOOLS_TERMINAL "xterm" + #endif +-#define GEANY_DEFAULT_TOOLS_BROWSER "firefox" ++#define GEANY_DEFAULT_TOOLS_BROWSER "sensible-browser" + #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" + #define GEANY_DEFAULT_TOOLS_GREP "grep" + #define GEANY_DEFAULT_MRU_LENGTH 10 diff -Nru geany-0.18/debian/README.source geany-0.19/debian/README.source --- geany-0.18/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/debian/README.source 2010-08-26 19:36:16.000000000 +0100 @@ -0,0 +1,3 @@ +This package uses dpatch to manage all modifications to the upstream source. +Please refer to /usr/share/doc/dpatch/README.source.gz for further information +abou thow to work with dpatch. diff -Nru geany-0.18/depcomp geany-0.19/depcomp --- geany-0.18/depcomp 2009-08-16 18:29:20.000000000 +0100 +++ geany-0.19/depcomp 2010-06-12 13:14:28.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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 @@ -17,9 +17,7 @@ # 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. +# 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 @@ -87,6 +85,15 @@ 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 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -585,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru geany-0.18/doc/Doxyfile.in geany-0.19/doc/Doxyfile.in --- geany-0.18/doc/Doxyfile.in 2009-07-14 16:06:20.000000000 +0100 +++ geany-0.19/doc/Doxyfile.in 2010-03-17 17:15:47.000000000 +0000 @@ -94,7 +94,8 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/ ./ ../plugins/pluginmacros.h ../plugins/geanyplugin.h \ +INPUT = ../src/ ./ \ + ../plugins/geanyplugin.h ../plugins/geanyfunctions.h \ ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \ ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \ ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h @@ -123,7 +124,7 @@ EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXCLUDE_SYMBOLS = -EXAMPLE_PATH = +EXAMPLE_PATH = . EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO IMAGE_PATH = @@ -228,7 +229,7 @@ INCLUDE_PATH = INCLUDE_FILE_PATTERNS = # make G_GNUC_PRINTF a no-op unless doxygen would ignore functions with varargs -PREDEFINED = "G_GNUC_PRINTF(x,y)=" GEANY_DISABLE_DEPRECATED HAVE_PLUGINS +PREDEFINED = "G_GNUC_PRINTF(x,y)=" HAVE_PLUGINS GEANY_FUNCTIONS_H EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = NO #--------------------------------------------------------------------------- diff -Nru geany-0.18/doc/geany.1 geany-0.19/doc/geany.1 --- geany-0.18/doc/geany.1 2009-08-16 18:29:35.000000000 +0100 +++ geany-0.19/doc/geany.1 2010-06-12 13:14:49.000000000 +0100 @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "August 16, 2009" "geany 0.18" "" +.TH "GEANY" "1" "June 12, 2010" "geany 0.19" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" @@ -42,6 +42,12 @@ Only available if Geany was compiled with support for Sockets. .IP "\fB-l\fP, \fB\-\-line\fP " 10 Set initial line number for the first opened file. +.IP "\fB\fP \fB\-\-list\-documents\fP " 10 +Return a list of open documents in a running Geany instance. +This can be used to read the currently opened documents in Geany from an external script +or tool. The returned list is separated by newlines (LF) and consists of the full, +UTF\-8 encoded filenames of the documents. +Only available if Geany was compiled with support for Sockets. .IP "\fB-m\fP, \fB\-\-no-msgwin\fP " 10 Don't show the message window. Use this option if you don't need compiler messages or VTE support. @@ -60,6 +66,8 @@ Don't load terminal support. Use this option, if you don't want to load the virtual terminal emulator widget at startup. If you don't have libvte.so.4 installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE. +.IP "\fB\fP \fB\-\-socket-file\fP " 10 +Use this socket filename for communication with a running Geany instance .IP "\fB\fP \fB\-\-vte-lib\fP " 10 Specify explicitly the path including filename or only the filename to the VTE library, e.g. /usr/lib/libvte.so or libvte.so. This option is only needed, when the autodetection doesn't diff -Nru geany-0.18/doc/geany.1.in geany-0.19/doc/geany.1.in --- geany-0.18/doc/geany.1.in 2009-08-16 17:25:56.000000000 +0100 +++ geany-0.19/doc/geany.1.in 2010-06-12 12:55:54.000000000 +0100 @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "August 16, 2009" "geany @VERSION@" "" +.TH "GEANY" "1" "June 12, 2010" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" @@ -42,6 +42,12 @@ Only available if Geany was compiled with support for Sockets. .IP "\fB-l\fP, \fB\-\-line\fP " 10 Set initial line number for the first opened file. +.IP "\fB\fP \fB\-\-list\-documents\fP " 10 +Return a list of open documents in a running Geany instance. +This can be used to read the currently opened documents in Geany from an external script +or tool. The returned list is separated by newlines (LF) and consists of the full, +UTF\-8 encoded filenames of the documents. +Only available if Geany was compiled with support for Sockets. .IP "\fB-m\fP, \fB\-\-no-msgwin\fP " 10 Don't show the message window. Use this option if you don't need compiler messages or VTE support. @@ -60,6 +66,8 @@ Don't load terminal support. Use this option, if you don't want to load the virtual terminal emulator widget at startup. If you don't have libvte.so.4 installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE. +.IP "\fB\fP \fB\-\-socket-file\fP " 10 +Use this socket filename for communication with a running Geany instance .IP "\fB\fP \fB\-\-vte-lib\fP " 10 Specify explicitly the path including filename or only the filename to the VTE library, e.g. /usr/lib/libvte.so or libvte.so. This option is only needed, when the autodetection doesn't diff -Nru geany-0.18/doc/geany.css geany-0.19/doc/geany.css --- geany-0.18/doc/geany.css 2008-05-28 16:35:27.000000000 +0100 +++ geany-0.19/doc/geany.css 2009-09-06 17:49:22.000000000 +0100 @@ -12,7 +12,7 @@ background-color: #f2f2f2; color: #404040; margin-left: 0.4em; - width: 60em; + max-width: 60em; font-size: 90%; } diff -Nru geany-0.18/doc/geany.html geany-0.19/doc/geany.html --- geany-0.18/doc/geany.html 2009-08-16 17:25:56.000000000 +0100 +++ geany-0.19/doc/geany.html 2010-06-04 17:34:15.000000000 +0100 @@ -3,10 +3,10 @@ - + Geany - + \n\ @@ -207,7 +207,7 @@ gchar *file_name; gchar *locale_filename; gchar *locale_dirname; - gchar *suffix = ""; + const gchar *suffix = ""; if (g_str_has_suffix(doc->file_name, extension)) suffix = "_export"; @@ -220,6 +220,7 @@ * gtk_file_chooser_set_current_folder() additionally */ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), locale_dirname); gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), file_name); + g_free(locale_dirname); g_free(locale_filename); g_free(short_name); g_free(file_name); @@ -275,7 +276,7 @@ static gchar *get_date(gint type) { - gchar *format; + const gchar *format; if (type == DATE_TYPE_HTML) /* needs testing */ diff -Nru geany-0.18/plugins/filebrowser.c geany-0.19/plugins/filebrowser.c --- geany-0.18/plugins/filebrowser.c 2009-07-29 18:40:20.000000000 +0100 +++ geany-0.19/plugins/filebrowser.c 2010-05-16 18:45:06.000000000 +0100 @@ -1,8 +1,8 @@ /* * filebrowser.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: filebrowser.c 4041 2009-07-29 17:40:20Z ntrel $ + * $Id: filebrowser.c 4926 2010-05-16 17:45:06Z eht16 $ */ /* Sidebar file browser plugin. */ @@ -29,13 +29,16 @@ #include +#ifdef G_OS_WIN32 +# include +#endif GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(131) +PLUGIN_VERSION_CHECK(175) PLUGIN_SET_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), VERSION, _("The Geany developer team")) @@ -85,6 +88,7 @@ GtkWidget *open; GtkWidget *open_external; GtkWidget *find_in_files; + GtkWidget *show_hidden_files; } popup_items; @@ -98,16 +102,35 @@ }; +#ifdef G_OS_WIN32 +static gboolean win32_check_hidden(const gchar *filename) +{ + DWORD attrs; + static wchar_t w_filename[MAX_PATH]; + MultiByteToWideChar(CP_UTF8, 0, filename, -1, w_filename, sizeof(w_filename)); + attrs = GetFileAttributesW(w_filename); + if (attrs != INVALID_FILE_ATTRIBUTES && attrs & FILE_ATTRIBUTE_HIDDEN) + return TRUE; + return FALSE; +} +#endif + + /* Returns: whether name should be hidden. */ -static gboolean check_hidden(const gchar *base_name) +static gboolean check_hidden(const gchar *filename, const gchar *base_name) { gsize len; if (! NZV(base_name)) return FALSE; +#ifdef G_OS_WIN32 + if (win32_check_hidden(filename)) + return TRUE; +#else if (base_name[0] == '.') return TRUE; +#endif len = strlen(base_name); if (base_name[len - 1] == '~') @@ -131,7 +154,7 @@ } -/* Returns: whether name has been removed by filter. */ +/* Returns: whether filename should be removed. */ static gboolean check_filtered(const gchar *base_name) { if (filter == NULL) @@ -141,7 +164,6 @@ { return TRUE; } - return FALSE; } @@ -150,12 +172,10 @@ static void add_item(const gchar *name) { GtkTreeIter iter; - gchar *fname, *utf8_name, *utf8_fullname, *sep; + gchar *fname, *utf8_name, *utf8_fullname; + const gchar *sep; gboolean dir; - if (! show_hidden_files && check_hidden(name)) - return; - sep = (utils_str_equal(current_dir, "/")) ? "" : G_DIR_SEPARATOR_S; fname = g_strconcat(current_dir, sep, name, NULL); dir = g_file_test(fname, G_FILE_TEST_IS_DIR); @@ -163,6 +183,13 @@ utf8_name = utils_get_utf8_from_locale(name); g_free(fname); + if (! show_hidden_files && check_hidden(utf8_fullname, name)) + { + g_free(utf8_name); + g_free(utf8_fullname); + return; + } + if (dir) { if (last_dir_iter == NULL) @@ -184,8 +211,6 @@ } gtk_list_store_append(file_store, &iter); } - - gtk_list_store_set(file_store, &iter, FILEVIEW_COLUMN_ICON, (dir) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, FILEVIEW_COLUMN_NAME, utf8_name, @@ -231,11 +256,15 @@ } +/* Reuses list to free each node, so list must be a variable */ +#define foreach_slist_free(node, list) \ + for (node = list, list = NULL; g_slist_free_1(list), node != NULL; list = node, node = node->next) + /* recreate the tree model from current_dir. */ static void refresh(void) { gchar *utf8_dir; - GSList *list; + GSList *list, *node; /* don't clear when the new path doesn't exist */ if (! g_file_test(current_dir, G_FILE_TEST_EXISTS)) @@ -252,11 +281,16 @@ list = utils_get_file_list(current_dir, NULL, NULL); if (list != NULL) { - g_slist_foreach(list, (GFunc) add_item, NULL); - g_slist_foreach(list, (GFunc) g_free, NULL); - g_slist_free(list); + /* free filenames & nodes as we go through the list */ + foreach_slist_free(node, list) + { + gchar *fname = node->data; + + add_item(fname); + g_free(fname); + } } - gtk_entry_completion_set_model(entry_completion, GTK_TREE_MODEL(file_store)); + gtk_entry_completion_set_model(entry_completion, GTK_TREE_MODEL(file_store)); } @@ -309,6 +343,9 @@ static void on_go_up(void) { + gsize len = strlen(current_dir); + if (current_dir[len-1] == G_DIR_SEPARATOR) + current_dir[len-1] = '\0'; /* remove the highest directory part (which becomes the basename of current_dir) */ setptr(current_dir, g_path_get_dirname(current_dir)); refresh(); @@ -438,10 +475,11 @@ /* We use document_open_files() as it's more efficient. */ -static void open_selected_files(GList *list) +static void open_selected_files(GList *list, gboolean do_not_focus) { GSList *files = NULL; GList *item; + GeanyDocument *doc; for (item = list; item != NULL; item = g_list_next(item)) { @@ -451,6 +489,10 @@ files = g_slist_append(files, fname); } document_open_files(files, FALSE, NULL, NULL); + doc = document_get_current(); + if (doc != NULL && ! do_not_focus) + keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); + g_slist_foreach(files, (GFunc) g_free, NULL); /* free filenames */ g_slist_free(files); } @@ -487,7 +529,7 @@ } } else - open_selected_files(list); + open_selected_files(list, GPOINTER_TO_INT(user_data)); g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL); g_list_free(list); @@ -540,6 +582,12 @@ } +static void on_show_preferences(void) +{ + plugin_show_configure(geany_plugin); +} + + static GtkWidget *create_popup_menu(void) { GtkWidget *item, *menu; @@ -558,6 +606,15 @@ g_signal_connect(item, "activate", G_CALLBACK(on_external_open), NULL); popup_items.open_external = item; + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_REFRESH, NULL); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(refresh), NULL); + item = ui_image_menu_item_new(GTK_STOCK_FIND, _("_Find in Files")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); @@ -572,6 +629,16 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_hidden_files_clicked), NULL); + popup_items.show_hidden_files = item; + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_show_preferences), NULL); item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -614,6 +681,8 @@ if (popup_menu == NULL) popup_menu = create_popup_menu(); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(popup_items.show_hidden_files), + show_hidden_files); gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); /* don't return TRUE here, unless the selection won't be changed */ } @@ -623,15 +692,18 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Return - || event->keyval == GDK_ISO_Enter - || event->keyval == GDK_KP_Enter - || event->keyval == GDK_space) + if (ui_is_keyval_enter_or_return(event->keyval)) { on_open_clicked(NULL, NULL); return TRUE; } + if (event->keyval == GDK_space) + { + on_open_clicked(NULL, GINT_TO_POINTER(TRUE)); + return TRUE; + } + if ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) && (event->state & GDK_MOD1_MASK)) /* FIXME: Alt-Up doesn't seem to work! */ @@ -707,12 +779,20 @@ } +static void on_filter_clear(GtkEntry *entry, gint icon_pos, + GdkEvent *event, gpointer data) +{ + setptr(filter, g_strdup("*")); + + refresh(); +} + + static void prepare_file_view(void) { GtkCellRenderer *text_renderer, *icon_renderer; GtkTreeViewColumn *column; - GtkTreeSelection *select; - PangoFontDescription *pfd; + GtkTreeSelection *selection; file_store = gtk_list_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); @@ -722,30 +802,28 @@ icon_renderer = gtk_cell_renderer_pixbuf_new(); text_renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new(); - gtk_tree_view_column_pack_start(column, icon_renderer, FALSE); - gtk_tree_view_column_set_attributes(column, icon_renderer, "stock-id", FILEVIEW_COLUMN_ICON, NULL); - gtk_tree_view_column_pack_start(column, text_renderer, TRUE); - gtk_tree_view_column_set_attributes(column, text_renderer, "text", FILEVIEW_COLUMN_NAME, NULL); + gtk_tree_view_column_pack_start(column, icon_renderer, FALSE); + gtk_tree_view_column_set_attributes(column, icon_renderer, "stock-id", FILEVIEW_COLUMN_ICON, NULL); + gtk_tree_view_column_pack_start(column, text_renderer, TRUE); + gtk_tree_view_column_set_attributes(column, text_renderer, "text", FILEVIEW_COLUMN_NAME, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(file_view), column); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(file_view), FALSE); gtk_tree_view_set_enable_search(GTK_TREE_VIEW(file_view), TRUE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_NAME); - pfd = pango_font_description_from_string(geany->interface_prefs->tagbar_font); - gtk_widget_modify_font(file_view, pfd); - pango_font_description_free(pfd); + ui_widget_modify_font_from_string(file_view, geany->interface_prefs->tagbar_font); /* GTK 2.12 tooltips */ if (gtk_check_version(2, 12, 0) == NULL) g_object_set(file_view, "has-tooltip", TRUE, "tooltip-column", FILEVIEW_COLUMN_FILENAME, NULL); /* selection handling */ - select = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view)); - gtk_tree_selection_set_mode(select, GTK_SELECTION_MULTIPLE); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); g_signal_connect(file_view, "realize", G_CALLBACK(on_current_path), NULL); - g_signal_connect(select, "changed", G_CALLBACK(on_tree_selection_changed), NULL); + g_signal_connect(selection, "changed", G_CALLBACK(on_tree_selection_changed), NULL); g_signal_connect(file_view, "button-press-event", G_CALLBACK(on_button_press), NULL); g_signal_connect(file_view, "key-press-event", G_CALLBACK(on_key_press), NULL); } @@ -759,34 +837,36 @@ gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); - wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_GO_UP); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_GO_UP)); ui_widget_set_tooltip_text(wid, _("Up")); g_signal_connect(wid, "clicked", G_CALLBACK(on_go_up), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH)); ui_widget_set_tooltip_text(wid, _("Refresh")); g_signal_connect(wid, "clicked", G_CALLBACK(refresh), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_HOME); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_HOME)); ui_widget_set_tooltip_text(wid, _("Home")); g_signal_connect(wid, "clicked", G_CALLBACK(on_go_home), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_JUMP_TO); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_JUMP_TO)); ui_widget_set_tooltip_text(wid, _("Set path from document")); g_signal_connect(wid, "clicked", G_CALLBACK(on_current_path), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = (GtkWidget *) gtk_separator_tool_item_new(); - gtk_container_add(GTK_CONTAINER(toolbar), wid); - - wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_CLEAR); - ui_widget_set_tooltip_text(wid, _("Clear the filter")); - g_signal_connect(wid, "clicked", G_CALLBACK(on_clear_filter), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), wid); + if (gtk_check_version(2, 15, 2) != NULL) + { + wid = GTK_WIDGET(gtk_separator_tool_item_new()); + gtk_container_add(GTK_CONTAINER(toolbar), wid); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_CLEAR)); + ui_widget_set_tooltip_text(wid, _("Clear the filter")); + g_signal_connect(wid, "clicked", G_CALLBACK(on_clear_filter), NULL); + gtk_container_add(GTK_CONTAINER(toolbar), wid); + } return toolbar; } @@ -800,6 +880,14 @@ label = gtk_label_new(_("Filter:")); filter_entry = gtk_entry_new(); + + if (gtk_check_version(2, 15, 2) == NULL) + { + ui_entry_add_clear_icon(GTK_ENTRY(filter_entry)); + g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL); + } + ui_widget_set_tooltip_text(filter_entry, + _("Filter your files with usual wildcards")); g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL); gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0); @@ -1025,6 +1113,38 @@ } +static void save_settings(void) +{ + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + + g_key_file_set_string(config, "filebrowser", "open_command", open_cmd); + g_key_file_set_boolean(config, "filebrowser", "show_hidden_files", show_hidden_files); + g_key_file_set_boolean(config, "filebrowser", "hide_object_files", hide_object_files); + g_key_file_set_boolean(config, "filebrowser", "fb_follow_path", fb_follow_path); + g_key_file_set_boolean(config, "filebrowser", "fb_set_project_base_path", + fb_set_project_base_path); + + 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(config_file, data); + g_free(data); + } + g_free(config_dir); + g_key_file_free(config); +} + + static struct { GtkWidget *open_cmd_entry; @@ -1040,10 +1160,6 @@ { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { - GKeyFile *config = g_key_file_new(); - gchar *data; - gchar *config_dir = g_path_get_dirname(config_file); - g_free(open_cmd); open_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(pref_widgets.open_cmd_entry))); show_hidden_files = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pref_widgets.show_hidden_checkbox)); @@ -1052,33 +1168,8 @@ fb_set_project_base_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( pref_widgets.set_project_base_path_checkbox)); - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - - g_key_file_set_string(config, "filebrowser", "open_command", open_cmd); - g_key_file_set_boolean(config, "filebrowser", "show_hidden_files", show_hidden_files); - g_key_file_set_boolean(config, "filebrowser", "hide_object_files", hide_object_files); - g_key_file_set_boolean(config, "filebrowser", "fb_follow_path", fb_follow_path); - g_key_file_set_boolean(config, "filebrowser", "fb_set_project_base_path", - fb_set_project_base_path); - - 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(config_file, data); - g_free(data); - } - /* apply the changes */ refresh(); - - g_free(config_dir); - g_key_file_free(config); } } @@ -1086,12 +1177,14 @@ GtkWidget *plugin_configure(GtkDialog *dialog) { GtkWidget *label, *entry, *checkbox_of, *checkbox_hf, *checkbox_fp, *checkbox_pb, *vbox; + GtkWidget *box; vbox = gtk_vbox_new(FALSE, 6); + box = gtk_vbox_new(FALSE, 3); label = gtk_label_new(_("External open command:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); + gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0); entry = gtk_entry_new(); gtk_widget_show(entry); @@ -1101,13 +1194,15 @@ _("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")); - gtk_container_add(GTK_CONTAINER(vbox), entry); + gtk_box_pack_start(GTK_BOX(box), entry, FALSE, FALSE, 0); pref_widgets.open_cmd_entry = entry; + gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 6); + checkbox_hf = gtk_check_button_new_with_label(_("Show hidden files")); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_hf), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_hf), show_hidden_files); - gtk_box_pack_start(GTK_BOX(vbox), checkbox_hf, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), checkbox_hf, FALSE, FALSE, 0); pref_widgets.show_hidden_checkbox = checkbox_hf; checkbox_of = gtk_check_button_new_with_label(_("Hide object files")); @@ -1116,13 +1211,13 @@ ui_widget_set_tooltip_text(checkbox_of, _("Don't show generated object files in the file browser, this includes " "*.o, *.obj. *.so, *.dll, *.a, *.lib")); - gtk_box_pack_start(GTK_BOX(vbox), checkbox_of, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), checkbox_of, FALSE, FALSE, 0); pref_widgets.hide_objects_checkbox = checkbox_of; checkbox_fp = gtk_check_button_new_with_label(_("Follow the path of the current file")); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_fp), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_fp), fb_follow_path); - gtk_box_pack_start(GTK_BOX(vbox), checkbox_fp, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), checkbox_fp, FALSE, FALSE, 0); pref_widgets.follow_path_checkbox = checkbox_fp; checkbox_pb = gtk_check_button_new_with_label(_("Use the project's base directory")); @@ -1130,7 +1225,7 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_pb), fb_set_project_base_path); ui_widget_set_tooltip_text(checkbox_pb, _("Change the directory to the base directory of the currently opened project")); - gtk_box_pack_start(GTK_BOX(vbox), checkbox_pb, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), checkbox_pb, FALSE, FALSE, 0); pref_widgets.set_project_base_path_checkbox = checkbox_pb; gtk_widget_show_all(vbox); @@ -1142,6 +1237,8 @@ void plugin_cleanup(void) { + save_settings(); + g_free(config_file); g_free(open_cmd); g_free(filter); diff -Nru geany-0.18/plugins/geanyfunctions.h geany-0.19/plugins/geanyfunctions.h --- geany-0.18/plugins/geanyfunctions.h 2009-08-16 18:29:38.000000000 +0100 +++ geany-0.19/plugins/geanyfunctions.h 2010-06-12 13:14:53.000000000 +0100 @@ -1,278 +1,378 @@ -/* This file is generated automatically by genapi.py - do not edit. +/* This file is generated automatically by genapi.py - do not edit. */ + +/** @file geanyfunctions.h @ref geany_functions wrappers. + * This allows the use of normal API function names in plugins by defining macros. + * + * E.g.:@code + * #define plugin_add_toolbar_item \ + * geany_functions->p_plugin->plugin_add_toolbar_item @endcode * - * @file geanyfunctions.h @ref geany_functions wrappers. - * This allows the use of normal API function names in plugins. * You need to declare the @ref geany_functions symbol yourself. * - * Note: This must be included after all other API headers. + * Note: This must be included after all other API headers to prevent conflicts with + * other header's function prototypes - this is done for you when using geanyplugin.h. */ #ifndef GEANY_FUNCTIONS_H #define GEANY_FUNCTIONS_H #define plugin_add_toolbar_item \ - geany_functions->p_plugin->add_toolbar_item + geany_functions->p_plugin->plugin_add_toolbar_item #define plugin_module_make_resident \ - geany_functions->p_plugin->module_make_resident + geany_functions->p_plugin->plugin_module_make_resident #define plugin_signal_connect \ - geany_functions->p_plugin->signal_connect + geany_functions->p_plugin->plugin_signal_connect +#define plugin_set_key_group \ + geany_functions->p_plugin->plugin_set_key_group +#define plugin_show_configure \ + geany_functions->p_plugin->plugin_show_configure #define document_new_file \ - geany_functions->p_document->new_file + geany_functions->p_document->document_new_file #define document_get_current \ - geany_functions->p_document->get_current + geany_functions->p_document->document_get_current #define document_get_from_page \ - geany_functions->p_document->get_from_page + geany_functions->p_document->document_get_from_page #define document_find_by_filename \ - geany_functions->p_document->find_by_filename + geany_functions->p_document->document_find_by_filename #define document_find_by_real_path \ - geany_functions->p_document->find_by_real_path + geany_functions->p_document->document_find_by_real_path #define document_save_file \ - geany_functions->p_document->save_file + geany_functions->p_document->document_save_file #define document_open_file \ - geany_functions->p_document->open_file + geany_functions->p_document->document_open_file #define document_open_files \ - geany_functions->p_document->open_files + geany_functions->p_document->document_open_files #define document_remove_page \ - geany_functions->p_document->remove_page + geany_functions->p_document->document_remove_page #define document_reload_file \ - geany_functions->p_document->reload_file + geany_functions->p_document->document_reload_file #define document_set_encoding \ - geany_functions->p_document->set_encoding + geany_functions->p_document->document_set_encoding #define document_set_text_changed \ - geany_functions->p_document->set_text_changed + geany_functions->p_document->document_set_text_changed #define document_set_filetype \ - geany_functions->p_document->set_filetype + geany_functions->p_document->document_set_filetype #define document_close \ - geany_functions->p_document->close + geany_functions->p_document->document_close #define document_index \ - geany_functions->p_document->index + geany_functions->p_document->document_index #define document_save_file_as \ - geany_functions->p_document->save_file_as + geany_functions->p_document->document_save_file_as #define document_rename_file \ - geany_functions->p_document->rename_file + geany_functions->p_document->document_rename_file #define document_get_status_color \ - geany_functions->p_document->get_status_color + geany_functions->p_document->document_get_status_color #define document_get_basename_for_display \ - geany_functions->p_document->get_basename_for_display + geany_functions->p_document->document_get_basename_for_display +#define document_get_notebook_page \ + geany_functions->p_document->document_get_notebook_page #define editor_get_indent_prefs \ - geany_functions->p_editor->get_indent_prefs + geany_functions->p_editor->editor_get_indent_prefs #define editor_create_widget \ - geany_functions->p_editor->create_widget + geany_functions->p_editor->editor_create_widget #define editor_indicator_set_on_range \ - geany_functions->p_editor->indicator_set_on_range + geany_functions->p_editor->editor_indicator_set_on_range #define editor_indicator_set_on_line \ - geany_functions->p_editor->indicator_set_on_line + geany_functions->p_editor->editor_indicator_set_on_line #define editor_indicator_clear \ - geany_functions->p_editor->indicator_clear + geany_functions->p_editor->editor_indicator_clear #define editor_set_indent_type \ - geany_functions->p_editor->set_indent_type + geany_functions->p_editor->editor_set_indent_type #define editor_get_word_at_pos \ - geany_functions->p_editor->get_word_at_pos + geany_functions->p_editor->editor_get_word_at_pos +#define editor_get_eol_char_name \ + geany_functions->p_editor->editor_get_eol_char_name +#define editor_get_eol_char_len \ + geany_functions->p_editor->editor_get_eol_char_len +#define editor_get_eol_char \ + geany_functions->p_editor->editor_get_eol_char +#define editor_insert_text_block \ + geany_functions->p_editor->editor_insert_text_block #define scintilla_send_message \ - geany_functions->p_scintilla->send_message + geany_functions->p_scintilla->scintilla_send_message #define scintilla_new \ - geany_functions->p_scintilla->new + geany_functions->p_scintilla->scintilla_new #define sci_send_command \ - geany_functions->p_sci->send_command + geany_functions->p_sci->sci_send_command #define sci_start_undo_action \ - geany_functions->p_sci->start_undo_action + geany_functions->p_sci->sci_start_undo_action #define sci_end_undo_action \ - geany_functions->p_sci->end_undo_action + geany_functions->p_sci->sci_end_undo_action #define sci_set_text \ - geany_functions->p_sci->set_text + geany_functions->p_sci->sci_set_text #define sci_insert_text \ - geany_functions->p_sci->insert_text + geany_functions->p_sci->sci_insert_text #define sci_get_text \ - geany_functions->p_sci->get_text + geany_functions->p_sci->sci_get_text #define sci_get_length \ - geany_functions->p_sci->get_length + geany_functions->p_sci->sci_get_length #define sci_get_current_position \ - geany_functions->p_sci->get_current_position + geany_functions->p_sci->sci_get_current_position #define sci_set_current_position \ - geany_functions->p_sci->set_current_position + geany_functions->p_sci->sci_set_current_position #define sci_get_col_from_position \ - geany_functions->p_sci->get_col_from_position + geany_functions->p_sci->sci_get_col_from_position #define sci_get_line_from_position \ - geany_functions->p_sci->get_line_from_position + geany_functions->p_sci->sci_get_line_from_position #define sci_get_position_from_line \ - geany_functions->p_sci->get_position_from_line + geany_functions->p_sci->sci_get_position_from_line #define sci_replace_sel \ - geany_functions->p_sci->replace_sel + geany_functions->p_sci->sci_replace_sel #define sci_get_selected_text \ - geany_functions->p_sci->get_selected_text + geany_functions->p_sci->sci_get_selected_text #define sci_get_selected_text_length \ - geany_functions->p_sci->get_selected_text_length + geany_functions->p_sci->sci_get_selected_text_length #define sci_get_selection_start \ - geany_functions->p_sci->get_selection_start + geany_functions->p_sci->sci_get_selection_start #define sci_get_selection_end \ - geany_functions->p_sci->get_selection_end + geany_functions->p_sci->sci_get_selection_end #define sci_get_selection_mode \ - geany_functions->p_sci->get_selection_mode + geany_functions->p_sci->sci_get_selection_mode #define sci_set_selection_mode \ - geany_functions->p_sci->set_selection_mode + geany_functions->p_sci->sci_set_selection_mode #define sci_set_selection_start \ - geany_functions->p_sci->set_selection_start + geany_functions->p_sci->sci_set_selection_start #define sci_set_selection_end \ - geany_functions->p_sci->set_selection_end + geany_functions->p_sci->sci_set_selection_end #define sci_get_text_range \ - geany_functions->p_sci->get_text_range + geany_functions->p_sci->sci_get_text_range #define sci_get_line \ - geany_functions->p_sci->get_line + geany_functions->p_sci->sci_get_line #define sci_get_line_length \ - geany_functions->p_sci->get_line_length + geany_functions->p_sci->sci_get_line_length #define sci_get_line_count \ - geany_functions->p_sci->get_line_count + geany_functions->p_sci->sci_get_line_count #define sci_get_line_is_visible \ - geany_functions->p_sci->get_line_is_visible + geany_functions->p_sci->sci_get_line_is_visible #define sci_ensure_line_is_visible \ - geany_functions->p_sci->ensure_line_is_visible + geany_functions->p_sci->sci_ensure_line_is_visible #define sci_scroll_caret \ - geany_functions->p_sci->scroll_caret + geany_functions->p_sci->sci_scroll_caret #define sci_find_matching_brace \ - geany_functions->p_sci->find_matching_brace + geany_functions->p_sci->sci_find_matching_brace #define sci_get_style_at \ - geany_functions->p_sci->get_style_at + geany_functions->p_sci->sci_get_style_at #define sci_get_char_at \ - geany_functions->p_sci->get_char_at + geany_functions->p_sci->sci_get_char_at #define sci_get_current_line \ - geany_functions->p_sci->get_current_line + geany_functions->p_sci->sci_get_current_line #define sci_has_selection \ - geany_functions->p_sci->has_selection + geany_functions->p_sci->sci_has_selection #define sci_get_tab_width \ - geany_functions->p_sci->get_tab_width + geany_functions->p_sci->sci_get_tab_width #define sci_indicator_clear \ - geany_functions->p_sci->indicator_clear + geany_functions->p_sci->sci_indicator_clear #define sci_indicator_set \ - geany_functions->p_sci->indicator_set + geany_functions->p_sci->sci_indicator_set #define sci_get_contents \ - geany_functions->p_sci->get_contents + geany_functions->p_sci->sci_get_contents #define sci_get_contents_range \ - geany_functions->p_sci->get_contents_range + geany_functions->p_sci->sci_get_contents_range #define sci_get_selection_contents \ - geany_functions->p_sci->get_selection_contents + geany_functions->p_sci->sci_get_selection_contents #define sci_set_font \ - geany_functions->p_sci->set_font + geany_functions->p_sci->sci_set_font +#define sci_get_line_end_position \ + geany_functions->p_sci->sci_get_line_end_position +#define sci_set_target_start \ + geany_functions->p_sci->sci_set_target_start +#define sci_set_target_end \ + geany_functions->p_sci->sci_set_target_end +#define sci_replace_target \ + geany_functions->p_sci->sci_replace_target +#define sci_set_marker_at_line \ + geany_functions->p_sci->sci_set_marker_at_line +#define sci_delete_marker_at_line \ + geany_functions->p_sci->sci_delete_marker_at_line +#define sci_is_marker_set_at_line \ + geany_functions->p_sci->sci_is_marker_set_at_line +#define sci_goto_line \ + geany_functions->p_sci->sci_goto_line +#define sci_find_text \ + geany_functions->p_sci->sci_find_text +#define sci_set_line_indentation \ + geany_functions->p_sci->sci_set_line_indentation +#define sci_get_line_indentation \ + geany_functions->p_sci->sci_get_line_indentation #define templates_get_template_fileheader \ - geany_functions->p_templates->get_template_fileheader + geany_functions->p_templates->templates_get_template_fileheader #define utils_str_equal \ - geany_functions->p_utils->str_equal + geany_functions->p_utils->utils_str_equal #define utils_string_replace_all \ - geany_functions->p_utils->string_replace_all + geany_functions->p_utils->utils_string_replace_all #define utils_get_file_list \ - geany_functions->p_utils->get_file_list + geany_functions->p_utils->utils_get_file_list #define utils_write_file \ - geany_functions->p_utils->write_file + geany_functions->p_utils->utils_write_file #define utils_get_locale_from_utf8 \ - geany_functions->p_utils->get_locale_from_utf8 + geany_functions->p_utils->utils_get_locale_from_utf8 #define utils_get_utf8_from_locale \ - geany_functions->p_utils->get_utf8_from_locale + geany_functions->p_utils->utils_get_utf8_from_locale #define utils_remove_ext_from_filename \ - geany_functions->p_utils->remove_ext_from_filename + geany_functions->p_utils->utils_remove_ext_from_filename #define utils_mkdir \ - geany_functions->p_utils->mkdir + geany_functions->p_utils->utils_mkdir #define utils_get_setting_boolean \ - geany_functions->p_utils->get_setting_boolean + geany_functions->p_utils->utils_get_setting_boolean #define utils_get_setting_integer \ - geany_functions->p_utils->get_setting_integer + geany_functions->p_utils->utils_get_setting_integer #define utils_get_setting_string \ - geany_functions->p_utils->get_setting_string + geany_functions->p_utils->utils_get_setting_string #define utils_spawn_sync \ - geany_functions->p_utils->spawn_sync + geany_functions->p_utils->utils_spawn_sync #define utils_spawn_async \ - geany_functions->p_utils->spawn_async + geany_functions->p_utils->utils_spawn_async #define utils_str_casecmp \ - geany_functions->p_utils->str_casecmp + geany_functions->p_utils->utils_str_casecmp #define utils_get_date_time \ - geany_functions->p_utils->get_date_time + geany_functions->p_utils->utils_get_date_time #define utils_open_browser \ - geany_functions->p_utils->open_browser + geany_functions->p_utils->utils_open_browser #define utils_string_replace_first \ - geany_functions->p_utils->string_replace_first + geany_functions->p_utils->utils_string_replace_first #define utils_str_middle_truncate \ - geany_functions->p_utils->str_middle_truncate + geany_functions->p_utils->utils_str_middle_truncate #define utils_str_remove_chars \ - geany_functions->p_utils->str_remove_chars + geany_functions->p_utils->utils_str_remove_chars +#define utils_get_file_list_full \ + geany_functions->p_utils->utils_get_file_list_full +#define utils_copy_environment \ + geany_functions->p_utils->utils_copy_environment #define ui_dialog_vbox_new \ - geany_functions->p_ui->dialog_vbox_new + geany_functions->p_ui->ui_dialog_vbox_new #define ui_frame_new_with_alignment \ - geany_functions->p_ui->frame_new_with_alignment + geany_functions->p_ui->ui_frame_new_with_alignment #define ui_set_statusbar \ - geany_functions->p_ui->set_statusbar + geany_functions->p_ui->ui_set_statusbar #define ui_table_add_row \ - geany_functions->p_ui->table_add_row + geany_functions->p_ui->ui_table_add_row #define ui_path_box_new \ - geany_functions->p_ui->path_box_new + geany_functions->p_ui->ui_path_box_new #define ui_button_new_with_image \ - geany_functions->p_ui->button_new_with_image + geany_functions->p_ui->ui_button_new_with_image #define ui_add_document_sensitive \ - geany_functions->p_ui->add_document_sensitive + geany_functions->p_ui->ui_add_document_sensitive #define ui_widget_set_tooltip_text \ - geany_functions->p_ui->widget_set_tooltip_text + geany_functions->p_ui->ui_widget_set_tooltip_text #define ui_image_menu_item_new \ - geany_functions->p_ui->image_menu_item_new + geany_functions->p_ui->ui_image_menu_item_new #define ui_lookup_widget \ - geany_functions->p_ui->lookup_widget + geany_functions->p_ui->ui_lookup_widget #define ui_progress_bar_start \ - geany_functions->p_ui->progress_bar_start + geany_functions->p_ui->ui_progress_bar_start #define ui_progress_bar_stop \ - geany_functions->p_ui->progress_bar_stop + geany_functions->p_ui->ui_progress_bar_stop #define ui_entry_add_clear_icon \ - geany_functions->p_ui->entry_add_clear_icon + geany_functions->p_ui->ui_entry_add_clear_icon +#define ui_menu_add_document_items \ + geany_functions->p_ui->ui_menu_add_document_items +#define ui_widget_modify_font_from_string \ + geany_functions->p_ui->ui_widget_modify_font_from_string +#define ui_is_keyval_enter_or_return \ + geany_functions->p_ui->ui_is_keyval_enter_or_return +#define ui_get_gtk_settings_integer \ + geany_functions->p_ui->ui_get_gtk_settings_integer #define dialogs_show_question \ - geany_functions->p_dialogs->show_question + geany_functions->p_dialogs->dialogs_show_question #define dialogs_show_msgbox \ - geany_functions->p_dialogs->show_msgbox + geany_functions->p_dialogs->dialogs_show_msgbox #define dialogs_show_save_as \ - geany_functions->p_dialogs->show_save_as + geany_functions->p_dialogs->dialogs_show_save_as #define dialogs_show_input_numeric \ - geany_functions->p_dialogs->show_input_numeric + geany_functions->p_dialogs->dialogs_show_input_numeric #define msgwin_status_add \ - geany_functions->p_msgwin->status_add + geany_functions->p_msgwin->msgwin_status_add #define msgwin_compiler_add \ - geany_functions->p_msgwin->compiler_add + geany_functions->p_msgwin->msgwin_compiler_add #define msgwin_msg_add \ - geany_functions->p_msgwin->msg_add + geany_functions->p_msgwin->msgwin_msg_add #define msgwin_clear_tab \ - geany_functions->p_msgwin->clear_tab + geany_functions->p_msgwin->msgwin_clear_tab #define msgwin_switch_tab \ - geany_functions->p_msgwin->switch_tab + geany_functions->p_msgwin->msgwin_switch_tab #define encodings_convert_to_utf8 \ - geany_functions->p_encodings->convert_to_utf8 + geany_functions->p_encodings->encodings_convert_to_utf8 #define encodings_convert_to_utf8_from_charset \ - geany_functions->p_encodings->convert_to_utf8_from_charset + geany_functions->p_encodings->encodings_convert_to_utf8_from_charset #define encodings_get_charset_from_index \ - geany_functions->p_encodings->get_charset_from_index + geany_functions->p_encodings->encodings_get_charset_from_index #define keybindings_send_command \ - geany_functions->p_keybindings->send_command + geany_functions->p_keybindings->keybindings_send_command #define keybindings_set_item \ - geany_functions->p_keybindings->set_item + geany_functions->p_keybindings->keybindings_set_item +#define keybindings_get_item \ + geany_functions->p_keybindings->keybindings_get_item #define tm_get_real_path \ - geany_functions->p_tm->get_real_path + geany_functions->p_tm->tm_get_real_path #define tm_source_file_new \ - geany_functions->p_tm->source_file_new + geany_functions->p_tm->tm_source_file_new #define tm_workspace_add_object \ - geany_functions->p_tm->workspace_add_object + geany_functions->p_tm->tm_workspace_add_object #define tm_source_file_update \ - geany_functions->p_tm->source_file_update + geany_functions->p_tm->tm_source_file_update #define tm_work_object_free \ - geany_functions->p_tm->work_object_free + geany_functions->p_tm->tm_work_object_free #define tm_workspace_remove_object \ - geany_functions->p_tm->workspace_remove_object + geany_functions->p_tm->tm_workspace_remove_object #define search_show_find_in_files_dialog \ - geany_functions->p_search->show_find_in_files_dialog + geany_functions->p_search->search_show_find_in_files_dialog #define highlighting_get_style \ - geany_functions->p_highlighting->get_style + geany_functions->p_highlighting->highlighting_get_style +#define highlighting_set_styles \ + geany_functions->p_highlighting->highlighting_set_styles #define filetypes_detect_from_file \ - geany_functions->p_filetypes->detect_from_file + geany_functions->p_filetypes->filetypes_detect_from_file #define filetypes_lookup_by_name \ - geany_functions->p_filetypes->lookup_by_name + geany_functions->p_filetypes->filetypes_lookup_by_name #define filetypes_index \ - geany_functions->p_filetypes->index + geany_functions->p_filetypes->filetypes_index #define navqueue_goto_line \ - geany_functions->p_navqueue->goto_line + geany_functions->p_navqueue->navqueue_goto_line #define main_reload_configuration \ - geany_functions->p_main->reload_configuration + geany_functions->p_main->main_reload_configuration #define main_locale_init \ - geany_functions->p_main->locale_init + geany_functions->p_main->main_locale_init +#define main_is_realized \ + geany_functions->p_main->main_is_realized +#define stash_group_new \ + geany_functions->p_stash->stash_group_new +#define stash_group_add_boolean \ + geany_functions->p_stash->stash_group_add_boolean +#define stash_group_add_integer \ + geany_functions->p_stash->stash_group_add_integer +#define stash_group_add_string \ + geany_functions->p_stash->stash_group_add_string +#define stash_group_add_string_vector \ + geany_functions->p_stash->stash_group_add_string_vector +#define stash_group_load_from_key_file \ + geany_functions->p_stash->stash_group_load_from_key_file +#define stash_group_save_to_key_file \ + geany_functions->p_stash->stash_group_save_to_key_file +#define stash_group_free \ + geany_functions->p_stash->stash_group_free +#define stash_group_load_from_file \ + geany_functions->p_stash->stash_group_load_from_file +#define stash_group_save_to_file \ + geany_functions->p_stash->stash_group_save_to_file +#define stash_group_add_toggle_button \ + geany_functions->p_stash->stash_group_add_toggle_button +#define stash_group_add_radio_buttons \ + geany_functions->p_stash->stash_group_add_radio_buttons +#define stash_group_add_spin_button_integer \ + geany_functions->p_stash->stash_group_add_spin_button_integer +#define stash_group_add_combo_box \ + geany_functions->p_stash->stash_group_add_combo_box +#define stash_group_add_combo_box_entry \ + geany_functions->p_stash->stash_group_add_combo_box_entry +#define stash_group_add_entry \ + geany_functions->p_stash->stash_group_add_entry +#define stash_group_add_widget_property \ + geany_functions->p_stash->stash_group_add_widget_property +#define stash_group_display \ + geany_functions->p_stash->stash_group_display +#define stash_group_update \ + geany_functions->p_stash->stash_group_update +#define symbols_get_context_separator \ + geany_functions->p_symbols->symbols_get_context_separator #endif diff -Nru geany-0.18/plugins/geanyplugin.h geany-0.19/plugins/geanyplugin.h --- geany-0.18/plugins/geanyplugin.h 2009-07-14 16:06:20.000000000 +0100 +++ geany-0.19/plugins/geanyplugin.h 2010-03-30 17:29:38.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanyplugin.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Enrico Tröger - * Copyright 2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: geanyplugin.h 3966 2009-07-14 15:06:20Z ntrel $ + * $Id: geanyplugin.h 4790 2010-03-30 16:29:38Z ntrel $ */ /** @@ -34,20 +34,18 @@ #include "geany.h" #include "plugindata.h" -#include "dialogs.h" +/* Note: only include headers that define types or macros, not just functions */ #include "document.h" #include "editor.h" #include "encodings.h" #include "filetypes.h" #include "highlighting.h" #include "keybindings.h" -#include "main.h" #include "msgwindow.h" -#include "plugins.h" #include "prefs.h" #include "project.h" -#include "sciwrappers.h" #include "search.h" +#include "stash.h" #include "support.h" #include "templates.h" #include "toolbar.h" diff -Nru geany-0.18/plugins/genapi.py geany-0.19/plugins/genapi.py --- geany-0.18/plugins/genapi.py 2009-07-14 14:26:19.000000000 +0100 +++ geany-0.19/plugins/genapi.py 2010-02-28 14:59:52.000000000 +0000 @@ -3,8 +3,8 @@ # # genapi.py - this file is part of Geany, a fast and lightweight IDE # -# Copyright 2008-2009 Nick Treleaven btinternet.com> -# Copyright 2008-2009 Enrico Tröger +# Copyright 2008-2010 Nick Treleaven btinternet.com> +# Copyright 2008-2010 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 @@ -26,43 +26,46 @@ Creates macros for each plugin API function pointer, e.g.: #define plugin_add_toolbar_item \ - p_plugin->add_toolbar_item + geany_functions->p_plugin->plugin_add_toolbar_item """ import re, sys def get_function_names(): - names = [] - try: - f = open('../src/plugins.c') - while 1: - l = f.readline() - if l == "": - break; - m = re.match("^\t&([a-z][a-z0-9_]+)", l) - if m: - s = m.group(1) - if not s.endswith('_funcs'): - names.append(s) - f.close - except: - pass - return names - -def get_api_tuple(str): - m = re.match("^([a-z]+)_([a-z][a-z0-9_]+)$", str) - return 'p_' + m.group(1), m.group(2) + names = [] + filep = open('../src/plugins.c') + while 1: + line = filep.readline() + if line == "": + break + match = re.match("^\t&([a-z][a-z0-9_]+)", line) + if match: + symbol = match.group(1) + if not symbol.endswith('_funcs'): + names.append(symbol) + filep.close() + return names + +def get_api_tuple(source): + match = re.match("^([a-z]+)_([a-z][a-z0-9_]+)$", source) + return 'p_' + match.group(1), match.group(2) header = \ -'''/* This file is generated automatically by genapi.py - do not edit. +r'''/* This file is generated automatically by genapi.py - do not edit. */ + +/** @file %s @ref geany_functions wrappers. + * This allows the use of normal API function names in plugins by defining macros. + * + * E.g.:@code + * #define plugin_add_toolbar_item \ + * geany_functions->p_plugin->plugin_add_toolbar_item @endcode * - * @file %s @ref geany_functions wrappers. - * This allows the use of normal API function names in plugins. * You need to declare the @ref geany_functions symbol yourself. * - * Note: This must be included after all other API headers. + * Note: This must be included after all other API headers to prevent conflicts with + * other header's function prototypes - this is done for you when using geanyplugin.h. */ #ifndef GEANY_FUNCTIONS_H @@ -70,21 +73,22 @@ ''' if __name__ == "__main__": - outfile = 'geanyfunctions.h' + outfile = 'geanyfunctions.h' - fnames = get_function_names() - if not fnames: - sys.exit("No function names read!") + fnames = get_function_names() + if not fnames: + sys.exit("No function names read!") - f = open(outfile, 'w') - print >>f, header % (outfile) + f = open(outfile, 'w') + print >> f, header % (outfile) - for fname in fnames: - ptr, name = get_api_tuple(fname) - print >>f, '#define %s \\\n\tgeany_functions->%s->%s' % (fname, ptr, name) + for fname in fnames: + ptr, name = get_api_tuple(fname) + # note: name no longer needed + print >> f, '#define %s \\\n\tgeany_functions->%s->%s' % (fname, ptr, fname) - print >>f, '\n#endif' - f.close + print >> f, '\n#endif' + f.close() - if not '-q' in sys.argv: - print 'Generated ' + outfile + if not '-q' in sys.argv: + print 'Generated ' + outfile diff -Nru geany-0.18/plugins/htmlchars.c geany-0.19/plugins/htmlchars.c --- geany-0.18/plugins/htmlchars.c 2009-07-14 16:06:20.000000000 +0100 +++ geany-0.19/plugins/htmlchars.c 2010-04-25 18:43:09.000000000 +0100 @@ -1,9 +1,9 @@ /* * htmlchars.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Frank Lanitz - * Copyright 2006-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2009-2010 Frank Lanitz + * Copyright 2006-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: htmlchars.c 3966 2009-07-14 15:06:20Z ntrel $ + * $Id: htmlchars.c 4861 2010-04-25 17:43:09Z eht16 $ */ /* HTML Characters plugin (Inserts HTML character entities like '&') */ @@ -68,6 +68,9 @@ static GtkWidget *menu_htmltoggle = NULL; static gboolean plugin_active = FALSE; +/* Configuration file */ +static gchar *config_file = NULL; + const gchar *chars[][2] ={ { N_("HTML characters"), NULL }, { "\"", """ }, @@ -342,12 +345,39 @@ /* Functions to toggle the status of plugin */ -void set_status(gboolean new_status) +static void set_status(gboolean new_status) { - /* No more function at the moment.*/ if (plugin_active != new_status) + { + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); + plugin_active = new_status; -} + + /* Now we save the new status into configuration file to + * remember next time */ + g_key_file_set_boolean(config, "general", "replacement_on_typing_active", + plugin_active); + + 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(config_file, data); + g_free(data); + } + g_free(config_dir); + g_key_file_free(config); + } +} + static void toggle_status(G_GNUC_UNUSED GtkMenuItem * menuitem) { @@ -368,7 +398,7 @@ /* Function takes over value of key which was pressed and returns * HTML/SGML entity if any */ -const gchar *get_entity(gchar *letter) +static const gchar *get_entity(gchar *letter) { guint i, len; @@ -429,11 +459,16 @@ static void kbhtmltoggle_toggle(G_GNUC_UNUSED guint key_id) { if (plugin_active == TRUE) + { set_status(FALSE); + } else + { set_status(TRUE); + } } + static void tools_show_dialog_insert_special_chars(void) { if (sc_dialog == NULL) @@ -451,7 +486,7 @@ gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(sc_dialog, "GeanyDialog"); - height = GEANY_WINDOW_MINIMAL_HEIGHT; + height = GEANY_DEFAULT_DIALOG_HEIGHT; gtk_window_set_default_size(GTK_WINDOW(sc_dialog), height * 8 / 10, height); gtk_dialog_set_default_response(GTK_DIALOG(sc_dialog), GTK_RESPONSE_CANCEL); @@ -530,6 +565,7 @@ } } + /* just inserts the HTML_NAME coloumn of the selected row at current position * returns only TRUE if a valid selection(i.e. no category) could be found */ static gboolean sc_insert(GtkTreeModel *model, GtkTreeIter *iter) @@ -599,7 +635,7 @@ } -static void replace_special_character() +static void replace_special_character(void) { GeanyDocument *doc = NULL; doc = document_get_current(); @@ -650,6 +686,7 @@ tools_show_dialog_insert_special_chars(); } + static void kb_activate(G_GNUC_UNUSED guint key_id) { item_activate(NULL, NULL); @@ -664,19 +701,38 @@ } - static void kb_special_chars_replacement(G_GNUC_UNUSED guint key_id) { replace_special_character(); } -/* Called by Geany to initialize the plugin */ +static void init_configuration(void) +{ + GKeyFile *config = g_key_file_new(); + + /* loading configurations from file ...*/ + config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, + "htmchars", G_DIR_SEPARATOR_S, "general.conf", NULL); + + /* ... and initialising options from config file */ + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + + plugin_active = utils_get_setting_boolean(config, "general", + "replacement_on_typing_active", FALSE); +} + + +/* Called by Geany to initialise the plugin */ void plugin_init(GeanyData *data) { GtkWidget *menu_item; const gchar *menu_text = _("_Insert Special HTML Characters"); + /* First we catch the configuration and initialize them */ + init_configuration(); + /* Add an item to the Tools menu for html chars dialog*/ menu_item = gtk_menu_item_new_with_mnemonic(menu_text); gtk_widget_show(menu_item); @@ -736,6 +792,9 @@ if (sc_dialog != NULL) gtk_widget_destroy(sc_dialog); + + if (config_file != NULL) + g_free(config_file); } diff -Nru geany-0.18/plugins/Makefile.am geany-0.19/plugins/Makefile.am --- geany-0.18/plugins/Makefile.am 2009-07-14 16:06:20.000000000 +0100 +++ geany-0.19/plugins/Makefile.am 2010-05-25 20:49:49.000000000 +0100 @@ -8,7 +8,6 @@ plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ - pluginmacros.h \ geanyplugin.h \ geanyfunctions.h @@ -36,6 +35,7 @@ MINGW_CFLAGS = \ -DGEANY_DATADIR=\"data\" \ -DHAVE_CONFIG_H \ + -DGTK \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tagmanager/include \ @@ -84,7 +84,14 @@ filebrowser_la_SOURCES = filebrowser.c splitwindow_la_SOURCES = splitwindow.c -# instead of linking against all in $(GTK_LIBS), we link only against needed libs +demoplugin_la_CFLAGS = -DG_LOG_DOMAIN=\""Demoplugin"\" +classbuilder_la_CFLAGS = -DG_LOG_DOMAIN=\""Classbuilder"\" +htmlchars_la_CFLAGS = -DG_LOG_DOMAIN=\""HTMLChars"\" +export_la_CFLAGS = -DG_LOG_DOMAIN=\""Export"\" +saveactions_la_CFLAGS = -DG_LOG_DOMAIN=\""SaveActions"\" +filebrowser_la_CFLAGS = -DG_LOG_DOMAIN=\""FileBrowser"\" +splitwindow_la_CFLAGS = -DG_LOG_DOMAIN=\""SplitWindow"\" + demoplugin_la_LIBADD = $(GTK_LIBS) classbuilder_la_LIBADD = $(GTK_LIBS) htmlchars_la_LIBADD = $(GTK_LIBS) @@ -98,6 +105,7 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ + -DGTK \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tagmanager/include \ -I$(top_srcdir)/scintilla/include \ diff -Nru geany-0.18/plugins/Makefile.in geany-0.19/plugins/Makefile.in --- geany-0.18/plugins/Makefile.in 2009-08-16 18:29:21.000000000 +0100 +++ geany-0.19/plugins/Makefile.in 2010-06-12 13:14:28.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,8 +20,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@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 @@ -39,103 +41,144 @@ DIST_COMMON = $(plugins_include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 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 = `echo $$p | sed -e 's|^.*/||'`; +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__installdirs = "$(DESTDIR)$(plugindir)" \ "$(DESTDIR)$(plugins_includedir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES) am__DEPENDENCIES_1 = @MINGW_FALSE@@PLUGINS_TRUE@classbuilder_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__classbuilder_la_SOURCES_DIST = classbuilder.c @MINGW_FALSE@@PLUGINS_TRUE@am_classbuilder_la_OBJECTS = \ -@MINGW_FALSE@@PLUGINS_TRUE@ classbuilder.lo +@MINGW_FALSE@@PLUGINS_TRUE@ classbuilder_la-classbuilder.lo classbuilder_la_OBJECTS = $(am_classbuilder_la_OBJECTS) -classbuilder_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(classbuilder_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +classbuilder_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(classbuilder_la_CFLAGS) $(CFLAGS) $(classbuilder_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_classbuilder_la_rpath = -rpath \ @MINGW_FALSE@@PLUGINS_TRUE@ $(plugindir) @MINGW_FALSE@@PLUGINS_TRUE@demoplugin_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__demoplugin_la_SOURCES_DIST = demoplugin.c -@MINGW_FALSE@@PLUGINS_TRUE@am_demoplugin_la_OBJECTS = demoplugin.lo +@MINGW_FALSE@@PLUGINS_TRUE@am_demoplugin_la_OBJECTS = \ +@MINGW_FALSE@@PLUGINS_TRUE@ demoplugin_la-demoplugin.lo demoplugin_la_OBJECTS = $(am_demoplugin_la_OBJECTS) -demoplugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(demoplugin_la_LDFLAGS) $(LDFLAGS) -o $@ +demoplugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(demoplugin_la_CFLAGS) \ + $(CFLAGS) $(demoplugin_la_LDFLAGS) $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_demoplugin_la_rpath = @MINGW_FALSE@@PLUGINS_TRUE@export_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__export_la_SOURCES_DIST = export.c -@MINGW_FALSE@@PLUGINS_TRUE@am_export_la_OBJECTS = export.lo +@MINGW_FALSE@@PLUGINS_TRUE@am_export_la_OBJECTS = export_la-export.lo export_la_OBJECTS = $(am_export_la_OBJECTS) -export_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(export_la_LDFLAGS) $(LDFLAGS) -o $@ +export_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(export_la_CFLAGS) \ + $(CFLAGS) $(export_la_LDFLAGS) $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_export_la_rpath = -rpath $(plugindir) @MINGW_FALSE@@PLUGINS_TRUE@filebrowser_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__filebrowser_la_SOURCES_DIST = filebrowser.c -@MINGW_FALSE@@PLUGINS_TRUE@am_filebrowser_la_OBJECTS = filebrowser.lo +@MINGW_FALSE@@PLUGINS_TRUE@am_filebrowser_la_OBJECTS = \ +@MINGW_FALSE@@PLUGINS_TRUE@ filebrowser_la-filebrowser.lo filebrowser_la_OBJECTS = $(am_filebrowser_la_OBJECTS) -filebrowser_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(filebrowser_la_LDFLAGS) $(LDFLAGS) -o $@ +filebrowser_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(filebrowser_la_CFLAGS) $(CFLAGS) $(filebrowser_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_filebrowser_la_rpath = -rpath \ @MINGW_FALSE@@PLUGINS_TRUE@ $(plugindir) @MINGW_FALSE@@PLUGINS_TRUE@htmlchars_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__htmlchars_la_SOURCES_DIST = htmlchars.c -@MINGW_FALSE@@PLUGINS_TRUE@am_htmlchars_la_OBJECTS = htmlchars.lo +@MINGW_FALSE@@PLUGINS_TRUE@am_htmlchars_la_OBJECTS = \ +@MINGW_FALSE@@PLUGINS_TRUE@ htmlchars_la-htmlchars.lo htmlchars_la_OBJECTS = $(am_htmlchars_la_OBJECTS) -htmlchars_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(htmlchars_la_LDFLAGS) $(LDFLAGS) -o $@ +htmlchars_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(htmlchars_la_CFLAGS) \ + $(CFLAGS) $(htmlchars_la_LDFLAGS) $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_htmlchars_la_rpath = -rpath $(plugindir) @MINGW_FALSE@@PLUGINS_TRUE@saveactions_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__saveactions_la_SOURCES_DIST = saveactions.c -@MINGW_FALSE@@PLUGINS_TRUE@am_saveactions_la_OBJECTS = saveactions.lo +@MINGW_FALSE@@PLUGINS_TRUE@am_saveactions_la_OBJECTS = \ +@MINGW_FALSE@@PLUGINS_TRUE@ saveactions_la-saveactions.lo saveactions_la_OBJECTS = $(am_saveactions_la_OBJECTS) -saveactions_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(saveactions_la_LDFLAGS) $(LDFLAGS) -o $@ +saveactions_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(saveactions_la_CFLAGS) $(CFLAGS) $(saveactions_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_saveactions_la_rpath = -rpath \ @MINGW_FALSE@@PLUGINS_TRUE@ $(plugindir) @MINGW_FALSE@@PLUGINS_TRUE@splitwindow_la_DEPENDENCIES = \ @MINGW_FALSE@@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__splitwindow_la_SOURCES_DIST = splitwindow.c -@MINGW_FALSE@@PLUGINS_TRUE@am_splitwindow_la_OBJECTS = splitwindow.lo +@MINGW_FALSE@@PLUGINS_TRUE@am_splitwindow_la_OBJECTS = \ +@MINGW_FALSE@@PLUGINS_TRUE@ splitwindow_la-splitwindow.lo splitwindow_la_OBJECTS = $(am_splitwindow_la_OBJECTS) -splitwindow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(splitwindow_la_LDFLAGS) $(LDFLAGS) -o $@ +splitwindow_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(splitwindow_la_CFLAGS) $(CFLAGS) $(splitwindow_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @MINGW_FALSE@@PLUGINS_TRUE@am_splitwindow_la_rpath = -rpath \ @MINGW_FALSE@@PLUGINS_TRUE@ $(plugindir) 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) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=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_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +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_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(classbuilder_la_SOURCES) $(demoplugin_la_SOURCES) \ $(export_la_SOURCES) $(filebrowser_la_SOURCES) \ $(htmlchars_la_SOURCES) $(saveactions_la_SOURCES) \ @@ -147,7 +190,6 @@ $(am__htmlchars_la_SOURCES_DIST) \ $(am__saveactions_la_SOURCES_DIST) \ $(am__splitwindow_la_SOURCES_DIST) -plugins_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(plugins_include_HEADERS) ETAGS = etags CTAGS = ctags @@ -155,6 +197,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -232,6 +275,8 @@ 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@ @@ -304,7 +349,6 @@ plugindir = $(libdir)/geany plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ - pluginmacros.h \ geanyplugin.h \ geanyfunctions.h @@ -322,6 +366,7 @@ @MINGW_TRUE@@PLUGINS_TRUE@MINGW_CFLAGS = \ @MINGW_TRUE@@PLUGINS_TRUE@ -DGEANY_DATADIR=\"data\" \ @MINGW_TRUE@@PLUGINS_TRUE@ -DHAVE_CONFIG_H \ +@MINGW_TRUE@@PLUGINS_TRUE@ -DGTK \ @MINGW_TRUE@@PLUGINS_TRUE@ -I$(top_srcdir) \ @MINGW_TRUE@@PLUGINS_TRUE@ -I$(top_srcdir)/src \ @MINGW_TRUE@@PLUGINS_TRUE@ -I$(top_srcdir)/tagmanager/include \ @@ -351,8 +396,13 @@ @MINGW_FALSE@@PLUGINS_TRUE@saveactions_la_SOURCES = saveactions.c @MINGW_FALSE@@PLUGINS_TRUE@filebrowser_la_SOURCES = filebrowser.c @MINGW_FALSE@@PLUGINS_TRUE@splitwindow_la_SOURCES = splitwindow.c - -# instead of linking against all in $(GTK_LIBS), we link only against needed libs +@MINGW_FALSE@@PLUGINS_TRUE@demoplugin_la_CFLAGS = -DG_LOG_DOMAIN=\""Demoplugin"\" +@MINGW_FALSE@@PLUGINS_TRUE@classbuilder_la_CFLAGS = -DG_LOG_DOMAIN=\""Classbuilder"\" +@MINGW_FALSE@@PLUGINS_TRUE@htmlchars_la_CFLAGS = -DG_LOG_DOMAIN=\""HTMLChars"\" +@MINGW_FALSE@@PLUGINS_TRUE@export_la_CFLAGS = -DG_LOG_DOMAIN=\""Export"\" +@MINGW_FALSE@@PLUGINS_TRUE@saveactions_la_CFLAGS = -DG_LOG_DOMAIN=\""SaveActions"\" +@MINGW_FALSE@@PLUGINS_TRUE@filebrowser_la_CFLAGS = -DG_LOG_DOMAIN=\""FileBrowser"\" +@MINGW_FALSE@@PLUGINS_TRUE@splitwindow_la_CFLAGS = -DG_LOG_DOMAIN=\""SplitWindow"\" @MINGW_FALSE@@PLUGINS_TRUE@demoplugin_la_LIBADD = $(GTK_LIBS) @MINGW_FALSE@@PLUGINS_TRUE@classbuilder_la_LIBADD = $(GTK_LIBS) @MINGW_FALSE@@PLUGINS_TRUE@htmlchars_la_LIBADD = $(GTK_LIBS) @@ -362,6 +412,7 @@ @MINGW_FALSE@@PLUGINS_TRUE@splitwindow_la_LIBADD = $(GTK_LIBS) AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ + -DGTK \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tagmanager/include \ -I$(top_srcdir)/scintilla/include \ @@ -387,9 +438,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -407,6 +458,7 @@ 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): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @@ -419,20 +471,24 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + list2="$$list2 $$p"; \ else :; fi; \ - done + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ done clean-pluginLTLIBRARIES: @@ -444,19 +500,19 @@ rm -f "$${dir}/so_locations"; \ done classbuilder.la: $(classbuilder_la_OBJECTS) $(classbuilder_la_DEPENDENCIES) - $(classbuilder_la_LINK) $(am_classbuilder_la_rpath) $(classbuilder_la_OBJECTS) $(classbuilder_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(classbuilder_la_LINK) $(am_classbuilder_la_rpath) $(classbuilder_la_OBJECTS) $(classbuilder_la_LIBADD) $(LIBS) demoplugin.la: $(demoplugin_la_OBJECTS) $(demoplugin_la_DEPENDENCIES) - $(demoplugin_la_LINK) $(am_demoplugin_la_rpath) $(demoplugin_la_OBJECTS) $(demoplugin_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(demoplugin_la_LINK) $(am_demoplugin_la_rpath) $(demoplugin_la_OBJECTS) $(demoplugin_la_LIBADD) $(LIBS) export.la: $(export_la_OBJECTS) $(export_la_DEPENDENCIES) - $(export_la_LINK) $(am_export_la_rpath) $(export_la_OBJECTS) $(export_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(export_la_LINK) $(am_export_la_rpath) $(export_la_OBJECTS) $(export_la_LIBADD) $(LIBS) filebrowser.la: $(filebrowser_la_OBJECTS) $(filebrowser_la_DEPENDENCIES) - $(filebrowser_la_LINK) $(am_filebrowser_la_rpath) $(filebrowser_la_OBJECTS) $(filebrowser_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(filebrowser_la_LINK) $(am_filebrowser_la_rpath) $(filebrowser_la_OBJECTS) $(filebrowser_la_LIBADD) $(LIBS) htmlchars.la: $(htmlchars_la_OBJECTS) $(htmlchars_la_DEPENDENCIES) - $(htmlchars_la_LINK) $(am_htmlchars_la_rpath) $(htmlchars_la_OBJECTS) $(htmlchars_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(htmlchars_la_LINK) $(am_htmlchars_la_rpath) $(htmlchars_la_OBJECTS) $(htmlchars_la_LIBADD) $(LIBS) saveactions.la: $(saveactions_la_OBJECTS) $(saveactions_la_DEPENDENCIES) - $(saveactions_la_LINK) $(am_saveactions_la_rpath) $(saveactions_la_OBJECTS) $(saveactions_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(saveactions_la_LINK) $(am_saveactions_la_rpath) $(saveactions_la_OBJECTS) $(saveactions_la_LIBADD) $(LIBS) splitwindow.la: $(splitwindow_la_OBJECTS) $(splitwindow_la_DEPENDENCIES) - $(splitwindow_la_LINK) $(am_splitwindow_la_rpath) $(splitwindow_la_OBJECTS) $(splitwindow_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(splitwindow_la_LINK) $(am_splitwindow_la_rpath) $(splitwindow_la_OBJECTS) $(splitwindow_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -464,35 +520,94 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classbuilder.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demoplugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/export.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filebrowser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlchars.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saveactions.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splitwindow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classbuilder_la-classbuilder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demoplugin_la-demoplugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/export_la-export.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filebrowser_la-filebrowser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlchars_la-htmlchars.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saveactions_la-saveactions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splitwindow_la-splitwindow.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +classbuilder_la-classbuilder.lo: classbuilder.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) $(classbuilder_la_CFLAGS) $(CFLAGS) -MT classbuilder_la-classbuilder.lo -MD -MP -MF $(DEPDIR)/classbuilder_la-classbuilder.Tpo -c -o classbuilder_la-classbuilder.lo `test -f 'classbuilder.c' || echo '$(srcdir)/'`classbuilder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/classbuilder_la-classbuilder.Tpo $(DEPDIR)/classbuilder_la-classbuilder.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='classbuilder.c' object='classbuilder_la-classbuilder.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(classbuilder_la_CFLAGS) $(CFLAGS) -c -o classbuilder_la-classbuilder.lo `test -f 'classbuilder.c' || echo '$(srcdir)/'`classbuilder.c + +demoplugin_la-demoplugin.lo: demoplugin.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) $(demoplugin_la_CFLAGS) $(CFLAGS) -MT demoplugin_la-demoplugin.lo -MD -MP -MF $(DEPDIR)/demoplugin_la-demoplugin.Tpo -c -o demoplugin_la-demoplugin.lo `test -f 'demoplugin.c' || echo '$(srcdir)/'`demoplugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/demoplugin_la-demoplugin.Tpo $(DEPDIR)/demoplugin_la-demoplugin.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='demoplugin.c' object='demoplugin_la-demoplugin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(demoplugin_la_CFLAGS) $(CFLAGS) -c -o demoplugin_la-demoplugin.lo `test -f 'demoplugin.c' || echo '$(srcdir)/'`demoplugin.c + +export_la-export.lo: export.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) $(export_la_CFLAGS) $(CFLAGS) -MT export_la-export.lo -MD -MP -MF $(DEPDIR)/export_la-export.Tpo -c -o export_la-export.lo `test -f 'export.c' || echo '$(srcdir)/'`export.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/export_la-export.Tpo $(DEPDIR)/export_la-export.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='export.c' object='export_la-export.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(export_la_CFLAGS) $(CFLAGS) -c -o export_la-export.lo `test -f 'export.c' || echo '$(srcdir)/'`export.c + +filebrowser_la-filebrowser.lo: filebrowser.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) $(filebrowser_la_CFLAGS) $(CFLAGS) -MT filebrowser_la-filebrowser.lo -MD -MP -MF $(DEPDIR)/filebrowser_la-filebrowser.Tpo -c -o filebrowser_la-filebrowser.lo `test -f 'filebrowser.c' || echo '$(srcdir)/'`filebrowser.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filebrowser_la-filebrowser.Tpo $(DEPDIR)/filebrowser_la-filebrowser.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filebrowser.c' object='filebrowser_la-filebrowser.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(filebrowser_la_CFLAGS) $(CFLAGS) -c -o filebrowser_la-filebrowser.lo `test -f 'filebrowser.c' || echo '$(srcdir)/'`filebrowser.c + +htmlchars_la-htmlchars.lo: htmlchars.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) $(htmlchars_la_CFLAGS) $(CFLAGS) -MT htmlchars_la-htmlchars.lo -MD -MP -MF $(DEPDIR)/htmlchars_la-htmlchars.Tpo -c -o htmlchars_la-htmlchars.lo `test -f 'htmlchars.c' || echo '$(srcdir)/'`htmlchars.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/htmlchars_la-htmlchars.Tpo $(DEPDIR)/htmlchars_la-htmlchars.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='htmlchars.c' object='htmlchars_la-htmlchars.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(htmlchars_la_CFLAGS) $(CFLAGS) -c -o htmlchars_la-htmlchars.lo `test -f 'htmlchars.c' || echo '$(srcdir)/'`htmlchars.c + +saveactions_la-saveactions.lo: saveactions.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) $(saveactions_la_CFLAGS) $(CFLAGS) -MT saveactions_la-saveactions.lo -MD -MP -MF $(DEPDIR)/saveactions_la-saveactions.Tpo -c -o saveactions_la-saveactions.lo `test -f 'saveactions.c' || echo '$(srcdir)/'`saveactions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/saveactions_la-saveactions.Tpo $(DEPDIR)/saveactions_la-saveactions.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='saveactions.c' object='saveactions_la-saveactions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(saveactions_la_CFLAGS) $(CFLAGS) -c -o saveactions_la-saveactions.lo `test -f 'saveactions.c' || echo '$(srcdir)/'`saveactions.c + +splitwindow_la-splitwindow.lo: splitwindow.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) $(splitwindow_la_CFLAGS) $(CFLAGS) -MT splitwindow_la-splitwindow.lo -MD -MP -MF $(DEPDIR)/splitwindow_la-splitwindow.Tpo -c -o splitwindow_la-splitwindow.lo `test -f 'splitwindow.c' || echo '$(srcdir)/'`splitwindow.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/splitwindow_la-splitwindow.Tpo $(DEPDIR)/splitwindow_la-splitwindow.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='splitwindow.c' object='splitwindow_la-splitwindow.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(splitwindow_la_CFLAGS) $(CFLAGS) -c -o splitwindow_la-splitwindow.lo `test -f 'splitwindow.c' || echo '$(srcdir)/'`splitwindow.c + mostlyclean-libtool: -rm -f *.lo @@ -501,20 +616,23 @@ install-plugins_includeHEADERS: $(plugins_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(plugins_includedir)" || $(MKDIR_P) "$(DESTDIR)$(plugins_includedir)" - @list='$(plugins_include_HEADERS)'; for p in $$list; do \ + @list='$(plugins_include_HEADERS)'; test -n "$(plugins_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(plugins_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(plugins_includedir)/$$f'"; \ - $(plugins_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(plugins_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(plugins_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(plugins_includedir)" || exit $$?; \ done uninstall-plugins_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(plugins_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(plugins_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(plugins_includedir)/$$f"; \ - done + @list='$(plugins_include_HEADERS)'; test -n "$(plugins_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugins_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugins_includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -528,7 +646,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -536,29 +654,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -579,13 +702,17 @@ 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -618,6 +745,7 @@ 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" @@ -641,6 +769,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -650,18 +780,28 @@ 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 @@ -733,6 +873,7 @@ @rm -f tmp$@.lo tmp$@.o libtmp$@.la @cp .libs/libtmp$@.so* $@ @rm -f .libs/libtmp$@.* + # 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-0.18/plugins/makefile.win32 geany-0.19/plugins/makefile.win32 --- geany-0.18/plugins/makefile.win32 2009-04-02 16:49:19.000000000 +0100 +++ geany-0.19/plugins/makefile.win32 2010-05-16 18:44:40.000000000 +0100 @@ -36,6 +36,7 @@ else CFLAGS=-O2 $(CBASEFLAGS) endif +CFLAGS += -DGTK ifndef GTK210 ALL_GTK_LIBS += -liconv diff -Nru geany-0.18/plugins/pluginmacros.h geany-0.19/plugins/pluginmacros.h --- geany-0.18/plugins/pluginmacros.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/plugins/pluginmacros.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -/* - * pluginmacros.h - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven - * - * 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: pluginmacros.h 3446 2009-01-04 18:30:42Z eht16 $ - */ - -/** @file pluginmacros.h - * @deprecated Use geanyfunctions.h instead. - * Macros to avoid typing @c geany_functions-> so often. - * - * @section function_macros Function Macros - * These macros are named the same as the first word in the core function name, - * but with a 'p_' prefix to prevent conflicts with other tag names. - * - * Example for @c document_open_file(): @c p_document->open_file(); */ - - -#ifndef PLUGINMACROS_H -#define PLUGINMACROS_H - -/* common items */ -#define documents_array geany_data->documents_array /**< @deprecated Use @c geany->documents_array->len and document_index() instead. */ -#define filetypes_array geany_data->filetypes_array /**< @deprecated Use @c geany->filetypes_array->len and filetypes_index() instead. */ - - -/* function group macros */ -#define p_editor geany_functions->p_editor /**< See editor.h */ -#define p_document geany_functions->p_document /**< See document.h */ -#define p_dialogs geany_functions->p_dialogs /**< See dialogs.h */ -#define p_encodings geany_functions->p_encodings /**< See encodings.h */ -#define p_filetypes geany_functions->p_filetypes /**< See filetypes.h */ -#define p_highlighting geany_functions->p_highlighting /**< See highlighting.h */ -#define p_keybindings geany_functions->p_keybindings /**< See keybindings.h */ -#define p_main geany_functions->p_main /**< See main.h */ -#define p_msgwindow geany_functions->p_msgwindow /**< See msgwindow.h */ -#define p_navqueue geany_functions->p_navqueue /**< See navqueue.h */ -#define p_plugin geany_functions->p_plugin /**< See plugins.c */ -#define p_sci geany_functions->p_sci /**< See sciwrappers.h */ -#define p_search geany_functions->p_search /**< See search.h */ -#define p_support geany_functions->p_support /**< See support.h */ -#define p_templates geany_functions->p_templates /**< See templates.h */ -#define p_tm geany_functions->p_tm /**< See the TagManager headers. */ -#define p_ui geany_functions->p_ui /**< See ui_utils.h */ -#define p_utils geany_functions->p_utils /**< See utils.h */ - -#endif diff -Nru geany-0.18/plugins/saveactions.c geany-0.19/plugins/saveactions.c --- geany-0.18/plugins/saveactions.c 2009-07-14 16:06:20.000000000 +0100 +++ geany-0.19/plugins/saveactions.c 2010-04-25 18:43:09.000000000 +0100 @@ -1,8 +1,8 @@ /* * saveactions.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: saveactions.c 3966 2009-07-14 15:06:20Z ntrel $ + * $Id: saveactions.c 4861 2010-04-25 17:43:09Z eht16 $ */ @@ -250,7 +250,7 @@ if (fd != -1) close(fd); /* close the returned file descriptor as we only need the filename */ - if (ft == NULL) + if (ft == NULL || ft->id == GEANY_FILETYPES_NONE) /* ft is NULL when a new file without template was opened, so use the * configured default file type */ ft = filetypes_lookup_by_name(instantsave_default_ft); @@ -278,7 +278,7 @@ }; -gboolean auto_save(gpointer data) +static gboolean auto_save(gpointer data) { GeanyDocument *doc; GeanyDocument *cur_doc = document_get_current(); @@ -316,7 +316,7 @@ } -void autosave_set_timeout(void) +static void autosave_set_timeout(void) { if (! enable_autosave) return; diff -Nru geany-0.18/plugins/splitwindow.c geany-0.19/plugins/splitwindow.c --- geany-0.18/plugins/splitwindow.c 2009-07-23 12:00:32.000000000 +0100 +++ geany-0.19/plugins/splitwindow.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * splitwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Nick Treleaven - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven + * Copyright 2008-2010 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: splitwindow.c 4012 2009-07-23 11:00:32Z ntrel $ + * $Id: splitwindow.c 4518 2010-01-01 22:55:18Z eht16 $ */ /* Split Window plugin. */ @@ -39,6 +39,7 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; +GeanyPlugin *geany_plugin; /* Keybinding(s) */ @@ -50,9 +51,6 @@ KB_COUNT }; -PLUGIN_KEY_GROUP(split_window, KB_COUNT); - - enum State { STATE_SPLIT_HORIZONTAL, @@ -88,69 +86,23 @@ static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data); -static gint sci_get_value(ScintillaObject *sci, gint message_id, gint param) -{ - return scintilla_send_message(sci, message_id, param, 0); -} - - -static void set_styles(ScintillaObject *oldsci, ScintillaObject *newsci) -{ - gint style_id; - - for (style_id = 0; style_id <= 127; style_id++) - { - gint val; - - val = sci_get_value(oldsci, SCI_STYLEGETFORE, style_id); - scintilla_send_message(newsci, SCI_STYLESETFORE, style_id, val); - val = sci_get_value(oldsci, SCI_STYLEGETBACK, style_id); - scintilla_send_message(newsci, SCI_STYLESETBACK, style_id, val); - val = sci_get_value(oldsci, SCI_STYLEGETBOLD, style_id); - scintilla_send_message(newsci, SCI_STYLESETBOLD, style_id, val); - val = sci_get_value(oldsci, SCI_STYLEGETITALIC, style_id); - scintilla_send_message(newsci, SCI_STYLESETITALIC, style_id, val); - } -} - - -static void update_font(ScintillaObject *current, ScintillaObject *sci) -{ - gint style_id; - gint size; - gchar font_name[1024]; /* should be big enough */ - - scintilla_send_message(current, SCI_STYLEGETFONT, 0, (sptr_t)font_name); - size = sci_get_value(current, SCI_STYLEGETSIZE, 0); - - for (style_id = 0; style_id <= 127; style_id++) - { - sci_set_font(sci, style_id, font_name, size); - } - - /* line number and braces */ - sci_set_font(sci, STYLE_LINENUMBER, font_name, size); - sci_set_font(sci, STYLE_BRACELIGHT, font_name, size); - sci_set_font(sci, STYLE_BRACEBAD, font_name, size); -} - - /* line numbers visibility */ -static void set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width) +static void set_line_numbers(ScintillaObject * sci, gboolean set) { if (set) { gchar tmp_str[15]; gint len = scintilla_send_message(sci, SCI_GETLINECOUNT, 0, 0); gint width; - g_snprintf(tmp_str, 15, "_%d%d", len, extra_width); + + g_snprintf(tmp_str, 15, "_%d", len); width = scintilla_send_message(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, (sptr_t) tmp_str); scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 0, width); scintilla_send_message(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */ } else { - scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 0, 0 ); + scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 0, 0); } } @@ -158,24 +110,20 @@ static void sync_to_current(ScintillaObject *sci, ScintillaObject *current) { gpointer sdoc; - gint lexer; gint pos; /* set the new sci widget to view the existing Scintilla document */ sdoc = (gpointer) scintilla_send_message(current, SCI_GETDOCPOINTER, 0, 0); scintilla_send_message(sci, SCI_SETDOCPOINTER, 0, (sptr_t) sdoc); - update_font(current, sci); - lexer = scintilla_send_message(current, SCI_GETLEXER, 0, 0); - scintilla_send_message(sci, SCI_SETLEXER, lexer, 0); - set_styles(current, sci); - + highlighting_set_styles(sci, edit_window.editor->document->file_type); pos = sci_get_current_position(current); sci_set_current_position(sci, pos, TRUE); /* override some defaults */ - set_line_numbers(sci, TRUE, 0); - scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */ + set_line_numbers(sci, geany->editor_prefs->show_linenumber_margin); + scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin (no commands) */ + scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 2, 0 ); /* hide fold margin (no toggle callback) */ } @@ -264,6 +212,23 @@ } +static void on_doc_menu_item_clicked(gpointer item, GeanyDocument *doc) +{ + if (doc->is_valid) + set_editor(&edit_window, doc->editor); +} + + +static void on_doc_menu_show(GtkMenu *menu) +{ + /* clear the old menu items */ + gtk_container_foreach(GTK_CONTAINER(menu), (GtkCallback) gtk_widget_destroy, NULL); + + ui_menu_add_document_items(menu, edit_window.editor->document, + G_CALLBACK(on_doc_menu_item_clicked)); +} + + static GtkWidget *create_toolbar(void) { GtkWidget *toolbar, *item; @@ -273,11 +238,17 @@ gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); - item = ui_tool_button_new(GTK_STOCK_JUMP_TO, "", - _("Show the current document")); + tool_item = gtk_menu_tool_button_new(NULL, NULL); + gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(tool_item), GTK_STOCK_JUMP_TO); + item = (GtkWidget*)tool_item; + ui_widget_set_tooltip_text(item, _("Show the current document")); gtk_container_add(GTK_CONTAINER(toolbar), item); g_signal_connect(item, "clicked", G_CALLBACK(on_refresh), NULL); + item = gtk_menu_new(); + gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(tool_item), item); + g_signal_connect(item, "show", G_CALLBACK(on_doc_menu_show), NULL); + tool_item = gtk_tool_item_new(); gtk_tool_item_set_expand(tool_item, TRUE); gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(tool_item)); @@ -395,6 +366,7 @@ void plugin_init(GeanyData *data) { GtkWidget *item, *menu; + GeanyKeyGroup *key_group; menu_items.main = item = gtk_menu_item_new_with_mnemonic(_("_Split Window")); gtk_menu_shell_append(GTK_MENU_SHELL(geany_data->main_widgets->tools_menu), item); @@ -423,12 +395,13 @@ set_state(STATE_UNSPLIT); /* setup keybindings */ - keybindings_set_item(plugin_key_group, KB_SPLIT_HORIZONTAL, kb_activate, + key_group = plugin_set_key_group(geany_plugin, "split_window", KB_COUNT, NULL); + keybindings_set_item(key_group, KB_SPLIT_HORIZONTAL, kb_activate, 0, 0, "split_horizontal", _("Split Horizontally"), menu_items.horizontal); - keybindings_set_item(plugin_key_group, KB_SPLIT_VERTICAL, kb_activate, + keybindings_set_item(key_group, KB_SPLIT_VERTICAL, kb_activate, 0, 0, "split_vertical", _("Split Vertically"), menu_items.vertical); - keybindings_set_item(plugin_key_group, KB_SPLIT_UNSPLIT, kb_activate, - 0, 0, "split_unsplit", _("Unsplit"), menu_items.unsplit); + keybindings_set_item(key_group, KB_SPLIT_UNSPLIT, kb_activate, + 0, 0, "split_unsplit", _("_Unsplit"), menu_items.unsplit); } diff -Nru geany-0.18/po/ast.po geany-0.19/po/ast.po --- geany-0.18/po/ast.po 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/po/ast.po 2010-05-23 09:08:49.000000000 +0100 @@ -0,0 +1,5562 @@ +# Asturian translation file for geany +# Copyright (C) 2006 +# This file is distributed under the same license as the geany package. +# +msgid "" +msgstr "" +"Project-Id-Version: geany 0.16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-03-05 17:14+0100\n" +"Last-Translator: maacub \n" +"Language-Team: Asturian \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-Launchpad-Export-Date: 2010-03-05 10:36+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../geany.desktop.in.h:1 +msgid "A fast and lightweight IDE using GTK2" +msgstr "Un IDE rápidu y llixeru basáu en GTK2" + +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 +msgid "Geany" +msgstr "Geany" + +#: ../geany.desktop.in.h:3 +msgid "Integrated Development Environment" +msgstr "Entornu Integráu de Desarrollu" + +#: ../src/about.c:145 +msgid "About Geany" +msgstr "Tocante a Geany" + +#: ../src/about.c:195 +msgid "A fast and lightweight IDE" +msgstr "Un IDE rápidu y llixeru" + +#: ../src/about.c:216 +#, c-format +msgid "(built on or after %s)" +msgstr "(construyíu en, o dempués del %s)" + +#. gtk_container_add(GTK_CONTAINER(info_box), cop_label); +#: ../src/about.c:247 +msgid "Info" +msgstr "Información" + +#: ../src/about.c:263 +msgid "Developers" +msgstr "Desarrolladores" + +#: ../src/about.c:272 +msgid "maintainer" +msgstr "caltenedor" + +#: ../src/about.c:280 +msgid "developer" +msgstr "desendolcador" + +#: ../src/about.c:288 +msgid "translation maintainer" +msgstr "caltenedor de torna" + +#: ../src/about.c:297 +msgid "Translators" +msgstr "Tornadores" + +#: ../src/about.c:317 +msgid "Previous Translators" +msgstr "Tornadores Anteriores" + +#: ../src/about.c:338 +msgid "Contributors" +msgstr "Collaboradores" + +#: ../src/about.c:348 +#, c-format +msgid "" +"Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "" +"Dalgunos de los munchos collaboradores (pa una llista detallada, mira'l " +"ficheru %s):" + +#: ../src/about.c:374 +msgid "Credits" +msgstr "Créitos" + +#: ../src/about.c:388 +msgid "License" +msgstr "Llicencia" + +#: ../src/about.c:397 +msgid "" +"License text could not be found, please visit http://www.gnu.org/licenses/" +"gpl-2.0.txt to view it online." +msgstr "" +"El testu de la llicencia non pudo ser atopáu, por favor visita http://www." +"gnu.org/licenses/gpl-2.0.txt pa velo en llínia" + +#. fall back to %d +#: ../src/build.c:635 +#, c-format +msgid "failed to substitute %%p, no project active" +msgstr "fallo sustituir %%p, ensin proyeutu activu" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Falló procesu, nun hai directoriu de trabayu" + +#: ../src/build.c:699 +#, c-format +msgid "%s (in directory: %s)" +msgstr "%s (en direutoriu: %s)" + +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 +#, c-format +msgid "Process failed (%s)" +msgstr "Falló'l procesu (%s)" + +#: ../src/build.c:790 +#, c-format +msgid "Failed to change the working directory to \"%s\"" +msgstr "Falló al camudar el direutoriu de trabayu a \"%s\"" + +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Falló al executar \"%s\" (el guión d'entamu non pudo ser criáu)" + +#: ../src/build.c:873 +msgid "" +"Could not execute the file in the VTE because it probably contains a command." +msgstr "" +"Non se pudó executar el ficheru na terminal virtual (VTE) probablemente " +"porque caltien un comandu." + +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Non s'atopó la terminal \"%s\" (verifica les rutes pa la ferramienta de " +"terminal nes Preferencies)" + +#: ../src/build.c:1081 +msgid "Compilation failed." +msgstr "La compilación falló." + +#: ../src/build.c:1095 +msgid "Compilation finished successfully." +msgstr "La compilación finó con éxitu." + +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Testu Personalizáu" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Introducir testu personalizáu equí, too testu introducíu amestaráse al " +"comandu." + +#: ../src/build.c:1331 +msgid "_Next Error" +msgstr "Siguie_nte Fallu" + +#: ../src/build.c:1333 +msgid "_Previous Error" +msgstr "Fallu _Previu" + +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "_Configurar comandos de compilación" + +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Construyir el ficheru actual" + +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Fae'l ficheru actual con Make y l'oxetivu por defeutu" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Fae'l ficheru actual con Make y l'oxetivu especificáu" + +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Compilar el ficheru actual con Make" + +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "El procesu nun pudo ser deteníu (%s)." + +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Nun hai más fallos de construción." + +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Elementu" + +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Etiqueta" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Comandu" + +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Directoriu de trabayu" + +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Llimpio" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, c-format +msgid "%s Commands" +msgstr "%s Comandos" + +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Ensin triba de ficheru" + +#: ../src/build.c:1914 ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Fallu n'espresión regular" + +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Comandos de non triba de ficheru" + +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Nota: Elementu 2 abre un diálogu y amesta la rempuesta al comandu." + +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Comandos d'execución" + +#: ../src/build.c:1992 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" +"%d, %e, %f, %p son sustituyíes nel comandu y campos de direutoriu, mira'l " +"manual pa más detalles." + +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Configurar comandos de compilación" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compilar" + +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Construyir" + +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +msgid "_Execute" +msgstr "_Executar:" + +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make Oxe_tivu Personalizáu" + +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make _Object" + +#: ../src/build.c:2462 ../src/build.c:2633 +msgid "_Make" +msgstr "_Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make All" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "_Configurar Comandos del menú de compilación" + +#: ../src/callbacks.c:150 +msgid "Do you really want to quit?" +msgstr "¿De xuro que quies colar?" + +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Ficheru %d guardáu." +msgstr[1] "Ficheros %d guardaos." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 +msgid "_Reload" +msgstr "_Recargar" + +#: ../src/callbacks.c:489 +msgid "Any unsaved changes will be lost." +msgstr "Cualisquier cambio non grabáu será perdíu." + +#: ../src/callbacks.c:490 +#, c-format +msgid "Are you sure you want to reload '%s'?" +msgstr "¿De xuro que quies recargar '%s'?" + +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 +msgid "Go to Line" +msgstr "Dir a la Llínia" + +#: ../src/callbacks.c:1202 +msgid "Enter the line you want to go to:" +msgstr "Introduz la llínia a la que quies dir:" + +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 +msgid "" +"Please set the filetype for the current file before using this function." +msgstr "" +"Por favor seleiciona la triba de ficheru pal ficheru actual enantes d'usar " +"esta función." + +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 +msgid "dd.mm.yyyy" +msgstr "dd.mm.yyyy" + +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 +msgid "mm.dd.yyyy" +msgstr "mm.dd.yyyy" + +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 +msgid "yyyy/mm/dd" +msgstr "yyyy/mm/dd" + +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.yyyy hh:mm:ss" + +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.yyyy hh:mm:ss" + +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "yyyy/mm/dd hh:mm:ss" + +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 +msgid "_Use Custom Date Format" +msgstr "_Usar Formatu de Fecha Personalizáu" + +#: ../src/callbacks.c:1446 +msgid "Custom Date Format" +msgstr "Formatu de Fecha Personalizáu" + +#: ../src/callbacks.c:1447 +msgid "" +"Enter here a custom date and time format. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Introduz equí un formatu de fecha y hora personalizáu. Puedes usar " +"cualisquier especificador de conversión que pueda ser usáu cola función " +"strftime d'ANSI C." + +#: ../src/callbacks.c:1466 +msgid "Date format string could not be converted (possibly too long)." +msgstr "" +"El formatu de fecha nun pudo ser convertíu (probablemente seya mui llargu)." + +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 +msgid "No more message items." +msgstr "Nun hai más items de mensaxes." + +#: ../src/dialogs.c:144 ../src/dialogs.c:229 +msgid "Open File" +msgstr "Abrir ficheru" + +#: ../src/dialogs.c:148 ../src/interface.c:790 +msgid "_View" +msgstr "_Ver" + +#: ../src/dialogs.c:151 +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Abre'l ficheru en mou sólo lllectura. Si escueyes más d'un ficheru toos " +"serán abiertos como sólo lllectura." + +#: ../src/dialogs.c:173 +msgid "Detect by file extension" +msgstr "Deteuctar por estensión de ficheru" + +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 +msgid "Detect from file" +msgstr "Deteutar dende ficheru" + +#: ../src/dialogs.c:262 +msgid "_More Options" +msgstr "_Más Opciones" + +#. line 1 with checkbox and encoding combo +#: ../src/dialogs.c:269 +msgid "Show _hidden files" +msgstr "Amosar ficheros _ocultos" + +#: ../src/dialogs.c:280 +msgid "Set encoding:" +msgstr "Escoyer _codificación:" + +#: ../src/dialogs.c:290 +msgid "" +"Explicitly defines an encoding for the file, if it would not be detected. " +"This is useful when you know that the encoding of a file cannot be detected " +"correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"encoding." +msgstr "" +"Define esplicitamente una codificación pal ficheru, non usaráse la deteición " +"automática. Esto ye útil cuando se sabe que la codificación d'un ficheru nun " +"puede ser deteutada correutamente por Geany.\n" +"Ten en cuenta que si se seleicionen multiples ficheros toos serán abiertos " +"cola codificación seleicionada." + +#. line 2 with filetype combo +#: ../src/dialogs.c:297 +msgid "Set filetype:" +msgstr "Seleicionar triba de ficheru:" + +#: ../src/dialogs.c:307 +msgid "" +"Explicitly defines a filetype for the file, if it would not be detected by " +"filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"filetype." +msgstr "" +"Define esplicitamente la triba de ficheru, non se usará la deteición por " +"estensión.\n" +"Ten en cuenta que si se seleicionen multiples ficheros toos serán abiertos " +"como la triba seleicionada" + +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "¿Sobrescribir?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "¡El nome de ficheru yá esiste!" + +#: ../src/dialogs.c:422 ../src/dialogs.c:552 +msgid "Save File" +msgstr "Grabar Ficheru" + +#: ../src/dialogs.c:430 +msgid "R_ename" +msgstr "R_enomar" + +#: ../src/dialogs.c:432 +msgid "Save the file and rename it" +msgstr "Guardar el ficheru y renomalu" + +#: ../src/dialogs.c:440 +msgid "_Open file in a new tab" +msgstr "_Abrir el ficheru nuna nueva llingüeta" + +#: ../src/dialogs.c:442 +msgid "" +"Keep the current unsaved document open and open the newly saved file in a " +"new tab" +msgstr "" +"Caltien el documentu actual non salváu y abre un ficheru guardáu nuevu nuna " +"llingüeta nueva" + +#: ../src/dialogs.c:570 ../src/win32.c:681 +msgid "Error" +msgstr "Fallu" + +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 +msgid "Question" +msgstr "Entruga" + +#: ../src/dialogs.c:576 ../src/win32.c:693 +msgid "Warning" +msgstr "Alvertencia" + +#: ../src/dialogs.c:579 ../src/win32.c:699 +msgid "Information" +msgstr "Información" + +#: ../src/dialogs.c:660 +msgid "_Don't save" +msgstr "_Non grabar" + +#: ../src/dialogs.c:691 +#, c-format +msgid "The file '%s' is not saved." +msgstr "El ficheru '%s' non foi guardáu." + +#: ../src/dialogs.c:693 +msgid "Do you want to save it before closing?" +msgstr "¿Quies guardalu enantes de zarrar?" + +#: ../src/dialogs.c:768 +msgid "Choose font" +msgstr "Escoyer fonte" + +#: ../src/dialogs.c:1057 +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"Ocurrió un fallu o non se pudo obtener información d'un ficheru (ex. d'un " +"ficheru nuevu)." + +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 +msgid "unknown" +msgstr "desconocíu" + +#: ../src/dialogs.c:1091 ../src/symbols.c:800 +msgid "Properties" +msgstr "Propiedaes" + +#: ../src/dialogs.c:1120 +msgid "Type:" +msgstr "Triba:" + +#: ../src/dialogs.c:1134 +msgid "Size:" +msgstr "Tamañu:" + +#: ../src/dialogs.c:1150 +msgid "Location:" +msgstr "Ubicación:" + +#: ../src/dialogs.c:1164 +msgid "Read-only:" +msgstr "Sólo Llectura:" + +#: ../src/dialogs.c:1171 +msgid "(only inside Geany)" +msgstr "(sólo dientro de Geany)" + +#: ../src/dialogs.c:1180 +msgid "Encoding:" +msgstr "Codificación" + +#. BOM = byte order mark +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 +msgid "(with BOM)" +msgstr "(con BOM)" + +#: ../src/dialogs.c:1190 +msgid "(without BOM)" +msgstr "(ensin BOM)" + +#: ../src/dialogs.c:1201 +msgid "Modified:" +msgstr "Modificáu:" + +#: ../src/dialogs.c:1215 +msgid "Changed:" +msgstr "Camudáu:" + +#: ../src/dialogs.c:1229 +msgid "Accessed:" +msgstr "Accedíu:" + +#: ../src/dialogs.c:1251 +msgid "Permissions:" +msgstr "Permisos" + +#. Header +#: ../src/dialogs.c:1259 +msgid "Read:" +msgstr "Llectura:" + +#: ../src/dialogs.c:1266 +msgid "Write:" +msgstr "Escritura:" + +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Execución:" + +#. Owner +#: ../src/dialogs.c:1281 +msgid "Owner:" +msgstr "Dueñu:" + +#. Group +#: ../src/dialogs.c:1317 +msgid "Group:" +msgstr "Grupu:" + +#. Other +#: ../src/dialogs.c:1353 +msgid "Other:" +msgstr "Otros:" + +#: ../src/document.c:648 +#, c-format +msgid "File %s closed." +msgstr "El ficheru %s foi zarráu." + +#: ../src/document.c:775 +#, c-format +msgid "New file \"%s\" opened." +msgstr "Nuevu ficheru \"%s\" abiertu." + +#: ../src/document.c:948 ../src/document.c:1464 +#, c-format +msgid "Could not open file %s (%s)" +msgstr "Non se pudo abrir el ficheru %s (%s)" + +#: ../src/document.c:978 +#, c-format +msgid "" +"The file \"%s\" could not be opened properly and has been truncated. This " +"can occur if the file contains a NULL byte. Be aware that saving it can " +"cause data loss.\n" +"The file was set to read-only." +msgstr "" +"El ficheru \"%s\" non pudó ser abiertu adecuadamente y probablemente foi " +"recortáu. Esto puede ocurrir si'l ficheru caltien un byte NULL. Tate " +"consciente de que grabalu puede provocar perdida de datos.\n" +"El ficheru foi abiertu como sólo llectura." + +#. For translators: the second wildcard is an encoding name, e.g. +#. * The file \"test.txt\" is not valid UTF-8. +#: ../src/document.c:1004 +#, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "El ficheru \"%s\" non ye %s válidu." + +#: ../src/document.c:1014 +#, c-format +msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"El ficheru \"%s\" non parez ser de testu o la codificación non ye sofitada." + +#: ../src/document.c:1163 +msgid "Spaces" +msgstr "Espacios" + +#: ../src/document.c:1166 +msgid "Tabs" +msgstr "Tabulaciones" + +#: ../src/document.c:1169 +msgid "Tabs and Spaces" +msgstr "Tabulación y espacios" + +#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs +#. * and Spaces), the second one is the filename +#: ../src/document.c:1174 +#, c-format +msgid "Setting %s indentation mode for %s." +msgstr "Configura'l mou d'indentación de %s pa %s." + +#: ../src/document.c:1227 +msgid "Invalid filename" +msgstr "Nome de ficheru invalidu" + +#: ../src/document.c:1342 +#, c-format +msgid "File %s reloaded." +msgstr "Ficheru %s recargáu." + +#. For translators: this is the status window message for opening a file. %d is the number +#. * of the newly opened file, %s indicates whether the file is opened read-only +#. * (it is replaced with the string ", read-only"). +#: ../src/document.c:1347 +#, c-format +msgid "File %s opened(%d%s)." +msgstr "Ficheru %s abiertu(%d%s)" + +#: ../src/document.c:1349 +msgid ", read-only" +msgstr ", sólo llectura" + +#: ../src/document.c:1558 +msgid "Error renaming file." +msgstr "Fallu renomando'l ficheru." + +#: ../src/document.c:1643 +#, c-format +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved." +msgstr "" +"Ocurrió un fallu mientres se convertía'l ficheru dende UTF-8 en \"%s\". El " +"ficheru non foi guardáu.n" + +#: ../src/document.c:1665 +#, c-format +msgid "" +"Error message: %s\n" +"The error occurred at \"%s\" (line: %d, column: %d)." +msgstr "" +"Mensax de fallu: %s\n" +"El fallu ocurrió en \"%s\" (llinia: %d, columna: %d)." + +#: ../src/document.c:1670 +#, c-format +msgid "Error message: %s." +msgstr "Mensax de fallu: %s." + +#: ../src/document.c:1770 ../src/document.c:1833 +msgid "Error saving file." +msgstr "Fallu guardando ficheru." + +#: ../src/document.c:1832 +#, c-format +msgid "Error saving file (%s)." +msgstr "Fallu guardando ficheru (%s)." + +#: ../src/document.c:1857 +#, c-format +msgid "File %s saved." +msgstr "Ficheru %s guardáu." + +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 +#, c-format +msgid "\"%s\" was not found." +msgstr "non s'atopó \"%s\"." + +#: ../src/document.c:1990 +msgid "Wrap search and find again?" +msgstr "¿Volver al entamu y guetar de nueves?" + +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 +#, c-format +msgid "No matches found for \"%s\"." +msgstr "Non s'atoparon coincidencies pa \"%s\"." + +#: ../src/document.c:2080 ../src/document.c:2089 +#, c-format +msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." +msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." +msgstr[0] "%s: reemplazada %d ocurrencia de \"%s\" con \"%s\"." +msgstr[1] "%s: reemplazado %d ocurrencies de \"%s\" con \"%s\"." + +#: ../src/document.c:2896 +msgid "Do you want to reload it?" +msgstr "¿Quies recargalu?" + +#: ../src/document.c:2897 +#, c-format +msgid "" +"The file '%s' on the disk is more recent than\n" +"the current buffer." +msgstr "" +"El ficheru '%s' del discu ye más reciente\n" +"que la vista actual." + +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" + +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "Ficheru \"%s\" non foi atopáu nel discu!" + +#: ../src/editor.c:4425 +msgid "Enter Tab Width" +msgstr "Introduz l'anchu de la llingüeta" + +#: ../src/editor.c:4426 +msgid "Enter the amount of spaces which should be replaced by a tab character." +msgstr "" +"Introduz la cantidá d'espacios que deben ser reemplazaos por un carauter de " +"tabulación." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + +#: ../src/encodings.c:76 +msgid "Celtic" +msgstr "Celta" + +#: ../src/encodings.c:77 ../src/encodings.c:78 +msgid "Greek" +msgstr "Griegu" + +#: ../src/encodings.c:79 +msgid "Nordic" +msgstr "Nórdicu" + +#: ../src/encodings.c:80 +msgid "South European" +msgstr "Europeu del sur" + +#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:84 +msgid "Western" +msgstr "Occidental" + +#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +msgid "Baltic" +msgstr "Bálticu" + +#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +msgid "Central European" +msgstr "Europeu central" + +#. ISO-IR-111 not available on Windows +#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 +#: ../src/encodings.c:96 ../src/encodings.c:97 +msgid "Cyrillic" +msgstr "Cirílicu" + +#: ../src/encodings.c:98 +msgid "Cyrillic/Russian" +msgstr "Cirílicu/Rusu" + +#: ../src/encodings.c:99 +msgid "Cyrillic/Ukrainian" +msgstr "Cirílicu/Ucranianu" + +#: ../src/encodings.c:100 +msgid "Romanian" +msgstr "Rumanu" + +#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +msgid "Arabic" +msgstr "Árabe" + +#. not available at all, ? +#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +msgid "Hebrew" +msgstr "Hebreu" + +#: ../src/encodings.c:109 +msgid "Hebrew Visual" +msgstr "Hebreu Visual" + +#: ../src/encodings.c:111 +msgid "Armenian" +msgstr "Armeniu" + +#: ../src/encodings.c:112 +msgid "Georgian" +msgstr "Xeorxianu" + +#: ../src/encodings.c:113 +msgid "Thai" +msgstr "Tailandés" + +#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +msgid "Turkish" +msgstr "Turcu" + +#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +msgid "Vietnamese" +msgstr "Vietnamita" + +#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 +#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 +#: ../src/encodings.c:127 ../src/encodings.c:128 +msgid "Unicode" +msgstr "Unicode" + +#. maybe not available on Linux +#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:134 +msgid "Chinese Simplified" +msgstr "Chinu simplificáu" + +#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +msgid "Chinese Traditional" +msgstr "Chinu tradicional" + +#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 +msgid "Japanese" +msgstr "Xaponés" + +#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:145 +msgid "Korean" +msgstr "Coreanu" + +#: ../src/encodings.c:147 +msgid "Without encoding" +msgstr "Ensin _codificación" + +#: ../src/encodings.c:375 +msgid "_West European" +msgstr "Europeu del _Oeste" + +#: ../src/encodings.c:381 +msgid "_East European" +msgstr "Europeu del _Este" + +#: ../src/encodings.c:387 +msgid "East _Asian" +msgstr "Este _Asiáticu" + +#: ../src/encodings.c:393 +msgid "_SE & SW Asian" +msgstr "_SE & SO Asiáticu" + +#: ../src/encodings.c:399 +msgid "_Middle Eastern" +msgstr "_Cercanu Oriente" + +#: ../src/encodings.c:405 +msgid "_Unicode" +msgstr "_Unicode" + +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 +#, c-format +msgid "%s source file" +msgstr "Ficheru fonte %s" + +#: ../src/filetypes.c:102 +#, c-format +msgid "%s file" +msgstr "Ficheru %s" + +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 +msgid "None" +msgstr "Nengún" + +#: ../src/filetypes.c:409 +msgid "Shell script file" +msgstr "Ficheru de guiones shell" + +#: ../src/filetypes.c:421 +msgid "Makefile" +msgstr "Makefile" + +#: ../src/filetypes.c:433 +msgid "XML document" +msgstr "Documentu XML" + +#: ../src/filetypes.c:468 +msgid "Cascading StyleSheet" +msgstr "Fueyes d'estilu en cascada (CSS)" + +#: ../src/filetypes.c:479 +msgid "SQL Dump file" +msgstr "Ficheru de volcáu SQL" + +#: ../src/filetypes.c:534 +msgid "Config file" +msgstr "Ficheru de configuración" + +#: ../src/filetypes.c:546 +msgid "Gettext translation file" +msgstr "Ficheru de torna Gettext" + +#: ../src/filetypes.c:579 +#, c-format +msgid "%s script file" +msgstr "Ficheru guión %s" + +#: ../src/filetypes.c:826 +msgid "_Programming Languages" +msgstr "Llingüaxes de _Programación" + +#: ../src/filetypes.c:827 +msgid "_Scripting Languages" +msgstr "Llingüaxes de _Scripts" + +#: ../src/filetypes.c:828 +msgid "_Markup Languages" +msgstr "Llingüaxes d'_Etiquetes" + +#: ../src/filetypes.c:829 +msgid "M_iscellaneous Languages" +msgstr "Llingüaxes M_isceláneos" + +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Triba de Fi_cheru Personalizada" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 +msgid "All Source" +msgstr "Too codigu fonte" + +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 +msgid "All files" +msgstr "Tolos ficheros" + +#: ../src/filetypes.c:1487 +#, c-format +msgid "Bad regex for filetype %s: %s" +msgstr "Espresión regular incorreuta pa la triba de ficheru %s: %s" + +#: ../src/geany.h:52 +msgid "untitled" +msgstr "ensin títulu" + +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Non se pudo atopar el ficheru '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Temes de _colores" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Defeutu" + +#: ../src/interface.c:295 +msgid "_File" +msgstr "_Ficheru" + +#: ../src/interface.c:306 +msgid "New (with _Template)" +msgstr "Nuevu (dende _Plantilla)" + +#: ../src/interface.c:323 ../src/interface.c:2022 +msgid "Open Selected F_ile" +msgstr "Abrir Ficheru Seleic_ionáu" + +#: ../src/interface.c:327 +msgid "Recent _Files" +msgstr "_Ficheros Recientes" + +#: ../src/interface.c:344 +msgid "Save A_ll" +msgstr "Guardar _Too" + +#: ../src/interface.c:360 +msgid "R_eload As" +msgstr "R_ecargar Como" + +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "invisible" + +#: ../src/interface.c:388 +msgid "Page Set_up" +msgstr "_Configuración de Páxina" + +#: ../src/interface.c:405 ../src/notebook.c:214 +msgid "Close Ot_her Documents" +msgstr "Zarrar otr_os documentos" + +#: ../src/interface.c:413 ../src/notebook.c:219 +msgid "C_lose All" +msgstr "Za_rrar Too" + +#: ../src/interface.c:430 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/interface.c:480 ../src/interface.c:2031 +msgid "_Format" +msgstr "_Formatu" + +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Celar llinies/bloque" + +#: ../src/interface.c:491 +msgid "T_oggle Case of Selection" +msgstr "C_onvertir mayúscules/minúscules de la Seleición" + +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Tresponer la llinia actual" + +#: ../src/interface.c:504 +msgid "_Comment Line(s)" +msgstr "_Comentar Llínia(es)" + +#: ../src/interface.c:508 +msgid "U_ncomment Line(s)" +msgstr "_Descomentar Llínia(es)" + +#: ../src/interface.c:512 +msgid "_Toggle Line Commentation" +msgstr "Comen_tar/Descomentar" + +#: ../src/interface.c:521 +msgid "_Increase Indent" +msgstr "_Incrementar sangría" + +#: ../src/interface.c:529 +msgid "_Decrease Indent" +msgstr "_Decrementar sangría" + +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Sangráu de llínia intelixente" + +#: ../src/interface.c:546 +msgid "_Send Selection to" +msgstr "Mandar _Seleición a" + +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Comandos" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Cortar la(es) llínia(es) actual(es)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copiar la(es) llínia(es) actual(es)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Esborrar la(es) llínia(es) actual(es)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Du_plicar Llínia o Seleición" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Seleicionar llínia(es) actual(es)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Seleicionar parrafu actual" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Inxertar espaciu alternativu" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "_Dir a la siguiente marca" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "_Dir a la marca anterior" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Unviar la Seleición a la Terminal" + +#: ../src/interface.c:636 ../src/interface.c:2044 +msgid "I_nsert Comments" +msgstr "I_nxertar Comentarios" + +#: ../src/interface.c:647 ../src/interface.c:2055 +msgid "Insert _ChangeLog Entry" +msgstr "Inxertar Entrada de _ChangeLog" + +#: ../src/interface.c:651 ../src/interface.c:2059 +msgid "Insert File _Header" +msgstr "Inxertar _Encabezáu de Ficheru" + +#: ../src/interface.c:655 ../src/interface.c:2063 +msgid "Insert _Function Description" +msgstr "Inxertar Descripción de _Función" + +#: ../src/interface.c:659 ../src/interface.c:2067 +msgid "Insert _Multiline Comment" +msgstr "Inxertar Comentariu _Multillinia" + +#: ../src/interface.c:663 ../src/interface.c:2071 +msgid "Insert _GPL Notice" +msgstr "Inxertar avisu de llicencia _GPL" + +#: ../src/interface.c:667 ../src/interface.c:2075 +msgid "Insert _BSD License Notice" +msgstr "Inxertar avisu de llicencia _BSD" + +#: ../src/interface.c:671 ../src/interface.c:2079 +msgid "Insert Dat_e" +msgstr "Inxertar F_echa" + +#: ../src/interface.c:685 ../src/interface.c:2093 +msgid "_Insert \"include <...>\"" +msgstr "_Inxertar \"include <...>\"" + +#: ../src/interface.c:704 +msgid "Preference_s" +msgstr "Preferencie_s" + +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "_Preferencies de plugins" + +#: ../src/interface.c:720 +msgid "_Search" +msgstr "_Guetar" + +#: ../src/interface.c:731 +msgid "Find _Next" +msgstr "Guetar _Sigiuente" + +#: ../src/interface.c:735 +msgid "Find _Previous" +msgstr "Guetar _Anterior" + +#: ../src/interface.c:739 +msgid "Find in F_iles" +msgstr "Guetar n'Arch_ivos" + +#: ../src/interface.c:743 ../src/search.c:551 +msgid "_Replace" +msgstr "_Reemplazar" + +#: ../src/interface.c:756 +msgid "Find _Selected" +msgstr "Guetar _Seleición" + +#: ../src/interface.c:760 +msgid "Find Pre_vious Selected" +msgstr "Guetar Seleición Pre_via" + +#: ../src/interface.c:769 +msgid "Next _Message" +msgstr "Prósimo _Mensax" + +#: ../src/interface.c:773 +msgid "Pr_evious Message" +msgstr "Mensax Ant_erior" + +#: ../src/interface.c:782 ../src/interface.c:2145 +msgid "_Go to Line" +msgstr "D_ir a la Llínia" + +#: ../src/interface.c:797 +msgid "Change _Font" +msgstr "Camudar _Fonte" + +#: ../src/interface.c:810 +msgid "To_ggle All Additional Widgets" +msgstr "Am_osar/Anubrir tolos paneles adicionales" + +#: ../src/interface.c:814 +msgid "Full_screen" +msgstr "Pantalla _completa" + +#: ../src/interface.c:818 +msgid "Show Message _Window" +msgstr "Amosar _Ventanu de Mensaxes" + +#: ../src/interface.c:823 +msgid "Show _Toolbar" +msgstr "Amosar Barra de _Ferramientes" + +#: ../src/interface.c:828 +msgid "Show Side_bar" +msgstr "Amosar _Barra llateral" + +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 +msgid "Editor" +msgstr "Editor" + +#: ../src/interface.c:840 +msgid "Show _Markers Margin" +msgstr "Amosar les _Marques de Marxenes" + +#: ../src/interface.c:845 +msgid "Show _Line Numbers" +msgstr "Amosar Númberos de _Llínia" + +#: ../src/interface.c:850 +msgid "Show _White Space" +msgstr "Amosar Espacios en Blancu" + +#: ../src/interface.c:854 +msgid "Show Line _Endings" +msgstr "Amosar Final de Llín_ia" + +#: ../src/interface.c:858 +msgid "Show _Indentation Guides" +msgstr "Amosar Guíes d'_Identación" + +#: ../src/interface.c:879 +msgid "_Document" +msgstr "_Documentu" + +#: ../src/interface.c:886 +msgid "_Line Wrapping" +msgstr "_Cortáu de Llínies" + +#: ../src/interface.c:891 +msgid "Line _Breaking" +msgstr "_Dixebráu de llínia" + +#: ../src/interface.c:895 +msgid "_Auto-indentation" +msgstr "Formateu de Códigu _Automáticu" + +#: ../src/interface.c:900 +msgid "In_dent Type" +msgstr "Triba _de formateu" + +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 +msgid "_Tabs" +msgstr "_Tabulaciones" + +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 +msgid "_Spaces" +msgstr "E_spacios" + +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 +msgid "T_abs and Spaces" +msgstr "S_angríes y Espacios" + +#: ../src/interface.c:930 +msgid "Read _Only" +msgstr "S_ólo Llectura" + +#: ../src/interface.c:934 +msgid "_Write Unicode BOM" +msgstr "_Escribir el BOM Unicode" + +#: ../src/interface.c:943 +msgid "Set File_type" +msgstr "Escoyer _Triba de Ficheru" + +#: ../src/interface.c:953 +msgid "Set _Encoding" +msgstr "Escoyer _Codificación" + +#: ../src/interface.c:963 +msgid "Set Line E_ndings" +msgstr "Escoyer Termi_naciones de Llínia" + +#: ../src/interface.c:970 +msgid "Convert and Set to _CR/LF (Win)" +msgstr "Convertir a, y Escoyer _CR/LF (Win)" + +#: ../src/interface.c:976 +msgid "Convert and Set to _LF (Unix)" +msgstr "Convertir a, y Escoyer _LF (Unix)" + +#: ../src/interface.c:982 +msgid "Convert and Set to CR (_Mac)" +msgstr "Convertir a, y Escoyer CR (_Mac)" + +#: ../src/interface.c:993 +msgid "_Strip Trailing Spaces" +msgstr "_Esborrar espacios al final" + +#: ../src/interface.c:997 +msgid "_Replace Tabs by Spaces" +msgstr "_Reemplazar Tabulaciones por Espacios" + +#: ../src/interface.c:1001 +msgid "Replace Spaces b_y Tabs" +msgstr "Reemplazar Espacios por San_gríes" + +#: ../src/interface.c:1010 +msgid "_Fold All" +msgstr "_Replegar Too" + +#: ../src/interface.c:1014 +msgid "_Unfold All" +msgstr "_Estenderexar Too" + +#: ../src/interface.c:1023 +msgid "Remove _Markers" +msgstr "Esborrar _Marques" + +#: ../src/interface.c:1027 +msgid "Remove Error _Indicators" +msgstr "Esborrar los _Indicadores de Fallos" + +#: ../src/interface.c:1031 +msgid "_Project" +msgstr "_Proyeutu" + +#: ../src/interface.c:1038 +msgid "_New" +msgstr "_Nuevu" + +#: ../src/interface.c:1046 +msgid "_Open" +msgstr "_Abrir" + +#: ../src/interface.c:1054 +msgid "_Recent Projects" +msgstr "Proyeutos _Recientes" + +#: ../src/interface.c:1058 +msgid "_Close" +msgstr "_Zarrar" + +#: ../src/interface.c:1079 +msgid "_Tools" +msgstr "_Ferramientes" + +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Recargar Configuración" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Ficheros de C_onfiguración" + +#: ../src/interface.c:1107 +msgid "_Color Chooser" +msgstr "Seleutor de _Collor" + +#: ../src/interface.c:1115 +msgid "_Word Count" +msgstr "C_untar Pallabres" + +#: ../src/interface.c:1119 +msgid "Load Ta_gs" +msgstr "Cargar Ta_gs" + +#: ../src/interface.c:1123 ../src/interface.c:1130 +msgid "_Help" +msgstr "A_ida" + +#: ../src/interface.c:1138 +msgid "_Website" +msgstr "Sitiu _Web" + +#: ../src/interface.c:1142 +msgid "_Keyboard Shortcuts" +msgstr "_Ataxos de Tecláu" + +#: ../src/interface.c:1146 +msgid "_Debug Messages" +msgstr "Mensaxes de _Depuración" + +#: ../src/interface.c:1185 ../src/sidebar.c:130 +msgid "Symbols" +msgstr "Símbolos" + +#: ../src/interface.c:1199 +msgid "Documents" +msgstr "Documentos" + +#: ../src/interface.c:1235 +msgid "Status" +msgstr "Estáu" + +#: ../src/interface.c:1249 +msgid "Compiler" +msgstr "Compilador" + +#: ../src/interface.c:1264 +msgid "Messages" +msgstr "Mensaxes" + +#: ../src/interface.c:1277 +msgid "Scribble" +msgstr "Borrador" + +#: ../src/interface.c:1887 +#, fuzzy +msgid "_Toolbar Preferences" +msgstr "_Preferencies de plugins" + +#: ../src/interface.c:1900 +msgid "_Hide Toolbar" +msgstr "_Anubrir la Barra de Ferramientes" + +#: ../src/interface.c:2112 +msgid "Find _Usage" +msgstr "Atopar _Usu" + +#: ../src/interface.c:2120 +msgid "Find _Document Usage" +msgstr "Atopar Usu del _Documentu" + +#: ../src/interface.c:2128 +msgid "Go to _Tag Definition" +msgstr "Dir a la Definición del _Tag" + +#: ../src/interface.c:2132 +msgid "Go to T_ag Declaration" +msgstr "Dir a la Declaración del T_ag" + +#: ../src/interface.c:2136 +msgid "Conte_xt Action" +msgstr "Aición Conte_stual" + +#: ../src/interface.c:2669 ../src/keybindings.c:387 +msgid "Preferences" +msgstr "Preferencies" + +#: ../src/interface.c:2705 +msgid "Load files from the last session" +msgstr "Cargar ficheros de la cabera sesión" + +#: ../src/interface.c:2708 +msgid "Opens at startup the files from the last session" +msgstr "Abre nel entamu los ficheros de la cabera sesion" + +#: ../src/interface.c:2710 +msgid "Load virtual terminal support" +msgstr "Cargar emulación de terminal virtual" + +#: ../src/interface.c:2712 +msgid "" +"Whether the virtual terminal emulation (VTE) should be loaded at startup, " +"disable it if you do not need it" +msgstr "" +"Cuando la emulación de la terminal virtual (VTE) debiera cargase al entamu, " +"desactivalu si nun lo necesites" + +#: ../src/interface.c:2714 +msgid "Enable plugin support" +msgstr "Activar sofitu de complementos" + +#: ../src/interface.c:2718 +msgid "Startup" +msgstr "Entamu" + +#: ../src/interface.c:2737 +msgid "Save window position and geometry" +msgstr "Guardar la posición de la ventana y la so xeometría" + +#: ../src/interface.c:2740 +msgid "Saves the window position and geometry and restores it at the start" +msgstr "" +"Guardar la posición de la ventana y la so xeometría y restableceles al entamu" + +#: ../src/interface.c:2742 +msgid "Confirm exit" +msgstr "Confirmar salida" + +#: ../src/interface.c:2745 +msgid "Shows a confirmation dialog on exit" +msgstr "Pidir confirmación al salir" + +#: ../src/interface.c:2747 +msgid "Shutdown" +msgstr "Zarráu" + +#: ../src/interface.c:2768 +msgid "Startup path:" +msgstr "Camín d'aniciu:" + +#: ../src/interface.c:2780 +msgid "" +"Path to start in when opening or saving files. Must be an absolute path. " +"Leave blank to use the current working directory." +msgstr "" +"Camín a aniciar cuando s'abren o guarden ficheros. Debe ser un camín " +"absolutu. Dexar en blancu pa usar el direutoriu de trabayu actual." + +#: ../src/interface.c:2793 +msgid "Project files:" +msgstr "Ficheros del proyeutu:" + +#: ../src/interface.c:2805 +msgid "Path to start in when opening project files" +msgstr "Camín a aniciar cuando s'abran ficheros de proyeutos" + +#: ../src/interface.c:2818 +msgid "Extra plugin path:" +msgstr "Camín adicional pa plugins:" + +#: ../src/interface.c:2830 +msgid "" +"Geany looks by default in the global installation path and in the " +"configuration directory. The path entered here will be searched additionally " +"for plugins. Leave blank to disable." +msgstr "" +"De mou predetermináu, Geany restola nel camín global d'instalación y nel " +"direutoriu de configuración. Nel camín qu'introduzas equí van guetase " +"adicionalmente plugins. Déxalu en blancu pa desactivalu." + +#: ../src/interface.c:2843 +msgid "Paths" +msgstr "Caminos" + +#: ../src/interface.c:2848 +msgid "Startup" +msgstr "Anicíu" + +#: ../src/interface.c:2871 +msgid "Beep on errors or when compilation has finished" +msgstr "Alerta sonora pa fallos o la finalización de la compilación" + +#: ../src/interface.c:2874 +msgid "" +"Whether to beep if an error occurred or when the compilation process has " +"finished" +msgstr "cuando pitar si pasó un fallu o cuando'l procesu de compilación finé" + +#: ../src/interface.c:2876 +msgid "Switch to status message list at new message" +msgstr "Camudar a la llista de mensaxes d'estáu cuando heba un nuevu mensaxe" + +#: ../src/interface.c:2879 +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives" +msgstr "" +"Camudar a la llingüeta de mensaxes d'estáu (no cimero de la ventana de " +"llingüetes) si ye un mensaxe d'estáu nuevu" + +#: ../src/interface.c:2881 +msgid "Suppress status messages in the status bar" +msgstr "Desaniciar mensaxes de estáu na barra d'estáu" + +#: ../src/interface.c:2884 +msgid "" +"Removes all messages from the status bar. The messages are still displayed " +"in the status messages window." +msgstr "" +"Desaniciar tolos mensaxes de la barra d'estáu. Los mensaxes son amosaos de " +"toes formes nel ventanu de mensaxes d'estáu." + +#: ../src/interface.c:2886 +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "Enfocar automáticamente los widgets (el focu sigue al mur)" + +#: ../src/interface.c:2889 +msgid "" +"Gives the focus automatically to widgets below the mouse cursor. Works for " +"the main editor widget, the scribble, the toolbar search and goto line " +"fields and the VTE." +msgstr "" +"Dar focu automáticamente a los paneles embaxo del cursor del mur. Furrula " +"pal panel d'edición principal, el borrador, la barra de guetes, el campu dir " +"a y la VTE." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 +msgid "Miscellaneous" +msgstr "Miscelaneos" + +#: ../src/interface.c:2915 +msgid "Always wrap search and hide the Find dialog" +msgstr "Siempre dar la vuelta cola gueta y anubrir el dialogu de Guetar" + +#: ../src/interface.c:2918 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Axustar siempre la gueta alrodiu del documentu y anubrir el diálogu d'Atopar " +"dempués de calcar Atopar Siguiente/Previu" + +#: ../src/interface.c:2920 +msgid "Use the current word under the cursor for Find dialogs" +msgstr "" +"Usar la pallabra actualmente embaxu del cursor pa los diálogos de Guetar" + +#: ../src/interface.c:2923 +msgid "" +"Use current word under the cursor when opening the Find, Find in Files or " +"Replace dialog and there is no selection" +msgstr "" +"Usar pallabra actual embaxu'l cursor cuando abriendo Atopar, Atopar en " +"Ficheros o Reemplazar diálogu y nun hai seleición" + +#: ../src/interface.c:2925 +msgid "Use the current file's directory for Find in Files" +msgstr "Usar el direutoriu del ficheru actual pa Guetar en Ficheros" + +#: ../src/interface.c:2929 +msgid "Search" +msgstr "Guetar" + +#: ../src/interface.c:2948 +msgid "Use project-based session files" +msgstr "Usar ficheros de sesión por proyeutos" + +#: ../src/interface.c:2951 +msgid "" +"Whether to store a project's session files and open them when re-opening the " +"project" +msgstr "" +"Cuando almacenar los ficheros d'una sesión de proyeutu y abrilos al reabrir " +"el proyeutu" + +#: ../src/interface.c:2953 +msgid "Store project file inside the project base directory" +msgstr "" +"Guardar el ficheru de proyeutu dientro del direutoriu base del proyeutu" + +#: ../src/interface.c:2956 +msgid "" +"When enabled, a project file is stored by default inside the project base " +"directory when creating new projects instead of one directory above the base " +"directory. You can still change the path of the project file in the New " +"Project dialog." +msgstr "" +"Cuando ta activáu, y en creando nuevos proyeutos, atróxase de mou " +"predetermináu un ficheru de proyeutu dientro'l direutoriu base del proyeutu " +"en cuenta de facelo nun direutoriu perriba del base. Entá podrás camudar el " +"camín del ficheru de proyeutu nel diálogu Nuevu Proyeutu." + +#: ../src/interface.c:2958 +msgid "Projects" +msgstr "Proyeutos" + +#: ../src/interface.c:2963 +msgid "Miscellaneous" +msgstr "Varios" + +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 +msgid "General" +msgstr "Xeneral" + +#: ../src/interface.c:3004 +msgid "Show symbol list" +msgstr "Amosar la llista de símbolos" + +#: ../src/interface.c:3007 +msgid "Toggle the symbol list on and off" +msgstr "Amosar/anubrir la llista de símbolos" + +#: ../src/interface.c:3009 +msgid "Show documents list" +msgstr "Amosar la llista de documentos" + +#: ../src/interface.c:3012 +msgid "Toggle the documents list on and off" +msgstr "Amosar/anubrir la llista de documentos" + +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Amosar _Barra llateral" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Posición:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Manzorga" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Mandrecha" + +#: ../src/interface.c:3039 +msgid "Sidebar" +msgstr "Barra llateral" + +#: ../src/interface.c:3060 +msgid "Symbol list:" +msgstr "Llista de símbolos:" + +#: ../src/interface.c:3067 ../src/interface.c:3197 +msgid "Message window:" +msgstr "Ventanu de mensaxes:" + +#: ../src/interface.c:3074 ../src/interface.c:3233 +msgid "Editor:" +msgstr "Editor:" + +#: ../src/interface.c:3086 +msgid "Sets the font for the message window" +msgstr "Seleiciona la fonte pal ventanu de mensaxes" + +#: ../src/interface.c:3094 +msgid "Sets the font for the symbol list" +msgstr "Seleiciona la fonte pa la llista de símbolos" + +#: ../src/interface.c:3102 +msgid "Sets the editor font" +msgstr "Seleiciona la fonte del editor" + +#: ../src/interface.c:3104 +msgid "Fonts" +msgstr "Fontes" + +#: ../src/interface.c:3123 +msgid "Show editor tabs" +msgstr "Amosar llingüetes del editor" + +#: ../src/interface.c:3127 +msgid "Show close buttons" +msgstr "Amosar botónes pa zarrar" + +#: ../src/interface.c:3130 +msgid "" +"Shows a small cross button in the file tabs to easily close files when " +"clicking on it (requires restart of Geany)" +msgstr "" +"Amosa una pequeña cruz nes llingüetes de ficheru pa poder zarrales " +"fácilmente (requier reaniciar Geany)" + +#: ../src/interface.c:3136 +msgid "Placement of new file tabs:" +msgstr "Ubicación de les llingüetes de ficheros nuevos:" + +#: ../src/interface.c:3152 +msgid "File tabs will be placed on the left of the notebook" +msgstr "" +"Les llingüetes de ficheros serán ubicaes a la manzorga de la llista de " +"pestañes" + +#: ../src/interface.c:3160 +msgid "File tabs will be placed on the right of the notebook" +msgstr "" +"Les llingüetes de ficheros serán ubicaes a la mandrecha de la llista de " +"llingüetes" + +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Grabar el ficheru actual" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 +msgid "Double-clicking hides all additional widgets" +msgstr "Calcar dos vegaes anubre tolos widgets adicionales" + +#: ../src/interface.c:3174 +msgid "Calls the View->Toggle All Additional Widgets command" +msgstr "Llamar a la Vista->Camuda'l comandu de Tolos los Widgets Adicionales" + +#: ../src/interface.c:3176 +msgid "Editor tabs" +msgstr "Llingüetes d'edición" + +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 +msgid "Top" +msgstr "Enrriba" + +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 +msgid "Bottom" +msgstr "Embaxu" + +#: ../src/interface.c:3215 +msgid "Sidebar:" +msgstr "Barra llateral:" + +#: ../src/interface.c:3251 +msgid "Tab positions" +msgstr "Posición de llingüetes:" + +#: ../src/interface.c:3270 +msgid "Show status bar" +msgstr "Amosar barra d'estáu" + +#: ../src/interface.c:3273 +msgid "Whether to show the status bar at the bottom of the main window" +msgstr "Cuando amosar la barra d'estáu no cimero de la ventana principal" + +#: ../src/interface.c:3280 ../src/prefs.c:1527 +msgid "Interface" +msgstr "Interface" + +#: ../src/interface.c:3311 +msgid "Show T_oolbar" +msgstr "Amosar la _Barra de Ferramientes" + +#: ../src/interface.c:3315 +msgid "_Append Toolbar to the Menu" +msgstr "A_mestar la Barra de Ferramientes al Menú" + +#: ../src/interface.c:3318 +msgid "Pack the toolbar to the main menu to save vertical space" +msgstr "" +"Empaquetar la barra de ferramientes nel menú p'aforrar espaciu vertical" + +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Personalizar la Barra de Ferramientes" + +#: ../src/interface.c:3360 +#, fuzzy +msgid "System _Default" +msgstr "_Defeutu" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Imáxenes _y testu" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Sólo _imáxenes" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Sólo _testu" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Fontes" + +#: ../src/interface.c:3413 +#, fuzzy +msgid "S_ystem Default" +msgstr "_Defeutu" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Iconos _pequeños" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Iconos mui pequeños" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Iconos _grandes" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Tamañu:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra de Ferramientes" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 +msgid "Toolbar" +msgstr "Barra de Ferramientes" + +#: ../src/interface.c:3482 +msgid "Line wrapping" +msgstr "Cortáu de llínias" + +#: ../src/interface.c:3485 +msgid "" +"Wrap the line at the window border and continue it on the next line. Note: " +"line wrapping has a high performance cost for large documents so should be " +"disabled on slow machines." +msgstr "" +"Cortar la llínia nel borde de la ventana y continuala na llínia siguiente. " +"Nota: esta opción tien un gran costu en velocidá pa documentos grandes asina " +"que debería ser desactivada en maquines llentes." + +#: ../src/interface.c:3487 +msgid "Enable \"smart\" home key" +msgstr "Activar la tecla anicio \"intelixente\"" + +#: ../src/interface.c:3490 +msgid "" +"When \"smart\" home is enabled, the HOME key will move the caret to the " +"first non-blank character of the line, unless it is already there, it moves " +"to the very beginning of the line. When this feature is disabled, the HOME " +"key always moves the caret to the start of the current line, regardless of " +"its current position." +msgstr "" +"Cuando la tecla d'anicio \"intelixente\" te activa, la tecla ANICIU moverá'l " +"cursor al primer caráuter non blancu de la llinia, a menos que ya té elli, " +"en cuyo casu muevelu al principiu absolutu de la llinia. Cuando esta " +"funcionalidá ta desactivada, la tecla ANICIU siempre mueve'l cursor al " +"principiu de la llinia actual, independientemente de la so posición actual." + +#: ../src/interface.c:3492 +msgid "Disable Drag and Drop" +msgstr "Desactivar Arrastrar y Soltar (Drag and Drop)" + +#: ../src/interface.c:3495 +msgid "" +"Disable drag and drop completely in the editor window so you can't drag and " +"drop any selections within or outside of the editor window" +msgstr "" +"Desactiva completamente arrastrar y soltar na ventana del editor, asina que " +"nun puedes soltar y arrastrar nenguna seleición dientro o fuera de la " +"ventana del editor" + +#: ../src/interface.c:3497 +msgid "Enable folding" +msgstr "Activar plegáu" + +#: ../src/interface.c:3500 +msgid "Whether to enable folding the code" +msgstr "Si activar el plegáu de códigu" + +#: ../src/interface.c:3502 +msgid "Fold/unfold all children of a fold point" +msgstr "Replegar/Desplegar tolos fíos d'un puntu de plegáu" + +#: ../src/interface.c:3505 +msgid "" +"Fold or unfold all children of a fold point. By pressing the Shift key while " +"clicking on a fold symbol the contrary behavior is used." +msgstr "" +"Plegar o desplegar tolos fíos d'un puntu de pliegu. N'apertando la tecla " +"Mayúscules demientres se calca nun símbolu de pliegu, algamaráse'l " +"comportamientu contrariu." + +#: ../src/interface.c:3507 +msgid "Use indicators to show compile errors" +msgstr "Usar indicadores p'amosar los fallos de compilación" + +#: ../src/interface.c:3510 +msgid "" +"Whether to use indicators (a squiggly underline) to highlight the lines " +"where the compiler found a warning or an error" +msgstr "" +"Cuando usar indicadores (una llínia ondulada) pa marcar les llínies cuando'l " +"compilador atopa un avisu o un fallu" + +#: ../src/interface.c:3512 +msgid "Newline strips trailing spaces" +msgstr "Una nueva llinia esborra espacios estra al final" + +#: ../src/interface.c:3515 +msgid "Enable newline to strip the trailing spaces on the previous line" +msgstr "" +"Activa nueva llínia curtiando los espacios sobrantes na llínia siguiente" + +#: ../src/interface.c:3521 +msgid "Line breaking column:" +msgstr "Columna de división de llínia:" + +#: ../src/interface.c:3535 +msgid "Comment toggle marker:" +msgstr "Activar/Desactivar marcador de comentarios:" + +#: ../src/interface.c:3542 +msgid "" +"A string which is added when toggling a line comment in a source file, it is " +"used to mark the comment as toggled." +msgstr "" +"Una cadena la cual ye amestada cuando s'alterna una llínia de comentariu nel " +"ficheru fonte, ello ye usáu pa marcar los comentarios como camudaos." + +#: ../src/interface.c:3544 +msgid "Features" +msgstr "Característiques" + +#: ../src/interface.c:3549 +msgid "Features" +msgstr "Característiques" + +#: ../src/interface.c:3582 ../src/interface.c:5194 +msgid "Auto-indent mode:" +msgstr "Mou de formatéu de códigu:" + +#: ../src/interface.c:3595 ../src/interface.c:5207 +msgid "Basic" +msgstr "Básicu" + +#: ../src/interface.c:3596 ../src/interface.c:5208 +msgid "Current chars" +msgstr "Caráuter actual" + +#: ../src/interface.c:3597 ../src/interface.c:5209 +msgid "Match braces" +msgstr "Concasando coles llaves correspondientes" + +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 +msgid "Type:" +msgstr "Triba:" + +#: ../src/interface.c:3606 ../src/interface.c:5218 +msgid "Width:" +msgstr "Anchu:" + +#: ../src/interface.c:3619 ../src/interface.c:5231 +msgid "The width in chars of a single indent" +msgstr "L'anchu en carauteres d'una indentación simple" + +#: ../src/interface.c:3629 ../src/interface.c:5241 +msgid "Use spaces when inserting indentation" +msgstr "Usar espacios cuando s'inxerte la identación" + +#: ../src/interface.c:3638 ../src/interface.c:5250 +msgid "Use one tab per indent" +msgstr "Usar una tabulación por identación" + +#: ../src/interface.c:3647 ../src/interface.c:5259 +msgid "" +"Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "" +"Usar espacios si la identación ye menor que l'anchu d'una sangría, sinon " +"usar dambos" + +#: ../src/interface.c:3656 ../src/interface.c:5268 +msgid "" +"Whether to detect the indentation type from file contents when a file is " +"opened" +msgstr "" +"Cuando deteutar la triba d'indentación dende'l conteníu d'un ficheru cuando " +"ye abiertu" + +#: ../src/interface.c:3658 +msgid "Tab key indents" +msgstr "Indentación de la tecla Tabulación" + +#: ../src/interface.c:3661 +msgid "" +"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "" +"Calcar tab/shift-tab indenta/desidenta en llugar d'insertar un carauter de " +"tabulación" + +#: ../src/interface.c:3663 +msgid "Indentation" +msgstr "Sangría" + +#: ../src/interface.c:3668 ../src/interface.c:5270 +msgid "Indentation" +msgstr "Indentáu" + +#: ../src/interface.c:3691 +msgid "Snippet completion" +msgstr "Completáu de construcciones" + +#: ../src/interface.c:3694 +msgid "" +"Type a defined short character sequence and complete it to a more complex " +"string using a single keypress" +msgstr "" +"Escribir la secuencia d'un carauter curtíu definíu y completalu a una cadena " +"más complexa usando pulsación de telcles simple" + +#: ../src/interface.c:3696 +msgid "XML tag autocompletion" +msgstr "Completar etiquetes XML automáticamente" + +#: ../src/interface.c:3699 +msgid "Automatic completion and closing of XML tags (includes HTML tags)" +msgstr "" +"Completáu y zarráu automáticu d'etiquetes XML abiertes (incluí etiquetes " +"HTML)" + +#: ../src/interface.c:3701 +msgid "Automatic continuation of multi-line comments" +msgstr "Continuación automática de comentarios multi-llínia" + +#: ../src/interface.c:3704 +msgid "" +"Continue automatically multi-line comments in languages like C, C++ and Java " +"when a new line is entered inside such a comment" +msgstr "" +"Siguir automáticamente los comentarios multillínia en llingüaxes como C, C++ " +"y Java cuando una nueva llínia seya inxertada en dicho comentariu" + +#: ../src/interface.c:3706 +msgid "Autocomplete symbols" +msgstr "Completar símbolos automáticamente" + +#: ../src/interface.c:3709 +msgid "" +"Automatic completion of known symbols in open files (function names, global " +"variables, ...)" +msgstr "" +"Completáu automáticu de símbolos conocíos en ficheros abiertos (nomes de " +"funciones, variables globales, ...)" + +#: ../src/interface.c:3711 +msgid "Autocomplete all words in document" +msgstr "Completar toles pallabres del documentu automáticamente" + +#: ../src/interface.c:3715 +msgid "Drop rest of word on completion" +msgstr "Omitir el restu de la pallabra tres completar" + +#: ../src/interface.c:3725 +msgid "Max. symbol name suggestions:" +msgstr "Númberu de suxerencies másimu pa un símbolu:" + +#: ../src/interface.c:3732 +msgid "Completion list height:" +msgstr "Largu de la llista de completáu:" + +#: ../src/interface.c:3739 +msgid "Characters to type for autocompletion:" +msgstr "Carauteres a tecliar pa completar automáticamente:" + +#: ../src/interface.c:3752 +msgid "" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" +msgstr "" +"La cantidá de carauteres necesarios p'amosar la llista de símbolos pa " +"completar automáticamente" + +#: ../src/interface.c:3761 +msgid "Display height in rows for the autocompletion list" +msgstr "Altor, en files, del visor pa la llista de completáu automáticu" + +#: ../src/interface.c:3770 +msgid "Maximum number of entries to display in the autocompletion list" +msgstr "Númberu máximu d'entraes p'amosar na llista de completáu automáticu" + +#: ../src/interface.c:3773 +msgid "Completions" +msgstr "Completaos" + +#: ../src/interface.c:3792 +msgid "Parenthesis ( )" +msgstr "Paréntesis ( )" + +#: ../src/interface.c:3797 +msgid "Auto-close parenthesis when typing an opening one" +msgstr "Zarrar automáticamente los paréntesis cuando s'abra un" + +#: ../src/interface.c:3799 +msgid "Single quotes ' '" +msgstr "Comilles simples ' '" + +#: ../src/interface.c:3804 +msgid "Auto-close simple quote when typing an opening one" +msgstr "Zarrar automáticamente los apóstrofes cuando s'abra un" + +#: ../src/interface.c:3806 +msgid "Curly brackets { }" +msgstr "Llaves { }" + +#: ../src/interface.c:3811 +msgid "Auto-close curly bracket when typing an opening one" +msgstr "Zarrar automáticamente les llaves cuando s'abra una" + +#: ../src/interface.c:3813 +msgid "Square brackets [ ]" +msgstr "Corchetes [ ]" + +#: ../src/interface.c:3818 +msgid "Auto-close square-bracket when typing an opening one" +msgstr "Zarrar automáticamente los corchetes en tecliando ún d'apertura" + +#: ../src/interface.c:3820 +msgid "Double quotes \" \"" +msgstr "Comilles \" \"" + +#: ../src/interface.c:3825 +msgid "Auto-close double quote when typing an opening one" +msgstr "Zarrar automáticamente les comilles cuando s'abra una" + +#: ../src/interface.c:3827 +msgid "Auto-close quotes and brackets" +msgstr "Zarrar automáticamente los corchetes y comilles" + +#: ../src/interface.c:3832 +msgid "Completions" +msgstr "Completaos" + +#: ../src/interface.c:3855 +msgid "Invert syntax highlighting colors" +msgstr "Invierte los collores de resaltáu de sintasis" + +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "" +"Invertir tolos colores, por defeutu usa testu blancu sobre fondu prietu" + +#: ../src/interface.c:3860 +msgid "Show indentation guides" +msgstr "Amosar guíes de formatéu automáticu de códigu" + +#: ../src/interface.c:3863 +msgid "Shows small dotted lines to help you to use the right indentation" +msgstr "" +"Amosar pequeñes llínies de puntos p'aidar nel usu de la indentación correuta" + +#: ../src/interface.c:3865 +msgid "Show white space" +msgstr "Amosar espacios en blancu" + +#: ../src/interface.c:3868 +msgid "Marks spaces with dots and tabs with arrows" +msgstr "Marcar espacios con puntos y tabuladores con fleches" + +#: ../src/interface.c:3870 +msgid "Show line endings" +msgstr "Amosar terminaciones de llínia" + +#: ../src/interface.c:3873 +msgid "Shows the line ending character" +msgstr "Amuesa'l caráuter de fin de llinia" + +#: ../src/interface.c:3875 +msgid "Show line numbers" +msgstr "Amosar númberu de llínia" + +#: ../src/interface.c:3878 +msgid "Shows or hides the Line Number margin" +msgstr "Amosar o anubrir la Numberación de Llínia nel marxe" + +#: ../src/interface.c:3880 +msgid "Show markers margin" +msgstr "Amosar marcadores nel marxe" + +#: ../src/interface.c:3883 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines" +msgstr "" +"Amosar o anubrir nel pequeñu marxe de la mandrecha los númberos de llínia, " +"los cuales son usaos pa marcar llínies" + +#: ../src/interface.c:3885 +msgid "Stop scrolling at last line" +msgstr "Parar desplazamientu na cabera llínia" + +#: ../src/interface.c:3888 +msgid "Whether to stop scrolling one page past the last line of a document" +msgstr "" +"Cuando detener el desplazamiento d'una páxina pasada de la cabera llínia " +"d'un documentu" + +#: ../src/interface.c:3890 +msgid "Display" +msgstr "Amosar" + +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Compañia:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "" + +#: ../src/interface.c:3937 +msgid "Sets the color of the long line marker" +msgstr "Seleiciona'l collor del marcador de llínies llargues" + +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 +msgid "Color Chooser" +msgstr "Selector de collor" + +#: ../src/interface.c:3946 +msgid "" +"The long line marker is a thin vertical line in the editor, it helps to mark " +"long lines, or as a hint to break the line. Set this value to a value " +"greater than 0 to specify the column where it should appear." +msgstr "" +"El marcador de llínia llarga ye una fina llínia vertical nel editor, qu'aida " +"a marcar llínies llarges, o un avisu a dixebrar la llínia. Afitar esti valor " +"a un valor más grande que 0 especifica la columna onde debiere aparecer." + +#: ../src/interface.c:3956 +msgid "Line" +msgstr "Llínia" + +#: ../src/interface.c:3959 +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)" +msgstr "" +"Amosar una llínia vertical nel editor na posición indicada (ver más abaxo)" + +#: ../src/interface.c:3963 +msgid "Background" +msgstr "Fondu" + +#: ../src/interface.c:3966 +msgid "" +"The background color of characters after the given cursor position (see " +"below) changed to the color set below, (this is recommended if you use " +"proportional fonts)" +msgstr "" +"Camudó'l collor de carauteres del fondu dempués de la posición dada (ver " +"embaxu) al collor afitáu enrriba, (esto ye recomendáu si uses fontes " +"proporcionales)" + +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Activar" + +#: ../src/interface.c:3976 ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Marcador de llínies llargues" + +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Desactiváu" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Esborra los espacios y tabulaciones al final de les llínies" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Caminos a les ferramientes" + +#: ../src/interface.c:4021 +msgid "Display" +msgstr "Amosar" + +#: ../src/interface.c:4052 +msgid "Open new documents from the command-line" +msgstr "Abre nuevos documentos dende la llínia de comandos" + +#: ../src/interface.c:4055 +msgid "Start a new file for each command-line filename that doesn't exist" +msgstr "" +"Anicia un nuevu ficheru pa cada nome de ficheru na llínia de comandu que nun " +"existe" + +#: ../src/interface.c:4069 +msgid "Default end of line characters:" +msgstr "Carauteres de final de llínia predeterminaos:" + +#: ../src/interface.c:4076 +msgid "New files" +msgstr "Ficheros nuevos" + +#: ../src/interface.c:4099 +msgid "Default encoding (new files):" +msgstr "Codificación por omisión (pa ficheros nuevos):" + +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Afita la codificación por defeutu na criación de nuevos ficheros" + +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Usar una codificación fixa al abrir ficheros non Unicode" + +#: ../src/interface.c:4116 +msgid "" +"This option disables the automatic detection of the file encoding when " +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" +msgstr "" +"Esta opción desactiva la deteción automática de la codificación de ficheros " +"cuando son abiertos ficheros non Unicode y abre'l ficheru cola codificación " +"especificada (usualmente non necesaria)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codificación por omisión (pa ficheros non Unicode):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Afita la codificación por defeutu al abrir ficheros existentes non Unicode" + +#: ../src/interface.c:4136 +msgid "Encodings" +msgstr "Codificaciones" + +#: ../src/interface.c:4155 +msgid "Ensure new line at file end" +msgstr "Asegurar terminación de llínia al final del ficheru" + +#: ../src/interface.c:4158 +msgid "Ensures that at the end of the file is a new line" +msgstr "Asegura que haya una terminación de llíniaal final del ficheru" + +#: ../src/interface.c:4160 +msgid "Strip trailing spaces and tabs" +msgstr "Eliminar espacios y tabuladores al final de llínia" + +#: ../src/interface.c:4163 +msgid "Removes trailing spaces and tabs and the end of lines" +msgstr "Esborra los espacios y tabulaciones al final de les llínies" + +#: ../src/interface.c:4165 ../src/keybindings.c:522 +msgid "Replace tabs by space" +msgstr "Reemplazar tabulaciones por espacios" + +#: ../src/interface.c:4168 +msgid "Replaces all tabs in document by spaces" +msgstr "Reemplaza tolos tabuladores nel documentu por espacios" + +#: ../src/interface.c:4170 +msgid "Saving files" +msgstr "Grabando ficheros" + +#: ../src/interface.c:4195 +msgid "Recent files list length:" +msgstr "Llonxitú de la llista de ficheros recientes:" + +#: ../src/interface.c:4209 +msgid "Specifies the number of files which are stored in the Recent files list" +msgstr "" +"Indica'l númberu de ficheros que serán almacenaos na llista de Ficheros " +"Recientes" + +#: ../src/interface.c:4213 +msgid "Disk check timeout:" +msgstr "Venció'l tiempu de comprobación de discu:" + +#: ../src/interface.c:4226 +msgid "" +"How often to check for changes to document files on disk, in seconds. Zero " +"disables checking." +msgstr "" +"Cuando seguío verificar cambios a los ficheros de documentos nel discu, en " +"segundos. Cero desactiva la verificación." + +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 +msgid "Files" +msgstr "_Ficheros" + +#: ../src/interface.c:4268 +msgid "Terminal:" +msgstr "Terminal:" + +#: ../src/interface.c:4275 +msgid "Browser:" +msgstr "Restolador:" + +#: ../src/interface.c:4287 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Un emulador de terminal como xterm, gnome-terminal o konsole (tien " +"qu'aceptar l'argumentu -e)" + +#: ../src/interface.c:4294 +msgid "Path (and possibly additional arguments) to your favorite browser" +msgstr "" +"Camín (y posiblemente argumentos adicionales) al to restolador preferíu" + +#: ../src/interface.c:4316 +msgid "Grep:" +msgstr "Grep:" + +#: ../src/interface.c:4339 +msgid "Tool paths" +msgstr "Caminos a les ferramientes" + +#: ../src/interface.c:4360 +msgid "Context action:" +msgstr "Aición contestual:" + +#: ../src/interface.c:4371 +#, c-format +msgid "" +"Context action command. The currently selected word can be used with %s. It " +"can appear anywhere in the given command and will be replaced before " +"execution." +msgstr "" +"Comandu d'aición contestual. La pallabra actualmente seleicionada puede ser " +"usada con %s. Puedes tar en cualisquier llugar del comandu dau y será " +"remplazada enantes de la execución." + +#: ../src/interface.c:4384 +msgid "Commands" +msgstr "Comandos" + +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 +msgid "Tools" +msgstr "Ferramientes" + +#: ../src/interface.c:4427 +msgid "email address of the developer" +msgstr "direición de correu electrónicu del desarrollador" + +#: ../src/interface.c:4434 +msgid "Initials of the developer name" +msgstr "Iniciales del nome del desarrollador" + +#: ../src/interface.c:4436 +msgid "Initial version:" +msgstr "Version inicial:" + +#: ../src/interface.c:4448 +msgid "Version number, which a new file initially has" +msgstr "Númberu de version que tien un ficheru nuevu" + +#: ../src/interface.c:4455 +msgid "Company name" +msgstr "Nome de la compañia" + +#: ../src/interface.c:4457 +msgid "Developer:" +msgstr "Desarrollador:" + +#: ../src/interface.c:4464 +msgid "Company:" +msgstr "Compañia:" + +#: ../src/interface.c:4471 +msgid "Mail address:" +msgstr "Direición de correu electrónicu:" + +#: ../src/interface.c:4478 +msgid "Initials:" +msgstr "Iniciales:" + +#: ../src/interface.c:4490 +msgid "The name of the developer" +msgstr "El nome del desarrollador" + +#: ../src/interface.c:4492 +msgid "Year:" +msgstr "Añu:" + +#: ../src/interface.c:4499 +msgid "Date:" +msgstr "Fecha:" + +#: ../src/interface.c:4506 +msgid "Date & Time:" +msgstr "Fecha y hora:" + +#: ../src/interface.c:4518 +msgid "" +"Specify a format for the the {datetime} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Indica'l formatu del comodín {datetime}. Puedes usar cualisquier conversión " +"especificada la cual puede ser usada cola función strftime d'ANSI C." + +#: ../src/interface.c:4525 +msgid "" +"Specify a format for the the {year} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Indica'l formatu de comodín {year}. Podemos usar cualisquier conversión " +"especificada la cual puede ser usada cola función strftime n'ANSI C." + +#: ../src/interface.c:4532 +msgid "" +"Specify a format for the the {date} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Especificar un formatu pal comodín {fecha}. Tu puedes usar cualisquier " +"conversión especifica la cual puede usase cola función strftime n'ANSI C." + +#: ../src/interface.c:4534 +msgid "Template data" +msgstr "Datos de plantilles" + +#: ../src/interface.c:4539 ../src/prefs.c:1537 +msgid "Templates" +msgstr "Plantilles" + +#: ../src/interface.c:4577 +msgid "C_hange" +msgstr "_Camudar" + +#: ../src/interface.c:4581 +msgid "Keyboard shortcuts" +msgstr "Ataxos de tecláu" + +#: ../src/interface.c:4586 ../src/prefs.c:1539 +msgid "Keybindings" +msgstr "Ataxos" + +#: ../src/interface.c:4620 +msgid "Command:" +msgstr "Comandu:" + +#: ../src/interface.c:4627 +#, c-format +msgid "Path to the command for printing files (use %f for the filename)" +msgstr "Camín pal comandu d'imprentar ficheros (usar %f pal nome del ficheru)" + +#: ../src/interface.c:4637 +msgid "Use an external command for printing" +msgstr "Usar un comandu esterno pa la impresión" + +#: ../src/interface.c:4657 ../src/printing.c:381 +msgid "Print line numbers" +msgstr "Imprentar númberos de llínia" + +#: ../src/interface.c:4660 ../src/printing.c:383 +msgid "Add line numbers to the printed page" +msgstr "Añader númberos de llínia a la páxina imprentadas" + +#: ../src/interface.c:4662 ../src/printing.c:386 +msgid "Print page numbers" +msgstr "Imprentar númberos de páxina" + +#: ../src/interface.c:4665 ../src/printing.c:388 +msgid "" +"Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "" +"Amestar númberos de páxina nel pie de cada páxina. Garra 2 llinies de la " +"páxina." + +#: ../src/interface.c:4667 ../src/printing.c:391 +msgid "Print page header" +msgstr "Imprentar encabezáu de páxina" + +#: ../src/interface.c:4670 ../src/printing.c:393 +msgid "" +"Add a little header to every page containing the page number, the filename " +"and the current date (see below). It takes 3 lines of the page." +msgstr "" +"Amestar una pequeña cabecera a cada páxina, conteniendo'l númberu de páxina, " +"el nome del ficheru y la data actual (ver abaxo). Garra 3 llinies de la " +"páxina." + +#: ../src/interface.c:4687 ../src/printing.c:409 +msgid "Use the basename of the printed file" +msgstr "Usa'l nome del ficheru imprentáu" + +#: ../src/interface.c:4690 +msgid "Print only the basename (without the path) of the printed file" +msgstr "Imprentar namái'l nome (ensin el camín) del ficheru imprentáu" + +#: ../src/interface.c:4696 ../src/printing.c:417 +msgid "Date format:" +msgstr "Formatu de Fecha:" + +#: ../src/interface.c:4703 ../src/printing.c:423 +msgid "" +"Specify a format for the date and time stamp which is added to the page " +"header on each page. You can use any conversion specifiers which can be used " +"with the ANSI C strftime function." +msgstr "" +"Introduz equí un formatu de fecha y hora que será agregáu al encabezáu de " +"cada páxina. Puedes usar cualisquier especificador de conversión que pueda " +"ser usáu cola función strftime d'ANSI C." + +#: ../src/interface.c:4706 +msgid "Use native GTK printing" +msgstr "Usar la impresión nativa de GTK" + +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Codificación" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 +msgid "Printing" +msgstr "Imprentando" + +#: ../src/interface.c:5177 +msgid "Project Properties" +msgstr "Propiedaes del Proyeutu" + +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Amosar" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Testu Personalizáu" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 +msgid "File" +msgstr "Ficheru" + +#: ../src/keybindings.c:230 +msgid "New" +msgstr "Nuevu" + +#: ../src/keybindings.c:232 +msgid "Open" +msgstr "Abrir" + +#: ../src/keybindings.c:235 +msgid "Open selected file" +msgstr "Abrir ficheros seleicionados" + +#: ../src/keybindings.c:237 +msgid "Save" +msgstr "Guardar" + +#: ../src/keybindings.c:239 +msgid "Save as" +msgstr "Guardar como" + +#: ../src/keybindings.c:241 +msgid "Save all" +msgstr "Guardar too" + +#: ../src/keybindings.c:244 +msgid "Print" +msgstr "Imprentar" + +#: ../src/keybindings.c:246 +msgid "Close" +msgstr "Zarrar" + +#: ../src/keybindings.c:248 +msgid "Close all" +msgstr "Zarrar too" + +#: ../src/keybindings.c:251 +msgid "Reload file" +msgstr "Recargar ficheru" + +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Reabrir cabera llingüeta zarrada" + +#: ../src/keybindings.c:255 ../src/project.c:519 +msgid "Project" +msgstr "Proyeutu" + +#: ../src/keybindings.c:258 +msgid "Project properties" +msgstr "Propiedaes del proyeutu" + +#: ../src/keybindings.c:263 +msgid "Undo" +msgstr "Desfacer" + +#: ../src/keybindings.c:265 +msgid "Redo" +msgstr "Refacer" + +#: ../src/keybindings.c:274 +msgid "Delete to line end" +msgstr "Esborrar fasta la fin de llinia" + +#: ../src/keybindings.c:280 +msgid "Scroll to current line" +msgstr "Desplazar a la llínia actual" + +#: ../src/keybindings.c:282 +msgid "Scroll up the view by one line" +msgstr "Desplazar la vista p'arriba una llínia" + +#: ../src/keybindings.c:284 +msgid "Scroll down the view by one line" +msgstr "Desplazar la vista p'abaxo una llínia" + +#: ../src/keybindings.c:286 +msgid "Complete snippet" +msgstr "Completar construcción" + +#: ../src/keybindings.c:288 +msgid "Move cursor in snippet" +msgstr "Desplazar el cursor na contrucción" + +#: ../src/keybindings.c:290 +msgid "Suppress snippet completion" +msgstr "Evitar completáu de contrucciones" + +#: ../src/keybindings.c:292 +msgid "Context Action" +msgstr "Aición contestual" + +#: ../src/keybindings.c:294 +msgid "Complete word" +msgstr "Completar pallabra" + +#: ../src/keybindings.c:296 +msgid "Show calltip" +msgstr "Amosar pistes de prototipos" + +#: ../src/keybindings.c:298 +msgid "Show macro list" +msgstr "Amosar la llista de macros" + +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Completáu de pallabres" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Mover llínia(es) p'arriba" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Mover llínia(es) p'abaxo" + +#: ../src/keybindings.c:306 +msgid "Clipboard" +msgstr "Portapapeles" + +#: ../src/keybindings.c:309 +msgid "Cut" +msgstr "Cortar" + +#: ../src/keybindings.c:311 +msgid "Copy" +msgstr "Copiar" + +#: ../src/keybindings.c:313 +msgid "Paste" +msgstr "Apegar" + +#: ../src/keybindings.c:321 +msgid "Select" +msgstr "Seleicionar" + +#: ../src/keybindings.c:324 +msgid "Select All" +msgstr "Seleicionar Too" + +#: ../src/keybindings.c:326 +msgid "Select current word" +msgstr "Seleicionar pallabra actual" + +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Seleicionar Parte de Pallabra Anterior" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Seleicionar Parte de la Pallabra siguiente" + +#: ../src/keybindings.c:338 +msgid "Format" +msgstr "Formatu" + +#: ../src/keybindings.c:342 +msgid "Toggle Case of Selection" +msgstr "Camudar ente Mayúscules y minúscules" + +#: ../src/keybindings.c:344 +msgid "Toggle line commentation" +msgstr "Comentar/Descomentar" + +#: ../src/keybindings.c:347 +msgid "Comment line(s)" +msgstr "Comentar llínia(es)" + +#: ../src/keybindings.c:349 +msgid "Uncomment line(s)" +msgstr "Descomentar llínia(es)" + +#: ../src/keybindings.c:351 +msgid "Increase indent" +msgstr "Incrementar sangría" + +#: ../src/keybindings.c:354 +msgid "Decrease indent" +msgstr "Decrementar sangría" + +#: ../src/keybindings.c:357 +msgid "Increase indent by one space" +msgstr "Incrementar sangría nun espaciu" + +#: ../src/keybindings.c:359 +msgid "Decrease indent by one space" +msgstr "Decrementar sangría nun espaciu" + +#: ../src/keybindings.c:363 +msgid "Send to Custom Command 1" +msgstr "Unviar al Comandu Personalizáu 1" + +#: ../src/keybindings.c:365 +msgid "Send to Custom Command 2" +msgstr "Unviar al Comandu Personalizáu 2" + +#: ../src/keybindings.c:367 +msgid "Send to Custom Command 3" +msgstr "Unviar al Comandu Personalizáu 3" + +#: ../src/keybindings.c:375 +msgid "Insert" +msgstr "Inxertar" + +#: ../src/keybindings.c:378 +msgid "Insert date" +msgstr "Inxertar fecha" + +#: ../src/keybindings.c:384 +msgid "Settings" +msgstr "Opciones" + +#: ../src/keybindings.c:392 ../src/toolbar.c:381 +msgid "Search" +msgstr "Guetar" + +#: ../src/keybindings.c:395 ../src/search.c:396 +msgid "Find" +msgstr "Atopar" + +#: ../src/keybindings.c:397 +msgid "Find Next" +msgstr "Guetar Siguente" + +#: ../src/keybindings.c:399 +msgid "Find Previous" +msgstr "Guetar Anterior" + +#: ../src/keybindings.c:402 +msgid "Find Next Selection" +msgstr "Guetar Siguiente Seleición" + +#: ../src/keybindings.c:404 +msgid "Find Previous Selection" +msgstr "Guetar Anterior Seleición" + +#: ../src/keybindings.c:406 ../src/search.c:541 +msgid "Replace" +msgstr "Reemplazar" + +#: ../src/keybindings.c:408 ../src/search.c:715 +msgid "Find in Files" +msgstr "Guetar en Ficheros" + +#: ../src/keybindings.c:411 +msgid "Next Message" +msgstr "Mensax Siguiente" + +#: ../src/keybindings.c:413 +msgid "Previous Message" +msgstr "Mensax anterior" + +#: ../src/keybindings.c:415 +msgid "Find Usage" +msgstr "Atopar usu" + +#: ../src/keybindings.c:417 +msgid "Find Document Usage" +msgstr "Atopar Utilización de Documentu" + +#: ../src/keybindings.c:419 +msgid "Mark All" +msgstr "Marcar Too" + +#: ../src/keybindings.c:421 +msgid "Go to" +msgstr "Dir a" + +#: ../src/keybindings.c:424 ../src/toolbar.c:67 +msgid "Navigate back a location" +msgstr "Restolar una ubicación p'atrás" + +#: ../src/keybindings.c:426 ../src/toolbar.c:68 +msgid "Navigate forward a location" +msgstr "Restolar una ubicación p'alantre" + +#: ../src/keybindings.c:431 +msgid "Go to matching brace" +msgstr "Dir a la llave correspondiente" + +#: ../src/keybindings.c:434 +msgid "Toggle marker" +msgstr "Activar/Desactivar marca" + +#: ../src/keybindings.c:442 +msgid "Go to Tag Definition" +msgstr "Dir a la Definición del Tag" + +#: ../src/keybindings.c:444 +msgid "Go to Tag Declaration" +msgstr "Dir a la Declaración del Tag" + +#: ../src/keybindings.c:446 +msgid "Go to Start of Line" +msgstr "Dir al entamu de llínia" + +#: ../src/keybindings.c:448 +msgid "Go to End of Line" +msgstr "Dir a lo cabero de llínia" + +#: ../src/keybindings.c:450 +msgid "Go to End of Display Line" +msgstr "Dir a la Fin de la Llinia Amosada" + +#: ../src/keybindings.c:452 +msgid "Go to Previous Word Part" +msgstr "Dir a la Parte de Pallabra Anterior" + +#: ../src/keybindings.c:454 +msgid "Go to Next Word Part" +msgstr "Dir a la Siguietne Parte de la Pallabra" + +#: ../src/keybindings.c:456 +msgid "View" +msgstr "Ver" + +#: ../src/keybindings.c:459 +msgid "Toggle All Additional Widgets" +msgstr "Amosar/Anubrir tolos paneles adicionales" + +#: ../src/keybindings.c:462 +msgid "Fullscreen" +msgstr "Pantalla completa" + +#: ../src/keybindings.c:464 +msgid "Toggle Messages Window" +msgstr "Amosar ventanu de mensaxes" + +#: ../src/keybindings.c:467 +msgid "Toggle Sidebar" +msgstr "Amosar/Anubrir barra llateral" + +#: ../src/keybindings.c:469 +msgid "Zoom In" +msgstr "Acercar el testu" + +#: ../src/keybindings.c:471 +msgid "Zoom Out" +msgstr "Alloñar el testu" + +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Alloñar el testu" + +#: ../src/keybindings.c:475 +msgid "Focus" +msgstr "Focu" + +#: ../src/keybindings.c:478 +msgid "Switch to Editor" +msgstr "Dir al Editor" + +#: ../src/keybindings.c:480 +msgid "Switch to Scribble" +msgstr "Dir al Borrador" + +#: ../src/keybindings.c:482 +msgid "Switch to VTE" +msgstr "Dir a la VTE" + +#: ../src/keybindings.c:484 +msgid "Switch to Search Bar" +msgstr "Dir a la Barra de Gueta" + +#: ../src/keybindings.c:486 +msgid "Switch to Sidebar" +msgstr "Dir a la Barra Llateral" + +#: ../src/keybindings.c:488 +msgid "Switch to Compiler" +msgstr "Camudar a Compilador" + +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Camudar a Mensaxes" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Camudar _Ventanu de Mensaxes" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Camudar a barra llateral de llista de Documentos" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Camudar a la Barra Llateral de llista de símbolos" + +#: ../src/keybindings.c:498 +msgid "Notebook tab" +msgstr "Llingüeta d'anotador" + +#: ../src/keybindings.c:501 +msgid "Switch to left document" +msgstr "Dir al documentu de manzorga" + +#: ../src/keybindings.c:503 +msgid "Switch to right document" +msgstr "Dir al documentu de mandrecha." + +#: ../src/keybindings.c:505 +msgid "Switch to last used document" +msgstr "Dir al caberu documentu usáu" + +#: ../src/keybindings.c:507 +msgid "Move document left" +msgstr "Mover el documentu a manzorga" + +#: ../src/keybindings.c:509 +msgid "Move document right" +msgstr "Mover el documentu a mandrecha" + +#: ../src/keybindings.c:511 +msgid "Move document first" +msgstr "Mover el documentu al entamu" + +#: ../src/keybindings.c:513 +msgid "Move document last" +msgstr "Mover el documentu a lo cabero" + +#: ../src/keybindings.c:515 +msgid "Document" +msgstr "Documentu" + +#: ../src/keybindings.c:518 +msgid "Toggle Line wrapping" +msgstr "Activar/Desactivar axuste de testu" + +#: ../src/keybindings.c:520 +msgid "Toggle Line breaking" +msgstr "Activar/Desactivar ddixebráu de llínies" + +#: ../src/keybindings.c:524 +msgid "Replace spaces by tabs" +msgstr "Reemplazar espacios con tabulaciones" + +#: ../src/keybindings.c:526 +msgid "Toggle current fold" +msgstr "Entenderexar/replegar el puntu actual" + +#: ../src/keybindings.c:528 +msgid "Fold all" +msgstr "Replegar too" + +#: ../src/keybindings.c:530 +msgid "Unfold all" +msgstr "Estenderexar too" + +#: ../src/keybindings.c:532 +msgid "Reload symbol list" +msgstr "Recargar llista de símbolos" + +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Esborrar _Marques" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Esborrar los _Indicadores de Fallos" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 +msgid "Build" +msgstr "Construyir" + +#: ../src/keybindings.c:541 ../src/toolbar.c:69 +msgid "Compile" +msgstr "Compilar" + +#: ../src/keybindings.c:545 +msgid "Make all" +msgstr "Make all" + +#: ../src/keybindings.c:548 +msgid "Make custom target" +msgstr "Construí con make (oxetivu personalizáu)" + +#: ../src/keybindings.c:550 +msgid "Make object" +msgstr "Make object" + +#: ../src/keybindings.c:552 +msgid "Next error" +msgstr "Siguiente fallu" + +#: ../src/keybindings.c:554 +msgid "Previous error" +msgstr "Fallu anterior" + +#: ../src/keybindings.c:556 +msgid "Run" +msgstr "Executar" + +#: ../src/keybindings.c:558 +msgid "Build options" +msgstr "Opciones de construcción" + +#: ../src/keybindings.c:563 +msgid "Show Color Chooser" +msgstr "Amosar Seleutor de Collores" + +#: ../src/keybindings.c:565 ../src/keybindings.c:568 +msgid "Help" +msgstr "Aida" + +#: ../src/keybindings.c:856 +msgid "Keyboard Shortcuts" +msgstr "Ataxos de Tecláu" + +#: ../src/keybindings.c:868 +msgid "The following keyboard shortcuts are configurable:" +msgstr "Los siguientes ataxos de tecláu son configurables:" + +#: ../src/keybindings.c:1791 +msgid "Switch to Document" +msgstr "Camudar a Documentu" + +#: ../src/keyfile.c:852 +msgid "Type here what you want, use it as a notice/scratch board" +msgstr "Escribe equí lo que quies, úsalo como nota o borrador" + +#: ../src/keyfile.c:1056 +msgid "Failed to load one or more session files." +msgstr "Fallu al cargar un o más ficheros de la sesión." + +#: ../src/log.c:181 +msgid "Debug Messages" +msgstr "Mensaxes de Depuración" + +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "_Llimpiar" + +#: ../src/main.c:122 +msgid "" +"Set initial column number for the first opened file (useful in conjunction " +"with --line)" +msgstr "" +"Seleiciona'l númberu inicial de columna pal primer ficheru abiertu (útil en " +"conxuntu con --line)" + +#: ../src/main.c:123 +msgid "Use an alternate configuration directory" +msgstr "Usar un direutoriu de configuración alternativu" + +#: ../src/main.c:124 +msgid "Print internal filetype names" +msgstr "Imprentar nomes internos de tribes de ficheros" + +#: ../src/main.c:125 +msgid "Generate global tags file (see documentation)" +msgstr "Xenerar ficheru global de tags (ver la documentación)" + +#: ../src/main.c:126 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "Ensin ficheros prepocesaos C/C++ al xenerar etiquetes" + +#: ../src/main.c:128 +msgid "Don't open files in a running instance, force opening a new instance" +msgstr "" +"Non abrir ficheros n'instancies corriendo, forzar l'apertura d'una nueva " +"instancia" + +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "Usar esti nome de ficheru pa comunicaciones cola instancia de Geany" + +#: ../src/main.c:130 +#, fuzzy +msgid "Return a list of open documents in a running Geany instance" +msgstr "Usar esti nome de ficheru pa comunicaciones cola instancia de Geany" + +#: ../src/main.c:132 +msgid "Set initial line number for the first opened file" +msgstr "Seleiciona'l númberu inicial pal primer ficheru abiertu" + +#: ../src/main.c:133 +msgid "Don't show message window at startup" +msgstr "Non amosar ventanu de mensaxes al entamu" + +#: ../src/main.c:134 +msgid "Don't load auto completion data (see documentation)" +msgstr "Non cargar los datos de completáu automáticu (ver la documentación)" + +#: ../src/main.c:136 +msgid "Don't load plugins" +msgstr "Non cargar módulos complementarios" + +#: ../src/main.c:138 +msgid "Print Geany's installation prefix" +msgstr "Imprentar el prefixu d'instalación de Geany" + +#: ../src/main.c:139 +msgid "Don't load the previous session's files" +msgstr "Nun cargar los ficheros de la cabera sesión" + +#: ../src/main.c:141 +msgid "Don't load terminal support" +msgstr "Non cargar el sofitu de terminal" + +#: ../src/main.c:142 +msgid "Filename of libvte.so" +msgstr "Nome de ficheru de libvte.so" + +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Más esplicativu" + +#: ../src/main.c:145 +msgid "Show version and exit" +msgstr "Amosar versión y colar" + +#: ../src/main.c:498 +msgid "[FILES...]" +msgstr "[FICHEROS...]" + +#: ../src/main.c:515 +#, c-format +msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" +msgstr "(compiláu en %s con GTK %d.%d.%d, GLib %d.%d.%d)" + +#: ../src/main.c:614 +msgid "Move it now?" +msgstr "¿Movelo agora?" + +#: ../src/main.c:616 +msgid "Geany needs to move your old configuration directory before starting." +msgstr "" +"Geany necesita mover el to direutoriu vieyu de configuración anantes " +"d'entamar." + +#: ../src/main.c:625 +#, c-format +msgid "" +"Your configuration directory has been successfully moved from \"%s\" to \"%s" +"\"." +msgstr "" +"El to direutoriu de configuración foi movíu dafechu dende \"%s\" a \"%s\"." + +#. for translators: the third %s in brackets is the error message which +#. * describes why moving the dir didn't work +#: ../src/main.c:635 +#, c-format +msgid "" +"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " +"Please move manually the directory to the new location." +msgstr "" +"El direutoriu vieyu de configuración \"%s\" nun pudó movese a \"%s\" (%s). " +"Por favor, mueve a man el direutoriu a la nueva llocalización." + +#: ../src/main.c:716 +#, c-format +msgid "" +"Configuration directory could not be created (%s).\n" +"There could be some problems using Geany without a configuration directory.\n" +"Start Geany anyway?" +msgstr "" +"El direutoriu de configuración non puede ser criáu (%s).\n" +"Puede haber problemes usando Geany ensin un direutoriu de configuración.\n" +"¿Entamar Geany de toes formes?" + +#: ../src/main.c:1031 +#, c-format +msgid "This is Geany %s." +msgstr "Esti ye Geany %s." + +#: ../src/main.c:1033 +#, c-format +msgid "Configuration directory could not be created (%s)." +msgstr "El direutoriu de configuración non pudo ser criáu (%s)." + +#: ../src/main.c:1244 +msgid "Configuration files reloaded." +msgstr "Ficheros de configuración recargaos." + +#: ../src/msgwindow.c:147 +msgid "Status messages" +msgstr "Mensaxes d'estáu" + +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Copiar" + +#: ../src/msgwindow.c:533 +msgid "Copy _All" +msgstr "Copi_ar Too" + +#: ../src/msgwindow.c:563 +msgid "_Hide Message Window" +msgstr "_Anubrir Ventanu de Mensaxes" + +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" +"Nun pudo alcontrase'l ficheru '%s' - intentando dende'l camín del documentu " +"actual." + +#: ../src/plugins.c:464 +#, c-format +msgid "" +"The plugin \"%s\" is not binary compatible with this release of Geany - " +"please recompile it." +msgstr "" +"El complementu \"%s\" non ye compatible binariamente con esta distribución " +"de Geany - por favor recompilalu." + +#: ../src/plugins.c:906 +msgid "_Plugin Manager" +msgstr "_Alministrador de Complementos" + +#: ../src/plugins.c:1083 +#, c-format +msgid "" +"Plugin: %s %s\n" +"Description: %s\n" +"Author(s): %s" +msgstr "" +"Complementu: %s %s\n" +"Descripción: %s\n" +"Autor(es): %s" + +#: ../src/plugins.c:1159 +msgid "Active" +msgstr "Activu" + +#: ../src/plugins.c:1165 +msgid "Plugin" +msgstr "Complementu" + +#: ../src/plugins.c:1189 +msgid "No plugins available." +msgstr "Non hai complementos disponibles." + +#: ../src/plugins.c:1269 +msgid "Plugins" +msgstr "Complementos" + +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Escoyer qué plugins podríen cargase nel aniciu:" + +#: ../src/plugins.c:1301 +msgid "Plugin details:" +msgstr "Detalles del complementu:" + +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configurar Plugins" + +#: ../src/prefs.c:165 +msgid "Grab Key" +msgstr "Capturar Tecla" + +#: ../src/prefs.c:171 +#, c-format +msgid "Press the combination of the keys you want to use for \"%s\"." +msgstr "Calca la combinación de tecles que quies usar pa \"%s\"." + +#: ../src/prefs.c:214 ../src/symbols.c:1866 +msgid "_Expand All" +msgstr "_Estenderexar Too" + +#: ../src/prefs.c:219 ../src/symbols.c:1871 +msgid "_Collapse All" +msgstr "_Replegar Too" + +#: ../src/prefs.c:278 +msgid "Action" +msgstr "Aición" + +#: ../src/prefs.c:283 +msgid "Shortcut" +msgstr "Ataxu" + +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Permitir" + +#: ../src/prefs.c:1410 +msgid "_Override" +msgstr "S_obroescribir" + +#: ../src/prefs.c:1411 +msgid "Override that keybinding?" +msgstr "Sobroescribir esi ataxu?" + +#: ../src/prefs.c:1412 +#, c-format +msgid "The combination '%s' is already used for \"%s\"." +msgstr "La combinación '%s' ta usada por \"%s\"." + +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + +#. add manually GeanyWrapLabels because they can't be added with Glade +#. page Tools +#: ../src/prefs.c:1619 +msgid "Enter tool paths below. Tools you do not need can be left blank." +msgstr "" +"Introduz embaxu les rutes a les ferramientes. Les ferramientes que non " +"necesites pueden quedar en blancu." + +#. page Templates +#: ../src/prefs.c:1624 +msgid "" +"Set the information to be used in templates. See the documentation for " +"details." +msgstr "" +"Especificar la información que quies usar nes plantilles. Pa más detalles " +"ver la documentación." + +#: ../src/prefs.c:1628 +msgid "" +"Notice: For all changes you make here to take effect, you need to restart " +"Geany or force the reload of the settings using Tools->Reload Configuration." +"" +msgstr "" +"Avisu: Pa que tolos cambios fechos equí faigan efeutu, necesites " +"reaniciar Geany o forzar la recarga de les opciones usando Ferramientes-" +">Recargar Configuración." + +#. page Keybindings +#: ../src/prefs.c:1634 +msgid "" +"Here you can change keyboard shortcuts for various actions. Select one and " +"press the Change button to enter a new shortcut, or double click on an " +"action to edit the string representation of the shortcut directly." +msgstr "" +"Equí puedes camudar los ataxos de tecláu pa varies aiciones. Seleiciona una " +"y calca'l botón de Camudar pa introducir un nuevu ataxu, o calca dos vegaes " +"nuna aición pa editar direutamente'l testu que representa l'ataxu." + +#. page Printing +#: ../src/prefs.c:1639 +msgid "" +"Notice: Native GTK printing is only available if Geany was built against " +"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "" +"Noticia: La impresión nativa de GTK sólo ta disponible si Geany foi " +"compiláu escontra GTK 2.10 (o mayor) and Geany ta corriendo con GTK " +"2.10 (o mayor)." + +#. page Editor->Indentation +#: ../src/prefs.c:1645 +msgid "" +"Warning: these settings are overridden by the current project. See " +"Project->Properties." +msgstr "" +"Alvertencia: les preferencies serán sobroescrites pal proyeutu actual. " +"Mira Proyeutu->Propiedaes." + +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "¡La fonte del editor nun ye monoespaciada!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "El testu quedará mal espaciáu." + +#: ../src/printing.c:306 +#, c-format +msgid "Page %d of %d" +msgstr "Páxina %d de %d" + +#: ../src/printing.c:376 +msgid "Document Setup" +msgstr "Configuración del Documentu" + +#: ../src/printing.c:411 +msgid "Print only the basename(without the path) of the printed file" +msgstr "Imprentar sólo el nome base (ensín el camín) del ficheru imprentáu" + +#: ../src/printing.c:527 +#, c-format +msgid "Page %d of %d" +msgstr "Páxina %d de %d" + +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "Documentu %s nun mandáu al subsistema d'imprentación." + +#: ../src/printing.c:783 +#, c-format +msgid "Document %s was sent to the printing subsystem." +msgstr "Documentu %s mandáu al subsistema d'imprentación." + +#: ../src/printing.c:835 +#, c-format +msgid "Printing of %s failed (%s)." +msgstr "La impresión de %s falló (%s)." + +#: ../src/printing.c:875 +msgid "Please set a print command in the preferences dialog first." +msgstr "" +"Por favor, a lo primero configura un comandu d'imprentación nel diálogu de " +"preferencies." + +#: ../src/printing.c:883 +#, c-format +msgid "" +"The file \"%s\" will be printed with the following command:\n" +"\n" +"%s" +msgstr "" +"El ficheru \"%s\" será imprentáu col siguiente comandu:\n" +"\n" +"%s" + +#: ../src/printing.c:899 +#, c-format +msgid "Printing of \"%s\" failed (return code: %s)." +msgstr "La impresión de \"%s\" falló (códigu de retornu: %s)." + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Ficheru %s imprentáu." + +#. "projects" is part of the default project base path so be careful when translating +#. * please avoid special characters and spaces, look at the source for details or ask Frank +#: ../src/project.c:98 +msgid "projects" +msgstr "proyeutos" + +#: ../src/project.c:117 +msgid "New Project" +msgstr "Nuevu Proyeutu" + +#: ../src/project.c:125 +msgid "C_reate" +msgstr "C_riar" + +#: ../src/project.c:139 ../src/project.c:413 +msgid "Name:" +msgstr "Nome:" + +#: ../src/project.c:148 ../src/project.c:426 +msgid "Filename:" +msgstr "Nome de Ficheru:" + +#: ../src/project.c:164 ../src/project.c:456 +msgid "Base path:" +msgstr "Camín base:" + +#: ../src/project.c:170 ../src/project.c:465 +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 "" +"Direutoriu base de tolos ficheros que componen esti proyeutu. Esti puede ser " +"un camín nuevu o un árbol de direutorios ya existente. Puedes usar caminos " +"rellativos al ficheru de proyeutu." + +#: ../src/project.c:173 ../src/project.c:468 +msgid "Choose Project Base Path" +msgstr "Escueye'l Camín Base del Proyeutu" + +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 +#, c-format +msgid "Project file \"%s\" could not be loaded." +msgstr "El ficheru de proyeutu \"%s\" non pudo ser cargáu." + +#: ../src/project.c:257 ../src/project.c:269 +msgid "Open Project" +msgstr "Abrir Proyeutu" + +#: ../src/project.c:289 +msgid "Project files" +msgstr "Ficheros del proyeutu" + +#: ../src/project.c:339 +#, c-format +msgid "Project \"%s\" closed." +msgstr "Proyeutu \"%s\" zarráu." + +#: ../src/project.c:439 +msgid "Description:" +msgstr "Descripción:" + +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" +"Afitar la compilación de ficheros non triba de ficheros trabayando en " +"direutorios qu'usen el camín base:" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Afitar" + +#: ../src/project.c:486 +msgid "" +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" +msgstr "" +"Afitar los direutorios de trabayu (na llingüeta Compilación) pa los comandos " +"de compilación de ficheros ensin triba pa usar el camín base" + +#: ../src/project.c:501 +msgid "File patterns:" +msgstr "Patrones de ficheros:" + +#: ../src/project.c:610 +msgid "Do you want to close it before proceeding?" +msgstr "¿Quies zarralu enantes de proceder?" + +#: ../src/project.c:611 +#, c-format +msgid "The '%s' project is already open." +msgstr "El proyeutu '%s' ya ta abiertu." + +#: ../src/project.c:658 +msgid "The specified project name is too short." +msgstr "El nome del proyeutu especificáu ye mui curtiu." + +#: ../src/project.c:664 +#, c-format +msgid "The specified project name is too long (max. %d characters)." +msgstr "El nome del proyeutu especificáu ye mui llargu (máx. %d caráuteres)." + +#: ../src/project.c:672 +msgid "You have specified an invalid project filename." +msgstr "Especificáu un nome de ficheru de proyeutu inválidu." + +#: ../src/project.c:695 +msgid "Create the project's base path directory?" +msgstr "¿Criar el direutoriu del camín base del proyeutu?" + +#: ../src/project.c:696 +#, c-format +msgid "The path \"%s\" does not exist." +msgstr "El camín \"%s\" non esiste." + +#: ../src/project.c:705 +#, c-format +msgid "Project base directory could not be created (%s)." +msgstr "Non se pudo criar el direutoriu principal pal proyeutu (%s)." + +#: ../src/project.c:717 +#, c-format +msgid "Project file could not be written (%s)." +msgstr "El ficheru de proyeutu non pudo ser escritu (%s)." + +#: ../src/project.c:794 +#, c-format +msgid "Project \"%s\" created." +msgstr "Proyeutu \"%s\" criáu." + +#: ../src/project.c:796 +#, c-format +msgid "Project \"%s\" saved." +msgstr "Proyeutu \"%s\" guardáu." + +#. initialise the dialog +#: ../src/project.c:861 ../src/project.c:872 +msgid "Choose Project Filename" +msgstr "Escueye'l Nome del ficheru del Proyeutu" + +#: ../src/project.c:947 +#, c-format +msgid "Project \"%s\" opened." +msgstr "Proyeutu \"%s\" abiertu." + +#: ../src/search.c:233 +msgid "_Use regular expressions" +msgstr "_Usar espresiones regulares" + +#: ../src/search.c:237 +msgid "" +"Use POSIX-like regular expressions. For detailed information about using " +"regular expressions, please read the documentation." +msgstr "" +"Usar espresiones regulares estilo-POSIX. Por información detallada so l'usu " +"d'espresiones regulares, por favor llee la documentación" + +#: ../src/search.c:244 +msgid "Search _backwards" +msgstr "Guetar p'_atras" + +#: ../src/search.c:258 +msgid "Use _escape sequences" +msgstr "Usar secuencies d'_escape" + +#: ../src/search.c:263 +msgid "" +"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " +"corresponding control characters" +msgstr "" +"Reemplaza \\\\, \\t, \\n, \\r i \\uXXXX (caráuteres Unicode) polos " +"carauteres de control correspondientes" + +#: ../src/search.c:272 ../src/search.c:810 +msgid "C_ase sensitive" +msgstr "_Respetar Mayúscules y minúscules" + +#: ../src/search.c:277 ../src/search.c:816 +msgid "Match only a _whole word" +msgstr "Sólo _pallabres enteres" + +#: ../src/search.c:282 +msgid "Match from s_tart of word" +msgstr "Sólo dende l'entamu de les _pallabres" + +#: ../src/search.c:403 +msgid "_Previous" +msgstr "_Anterior" + +#: ../src/search.c:409 +msgid "_Next" +msgstr "Siguie_nte" + +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 +msgid "_Search for:" +msgstr "_Guetar por:" + +#. Now add the multiple match options +#: ../src/search.c:441 +msgid "_Find All" +msgstr "Guetar _Toos" + +#: ../src/search.c:448 +msgid "_Mark" +msgstr "_Marcar" + +#: ../src/search.c:450 +msgid "Mark all matches in the current document" +msgstr "Marca toles coincidencies nel documentu" + +#: ../src/search.c:455 ../src/search.c:622 +msgid "In Sessi_on" +msgstr "Na _Sesión" + +#: ../src/search.c:460 ../src/search.c:627 +msgid "_In Document" +msgstr "Nel _Documentu" + +#. close window checkbox +#: ../src/search.c:466 ../src/search.c:640 +msgid "Close _dialog" +msgstr "Zarrar _diálogu" + +#: ../src/search.c:471 ../src/search.c:645 +msgid "Disable this option to keep the dialog open" +msgstr "Desactiva esta opción pa caltener el diálogu d'abrir" + +#: ../src/search.c:556 +msgid "Replace & Fi_nd" +msgstr "Reemplazar y G_uetar" + +#: ../src/search.c:565 +msgid "Replace wit_h:" +msgstr "Reem_plazar con:" + +#. Now add the multiple replace options +#: ../src/search.c:615 +msgid "Re_place All" +msgstr "Reemplazar _Toes" + +#: ../src/search.c:632 +msgid "In Se_lection" +msgstr "Na Se_leición" + +#: ../src/search.c:634 +msgid "Replace all matches found in the currently selected text" +msgstr "Reemplaza toles ocurrencies atopaes nel testu actualmente seleicionáu" + +#: ../src/search.c:725 +msgid "_Directory:" +msgstr "_Direutoriu:" + +#: ../src/search.c:756 +msgid "E_ncoding:" +msgstr "_Codificación:" + +#: ../src/search.c:781 +msgid "Fixed s_trings" +msgstr "Cadenes _fixes" + +#: ../src/search.c:790 +msgid "_Grep regular expressions" +msgstr "Espresiones regulares _Grep" + +#: ../src/search.c:793 ../src/search.c:801 +msgid "See grep's manual page for more information" +msgstr "Ver la páxina de manual grep pa más información" + +#: ../src/search.c:798 +msgid "_Extended regular expressions" +msgstr "Espresiones regulares _Estendíes" + +#: ../src/search.c:805 +msgid "_Recurse in subfolders" +msgstr "Operar _Recursivamente nos subdireutorios" + +#: ../src/search.c:821 +msgid "_Invert search results" +msgstr "_Invertir los resultaos de la gueta" + +#: ../src/search.c:826 +msgid "Invert the sense of matching, to select non-matching lines" +msgstr "Invertir el sen de la rellación pa seleicionar llinies non venceyaes" + +#: ../src/search.c:843 +msgid "E_xtra options:" +msgstr "Opciónes e_xtra:" + +#: ../src/search.c:851 +msgid "Other options to pass to Grep" +msgstr "Otres opciones a pasar a Grep" + +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 +#, c-format +msgid "Found %d match for \"%s\"." +msgid_plural "Found %d matches for \"%s\"." +msgstr[0] "Atopóse %d coincidencia pa \"%s\"." +msgstr[1] "Atopáronse %d coincidencies pa \"%s\"." + +#: ../src/search.c:1177 +#, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Sustituyir %u coincidencies en %u documentos." + +#: ../src/search.c:1368 +msgid "Invalid directory for find in files." +msgstr "Direutoriu non válidu pa guetar ficheros." + +#: ../src/search.c:1388 +msgid "No text to find." +msgstr "Non hai testu pa guetar." + +#: ../src/search.c:1415 +#, c-format +msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." +msgstr "" +"Non se pudo atopar la ferramienta grep '%s'; verifica'l camín nes " +"Preferencies." + +#: ../src/search.c:1483 +msgid "Searching..." +msgstr "Guetando..." + +#: ../src/search.c:1495 +#, c-format +msgid "%s %s -- %s (in directory: %s)" +msgstr "%s %s -- %s (en direutoriu: %s)" + +#: ../src/search.c:1523 +#, c-format +msgid "Could not open directory (%s)" +msgstr "Non pudó abrise'l direutoriu (%s)" + +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Fallo la gueta." + +#: ../src/search.c:1621 +#, c-format +msgid "Search completed with %d match." +msgid_plural "Search completed with %d matches." +msgstr[0] "Finó la gueta con %d coincidencia." +msgstr[1] "Finó la gueta con %d coincidencies." + +#: ../src/search.c:1629 +msgid "No matches found." +msgstr "Non s'atoparon coincidencies." + +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Espresión regular incorreuta pa la triba de ficheru %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 +msgid "Chapter" +msgstr "Capítulu" + +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 +msgid "Section" +msgstr "Seición" + +#: ../src/symbols.c:613 +msgid "Sect1" +msgstr "Sec1" + +#: ../src/symbols.c:614 +msgid "Sect2" +msgstr "Sec2" + +#: ../src/symbols.c:615 +msgid "Sect3" +msgstr "Sec3" + +#: ../src/symbols.c:616 +msgid "Appendix" +msgstr "Apéndice" + +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 +msgid "Other" +msgstr "Otru" + +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 +msgid "Module" +msgstr "Módulu" + +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 +msgid "Types" +msgstr "Tribes" + +#: ../src/symbols.c:625 +msgid "Type constructors" +msgstr "Constructores de tribes" + +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 +msgid "Functions" +msgstr "Funciones" + +#: ../src/symbols.c:631 ../src/symbols.c:637 +msgid "Sections" +msgstr "Seiciónes" + +#: ../src/symbols.c:632 +msgid "Keys" +msgstr "Tecles" + +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 +msgid "Variables" +msgstr "Variables" + +#: ../src/symbols.c:646 +msgid "Environment" +msgstr "Entornu" + +#: ../src/symbols.c:648 ../src/symbols.c:720 +msgid "Subsection" +msgstr "Subseición" + +#: ../src/symbols.c:649 ../src/symbols.c:721 +msgid "Subsubsection" +msgstr "Subsubseición" + +#: ../src/symbols.c:660 +msgid "Structures" +msgstr "Estructures" + +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 +msgid "Package" +msgstr "Paquete" + +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Etiquetes" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constantes" + +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 +msgid "Interfaces" +msgstr "Interfaces" + +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 +msgid "Classes" +msgstr "Clases" + +#: ../src/symbols.c:698 +msgid "Anchors" +msgstr "Anchos" + +#: ../src/symbols.c:699 +msgid "H1 Headings" +msgstr "Cabeceres (H1)" + +#: ../src/symbols.c:700 +msgid "H2 Headings" +msgstr "Cabeceres (H2)" + +#: ../src/symbols.c:701 +msgid "H3 Headings" +msgstr "Cabeceres (H3)" + +#: ../src/symbols.c:709 +msgid "ID Selectors" +msgstr "Selectores d'ID" + +#: ../src/symbols.c:710 +msgid "Type Selectors" +msgstr "Selectores de Tribes" + +#: ../src/symbols.c:728 ../src/symbols.c:774 +msgid "Modules" +msgstr "Módulos" + +#: ../src/symbols.c:730 +msgid "Singletons" +msgstr "Singletons" + +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 +msgid "Methods" +msgstr "Métodos" + +#: ../src/symbols.c:738 ../src/symbols.c:870 +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:741 +msgid "Procedures" +msgstr "Procedimientos" + +#: ../src/symbols.c:752 +msgid "Imports" +msgstr "Importaciones" + +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entidaes" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Estructures" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funciones / Procedimientos" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variables / Signos" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Procesos / Componentes" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Eventos" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funciones /Tarees" + +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "Miembros" + +#: ../src/symbols.c:838 +msgid "Subroutines" +msgstr "Subrutines" + +#: ../src/symbols.c:841 +msgid "Blocks" +msgstr "Bloques" + +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 +msgid "Macros" +msgstr "Macros" + +#: ../src/symbols.c:851 +msgid "Defines" +msgstr "Defines" + +#: ../src/symbols.c:858 +msgid "Targets" +msgstr "Oxetivos" + +#: ../src/symbols.c:876 +msgid "Structs" +msgstr "Estructures" + +#: ../src/symbols.c:877 +msgid "Typedefs / Enums" +msgstr "Definición de Tribes / Enumberación" + +#: ../src/symbols.c:1365 +#, c-format +msgid "Unknown filetype extension for \"%s\".\n" +msgstr "Estención de ficheru desconocida pa \"%s\".\n" + +#: ../src/symbols.c:1389 +#, c-format +msgid "Failed to create tags file, perhaps because no tags were found.\n" +msgstr "" +"Fállo al criar el ficheru de tags, tal vez porque nun s'atopó nengún tag.\n" + +#: ../src/symbols.c:1396 +#, c-format +msgid "" +"Usage: %s -g \n" +"\n" +msgstr "" +"Usu: %s -g \n" +"\n" + +#: ../src/symbols.c:1397 +#, c-format +msgid "" +"Example:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" +msgstr "" +"Exemplu:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" + +#: ../src/symbols.c:1411 +msgid "Load Tags" +msgstr "Cargar Tags" + +#: ../src/symbols.c:1418 +msgid "Geany tag files (*.tags)" +msgstr "Ficheros de tags de Geany (*.tags)" + +#. For translators: the first wildcard is the filetype, the second the filename +#: ../src/symbols.c:1438 +#, c-format +msgid "Loaded %s tags file '%s'." +msgstr "Cargáu %s ficheru de tags '%s'." + +#: ../src/symbols.c:1440 +#, c-format +msgid "Could not load tags file '%s'." +msgstr "Non pudo cargase'l ficheru de tags '%s'." + +#: ../src/symbols.c:1573 +#, c-format +msgid "Forward declaration \"%s\" not found." +msgstr "Declaración de \"%s\" non atopada." + +#: ../src/symbols.c:1575 +#, c-format +msgid "Definition of \"%s\" not found." +msgstr "Definición de \"%s\" non atopada." + +#: ../src/symbols.c:1881 +msgid "Sort by _Name" +msgstr "Ordenar por _Nome" + +#: ../src/symbols.c:1888 +msgid "Sort by _Appearance" +msgstr "Ordenar por _Aparición" + +#: ../src/templates.c:278 +msgid "Old" +msgstr "Antigüu" + +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:56 +msgid "Save the current file" +msgstr "Grabar el ficheru actual" + +#: ../src/toolbar.c:57 +msgid "Save all open files" +msgstr "Grabar tolos ficheros abiertos" + +#: ../src/toolbar.c:58 +msgid "Reload the current file from disk" +msgstr "Recarga'l ficheru actual dende'l discu" + +#: ../src/toolbar.c:59 +msgid "Close the current file" +msgstr "Zarrar el ficheru actual" + +#: ../src/toolbar.c:60 +msgid "Close all open files" +msgstr "Zarrar tolos ficheros abiertos" + +#: ../src/toolbar.c:61 +msgid "Cut the current selection" +msgstr "Cortar la seleición actual" + +#: ../src/toolbar.c:62 +msgid "Copy the current selection" +msgstr "Copiar el testu de la seleición actual" + +#: ../src/toolbar.c:63 +msgid "Paste the contents of the clipboard" +msgstr "Apegar el conteníu del portapapeles" + +#: ../src/toolbar.c:64 +msgid "Delete the current selection" +msgstr "Esborrar la seleición actual" + +#: ../src/toolbar.c:65 +msgid "Undo the last modification" +msgstr "Desfacer la cabera modificación" + +#: ../src/toolbar.c:66 +msgid "Redo the last modification" +msgstr "Refacer la cabera modificación" + +#: ../src/toolbar.c:69 +msgid "Compile the current file" +msgstr "Compilar el ficheru actual" + +#: ../src/toolbar.c:70 +msgid "Run or view the current file" +msgstr "Executar o ver el ficheru actual" + +#: ../src/toolbar.c:71 +msgid "" +"Open a color chooser dialog, to interactively pick colors from a palette" +msgstr "" +"Abrir un diálogu d'escoyer collor, pa seleicionalu interautivamente dende " +"una paleta" + +#: ../src/toolbar.c:72 +msgid "Zoom in the text" +msgstr "Aumentar el testu" + +#: ../src/toolbar.c:73 +msgid "Zoom out the text" +msgstr "Alloñar el testu" + +#: ../src/toolbar.c:74 +msgid "Decrease indentation" +msgstr "Decrementar sangría" + +#: ../src/toolbar.c:75 +msgid "Increase indentation" +msgstr "Incrementar sangría" + +#: ../src/toolbar.c:76 ../src/toolbar.c:381 +msgid "Find the entered text in the current file" +msgstr "Guetar el testu ingresáu nel ficheru actual" + +#: ../src/toolbar.c:77 ../src/toolbar.c:389 +msgid "Jump to the entered line number" +msgstr "Saltar al númberu de llínia introducíu" + +#: ../src/toolbar.c:78 +msgid "Show the preferences dialog" +msgstr "Amosar el diálogu de preferencies" + +#: ../src/toolbar.c:79 +msgid "Quit Geany" +msgstr "Colar de Geany" + +#: ../src/toolbar.c:80 +msgid "Print document" +msgstr "Imprentar documentu" + +#: ../src/toolbar.c:81 +msgid "Replace text in the current document" +msgstr "Sustituyir el testu nel documentu actual" + +#: ../src/toolbar.c:357 +msgid "Create a new file" +msgstr "Criar un ficheru nuevu" + +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Criar un ficheru nuevu dende plantilla" + +#: ../src/toolbar.c:365 +msgid "Open an existing file" +msgstr "Abrir un ficheru existente" + +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Abrir ficheru reciente" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Escoyer más aiciones de compilación" + +#: ../src/toolbar.c:389 +msgid "Goto" +msgstr "Dir a" + +#: ../src/toolbar.c:578 +msgid "Separator" +msgstr "Separador" + +#: ../src/toolbar.c:579 +msgid "--- Separator ---" +msgstr "--- Separador ---" + +#: ../src/toolbar.c:946 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Esbillar elementos p'amosalos na barra de ferramientes. Los elementos pueden " +"reordenase n'arrastrándolos y desafitándolos." + +#: ../src/toolbar.c:962 +msgid "Available Items" +msgstr "Elementos Disponibles" + +#: ../src/toolbar.c:983 +msgid "Displayed Items" +msgstr "Elementos Amosaos" + +#: ../src/tools.c:153 +#, c-format +msgid "" +"The executed custom command returned an error. Your selection was not " +"changed. Error message: %s" +msgstr "" +"El comandu personalizáu executáu retornó fallu. La to seleición non fué " +"camudada. Mensaxe de fallu: %s" + +#: ../src/tools.c:219 +msgid "The executed custom command exited with an unsuccessful exit code." +msgstr "El comandu personalizáu executáu salió con un códigu de fallu." + +#: ../src/tools.c:246 +#, c-format +msgid "Passing data and executing custom command: %s" +msgstr "Pasando datos y executando comandu personalizáu: %s" + +#: ../src/tools.c:290 +#, c-format +msgid "Custom command failed: %s" +msgstr "Falló'l comandu personalizáu: %s" + +#: ../src/tools.c:304 ../src/tools.c:511 +msgid "Set Custom Commands" +msgstr "Configurar Comandos Personalizaos" + +#: ../src/tools.c:311 +msgid "" +"You can send the current selection to any of these commands and the output " +"of the command replaces the current selection." +msgstr "" +"Puedes unviar la seleición actual a cualisquiera d'estos comandos y la " +"salida del comandu remplaza la seleición actual." + +#: ../src/tools.c:486 +msgid "No custom commands defined." +msgstr "Non hai comandos personalizaos definíos." + +#: ../src/tools.c:586 +msgid "Word Count" +msgstr "Cuntar Pallabres" + +#: ../src/tools.c:596 +msgid "selection" +msgstr "seleición" + +#: ../src/tools.c:602 +msgid "whole document" +msgstr "tol documentu" + +#: ../src/tools.c:611 +msgid "Range:" +msgstr "Rangu:" + +#: ../src/tools.c:623 +msgid "Lines:" +msgstr "Llínies:" + +#: ../src/tools.c:637 +msgid "Words:" +msgstr "Pallabres:" + +#: ../src/tools.c:651 +msgid "Characters:" +msgstr "Caráuteres:" + +#: ../src/sidebar.c:186 +msgid "No tags found" +msgstr "Non s'atoparon tags" + +#: ../src/sidebar.c:546 +msgid "Show S_ymbol List" +msgstr "Amosar la llista de _símbolos" + +#: ../src/sidebar.c:554 +msgid "Show _Document List" +msgstr "Amosar la llista de _Documentos" + +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 +msgid "H_ide Sidebar" +msgstr "_Anubrir barra llateral" + +#: ../src/sidebar.c:631 +msgid "Show _Paths" +msgstr "Amosar _Caminos" + +#. Status bar statistics: col = column, sel = selection. +#: ../src/ui_utils.c:194 +#, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "llinia: %d / %d\t col: %d\t sel: %d\t " + +#. RO = read-only +#: ../src/ui_utils.c:200 +msgid "RO " +msgstr "SL " + +#. OVR = overwrite/overtype, INS = insert +#: ../src/ui_utils.c:202 +msgid "OVR" +msgstr "SOB" + +#: ../src/ui_utils.c:202 +msgid "INS" +msgstr "INS" + +#: ../src/ui_utils.c:208 +msgid "TAB" +msgstr "TAB" + +#: ../src/ui_utils.c:211 +msgid "SP" +msgstr "SP" + +#: ../src/ui_utils.c:214 +msgid "T/S" +msgstr "T/S" + +#: ../src/ui_utils.c:218 +#, c-format +msgid "mode: %s" +msgstr "mou: %s" + +#: ../src/ui_utils.c:221 +#, c-format +msgid "encoding: %s %s" +msgstr "codificación: %s %s" + +#: ../src/ui_utils.c:227 +#, c-format +msgid "filetype: %s" +msgstr "Triba de ficheru: %s" + +#: ../src/ui_utils.c:231 +msgid "MOD" +msgstr "MOD" + +#: ../src/ui_utils.c:236 +#, c-format +msgid "scope: %s" +msgstr "alcance: %s" + +#: ../src/ui_utils.c:321 +#, c-format +msgid "Font updated (%s)." +msgstr "Fonte actualizada (%s)." + +#: ../src/ui_utils.c:517 +msgid "C Standard Library" +msgstr "Biblioteca Standard de C" + +#: ../src/ui_utils.c:518 +msgid "ISO C99" +msgstr "ISO C99" + +#: ../src/ui_utils.c:519 +msgid "C++ (C Standard Library)" +msgstr "C++ (Biblioteca Standard de C)" + +#: ../src/ui_utils.c:520 +msgid "C++ Standard Library" +msgstr "Biblioteca Standard de C++" + +#: ../src/ui_utils.c:521 +msgid "C++ STL" +msgstr "C++ STL" + +#: ../src/ui_utils.c:585 +msgid "_Set Custom Date Format" +msgstr "_Configurar Formatu de Fecha Personalizáu" + +#: ../src/ui_utils.c:1659 +msgid "Select Folder" +msgstr "Seleicionar Carpeta" + +#: ../src/ui_utils.c:1659 +msgid "Select File" +msgstr "Seleicionar Ficheru" + +#: ../src/ui_utils.c:1813 +msgid "Save All" +msgstr "Guardar Too" + +#: ../src/ui_utils.c:1814 +msgid "Close All" +msgstr "Zarrar Too" + +#: ../src/utils.c:338 +msgid "Win (CRLF)" +msgstr "Win (CRLF)" + +#: ../src/utils.c:339 +msgid "Mac (CR)" +msgstr "Mac (CR)" + +#: ../src/utils.c:340 +msgid "Unix (LF)" +msgstr "Unix (LF)" + +#: ../src/vte.c:516 +msgid "_Set Path From Document" +msgstr "_Configurar Camín del Documentu" + +#: ../src/vte.c:521 +msgid "_Restart Terminal" +msgstr "_Reanicia Terminal" + +#: ../src/vte.c:544 +msgid "_Input Methods" +msgstr "Métodos d'_Entrada" + +#: ../src/vte.c:638 +msgid "" +"Could not change the directory in the VTE because it probably contains a " +"command." +msgstr "" +"Non se pudo camudar el direutoriu na terminal virtual (VTE) probablemente " +"porque caltien un comandu." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "" + +#: ../src/vte.c:746 +msgid "Sets the font for the terminal widget" +msgstr "Especifica la fonte del terminal" + +#: ../src/vte.c:748 +msgid "Foreground color:" +msgstr "Collor de primer planu:" + +#: ../src/vte.c:754 +msgid "Background color:" +msgstr "Collor de fondu:" + +#: ../src/vte.c:764 +msgid "Sets the foreground color of the text in the terminal widget" +msgstr "Especifica'l collor del testu de la terminal" + +#: ../src/vte.c:771 +msgid "Sets the background color of the text in the terminal widget" +msgstr "Especifica'l collor del testu de la terminal" + +#: ../src/vte.c:774 +msgid "Scrollback lines:" +msgstr "Llínies d'hestoricu:" + +#: ../src/vte.c:786 +msgid "" +"Specifies the history in lines, which you can scroll back in the terminal " +"widget" +msgstr "Indica'l nome de llínies d'hestoria que pueden revisase na terminal" + +#: ../src/vte.c:790 +msgid "Shell:" +msgstr "Shell:" + +#: ../src/vte.c:798 +msgid "" +"Sets the path to the shell which should be started inside the terminal " +"emulation" +msgstr "" +"Indica'l camín del shell el cual debiere ser aniciáu dientro de la emulación " +"de la terminal" + +#: ../src/vte.c:815 +msgid "Scroll on keystroke" +msgstr "Descender al calcar una tecla" + +#: ../src/vte.c:816 +msgid "Whether to scroll to the bottom if a key was pressed" +msgstr "Cuando desplazar a la parte d'embaxo si una tecla ye calcada" + +#: ../src/vte.c:819 +msgid "Scroll on output" +msgstr "Descender cuando heba salida" + +#: ../src/vte.c:820 +msgid "Whether to scroll to the bottom when output is generated" +msgstr "Desplazar a la parte d'embaxu cuando la salida seya xenerada" + +#: ../src/vte.c:823 +msgid "Cursor blinks" +msgstr "Parpadéu del cursor" + +#: ../src/vte.c:824 +msgid "Whether to blink the cursor" +msgstr "Activar el parpadéu del cursor" + +#: ../src/vte.c:827 +msgid "Override Geany keybindings" +msgstr "Sobroescribir ataxos de Geany" + +#: ../src/vte.c:829 +msgid "" +"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "" +"Permitir recibir abreviaciones de tecláu VTE (aparte del focu del comandu)" + +#: ../src/vte.c:832 +msgid "Disable menu shortcut key (F10 by default)" +msgstr "Desactivar l'ataxu de tecláu del menu (por omisión F10)" + +#: ../src/vte.c:833 +msgid "" +"This option disables the keybinding to popup the menu bar (default is F10). " +"Disabling it can be useful if you use, for example, Midnight Commander " +"within the VTE." +msgstr "" +"Esta opción desactiva l'ataxu de tecláu usáu pa estenderexar la barra de " +"menu (por omisión F10). Desactivalu puede ser útil si se usa, por exemplu, " +"Midnight Commander dientro de la VTE." + +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 +msgid "Follow the path of the current file" +msgstr "Siguir el camín del ficheru actual" + +#: ../src/vte.c:837 +msgid "Whether to execute \"cd $path\" when you switch between opened files" +msgstr "Executa \"cd $path\" pa camudar ente ficheros abiertos" + +#. create check_skip_script checkbox before the check_skip_script checkbox to be able to +#. * use the object for the toggled handler of check_skip_script checkbox +#: ../src/vte.c:842 +msgid "Don't use run script" +msgstr "Non usar script d'execución" + +#: ../src/vte.c:843 +msgid "" +"Don't use the simple run script which is usually used to display the exit " +"status of the executed program" +msgstr "" +"Non usar el script d'execución, que s'usa normalmente p'amosar el valor " +"d'estáu retornáu pol programa executáu" + +#: ../src/vte.c:846 +msgid "Execute programs in VTE" +msgstr "Executar programes na VTE" + +#: ../src/vte.c:847 +msgid "" +"Run programs in VTE instead of opening a terminal emulation window. Please " +"note, programs executed in VTE cannot be stopped" +msgstr "" +"Executa programes en VTE llugar d'abrir un ventanu d'emulación de terminal. " +"Por favor, ten en cuenta que programes executaos en VTE nun pueden posase." + +#: ../src/win32.c:161 +msgid "Geany project files" +msgstr "Ficheros de proyeutu Geany" + +#: ../src/win32.c:167 +msgid "Executables" +msgstr "Executables" + +#: ../plugins/classbuilder.c:36 +msgid "Class Builder" +msgstr "Constructor de clases" + +#: ../plugins/classbuilder.c:36 +msgid "Creates source files for new class types." +msgstr "Cria ficheros fonte pa nueves clases." + +#: ../plugins/classbuilder.c:372 +msgid "Create Class" +msgstr "Criar Clas" + +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:402 +msgid "Class" +msgstr "Clas" + +#: ../plugins/classbuilder.c:411 +msgid "Class name:" +msgstr "Nome de clas:" + +#: ../plugins/classbuilder.c:424 +msgid "Header file:" +msgstr "Ficheru d'encabezáu:" + +#: ../plugins/classbuilder.c:434 +msgid "Source file:" +msgstr "Ficheru fonte:" + +#: ../plugins/classbuilder.c:440 +msgid "Inheritance" +msgstr "Herencia" + +#: ../plugins/classbuilder.c:449 +msgid "Base class:" +msgstr "Clas base:" + +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Ficheru fonte %s" + +#: ../plugins/classbuilder.c:465 +msgid "Base header:" +msgstr "Encabezáu base:" + +#: ../plugins/classbuilder.c:475 +msgid "Global" +msgstr "Global" + +#: ../plugins/classbuilder.c:485 +msgid "Base GType:" +msgstr "Gtype base:" + +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 +msgid "Options" +msgstr "Opciones" + +#: ../plugins/classbuilder.c:514 +msgid "Create constructor" +msgstr "Criar constructor" + +#: ../plugins/classbuilder.c:518 +msgid "Create destructor" +msgstr "Criar destructor" + +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Singletons" + +#: ../plugins/classbuilder.c:540 +msgid "GTK+ constructor type" +msgstr "Constructor de triba GTK+" + +#: ../plugins/classbuilder.c:1040 +msgid "Create Cla_ss" +msgstr "Criar Cla_s" + +#: ../plugins/classbuilder.c:1046 +msgid "_C++ Class" +msgstr "Clas _C++" + +#: ../plugins/classbuilder.c:1049 +msgid "_GTK+ Class" +msgstr "Clas _GTK+" + +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Clas _C++" + +#: ../plugins/htmlchars.c:38 +msgid "HTML Characters" +msgstr "Caráuteres HTML" + +#: ../plugins/htmlchars.c:38 +msgid "Inserts HTML character entities like '&'." +msgstr "Inxertar entidaes HTML pa caráuteres como '&'." + +#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 +msgid "The Geany developer team" +msgstr "L'equipu de desarrollu de Geany" + +#: ../plugins/htmlchars.c:75 +msgid "HTML characters" +msgstr "Caráuteres HTML" + +#: ../plugins/htmlchars.c:81 +msgid "ISO 8859-1 characters" +msgstr "Caráuteres ISO 8859-1" + +#: ../plugins/htmlchars.c:179 +msgid "Greek characters" +msgstr "Caráuteres griegos" + +#: ../plugins/htmlchars.c:234 +msgid "Mathematical characters" +msgstr "Caráuteres matemáticos" + +#: ../plugins/htmlchars.c:275 +msgid "Technical characters" +msgstr "Caráuteres técnicos" + +#: ../plugins/htmlchars.c:283 +msgid "Arrow characters" +msgstr "Caráuteres de fleches" + +#: ../plugins/htmlchars.c:296 +msgid "Punctuation characters" +msgstr "Caráuteres de puntuación" + +#: ../plugins/htmlchars.c:312 +msgid "Miscellaneous characters" +msgstr "Caráuteres misceláneos" + +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "El direutoriu de configuración del complementu nonpudo ser criáu." + +#: ../plugins/htmlchars.c:482 +msgid "Special Characters" +msgstr "Caráuteres especiales" + +#: ../plugins/htmlchars.c:484 +msgid "_Insert" +msgstr "_Inxertar" + +#: ../plugins/htmlchars.c:493 +msgid "" +"Choose a special character from the list below and double click on it or use " +"the button to insert it at the current cursor position." +msgstr "" +"Escueye un caráuter especial de la llista d'embaxu y calca dos vegaes nel o " +"usa'l botón pa inxertalu na posición actual del cursor." + +#: ../plugins/htmlchars.c:507 +msgid "Character" +msgstr "Caráuter" + +#: ../plugins/htmlchars.c:513 +msgid "HTML (name)" +msgstr "HTML (nome)" + +#: ../plugins/htmlchars.c:731 +msgid "_Insert Special HTML Characters" +msgstr "_Inxertar Caráuteres Especiales de HTML" + +#. Add menuitem for html replacement functions +#: ../plugins/htmlchars.c:746 +msgid "HTML Replacement" +msgstr "Sustitución de HTML" + +#: ../plugins/htmlchars.c:753 +msgid "_HTMLToggle" +msgstr "_Activador de HTML" + +#: ../plugins/htmlchars.c:762 +msgid "Bulk replacement of special chars" +msgstr "Sustitución masiva de carauteres especiales" + +#: ../plugins/htmlchars.c:777 +msgid "Insert Special HTML Characters" +msgstr "Inxertar Caráuteres Especiales HTML" + +#: ../plugins/htmlchars.c:780 +msgid "Replace special characters" +msgstr "Sustituyir carauteres especiales" + +#: ../plugins/htmlchars.c:783 +msgid "Toggle plugin status" +msgstr "Activar/Desactivar l'estáu del plugin" + +#: ../plugins/export.c:37 +msgid "Export" +msgstr "Esportar" + +#: ../plugins/export.c:37 +msgid "Exports the current file into different formats." +msgstr "Esporta'l ficheru actual en diferentes formatos." + +#: ../plugins/export.c:166 +msgid "Export File" +msgstr "Esportar ficheru" + +#: ../plugins/export.c:183 +msgid "_Use current zoom level" +msgstr "_Usar el nivel actual d'acercamientu/alloñamientu" + +#: ../plugins/export.c:185 +msgid "" +"Renders the font size of the document together with the current zoom level" +msgstr "" +"Asoleya'l tamañu de la fonte del documentu cabo'l nivel actual d'averamientu" + +#: ../plugins/export.c:268 +#, c-format +msgid "Document successfully exported as '%s'." +msgstr "Documentu esportáu exitosamente como '%s'." + +#: ../plugins/export.c:270 +#, c-format +msgid "File '%s' could not be written (%s)." +msgstr "El ficheru '%s' non pudo ser escritu (%s)." + +#: ../plugins/export.c:317 +#, c-format +msgid "The file '%s' already exists. Do you want to overwrite it?" +msgstr "El ficheru '%s' ya existe. ¿Quies sobroescribilu?" + +#: ../plugins/export.c:704 +msgid "_Export" +msgstr "_Esportar" + +#. HTML +#: ../plugins/export.c:711 +msgid "As _HTML" +msgstr "Como _HTML" + +#. LaTeX +#: ../plugins/export.c:717 +msgid "As _LaTeX" +msgstr "Como _LaTeX" + +#: ../plugins/filebrowser.c:43 +msgid "File Browser" +msgstr "Restolador de Ficheros:" + +#: ../plugins/filebrowser.c:43 +msgid "Adds a file browser tab to the sidebar." +msgstr "Amesta una llingüeta de restolación de ficheros al panel llateral." + +#: ../plugins/filebrowser.c:360 +msgid "Too many items selected!" +msgstr "¡Demasiaos elementos seleicionaos!" + +#: ../plugins/filebrowser.c:436 +#, c-format +msgid "Could not execute configured external command '%s' (%s)." +msgstr "Non se pudo executar el comandu esternu configuráu '%s' (%s)." + +#: ../plugins/filebrowser.c:603 +msgid "Open _externally" +msgstr "Abrir _esternamente" + +#: ../plugins/filebrowser.c:618 +msgid "_Find in Files" +msgstr "_Guetar en Ficheros" + +#: ../plugins/filebrowser.c:628 +msgid "Show _Hidden Files" +msgstr "Amosar Ficheros Anubrí_os" + +#: ../plugins/filebrowser.c:841 +msgid "Up" +msgstr "P'arriba" + +#: ../plugins/filebrowser.c:846 +msgid "Refresh" +msgstr "Refrescar" + +#: ../plugins/filebrowser.c:851 +msgid "Home" +msgstr "Aniciu" + +#: ../plugins/filebrowser.c:856 +msgid "Set path from document" +msgstr "Afitar camín dende'l documentu" + +#: ../plugins/filebrowser.c:866 +msgid "Clear the filter" +msgstr "Llimpiar el filtru" + +#: ../plugins/filebrowser.c:880 +msgid "Filter:" +msgstr "Filtrar:" + +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Peñera los tos ficheros con comodines" + +#: ../plugins/filebrowser.c:1107 +msgid "Focus File List" +msgstr "Enfocar la Llista de Ficheros" + +#: ../plugins/filebrowser.c:1109 +msgid "Focus Path Entry" +msgstr "Enfocar Entrada de Camín" + +#: ../plugins/filebrowser.c:1185 +msgid "External open command:" +msgstr "Comandu esternu d'apertura:" + +#: ../plugins/filebrowser.c:1194 +#, 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 "" +"El comandu a executar cuando usase \"Abrir con\". Pueden usase %f y %d como " +"remplazos.\n" +"%f será remplazáu col nome del ficheru col so camín completu\n" +"%d será remplazáu col camín del ficheru seleicionáu ensin el so nome" + +#: ../plugins/filebrowser.c:1202 +msgid "Show hidden files" +msgstr "Amosar ficheros anubrí_os" + +#: ../plugins/filebrowser.c:1208 +msgid "Hide object files" +msgstr "Anubrir ficheros oxetu" + +#: ../plugins/filebrowser.c:1212 +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" +msgstr "" +"Non amosar oxetos xeneraos nel restolador de ficheros, esto incluí *.o, *." +"obj. *.so, *.dll, *.a, *.lib" + +#: ../plugins/filebrowser.c:1223 +msgid "Use the project's base directory" +msgstr "Facer usu del direutoriu base del proyeutu" + +#: ../plugins/filebrowser.c:1227 +msgid "" +"Change the directory to the base directory of the currently opened project" +msgstr "Camudar el direutoriu al direutoriu base del proyeutu abiertu actual" + +#: ../plugins/saveactions.c:39 +msgid "Save Actions" +msgstr "Guardar Aiciones" + +#: ../plugins/saveactions.c:39 +msgid "This plugin provides different actions related to saving of files." +msgstr "" +"La estensión proporciona diferentes aiciones rellacionaes con guardar " +"documentos." + +#: ../plugins/saveactions.c:169 +#, c-format +msgid "Backup Copy: Directory could not be created (%s)." +msgstr "Copia de Respaldu: Non pudó criase la carpeta (%s)." + +#. it's unlikely that this happens +#: ../plugins/saveactions.c:201 +#, c-format +msgid "Backup Copy: File could not be read (%s)." +msgstr "Copia de Respaldu: Non pudó lleese'l ficheru (%s)." + +#: ../plugins/saveactions.c:219 +#, c-format +msgid "Backup Copy: File could not be saved (%s)." +msgstr "Copia de Respaldu: Non pudo guardase'l ficheru (%s)." + +#: ../plugins/saveactions.c:311 +#, c-format +msgid "Autosave: Saved %d file automatically." +msgid_plural "Autosave: Saved %d files automatically." +msgstr[0] "Autoguardar: Guardó'l ficheru %d automáticamente." +msgstr[1] "Autoguardar: Guardó los ficheros %d automáticamente." + +#. initialize the dialog +#: ../plugins/saveactions.c:380 +msgid "Select Directory" +msgstr "Seleicionar direutoriu" + +#: ../plugins/saveactions.c:463 +msgid "Backup directory does not exist or is not writable." +msgstr "El direutoriu de respaldu non esiste o non ye escribible." + +#: ../plugins/saveactions.c:543 +msgid "Auto Save" +msgstr "AutoGuardar" + +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 +msgid "_Enable" +msgstr "_Activar" + +#: ../plugins/saveactions.c:553 +msgid "Auto save _interval:" +msgstr "Autoguardar _intervalu:" + +#: ../plugins/saveactions.c:561 +msgid "seconds" +msgstr "segundos" + +#: ../plugins/saveactions.c:570 +msgid "_Print status message if files have been automatically saved" +msgstr "Im_prentar mensax d'estáu si los ficheros son guardaos atuomáticamente" + +#: ../plugins/saveactions.c:578 +msgid "Save only current open _file" +msgstr "Guardar sólo'l ficheru actual" + +#: ../plugins/saveactions.c:585 +msgid "Sa_ve all open files" +msgstr "Guardar tolos fiche_ros abiertos" + +#: ../plugins/saveactions.c:605 +msgid "Instant Save" +msgstr "Guardáu Automáticu" + +#: ../plugins/saveactions.c:615 +msgid "_Filetype to use for newly opened files:" +msgstr "Tribes de _ficheru por defeutu pa ficheros abiertos:" + +#: ../plugins/saveactions.c:646 +msgid "Backup Copy" +msgstr "Copia de Seguridá" + +#: ../plugins/saveactions.c:656 +msgid "_Directory to save backup files in:" +msgstr "_Direutoriu onde guardar ficheros de seguridá:" + +#: ../plugins/saveactions.c:679 +msgid "Date/_Time format for backup files (\"man strftime\" for details):" +msgstr "" +"Forma_tu de fecha/hora pa los ficheros de seguridá (detalles en \"man " +"strftime\"):" + +#: ../plugins/saveactions.c:692 +msgid "Directory _levels to include in the backup destination:" +msgstr "" +"Nive_les de direutoriu que incluiránse nel destín de la copia de seguridá:" + +#: ../plugins/splitwindow.c:36 +msgid "Split Window" +msgstr "Dixebrar Ventana" + +#: ../plugins/splitwindow.c:36 +msgid "Splits the editor view into two windows." +msgstr "Dixebra la vista del editor en dos ventanes." + +#: ../plugins/splitwindow.c:244 +msgid "Show the current document" +msgstr "Amosar el documentu actual" + +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 +msgid "_Unsplit" +msgstr "N_un cortar" + +#: ../plugins/splitwindow.c:371 +msgid "_Split Window" +msgstr "_Dixebrar la ventana" + +#: ../plugins/splitwindow.c:379 +msgid "_Horizontally" +msgstr "_Horizontalmente" + +#: ../plugins/splitwindow.c:384 +msgid "_Vertically" +msgstr "_Verticalmente" + +#: ../plugins/splitwindow.c:400 +msgid "Split Horizontally" +msgstr "Xebrar Horizontalmente" + +#: ../plugins/splitwindow.c:402 +msgid "Split Vertically" +msgstr "Xebrar Verticalmente" + +#~ msgid "Try to resave the file?" +#~ msgstr "¿Intentar volver a guardar el ficheru?" + +#~ msgid "_Customize Toolbar" +#~ msgstr "_Personalizar la Barra de Ferramientes" + +#~ msgid "Icon style:" +#~ msgstr "Estilu d'iconu:" + +#~ msgid "Icon size:" +#~ msgstr "Tamañu d'iconu:" + +#~ msgid "Appearance" +#~ msgstr "Apariencia" + +#~ msgid "Hard tab width:" +#~ msgstr "Anchu del tabulador puru:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "L'anchu d'un tabulador cuando Tabulación y Espacios ye afitáu pa un " +#~ "documentu" + +#~ msgid "Long line marker:" +#~ msgstr "Marcador de llínies llargues:" + +#~ msgid "Long line marker color:" +#~ msgstr "Collor del marcador de llínies llargues:" + +#~ msgid "Terminal plugin" +#~ msgstr "Plugin de Terminal" + +#~ msgid "Terminal font:" +#~ msgstr "Fonte de la terminal:" + +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Seleiciona Inclusiones y Argumentos" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_Ver Ficheru DVI" + +#~ msgid "V_iew PDF File" +#~ msgstr "V_er Ficheru PDF" + +#~ msgid "_Set Arguments" +#~ msgstr "_Seleicionar argumentos" + +#~ msgid "Set Arguments" +#~ msgstr "Seleicionar argumentos" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Seleiciona los programes y opciones pa la compilación y visualización de " +#~ "ficheros (La)TeX." + +#~ msgid "DVI creation:" +#~ msgstr "Criación de DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Criación de PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Previsualización de DVI" + +#~ msgid "PDF preview:" +#~ msgstr "Previsualización de PDF" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f será reemplazáu pol nome del ficheru actual, ej. preba.c\n" +#~ "%e será reemplazáu pol nome del ficheru actual ensin estencion, ej. preba" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Seleiciona Inclusiones y Argumentos" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Configura los comandos pa construyir y executar programes." + +#~ msgid "Compile:" +#~ msgstr "Compilar:" + +#~ msgid "Build:" +#~ msgstr "Construyir:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Falló al executar el programa visualizador" + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr "dummy tooltip, don't translate this." + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Usar testu en blancu sobro fondo prietu ya invertir tolos collores, esta " +#~ "opción requier reaniciar Geany" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Camín y opciones pa la ferramienta make" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplicar llínia o seleición" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Unviar Seleición a la Terminal" + +#~ msgid "Run (alternative command)" +#~ msgstr "Executar (comandu alternativu)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Embaxu atopase una llista de complementos disponibles. Seleiciona los " +#~ "complementos que deben ser cargaos cuando s'anicie Geayn." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "La imprentación de %s foi encaboxada." + +#~ msgid "Make in base path" +#~ msgstr "Make nel direutoriu base" + +#~ msgid "Run command:" +#~ msgstr "Comandu d'execución:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Llínia de comandos a correr nel camín base del proyeutu. Opciones pueden " +#~ "ser amestaes al comandu. Dexar en blancu pa usar el comandu por defeutu." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Escueye'l Comandu d'Execución del Proyeutu" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Reemplazar testu en %u ficheru." +#~ msgstr[1] "Reemplazar testu en %u ficheros." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Falló la gueta (Ver Aida->Mensaxes de Depuración pa detalles)." + +#~ msgid "My" +#~ msgstr "El mio" + +#~ msgid "Local" +#~ msgstr "Llocal" + +#~ msgid "Our" +#~ msgstr "El nuestro" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Estes opciones pa la emulación de terminal virtual (VTE) sólo apliquen si " +#~ "la biblioteca de VTE pudo ser cargada." + +#~ msgid "Unsplit" +#~ msgstr "Arrexuntar" diff -Nru geany-0.18/po/be.po geany-0.19/po/be.po --- geany-0.18/po/be.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/be.po 2010-05-23 09:08:49.000000000 +0100 @@ -1,19 +1,20 @@ # Belarusian translation of geany. # Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. -# Yura Siamashka , 2006 - 2009. +# Yura Siamashka , 2006 - 2010. # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-05-01 21:30+0300\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-05-21 10:15+0300\n" "Last-Translator: Yura Siamashka \n" "Language-Team: Belarusian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: be\n" "X-Poedit-Language: Belarusian\n" "X-Poedit-Country: BELARUS\n" "X-Poedit-SourceCharset: utf-8\n" @@ -24,7 +25,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Хуткае і легкаважнае асяроддзе распрацоўкі, выкарыстоўваючае GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -32,68 +33,68 @@ msgid "Integrated Development Environment" msgstr "Інтэграванае асяроддзе распрацоўкі" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Пра Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Хуткае і легкаважнае асяроддзе распрацоўкі" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(пабудавана %s або пазней)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Інфармацыя" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Распрацоўшчыкі" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" -msgstr "Вядучы распрацоўшчык" +msgstr "вядучы распрацоўшчык" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "распрацоўшчык" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "падтрымка перакладу" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Перакладчыкі" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Былыя перакладчыкі" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Удзельнікі" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Некаторыя з шматлікіх удзельнікаў (больш дэталёвы спіс глядзі ў файле %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Аўтары" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Ліцэнзія" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -101,276 +102,279 @@ "Тэкст ліцэнзіі не знойдзены, калі ласка наведаеце http://www.gnu.org/" "licenses/gpl-2.0.txt, каб азнаёміцца з ім." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Немагчыма знайсці тэрмінал '%s' (праверце шлях да тэрмінала ў уласцівасцях)" +msgid "failed to substitute %%p, no project active" +msgstr "Немагчыма замяніць %%p, няма актыўнага праекта" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Працэс скончыўся непаспяхова, няма працоўнай дырэкторыі" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Памылка запуску \"%s\" (стартавы скрыпт не можа быць створаны)" +msgid "%s (in directory: %s)" +msgstr "%s (у дырэкторыі: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Працэс скончыўся непаспяхова (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (у дырэкторыі: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Не атрымалася змяніць працоўную дырэкторыю на \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Памылка запуску \"%s\" (стартавы скрыпт не можа быць створаны)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Немагчыма запусціць файл у VTE, бо ён, магчыма, утрымлівае каманду." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Немагчыма знайсці тэрмінал '%s' (праверце шлях да тэрмінала ў уласцівасцях)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Кампіляцыя скончылася непаспяхова." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Кампіляцыя скончылася паспяхова." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "Кампіляваць" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "Пабудаваць" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Будаваць усе" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Будаваць з make (свая мэта)" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Будаваць аб'ект" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Свой тэкст" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Увядзіце тут свой тэкст, увесь уведзены тэкст далучыцца да каманды." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Наступная памылка" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Папярэдняя памылка" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Усталяваць параметры зборкі" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "Праглядзець DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Праглядзець PDF" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "Усталяваць каманды будоўлі" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Усталяваць аргументы" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Будаваць цяперашні файл" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Усталяваць аргументы" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Будаваць цяперашні файл, выкарыстоўваючы make і мэту зборкі па змоўку" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Усталяваць праграмы і наладкі для зборкі і прагляду (La)TeX файлаў." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Будаваць цяперашні файл, выкарыстоўваючы make і указаную мэту" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Стварэнне DVI" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Скампіляваць цяперашні файл, выкарыстоўваючы make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Стварэнне PDF" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Працэс немагчыма спыніць (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Прагляд DVI:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Памылак будоўлі больш няма." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Прагляд PDF:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Усталяваць надпіс элемента меню" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Элемент" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f будзе заменены на поўнае імя, напрыклад, test_file.c\n" -"%e будзе заменены на імя файла без пашырэння, напрыклад, test_file" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Метка" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Каманда" + +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Працоўная дырэкторыя" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Усталяваць параметры зборкі" +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Ачысціць" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "сталяваць каманды для будоўлі і выканання праграм." +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Пстрыкніце для ўсталявання надпісу элемента меню" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1904 ../src/build.c:1906 #, c-format -msgid "%s commands" -msgstr "%s каманды" +msgid "%s Commands" +msgstr "%s Каманды" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Кампіляваць:" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Без тыпа файла" -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Будаваць:" +#: ../src/build.c:1914 ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Памылка ў сталым выразе:" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Выканаць:" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Каманды не звязаныя з тыпам файлаў" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Будаваць цяперашні файл" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Заўвага: Элемент 2 адчыняе дыялог і дадае адказ да каманды." -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Будаваць з make (свая мэта)" +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Выканаць каманды" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Увядзіце тут свае наладкі, увесь уведзены тэкст перадаецца камандзе make." +"%d, %e, %f, %p замяняюцца ў камандзе і дырэкторыі, глядзі даведку для " +"дэталяў." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Будаваць цяперашні файл, выкарыстоўваючы make і мэту зборкі па змоўку" +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Усталяваць каманды будоўлі" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Будаваць цяперашні файл, выкарыстоўваючы make і указаную мэту" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "Кампіляваць" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Скампіляваць цяперашні файл, выкарыстоўваючы make" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "Пабудаваць" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Немагчыма запусціць праграму прагляду" +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +msgid "_Execute" +msgstr "Выканаць" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Працэс немагчыма спыніць (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Будаваць з make (свая мэта)" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Памылак будоўлі больш няма." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Будаваць аб'ект" + +#: ../src/build.c:2462 ../src/build.c:2633 +msgid "_Make" +msgstr "Зрабіць" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Будаваць усе" -#: ../src/callbacks.c:152 +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "Усталяваць каманды меню пабудовы" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Вы ўпэўнены, што жадаеце выйсці?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d файл захаваны." +msgstr[1] "%d файла захавана." +msgstr[2] "%d файлаў захавана." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Загрузіць зноў" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Усе незахаваныя змяненні знікнуць." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Вы упэўнены што жадаеце загрузіць зноў '%s?'" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Перайсці да радка" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Увядзіце радок, на які перайсці:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Калі ласка вызначыце тып файла для цяперашняга дакумента перад " "выкарыстоўваннем гэтай функцыі" -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Выкарыстоўваць свой фармат даты" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Свой фармат даты" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -378,24 +382,23 @@ "Увядзіце свой фармат даты часу. Вы можаце выкарыстоўваць любыя параметры " "канверсіі, дастасавальныя да функцыі strftime ANSI C." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Немагчыма пераўтварыць фармат даты (магчыма радок надта доўгі)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Паведамленняў больш няма." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Адчыніць файл" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Выгляд" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -403,28 +406,28 @@ "Адчыніць файл ў рэжыме \"толькі чытанне\". Калі абраць больш за адзін файл, " "усе абраныя файлы будуць адчынены ў рэжыме \"толькі чытанне\"." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Вызначаць па пашырэнню файла" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Вызначаць па зместу файла" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "Дадатковыя наладкі" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Паказваць схаваныя файлы" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Усталяваць знаканабор:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -438,11 +441,11 @@ "знаканабору." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Усталюйце тып файла:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -454,31 +457,30 @@ "файла." #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "Замяніць" +msgstr "Перапісаць?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "Файл ужо існуе!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Захаваць файл" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Пераназваць" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Захаваць і пераназваць файл" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "Адчыніць файл у новай укладцы" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -486,41 +488,41 @@ "Захаваць цяперашні незахаваны дакумент адчыненым, і адчыніць створаны файл у " "новай укладцы." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Памылка" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Пытанне" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Папярэджанне" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Інфармацыя" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "Не захоўваць" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Файл '%s' не захаваны." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Захаваць файл да зачынення?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Абраць шрыфт" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -528,106 +530,110 @@ "Адбылася памылка або інфармацыя аб файле не можа быць атрымана (напрыклад, " "новы файл)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "невядомы" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Уласцівасці" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Тып:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Памер:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Размяшчэнне:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Толькі чытанне:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(толькі ў Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Знаканабор:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(з BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Мадыфікаваны:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Зменены:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Апошні доступ:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Права доступу:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Чытаць:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Пісаць:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Выканаць:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Уладальнік:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Група:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Іншыя:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Файл %s зачынены." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Адчынены новы файл \"%s\"." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Немагчыма адчыніць файл %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -636,18 +642,18 @@ "The file was set to read-only." msgstr "" "Файл \"%s\" не адчыніўся як трэба і магчыма быў абрэзаны. Гэта магло " -"здарыцца калі файл змяшчае NULL байт. Май на ўвазе, захаванне можа вызваць " -"страту дадзеных.\n" -"Усталёваны толькі чытанне рэжым." +"здарыцца таму, што файл змяшчае нулявы байт. Майце на ўвазе, захаванне можа " +"вызваць страту дадзеных.\n" +"Усталёваны рэжым толькі чытанне." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" не з'яўляецца сапраўдным %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -655,30 +661,30 @@ msgstr "" "Файл \"%s\" не выглядае як тэкст, альбо яго знаканабор не падтрымліваецца." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Прабелы" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Укладкі" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Адступы і прабелы" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Усталюецца %s рэжым фарматавання для %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" -msgstr "Благі файл" +msgstr "Благое імя файла" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Файл %s загружаны зноў." @@ -686,20 +692,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Файл %s адчынены (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", толькі чытаць" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Памылка пры перамяшчэнні файла." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -708,7 +714,7 @@ "Адбылася памылка пры пераўтварэнні фала з UTF-8 у \"%s\". Файл застанецца " "незахаваным." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -717,41 +723,41 @@ "Паведамленне памылкі: %s\n" "Памылка адбылася ў \"%s\" (радок %d, слупок: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Тэкст памылкі: (%s)." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Памылка пры захаванні файла." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Памылка пры захаванні файла (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Файл %s захаваны." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" не знайдзён." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Шукаць зноў с пачатку?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Супадзенні не знойдзены для \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -759,11 +765,11 @@ msgstr[1] "%s: зменена %d выпадкі \"%s\" на \"%s\"." msgstr[2] "%s: зменены %d выпадкаў \"%s\" на \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Вы жадаеце загрузіць яго зноў?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -772,24 +778,29 @@ "Файл '%s' на дыску больш новы чым\n" "цяперашні буфер." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Паспрабаваць перазахаваць файл?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Зачыніць без захавання" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "Файл \"%s\" не знайдзён на дыску!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "Файл \"%s\" не знайдзён на дыску! Паспрабаваць перазахаваць файл?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Увядзіце шырыню ўкладкі" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Увядзіце колькасць прабелаў якая павінна быць зменена на літару адступ." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "папярэджанне: не стандартная шырыня адступа: %d != 8!" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Кельцкі" @@ -900,574 +911,620 @@ msgid "Without encoding" msgstr "Без знаканабору" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Заходне Еўрапейскі" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "Усходне Еўрапейскі" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Усходне Азіяцкі" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Паўднёва-Усходні і Паўднёва-Заходнні Азіяцкі" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Сярэдні Усход" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "Юнікод" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s зыходны файл" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" -msgstr "%s зыходны файл" +msgstr "%s файл" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Нічога" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "файл абалонкі" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML дакумэнт" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Файл каскаднай табліцы стыляў (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" -msgstr "наладкі" +msgstr "Файл наладкаў" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext файл перакладу" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s скрыпт файл" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Мовы праграміравання" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Мовы скрыптоў" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Мовы разметкі" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Іншыя мовы" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Свой тып файла" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Усе зыходныя" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Усе файлы" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Дрэнны сталы выраз для файлаў тыпу %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "без назвы" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Нельга знайсці файл: '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Выбар колеру" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "Прадвызначаны" + +#: ../src/interface.c:295 msgid "_File" msgstr "Файл" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Новы (з шаблонам)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "нябачна" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Адчыніць вылучаны файл" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Нядаўнія файлы" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Захаваць усе" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Загрузіць зноў як" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "нябачна" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Наладка старонкі" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Зачыніць іншыя дакументы" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Зачыніць усе" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "Змена" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "Фармат" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "Фарматаваць Радок/Вылучэнне " + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Пераключыць рэгістр у вылучэнні" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "Пераставіць цяперашні радок" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Каментаваць радок" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Раскаментаваць радок" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Каментаваць/Раскаментаваць радок" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Дубліраваць радок ці вылучэнне" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Павялічыць адступ" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Зменшыць адступ" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "Паслаць вылучэнне ў тэрмінал" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "Разумныя адступы" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Паслаць вылучэнне да" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "Каманды" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "Выразаць цяперашні радок(і)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "Капіяваць цяперашні радок(і)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "Выдаліць цяперашні радок(і)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "Дубліраваць радок ці вылучэнне" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "Вылучыць цяперашні радок(і)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "Вылучыць цяперашні параграф" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "Уставіць іншае вольнае месца (прабел, адступ...)" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Перайсці да наступнага маркёра" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Перайсці да папярэдняга маркёра" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Паслаць вылучэнне ў тэрмінал" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Уставіць каментарый" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Уставіць ChangeLog запіс" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Уставіць загаловак файла" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Уставіць апісанне функцыі" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Уставіць шматрадковы каментарый" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Уставіць GPL паведамленне" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Уставіць BSD паведамленне" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Уставіць дату" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Уставіць \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Уласцівасці" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Уласцівасці ўбудоў" + +#: ../src/interface.c:720 msgid "_Search" msgstr "Шукаць" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Шукаць наступны" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" -msgstr "Шукаць былы" +msgstr "Шукаць папярэдні" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Шукаць у файлах" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Замяніць" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Шукаць вылучаны" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" -msgstr "Шукаць былы вылучаны" +msgstr "Шукаць папярэдні вылучаны" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Наступнае паведамленне" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" -msgstr "Былое паведамленне" +msgstr "Папярэдняе паведамленне" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Ісці да радка" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Змяніць шрыфт" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Паказаць/Схаваць усе дадатковыя віджэты" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Увесь экран" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Паказваць вакно паведамленняў" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" -msgstr "Паказваць панель прыладаў" +msgstr "Паказваць панэль прыладаў" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" -msgstr "Паказваць панель прыладаў" +msgstr "Паказваць панэль прыладаў" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Рэдактар" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Паказваць Markers Margin" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Паказваць нумар радка" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Паказваць прабелы" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Паказваць літары завяршэння радкоў" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Паказваць індыкатары водступу" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "Дакумент" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Дынамічны перанос радкоў" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Перанос радкоў" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Аўта-водступ" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Тып водступу" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "Адступы" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "Прабелы" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "Адступы і прабелы" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Талькі чытаць" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Пісаць юнікодны BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Усталяваць тып файла" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Усталяваць знаканабор" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Усталяваць завяршэнне радка" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Змяніць на CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Змяніць на LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Змяніць на CR (Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Выдаляць завяршаючыя прабелы" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Змяняць адступы на прабелы" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Змяняць прабелы на адступы" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Згарнуць усе" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Разгарнуць усе" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Убраць пазначальнікі" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Выдаліць індыкатары памылак" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "Праект" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Новы" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "Адчыніць" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Нядаўнія праекты" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "Зачыніць" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "Прылады" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "Загрузіць канфігурацыю зноў" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Файлы наладаў" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Выбар колеру" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Лічыць словы" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Загрузіць тэгі" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "Загрузіць канфігурацыю зноў" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "Дапамога" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Інтэрнэт старонка" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Клавішы" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Паведамленні адладкі" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Сімвалы" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Дакументы" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Стан" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Кампілятар" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Паведамленні" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Для заметак" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Малюнкі і тэкст" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Толькі малюнкі" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Уласцівасці панэлі прыладаў" -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Толькі тэкст" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Павялічаныя значкі" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Паменшаныя значкі" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Вельмі малыя значкі" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Схаваць панель прыладаў" - -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1900 msgid "_Hide Toolbar" -msgstr "Схаваць панель прыладаў" +msgstr "Схаваць панэль прыладаў" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Знайсці выкарыстоўванне" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Знайсці выкарыстоўванне дакумента" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Перайсці да рэалізацыі" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Перайсці да аб'явы" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Кантэкставае дзеянне" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Уласцівасці" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Загрузіць файлы з апошняга сеансу" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Адчыняць файлы з апошняга сеансу пры старце" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Загружаць эмулятар тэрмінала" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1475,60 +1532,60 @@ "Ці трэба загружаць эмулятар тэрмінала (VTE) пры старце. Забараніце, калі ён " "не патрэбен. " -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Дазволіць падтрымку ўбудоў" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Захаваць пазіцыю вакон і геаметрыю" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Захаваць пазіцыю вакон і геаметрыю, і аднаўляць яе пры старце" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Пацвярджаць выхад" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Паказваць пацвярджаючы дыялог пры выхадзе." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Завяршэнне" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Стартавая дырэкторыя:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." msgstr "" "Стартавая дырэкторыя пры адчыненні або захаванні файлаў. Павінна быць " -"абсалютным шляхам. Пакіньце пустой для выкарыстоўвання цяперашней " +"абсалютным шляхам. Пакіньце пустой для выкарыстоўвання цяперашней працоўнай " "дырэкторыі. " -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Файлы праекта:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Стартавая дырэкторыя пры адкрыцці файлаў праекта" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Дадатковы шлях да ўбудоў:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1537,39 +1594,39 @@ "Geany па змоўку шукае убудовы ў дырэкторыі інсталяцыі і наладак. Гэты шлях " "будзе дададзены для пошуку ўбудоў. Пакіньце пустым каб забараніць." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Шляхі" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Гудок пры памылках, ці на завяршэнне кампіляцыі" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Ці трэба гудзець пры памылцы, ці на завяршэнне кампіляцыі." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" -msgstr "Пераключацца ў вакно паведамленняў, пры з'з'яўленні новага" +msgstr "Пераключацца ў вакно паведамленняў, пры з'яўленні новага" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "Пераключацца ў вакно паведамленняў, пры атрыманні новага." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Забараніць паведамленні статуса ў радку стану" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1577,12 +1634,11 @@ "Выдаліць усе паведамленні з радка стану. Паведамленні паказваюцца ў акне " "стану." -#: ../src/interface.c:2883 -#, fuzzy +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Аўта фокус віджэтаў (фокус ідзе за мышам)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1592,27 +1648,39 @@ "Працуе для галоўнага вакна рэдактара, VTE, пошуку і пераходу да радка на " "панелі прыладаў." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Выкарыстоўваць Адчыніць/Захаваць дыялог Windows" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Вызначае ці выкарыстоўваць родны дыялог Адчыніць/Захаваць Windows ці " +"выкарыстоўваць дыялог GTK" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Іншае" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Заўсёды пракручваць пошук і хаваць дыялог пошуку" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "" "Заўсёды пракручваць пошук і хаваць дыялог пошуку пасля націскання Шукаць " -"Наступны/Былы." +"Наступны/Папярэдні." -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Выкарыстаць слова пад курсорам для дыялогаў пошуку" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1621,19 +1689,19 @@ "курсорам, пры адчыненні дыялогаў \"Пошук\", \"Шукаць у файлах\" або " "\"\"Замяніць\"." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Выкарыстоўваць цяперашнюю дырэкторыю для пошуку ў файлах" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Шукаць" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Выкарыстоўваць файлы сесій праекта" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1641,11 +1709,11 @@ "Ці захоўваць спіс адчыненых файлаў у праекце і адчыняць іх пры адкрыцці " "праекта" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Захоўваць файл праекта ў базавай дырэкторыі праекта" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1656,75 +1724,97 @@ "стварэнні новага праекта, замест дырэкторыі вышэй базавай дырэкторыі " "праекта. Вы можаце змяніць шлях да файла праекта ў дыялогу Новы Праект." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Праекты" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Разнастайнае" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Агульны" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Паказваць спіс сімвалаў" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Паказаць/Схаваць спіс сімвалаў" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Паказаць спіс дакументаў" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Паказаць/Схаваць спіс дакументаў" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Паказваць бакавую панэль" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Пазіцыя:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Улева" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Справа" + +#: ../src/interface.c:3039 msgid "Sidebar" -msgstr "Бакавая панель" +msgstr "Бакавая панэль" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Спіс сімвалаў:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Акно паведамленняў:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Рэдактар:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Усталяваць шрыфт для вакна паведамленняў" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Усталяваць шрыфт для спісу сімвалаў" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Шрыфт рэдактара" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Шрыфты" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Паказваць закладкі рэдактара" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Паказваць зачыняючыя кнопкі" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1732,111 +1822,138 @@ "Паказваць маленькія кнопкі з крыжыкам, на ўкладках, побач з назвамі файлаў, " "каб можна было лёгка зачыняць іх адным пстрычкам (патрэбен перазапуск Geany)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Пазіцыя новых файлаў ў закладцы файлаў" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Улева" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Новыя файлы будуць змешчаны злева у закладцы файлаў" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Справа" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Новыя файлы будуць змешчаны справа у закладцы файлаў" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Адразу за цяперашней" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "Змяшчаць новую ўкладку адразу за цяперашней ці самай апошняй " + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" -msgstr "Падвоены клік хавае усе дадатковыя віджэты" +msgstr "Падвоены клік хавае ўсе дадатковыя віджэты" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Перамкнуць усе дадатковыя віджэты" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Укладкі редактара тэкста" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Верх" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Ніз" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" -msgstr "Бакавая панель:" +msgstr "Бакавая панэль:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Месца укладак" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Паказваць радок стану" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ці паказваць радок стану ўнізе галоўнага вакна" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Інтэрфейс" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" -msgstr "Паказваць панель прыладаў" +msgstr "Паказваць панэль прыладаў" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" -msgstr "Дадаць панель прылад да меню" +msgstr "Дадаць панэль прылад да меню" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -"Далучыць панель прыладаў да меню каб захаваць больш вертыкальнага месца" +"Далучыць панэль прыладаў да меню каб захаваць больш вертыкальнага месца" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Панель прыладаў" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Наладзіць панэль прыладаў" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Стыль значкоў:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Памер значкоў:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Выгляд" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Прадвызначаны" -#: ../src/interface.c:3359 ../src/toolbar.c:881 -#, fuzzy -msgid "Customize Toolbar" -msgstr "Паказваць панель прыладаў" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Малюнкі і тэкст" -#: ../src/interface.c:3363 +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Толькі малюнкі" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Толькі тэкст" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Стыль значкоў" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Прадвызначаны" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Паменшаныя значкі" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Вельмі малыя значкі" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Павялічаныя значкі" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Памер значкоў" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Панэль прыладаў" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" -msgstr "Панель прылад" +msgstr "Панэль прыладаў" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Перанос радкоў" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1846,11 +1963,11 @@ "радка. Увага: дынамічны перанос радкоў з'яўляецца рэсурсаёмістым працэсам " "пры працы з вялікімі дакументамі, таму на слабых машынах варта яго адключыць." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Дазволіць \"разумную\" клавішу home" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1863,11 +1980,11 @@ "на пачатак радка. Калі гэта ўласцівасць забаронена курсор заўсёды " "перамяшчаецца ў пачатак радка, незалежна ад цяперашняга палажэння." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Забараніць перацягванне" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1875,55 +1992,56 @@ "Забараніць перацягванне увогуле, так, каб нельга было перацягваць вылучэнне " "ў акне рэдактара або за яго межамі" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Дазволіць згортванне блокаў кода" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Ці дазваляць згортванне блокаў кода" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Згарнуць/разгарнуць усе ўкладзеныя элементы" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." msgstr "" "Згарнуць ці разгарнуць усе ўкладзеныя элементы. Пры націску клавішы shift, " -"выкарыстоўваецца адваротныя дзеянні." +"выкарыстоўваюцца адваротныя дзеянні." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Выкарыстоўваць індыкатары для памылак кампіляцыі" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "" "Ці выкарыстоўваць індыкатары(падкрэсліванне) для пазначэння радка, калі " -"кампілятар знойдзе у ім папярэджанне ці памылку" +"кампілятар знойдзе ў ім папярэджанне ці памылку" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Выдаляць завяршаючыя прабелы " -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "Убіраць завяршаючыя прабелы с былога радка пры стварэнні новага радка." +msgstr "" +"Убіраць завяршаючыя прабелы с папярэдняга радка пры стварэнні новага радка." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Разбіваць радок па слупку:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" -msgstr "перамыкач маркёра каментарыяў:" +msgstr "Перамыкач маркёра каментарыяў:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1931,95 +2049,87 @@ "Тэкст, дабаўленне якога прывядзе да пераключэння рэжыму каментавання радкоў " "у зыходным файле." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Магчымасці" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Магчымасці" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Рэжым аўта-водступу:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Базавы" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Цяперашнія літары" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Парныя дужкі" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Тып:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Шырыня:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Шырыня ў літарах аднаго адступа" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Выкарыстоўваць прабелы для адступаў" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Выкарыстоўваць адзін адступ" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Выкарыстоўваць прабелы калі агульная шырыня адступа менш чым шырыня літары " "адступа, інакш выкарыстоўваць абодва" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Жорсткая шырыня адступа:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Шырыня адступа пры ўключаным рэжыме водступу \"Адступы і прабелы\"" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Ці вызначаць тып водступаў па змесціве адчыняемага файла." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Шырыня адступа" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Націск Tab (Shif-Tab) павялічвае (памяншае) водступ замест устаўкі літары " "адступа." -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Водступы" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Водступы" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Аўта дапаўненне канструкцый" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2027,20 +2137,19 @@ "Набярыце вызначаную кароткую паслядоўнасць літар і змяніце яе на больш " "складаную адным націскам клавішы" -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XML тэг аўта дадатак" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Аўтаматычна закрываць адчыненыя XML тагі (таксама для тагаў HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Аўтаматычны працяг шматрадковых каментарыяў" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2048,11 +2157,11 @@ "Аўтаматычна працягваць шматрадковыя каментарыі ў такіх мовах, як C, C++ і " "Java, калі ў тэкст такога каментара дадаецца новы радок." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "Аўта-дадатак сімвалаў " -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2060,147 +2169,139 @@ "Аўтаматычнае завяршэнне вядомых імёнаў аб'ектаў у адчыненых файлах (імёны " "функцый, глабальныя зменныя і г.д.)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Аўта-дадатак усіх слоў у дакуменце" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "" +msgstr "Выдаляць канец слова пры аўта-дадатку" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Макс. колькасць прапаноў для імя слова:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Вышыня спіса дадаткаў:" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Колькасць знакаў, неабходных для аўта-дадатку:" -#: ../src/interface.c:3683 -#, fuzzy +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Колькасць знакаў, неабходных для з'яўлення спісу аўта-дадатку" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Колькасць радкоў для паказу ў спісе аўта дадатку" -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Максімальная колькасць радкоў для паказу ў спісе аўта дадатку" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Дадаткі" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Дужкі ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Аўтаматычна ставіць ) пры друку (" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Адзінарныя двукоссі ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Аўтаматычна ставіць зачыняючы ' пры друку '" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Фігурныя дужкі { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Аўтаматычна ставіць } пры друку {" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Квадратныя дужкі [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Аўтаматычна ставіць ] пры друку [" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Падвойныя двукоссі \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Аўтаматычна ставіць зачыняючы \" пры друку \"" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Аўта зачыненне дужак і двукоссяў" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" -msgstr "Дадаткі" +msgstr "Дадаткі" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Інвертаваць колер падсветкі сінтаксіса" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Выкарыстоўваць белы тэкст на чорным фоне і інвертаваць усе колеры, " -"патрабуецца перазапуск Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Інвертаваць усе колеры, выкарыстоўваць белыя літары на чорным фоне" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Паказваць індыкатары водступу" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Паказваць маленькія рысы з кропкамі для дапамогі ў выбару правільнага " "водступу" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Паказваць прабелы" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Пазначыць прабелы кропкамі, адступы стрэлкамі." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Паказваць завяршэнне радка" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Паказваць літары завяршэння радкоў" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Паказваць нумары радкоў" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Паказаць/Схаваць нумары радкоў." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Паказваць вылучэнне радкоў" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2208,36 +2309,36 @@ "Паказаць/Схаваць маленькі адступ, які выкарыстоўваецца для вылучэння радкоў, " "справа ад нумару радка" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" -msgstr "пыніць прагортку на апошнім радку" +msgstr "Спыніць прагортку на апошнім радку" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Спыняць прагортку на апошнім радку дакумента" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Паказваць" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Маркёр доўгага радка:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Колер маркёра доўгага радка:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Слупок:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Колер:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Усталяваць колер маркёра доўгага радка" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Выбар колеру" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2247,11 +2348,11 @@ "вылучыць доўгія радкі. Усталюйце значэнне больш за 0 для вызначэння на якім " "радку яна павінна з'явіцца." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Рыса" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2259,122 +2360,157 @@ "Паказваць вертыкальную рысу ў акне рэдактара на указанай пазіцыі (глядзі " "ніжэй)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "" "Колер фону пасля зададзенай пазіцыі курсора (гл. далей) змяняецца на колер, " -"які ўсталяваны ніжэй (рэкамендавана, калі вы выкарыстаеце прапарцыйныя " +"які ўсталяваны ніжэй (рэкамендуецца, калі вы выкарыстоўваеце прапарцыйныя " "шрыфты)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Забаронены" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Уключана" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Маркёр доўгага радка" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Забаронены" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Не паказваць уяўныя прабелы" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Толькі для прамавугольных вылучэнняў" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Паказваць віртуальныя прабелы за канцом радка толькі пры маляванні " +"прамавугольнага вылучэння" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Заўсёды" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Заўсёды паказваць уяўныя прабелы за канцамі радкоў" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Уяўныя прабелы" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Паказваць" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Адчыняць новыя дакументы з каманднага радка" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Ствараць новы файл для кожнага неіснуючага файла ў камандным радку" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Прадвызначаная літара завяршэння радкоў:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Новыя файлы" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Вызначыць прадвызначаны знаканабор для новых файлаў" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Прадвызначаны знаканабор (новых файлаў):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Прадвызначаны знаканабор (існуючых файлаў):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Вызначыць прадвызначаны знаканабор для адчынення файлаў" - -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Выкарыстоўваць адзін і той жа знаканабор для адчынення файлаў" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Вызначыць прадвызначаны знаканабор для новых файлаў" + +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "" +"Выкарыстоўваць адзін і той жа знаканабор для адчынення не юнікодных файлаў" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" +msgstr "" +"Гэта наладка адключае аўтаматычнае вызначэнне знаканабору пры адкрыцці не " +"юнікодных файлаў, файл адчыняецца ў абраным знаканабору (звычайна ў гэтым " +"няма неабходнасці)." + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Прадвызначаны знаканабор (існуючых не юнікодных файлаў):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "" -"Гэта наладка адключае аўтавызначэнне знаканабору пры адкрыцці файлаў, файл " -"адчыняецца ў абраным знаканабору (звычайна ў гэтым няма неабходнасці)." +"Вызначыць прадвызначаны знаканабор для адчынення існуючых юнікодных файлаў" -#: ../src/interface.c:4032 +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Знаканаборы" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Забяспечыць пусты радок у канцы файла" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Забяспечыць пусты радок у канцы файла" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Выдаляць завяршаючыя прабелы і адступы" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Выдаляць завяршаючыя прабелы на канцах радкоў" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Змяніць адступы на прабелы" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Змяніць усе адступы ў дакуменце на прабелы" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Захаваць файлы" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Даўжыня спіса апошніх файлаў:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Вызначае колькі файлаў трэба паказваць у спісе нядаўніх файлаў" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Таймаўт праверкі дыска:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2382,27 +2518,20 @@ "Перыядычнасць праверкі на змену файлаў на дыске (у секундах). Нулявое " "значэнне адключае праверку." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Файлы" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Зрабіць:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Тэрмінал:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Браўзер:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Пуць і наладкі для прылады make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2410,23 +2539,23 @@ "Тэрмінал эмулятар як xterm, gnome-terminal o konsole (павінен прымаць -е " "аргумент)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Пуць і (магчыма) дадатковыя аргументы да браўзера" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Шлях да прыладаў" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Кантэкстныя дзеянні:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2437,67 +2566,67 @@ "падстаўляць з дапамогай %s. Яго можна ўстаўляць у любым месцы каманды і " "падстаноўка будзе выкананая да яе выканання." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Каманды" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Прылады" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "e-mail адрас распрацоўшчыка" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Ініцыялы распрацоўшчыка" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Пачатковая версія:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Нумар версіі, які файл мае у пачатку." -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Імя кампаніі" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Распрацоўшчык:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Кампанія:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Паштовы адрас:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Ініцыялы:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "імя распрацоўшчыка" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Год:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Дата:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Дата & Час:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2505,7 +2634,7 @@ "Вызначце фармат для групавога знака {datetime}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2513,7 +2642,7 @@ "Вызначце фармат для групавога знака {year}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2521,63 +2650,63 @@ "Вызначце фармат для групавога знака {date}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Дадзеныя шаблонаў" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Шаблоны" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Змяніць" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Наладка клавіш" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Прывязкі клавіш" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Каманда:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Шлях да каманды для друку (выкарыстоўвайце %f у якасці імя файла)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Выкарыстоўваць знешнюю праграму для друку" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Друкаваць нумары радкоў" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Дадаць нумары радкоў на старонку друку" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Друкаваць нумары старонак" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Дадаць нумар старонцы ўнізе кожнай старонцы. Гэта зойме два радка на " "старонцы." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Друкаваць загалоўкі старонкі" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2585,19 +2714,19 @@ "Дадаць невялікі загаловак да кожнай старонцы, які змяшчае нумар старонкі, " "імя файла і дату (глядзі ніжэй). Гэта зойме тры радка на старонцы." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Выкарыстоўваць базавае імя друкуемага файла" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Друкаваць толькі базавае імя (без поўнага шляху) файла" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Фармат даты:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2606,550 +2735,560 @@ "Вызначце фармат для групавога знака {datetime}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Выкарыстоўваць механізм друку GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Друкуецца" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Друкаваць" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Уласцівасці праекта" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Паказваць:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Свой" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Выкарыстоўваць глабальныя наладкі" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Новы" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Адчыніць" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Адчыніць вылучаны файл" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Захаваць" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Захаваць як" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Захаваць усе" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Друкаваць" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Зачыніць" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Зачыніць усе" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Загрузіць зноў" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Адчыніць апошнюю закрытую ўкладку" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Праект" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Уласцівасці праекта" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Вярнуць" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Паўтарыць" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Дубліраваць радок ці вылучэнне" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Выдаліць цяперашні радок(і)" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "Выдаліць цяперашні радок(і)" +msgstr "Выдаліць завяршэнне радка" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Пераставіць цяперашні радок" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Прагарнуць да цяперашняга радка" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Прагарнуць уверх на адзін радок" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Прагарнуць уніз на адзін радок" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Дапоўніць спалучэнне" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Перамяшчаць курсор у фрагменце" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Падавіць дапаўненне спалучэнняў" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Кантэкстныя дзеянні" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Скончыць слова" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Паказваць падказкі" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Паказваць спіс макрасаў" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Аўта дапаўненне часткі слова" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Перамясціць радок(і) уверх" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Перамясціць радок(і) уніз" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Буфер абмену" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Выразаць" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Капіяваць" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Уставіць" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Капіяваць цяперашні радок(і)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Выразаць цяперашні радок(і)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Вылучыць" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Вылучыць усё" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Вылучыць цяперашняе слова" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Вылучыць цяперашні радок(і)" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Вылучыць папярэдні кавалак слова" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Вылучыць цяперашні параграф" +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Вылучыць наступны кавалак слова" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Фармат" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Перамкнуць рэгістр літар" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Каментаваць/Рас каментаваць радок" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Каментаваць радок(і)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Раскаментаваць радок(і)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Павялічыць адступ" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Зменшыць адступ" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Павялічыць адступ на адзін прабел" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Зменшыць адступ на адзін прабел" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Разумныя адступы" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Паслаць сваю каманду 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Паслаць сваю каманду 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Паслаць сваю каманду 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Адправіць вылучэнне ў тэрмінал" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Уставіць" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Уставіць дату" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Уставіць іншы падзяліцель (прабел, адступ...)" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Наладкі" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Шукаць" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Знайсці" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Шукаць наступны" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" -msgstr "Шукаць былы" +msgstr "Шукаць папярэдні" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Шукаць вылучэнне ў наступным" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" -msgstr "Шукаць вылучэнне ў былым" +msgstr "Шукаць вылучэнне ў папярэднім" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Замяніць" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Шукаць у файлах" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Наступнае паведамленне" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Былое паведамленне" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Знайсці выкарыстоўванне" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Знайсці выкарыстоўванне дакумента" -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "Будаваць усе" +msgstr "Пазначыць усё" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Перайсці да" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Перамясціцца назад" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Перамясціцца ўперад" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Перайсці да парнай дужкі" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Перамкнуць маркёр" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Перайсці да наступнага маркёра" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Перайсці да былога маркёра" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Перайсці да рэалізацыі" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Перайсці да аб'явы" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Перайсці да пачатка радка" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Перайсці да канца радка" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" -msgstr "Перайсці да канца радка" +msgstr "Перайсці да бачнага канца радка" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Перайсці да былога кавалка слова" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Перайсці да наступнага кавалка слова" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Выгляд" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Перамкнуць усе дадатковыя віджэты" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Увесь экран" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Паказаць/Схаваць акно паведамленняў" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" -msgstr "Паказаць/Схаваць бакавую панель" +msgstr "Паказаць/Схаваць бакавую панэль" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Павялічыць" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Зменшыць" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Скінуць маштаб" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Фокус" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Пераключыцца ў рэдактар" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Пераключыцца ў заметкі" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Пераключыцца ў тэрмінал" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" -msgstr "Пераключыцца ў панель пошуку" +msgstr "Пераключыцца ў панэль пошуку" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" -msgstr "Пераключыцца ў бакавую панель" +msgstr "Пераключыцца ў бакавую панэль" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Пераключыцца да кампілятара" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Пераключыцца да паведамленняў" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Пераключыцца ў вакно паведамленняў" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Пераключыцца ў бакавую панэль (спіс дакументаў)" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Пераключыцца ў бакавую панэль (спіс сімвалаў)" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Укладкі" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Пераключыцца на левы дакумент" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Пераключыцца на правы дакумент" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Пераключыцца на апошні выкарыстаны дакумент" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Перамясціць дакумент улева" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Перамясціць дакумент управа" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Перамясціць дакумент у пачатак" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Перамясціць дакумент у канец" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Дакумент" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Перамкнуць перанос радкоў" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Перамкнуць абрыў радкоў" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Змяняць прабелы адступамі" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Перамкнуць цяперашнюю схованку" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Згарнуць усе" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Разгарнуць усе" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Загрузіць спіс сімвалаў зноў" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Убраць пазначальнікі" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Убраць індыкатары памылак" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Пабудаваць" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Кампіляваць" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Збудаваць усё" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Будаваць з make (свая цэль)" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Будаваць аб'ект" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Наступная памылка" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" -msgstr "Былыя памылка" +msgstr "Папярэдняя памылка" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Запусціць" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Запусціць (іншы загад)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Наладкі будоўлі" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Паказаць вылучыць колер" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Дапамога" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Камбінацыі клавіш" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Наступныя камбінацыі клавіш можна наладзіць:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Пераключыцца да дакумента" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Пішы тут што жадаеш, выкарыстоўвай для заметак." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Немагчыма загрузіць адзін або больш файлаў з прошлай сесіі" @@ -3157,7 +3296,11 @@ msgid "Debug Messages" msgstr "Паведамленні адладкі" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "Ачысціць" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3165,85 +3308,94 @@ "усталяваць пачатковы радок пры адчыненні файлаў (карысна ў спалучэнні з --" "line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Выкарыстоўваць іншую дырэкторыю наладкаў" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Дэталёва" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Друкаваць убудаваныя імёны тыпаў файлаў" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Не загружаць агульны файл аўта дапаўнення (глядзі дакументацыю)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Не выкарыстаць прэпрацэсар для файлаў C/C++ пры стварэнні тэгаў" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Не адчыняць файлы ў працуючай праграме, запускаць новую" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "Выкарыстоўваць гэта імя сокета для камунікацый з запушчаным Geany" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Вярнуць спіс адчыненых дакументаў у запушчаным Geany" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Усталяваць пачатковы радок пры адчыненні файла" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Не паказваць акно паведамленняў пры запуску" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Не загружаць файлы аўта дапаўнення (глядзі дакументацыю)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Не загружаць ўбудовы" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Друкаваць інсталяцыйны префікс Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "не загружаць файлы з прошлай сесіі" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Не загружаць падтрымку тэрмінала" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Імя файла libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Дэталёва" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Паказаць версію і выйсці" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[ФАЙЛЫ...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(збудаваны на %s з GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Перамясціць зараз?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Перад запускам Geany неабходна перамясціць ваш стары каталог з наладкамі." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3252,7 +3404,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3261,7 +3413,7 @@ "Ваш каталог з наладкамі \"%s\" не можа быць перамешчаны ў \"%s\" (%s). Калі " "ласка, перамесціце каталог з наладкамі рукамі." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3272,38 +3424,42 @@ "Магчымы праблемы пры карыстанні Geany без дырэкторыю наладкі.\n" "Запусціць Geany усё роўна?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Нельга знайсці файл: '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Гэта Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Немагчыма зрабіць дырэкторыю наладкаў (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Файлы наладкі загружаны зноў." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Статус паведамленні" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "Капіяваць" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Капіяваць усе" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Схаваць акно паведамленняў" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Немагчыма знайсці файл '%s' па цяперашнім шляху дакумента." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3312,11 +3468,11 @@ "Плагін \"%s\" бінарна не адпавядае гэтай версіі Geany - калі ласка " "перакампілюйце яго." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Кіраванне ўбудовамі" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3327,83 +3483,91 @@ "Апісанне: %s\n" "Аўтар(ы): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Актыўны" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Плагін" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Няма даступных ўбудоў." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Убудовы" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"нізе знаходзіцца спіс даступных убудоў. Абярыце тыя з іх, якія вы жадаеце " -"загружаць пры запуску Geany." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Выберыце ўбудовы якія павінны загружацца пры старце:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Падрабязнасці убудовы:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Наладжваць убудовы" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Захапіць клавішу" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Націсніце камбінацыю клавіш, якую вы жадаеце выкарыстоўваць для \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "Разгарнуць усё" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Згарнуць усё" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Дзеянне" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" -msgstr "Ярлык" +msgstr "Цэтлік" + +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "Дазволіць" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1410 msgid "_Override" msgstr "Замяніць" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Замяніць гэту камбінацыю клавіш" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Камбінацыя '%s' ужо выкарыстана для \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Тэрмінал" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Ніжэй увядзіце пуць да прылады. Прылады якія вам не патрэбны можаце пакінуць " "пустымі." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3411,7 +3575,7 @@ "Укажы інфармацыю якую жадаеш выкарыстоўваць у шаблонах.\n" "Глядзі дакументацыю калі не ведаеш як працуюць шаблоны." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3422,7 +3586,7 @@ "i>" #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3432,7 +3596,7 @@ "Змяніць. Вы можаце таксама змяніць пісьмовае адлюстраванае." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3442,7 +3606,7 @@ "і старэй." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3452,50 +3616,50 @@ #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "Шрыфт рэдактару не монашырынны! " #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "Тэкст будзе няправільна размешчаным." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Старонка %d із %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Наладкі дакумента" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Друкаваць толькі базавае імя (без поўнага шляху) друкуючага файла." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Старонка %d з %d " -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Друкаванне файла \"%s\" было скасавана." +msgid "Did not send document %s to the printing subsystem." +msgstr "Не дасылаць дакумент %s да падсістэмы друку." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Файл %s надрукаваны." +msgid "Document %s was sent to the printing subsystem." +msgstr "Дакумент %s быў адпраўлены да пасістэмы друку." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Друкаванне %s скончылася непаспяхова (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Калі ласка спачатку вызначце каманду для друку ў дыялогу ўласцівасцяў." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3506,38 +3670,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Друкаванне \"%s\" скончылася непаспяхова (код зваротку: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Файл %s надрукаваны." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "праекты" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Новы праект" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Стварыць" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Імя:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Імя файла:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Базавы шлях:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3547,123 +3716,120 @@ "шлях, або ужо існуючая дырэкторыя. Вы можаце задаць шлях адносна ад файла " "праекта." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Выберы базавы шлях праекта" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Немагчыма загрузіць файл праекта \"%s\"." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Адчыніць праект" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Зачыніць файлы" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Праект \"%s\" зачынены." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Апісанне:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Make у базавай дырэкторыі" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" +"Усталяваць працоўныя дырэкторыі на базавы шлях для тыпаў файлаў без каманд " +"Будаваць:" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Выканаць каманду:" +#: ../src/project.c:484 +msgid "Set" +msgstr "Прызначыць" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Каманда для запуску у базавай дырэкторыі праекта. Параметры можна далучыць " -"да каманды. Пакінь пустым для каманды па змоўку." +"Усталяваць працоўныя дырэкторыі (на укладцы Будаваць) для тыпаў файлаў без " +"каманд будаваць выкарыстоўваць базавы шлях" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Патэрны файла:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Жадаеце захаваць яго перад працягам?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Праект '%s' ужо адчынены." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Зададзенае імя праекта надта кароткае. " -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Абранае імя праекта занадта доўгае (максімум %d літар)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Вы абралі недапушчальнае імя файла праекта." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Стварыць базавую дырэкторыю праекта?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Шлях \"%s\" не існуе." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Немагчыма зрабіць базавую дырэкторыю праекта (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Немагчыма запісаць файл праекта (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Праект \"%s\" створаны." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Праект \"%s\" захаваны." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" -msgstr "Выбяры імя файла праекта" - -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Выбяры каманду запусціць для праекта " +msgstr "Выберы імя файла праекта" -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Праект \"%s\" адчынены." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Сталы выраз" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3671,15 +3837,15 @@ "Выкарыстоўваць POSIX сталыя выразы. Для дэталёвай інфармацыі па сталым " "выразам глядзі дакументацыю." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Шукаць у адваротным кірунку" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Выкарыстоўваць паслядоўнасці змены" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3687,126 +3853,126 @@ "Замяняць \\\\, \\t, \\n, \\r і \\uXXXX (Літары юнікоду) на адпаведныя " "кіруючыя літары" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "З улікам рэгістру" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Падыходзіць толькі поўнае слова" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Падыходзіць з пачатку слова" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" -msgstr "Былы" +msgstr "Папярэдні" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "Наступны" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "Шукаць:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Знайсці ўсё" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" -msgstr "Абазначыць" +msgstr "Пазначыць" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" -msgstr "Памеціць усё супадзенні у цяперашнім дакуменце" +msgstr "Пазначыць усё супадзенні ў цяперашнім дакуменце" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "У сесіі" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "У дакуменце" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Зачыніць дыялог" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Забараніце гэту наладку каб трымаць дыялог адчыненым." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Замяніць і шукаць" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Замяніць на:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Замяніць усё" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "У вылучэнні" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Замяніць ўсе знойдзеныя выпадкі ў вылучаным тэксце" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Дырэкторыя:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Знаканабор:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Сталыя радкі" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Шукаць сталы выраз" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Глядзі старонку дакументацыі grep для дакладнай інфармацыі" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Расшыраны сталы выраз" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Рэкурсіўна ў паддырэкторыях" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Шукаць не падыходзячыя" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Інвертаваць вынікі пошуку, вылучыць не супадаючыя радкі" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Дадатковыя наладкі:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Наладкі для Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -3814,48 +3980,43 @@ msgstr[1] "Знойдзена %d супадзення для \"%s\"." msgstr[2] "Знойдзена %d супадзенняў для \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Зменены тэкст у %u файле" -msgstr[1] "Зменены тэкст у %u файлах" -msgstr[2] "Зменены тэкст у %u файлах" +msgid "Replaced %u matches in %u documents." +msgstr "Зменена %u супадзенняў у %u дакументах." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Дрэнная дырэкторыя для пошуку файлаў" -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Тэкст не знойдзены" -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Нельга знайсці прыладу grep '%s'; (правер шлях ў Уласцівасцях)" -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Пошук..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (у дырэкторыі: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Немагчыма адчыніць дырэкторыю (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"Пошук скончыўся непаспяхова (глядзі Дапамога->Паведамленні адладкі для " -"дэталяў)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Пошук скончыўся непаспяхова." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3863,233 +4024,253 @@ msgstr[1] "Пошук завершаны з %d супадзеннямі." msgstr[2] "Пошук завершаны з %d супадзеннямі." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Супадзенні ня знойдзены" -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Дрэнны сталы выраз: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany паспрабаваў далучыцца да юніксовага даменнага сокету Geany, які быў " +"запушчаны іншым карыстальнікам.\n" +"Гэта крытычная памылка, Geany зараз зачыніцца." + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Секцыя" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Секцыя 1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Секцыя 2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Секцыя 3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Апендыкс" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Іншы" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Тыпы" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Канструктар тыпаў" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Функцыі" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Секцыі" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Клавішы" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Пераменныя" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Каманда" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Асяродзе" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Падсекцыя" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Пад-падсекцыя" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Метка" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Структуры" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Мой" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Месны" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Наш" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Меткі" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Канстанты" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Інтэрфэйс" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Класы" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Канстанты" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Якары" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Загаловак (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Загаловак (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Загаловак (H3)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Вылучэнне ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Вылучэнне тыпу" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Модулі" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Сінглтоны" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Метады" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Прасторы імёнаў" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "Уласцівасці" +msgstr "Працэдуры" -#: ../src/symbols.c:736 -#, fuzzy +#: ../src/symbols.c:752 msgid "Imports" -msgstr "Экспарт" +msgstr "Імпарты" + +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Артыкулы" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Архітэктуры" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Функцыі / Працэдуры" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Пераменныя / Сігналы" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Працэсы / Кампаненты" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Падзеі" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Функцыі / Задачы" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Чальцы" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Меткі" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Падпраграмы" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Блокі" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Макрасы" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Аб'яўленні" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Мэты" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Структуры" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Невядомы тып файла для пашырэння \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Немагчыма стварыць файл тэгаў, магчыма таму, што ніякіх тэгаў не знойдзена.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4098,7 +4279,7 @@ "Карыстаць: %s -g <файл тэгаў> <спіс файлаў>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4109,177 +4290,192 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Загрузіць тэгі" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany тэг файлы (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Загружана %s тэгаў файл: '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Немагчыма загрузіць файл тэгаў '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Аб'яўленне \"%s\" не знойдзена" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Рэалізацыя \"%s\" не знойдзена." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Сартаваць па імені" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Сартаваць па паяўленню" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Стары" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Захаваць цяперашні файл" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Захаваць усе адчыненыя файлы" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Загрузіць цяперашні файл з дыска" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Зачыніць цяперашні файл" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Зачыніць усе адчыненыя файлы" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Выразаць цяперашняе вылучэнне" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Капіяваць цяперашняе вылучэнне" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Уставіць змест буфера абмену" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Выдаліць цяперашняе вылучэнне" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Адмяніць апошнюю мадыфікацыю" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Адмяніць адмену апошняй мадыфікацыі" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Кампіляваць цяперашні файл" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Выканаць альбо глядзець цяперашні файл" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Адчыніць дыялог вылучэння колеру, для выбару колеру з палітры" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Павялічыць тэкст" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Зменшыць тэкст" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Зменшыць адступ" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Павялічыць адступ" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Знайсці уведзены тэкст у цяперашнім файле" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Перайсці да ўведзенага радка" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Паказваць дыялог уласцівасцяў" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Выхад" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Друкаваць дакумент" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "Памеціць усё супадзенні у цяперашнім дакуменце" +msgstr "Замяніць тэкст у цяперашнім дакуменце" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Стварыць новы файл" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Стварыць новы файл з шаблона" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Адчыніць існуючы файл" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Адчыніць нядаўні файл" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Выбраць больш дзеянняў будоўлі." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Перайсці" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "Межавальнік" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- Межавальнік ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" +"Вылучыце прылады для панелі прыладаў. Прылады можна перапарадкаваць " +"выкарыстоўваючы перацягванне" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "Даступныя элементы" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "Паказваць" +msgstr "Паказаныя рэчы" #: ../src/tools.c:153 #, c-format @@ -4304,7 +4500,7 @@ msgid "Custom command failed: %s" msgstr "Свая каманда скончылася непаспяхова: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Усталяваць свае каманды" @@ -4316,292 +4512,271 @@ "Вы можаце перадаць цяперашняе вылучэнне любой з гэтых каманд і замяніць яго " "на вынік. " -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Каманды карыстальніка не вызначаны." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Лічыць словы" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "вылучэнне" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "увесь дакумент" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Дыстанцыя:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Радкі:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Словы:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Літары:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Тагі не знойдзены" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Паказваць спіс сімвалаў" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Паказваць спіс дакументаў" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" -msgstr "Схаваць бакавую панель" +msgstr "Схаваць бакавую панэль" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "Паказваць радок стану" +msgstr "Паказваць Шляхі" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "радок: %d слупок: %d выл: %d\t" +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "радок: %d / %d\t слупок: %d выл: %d\t" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "ТЧ" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "Адступ" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "ПРБ" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "АДСТ/ПРБ" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "Рэжым: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "знаканабор: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "тып файла: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "Рэжым" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "вобласць бачнасці: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Шрыфт адноўлены (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Стандартная бібліятэка C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Стандартная бібліятэка)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Стандартная бібліятэка" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Усталяваць свой фармат даты" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Вылучыць дырэкторыю" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Вылучыць файл" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Файлы наладак" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Захаваць усё" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Зачыніць усё" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Max (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Тэрмінал" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" -msgstr "Усталяваць пуць з дакумента" +msgstr "Усталяваць шлях з дакумента" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "Перазапусціць тэрмінал" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Метады уводу" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "Немагчыма змяніць каталог у VTE, бо, магчыма, ён утрымлівае каманду." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Эмуляцыя тэрмінала" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Гэтыя наладкі дзеля віртуальнага тэрмінал эмулятара (VTE). Яны нешта " -"вызначаюць толькі калі VTE бібліятэка ўсталявана." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Шрыфт тэрмінала:" +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Шрыфт:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Усталяваць шрыфт тэрмінала." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Колер літар:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Колер фону:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Усталяваць колер тэксту для тэрмінала" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Усталяваць колер паперы для тэрмінала" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Прагарнуць назад радкі" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Указаць колькі радкоў гісторыі можна прагарнуць у тэрмінале" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Абалонка:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Усталёўвае шлях абалонкі, якая павінна запускацца ў тэрмінале" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Прагарнуць уніз пры націску клавішы" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Ці прагортваць уніз пры націску клавішы" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" -msgstr "Прагарнуць уніз пры дадатку да вывада" +msgstr "Прагарнуць уніз пры дадатку да вываду" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Ці прагортваць уніз, калі нешта было выведзена" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Мільганне курсорам" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Ці мільгаць курсорам" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Замяніць спалучэнні клавіш" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "Дазваляе тэрміналу атрымліваць цэтлікі (акрамя каманд фокусу)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Забараніць цэтлік меню (F10 па прадвызначэнню)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4610,21 +4785,21 @@ "Гэтая наладка адключае цэтлік для выкліку меню (звычайна F10). Гэта можа " "спатрэбіцца, напрыклад, калі вы выкарыстоўваеце MC у акне тэрмінала." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Следаваць за цяперашнім файлам" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Ці запускаць \"cd $path\" пры пераключэнні адчыненых файлаў" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Не выкарыстоўваць скрыпт запуску" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4632,11 +4807,11 @@ "Не выкарыстаць просты скрыпт, які звычайна выкарыстоўваецца для " "адлюстравання кода завяршэння выкананай праграмы." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Выконваць праграмы ў VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4644,90 +4819,118 @@ "Запускаць праграмы ў VTE, замест таго, каб адчыняць асобнае акно з " "тэрміналам. Увага: праграмы, выкананыя ў VTE, нельга спыніць" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Файлы Geany праектаў" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Файлы, якія можна выканаць" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Будаўнічы класаў" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Стварае файлы зыходнага кода для новых тыпаў класаў." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Стварыць клас" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Прастора імёнаў" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Прастора імёнаў:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Клас" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Імя класа:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Загаловак файла:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Зыходны файл:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Спадчыннасць" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Базавы клас:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Зыходны файл:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Базавы загаловак:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Агульныя" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Базавы GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Рэалізоўвае:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Наладкі" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Стварыць канструктар" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Стварыць дэструктар" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Ці абстрактны" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Ці сінглтон" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Канструктар GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Стварыць клас" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "C++ клас" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "GTK+ клас" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "PHP клас" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML літары" @@ -4737,52 +4940,57 @@ msgstr "Устаўляць HTML спалучэнні такія як '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Каманда распрацоўшчыкаў Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML літары" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "SO 8859-1 літары" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Грэцкія літары" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Матэматычныя літары" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Тэхнічныя літары" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Указальныя літары" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Знакі прыпынку" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Іншыя літары" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Немагчыма зрабіць наладкавую дырэкторыю ўбудоў." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Адмысловыя літары" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "Уставіць" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4790,40 +4998,40 @@ "Выберы адмысловыя літары са спіса ўнізе, і зрабі падвоены ціск на ім, альбо " "выкарыстай кнопку для устаўкі літары ў пазіцыі курсора." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Літара" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (імя)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Уставіць адмысловыя HTML літары" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML змяненні" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "Перамкнуць HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Змена адмысловых літараў" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Уставіць адмысловыя HTML літары" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Замяняць адмысловыя літары" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Паказаць/Схаваць стан убудовы" @@ -4841,112 +5049,112 @@ #: ../plugins/export.c:183 msgid "_Use current zoom level" -msgstr "Выкарыстоўваць цяперашні узровень маштабу!" +msgstr "Выкарыстоўваць цяперашні ўзровень маштабу!" #: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "Адлюстроўваць тэкст дакумента бягучым памерам шрыфта." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Дакумент паспяхова экспартаваны як '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Файл '%s' не можа быць запісаны (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' ужо існуе. Замяніць яго?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "Экспарт" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Як HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Як LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Файлавы аглядальнік" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Дадаць укладку аглядальніка файлаў да бакавой панелі." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Абрана занадта шмат аб'ектаў!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Немагчыма выканаць знешнюю каманду '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Адчыніць у знешняй праграме" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "Знайсці ў файлах" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Паказваць схаваныя файлы" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Уверх" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Абнавіць" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Усталяваць пуць з дакумента" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Чысціць фільтр" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Фільтр:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Фільтраваць файлы выкарыстоўваючы звычайныя шаблонавыя выразы" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Фокус спіс файлаў" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Фокус на ўвод шляху" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Немагчыма зрабіць наладкавую дырэкторыю ўбудоў." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Знешняя каманда адкрыцця:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4960,15 +5168,15 @@ "%f будзе зменена на імя файла з поўным шляхам да яго\n" "%d будзе зменена на дырэкторыю ў якой знаходзіцца файл" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Паказваць схаваныя файлы" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Хаваць файлы аб'ектаў" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4976,12 +5184,11 @@ "Не паказваць утвораныя аб'ектныя файлы, такія як *.o, *.obj. *.so, *.dll, *." "a, *.lib" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "Усталяваць базавую дырэкторыю праекта" +msgstr "Выкарыстоўваць базавую дырэкторыю праекта" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Зменіць шлях на базавую дырэкторыю адчыненага праекта" @@ -4992,7 +5199,7 @@ #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." -msgstr "Гэта убудова забяспечвае розныя дзеянні звязаныя з захаваннем файлаў." +msgstr "Гэта ўбудова забяспечвае розныя дзеянні звязаныя з захаваннем файлаў." #: ../plugins/saveactions.c:169 #, c-format @@ -5088,59 +5295,31 @@ msgid "Splits the editor view into two windows." msgstr "Падзяліць вакно рэдактара на два акна" -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "Памеціць усё супадзенні у цяперашнім дакуменце" +msgstr "Паказаць цяперашні дакумент" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "Аб'яднаць" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Падзяліць вакно" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "Гарызантальна" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "Вертыкальна" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Падзяліць гарызантальна" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Падзяліць вертыкальна" - -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Аб'яднаць" - -#~ msgid "Diff file" -#~ msgstr "Файл змяненняў" - -#~ msgid "reStructuredText file" -#~ msgstr "reStructuredText файл" - -#~ msgid "Select _All" -#~ msgstr "Вылучыць усё" - -#~ msgid "Automatic symbol completion" -#~ msgstr "Аўтаматычны дадатак сімвалаў" - -#~ msgid "" -#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -#~ "xml'. Please see the documentation for details." -#~ msgstr "" -#~ "Увага: Для змянення зместу панелі прыладаў, рэдагуйце файл " -#~ "'ui_toolbar.xml'. Калі ласка, глядзіце дакументацыю для дэталяў." - -#~ msgid "" -#~ "For all changes you make in this file to take effect, you need to restart " -#~ "Geany." -#~ msgstr "Для ўступа ў сілу зробленых змен неабходна перазапусціць Geany" diff -Nru geany-0.18/po/bg.po geany-0.19/po/bg.po --- geany-0.18/po/bg.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/bg.po 2010-05-23 09:08:49.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2008-11-30 16:22+0200\n" "Last-Translator: Atanas Beloborodov \n" "Language-Team: Bulgarian \n" @@ -23,7 +23,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Бърза и лека среда за разработване" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -31,70 +31,70 @@ msgid "Integrated Development Environment" msgstr "Вградена среда за разработка" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "За Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Бърза и лека среда за разработване" -#: ../src/about.c:210 +#: ../src/about.c:216 #, fuzzy, c-format msgid "(built on or after %s)" msgstr "(компилиран на %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Информация" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Разработчици" -#: ../src/about.c:266 +#: ../src/about.c:272 #, fuzzy msgid "maintainer" msgstr "Отговорник по поддръжката" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "разработчик" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "отговорник по поддържането на превода" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Преводачи" -#: ../src/about.c:311 +#: ../src/about.c:317 #, fuzzy msgid "Previous Translators" msgstr "Преводачи" -#: ../src/about.c:332 +#: ../src/about.c:338 #, fuzzy msgid "Contributors" msgstr "Сътрудници" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Някой от многото сътрудници (за повече детайли, вижте файла %s)" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Екип" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Лиценз" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -102,290 +102,298 @@ "Текстът, който съдържа лиценза, не бе намерен, моля посетете http://www.gnu." "org/licenses/gpl-2.0.txt, за да го прегледате в online вариант." -#: ../src/build.c:221 ../src/build.c:745 -#, fuzzy, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +#. fall back to %d +#: ../src/build.c:635 +#, c-format +msgid "failed to substitute %%p, no project active" msgstr "" -"Не успях да намеря терминала '%s' (проверете пътя в настройките за " -"Терминална програма в Предпочитания)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Не успях да сменя работната директория на %s" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Не успях да заредя \"%s\" (не можах да създам зареждащия script)" +msgid "%s (in directory: %s)" +msgstr "%s (в директорията: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Процеса завърши неуспешно (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (в директорията: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, fuzzy, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Не успях да сменя работната директория на %s" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Не успях да заредя \"%s\" (не можах да създам зареждащия script)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Имаше грешка при изпълнението на файла във VTE, защото най-вероятно съдържа " "команда." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, fuzzy, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Не успях да намеря терминала '%s' (проверете пътя в настройките за " +"Терминална програма в Предпочитания)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Неуспешна компилация." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Компилирането завърши успешно." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Компилирай" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Построй" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Направи всички (make)" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Направи потребителска _Цел" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Направете потребителска цел" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Направи _Обект (Object)" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Въведете потребителски опции тук, целият въведен текст се подава на " +"командата за построяване." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Следваща грешка" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 #, fuzzy msgid "_Previous Error" msgstr "_Предишна грешка" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Задай Включени файлове и аргументи" - -#. DVI -#: ../src/build.c:1143 +#: ../src/build.c:1343 #, fuzzy -msgid "LaTeX -> _DVI" -msgstr "LaTeX·->·DVI" +msgid "_Set Build Commands" +msgstr "Задайте потребителски команди" -#. PDF -#: ../src/build.c:1152 +#: ../src/build.c:1623 ../src/toolbar.c:373 #, fuzzy -msgid "LaTeX -> _PDF" -msgstr "LaTeX·->·PDF" +msgid "Build the current file" +msgstr "Компилирай текущия файл" -#. DVI view -#: ../src/build.c:1206 +#: ../src/build.c:1637 #, fuzzy -msgid "_View DVI File" -msgstr "Покажи DVI файл" +msgid "Build the current file with Make and the default target" +msgstr "Построява текущия файл със същата make програма и цел по подразбиране" -#. PDF view -#: ../src/build.c:1216 +#: ../src/build.c:1639 #, fuzzy -msgid "V_iew PDF File" -msgstr "Покажи PDF файл" +msgid "Build the current file with Make and the specified target" +msgstr "Построява текущия файл с програмата make и зададената цел" -#. arguments -#: ../src/build.c:1231 +#: ../src/build.c:1641 #, fuzzy -msgid "_Set Arguments" -msgstr "Задай аргументи" +msgid "Compile the current file with Make" +msgstr "Компилирай текущия файл" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Задай аргументи" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Процеса не можа да бъде спрян: (%s)." -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Задава програми и опции за компилиране и разглеждане на (La)TeX файлове." +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Няма повече грешки при построяването." -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Създаване на DVI:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Създаване на PDF:" +#: ../src/build.c:1788 +msgid "Item" +msgstr "" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Преглед на DVI:" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Надпис" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Преглед на PDF:" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Команда" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f ще бъде заменено с името на текущия файл, напр. тестов_файл.c\n" -"%e ще бъде заменено с името на файла без разширението, напр. тестов_файл" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (в директорията: %s)" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Задава Включвания и Аргументи" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Компилатор" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Задава командите за построяване и изпълнение на програми." +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1904 ../src/build.c:1906 #, fuzzy, c-format -msgid "%s commands" +msgid "%s Commands" msgstr " команди" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Компилирай:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Построй:" - -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Изпълни:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Задай _тип на файла" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1914 ../src/build.c:1949 #, fuzzy -msgid "Build the current file" -msgstr "Компилирай текущия файл" +msgid "Error Regular Expression:" +msgstr "Редовни изрази за _Grep" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Направете потребителска цел" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" -"Въведете потребителски опции тук, целият въведен текст се подава на " -"командата за построяване." -#: ../src/build.c:1967 +#: ../src/build.c:1981 #, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "Построява текущия файл със същата make програма и цел по подразбиране" +msgid "Execute Commands" +msgstr "Задайте потребителски команди" -#: ../src/build.c:1970 +#: ../src/build.c:1992 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" + +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "Построява текущия файл с програмата make и зададената цел" +msgid "Set Build Commands" +msgstr "Задайте потребителски команди" -#: ../src/build.c:1973 +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Компилирай" + +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Построй" + +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Compile the current file with Make" -msgstr "Компилирай текущия файл" +msgid "_Execute" +msgstr "Изпълни:" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Не успях да изпълня програмата за преглед" +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Направи потребителска _Цел" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Процеса не можа да бъде спрян: (%s)." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Направи _Обект (Object)" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Няма повече грешки при построяването." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" -#: ../src/callbacks.c:152 +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Направи всички (make)" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Задайте потребителски команди" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Наистина ли искате да спрете програмата?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Запазих файла %s." +msgstr[1] "Запазих файла %s." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Презареди" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Всички незапазени промени ще бъдат изгубени." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Сигурни ли сте, че искате да презаредите '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Отиди на ред" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Въведете линията до която искате да отидете:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Моля задайте тип на текущия файл преди да използвате тази функция." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "дд.мм.гггг" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "мм.дд.гггг" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "гггг/мм/дд" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.гггг чч:мм:сс" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.гггг чч:мм:сс" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "гггг/мм/дд чч:мм:сс" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 #, fuzzy msgid "_Use Custom Date Format" msgstr "Използвай потребителски формат за датата" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Потребителски формат за дата" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 #, fuzzy msgid "" "Enter here a custom date and time format. You can use any conversion " @@ -395,26 +403,25 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Формата за дата не може да бъде преобразуван (най-вероятно е прекалено " "дълъг)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Няма повече съобщения." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Отвори файл" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "И_зглед" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -422,29 +429,29 @@ "Отваря файла в режим \"само за четене\". Ако изберете за отваряне повече от " "един файл, всичките файлове ще бъдат отворени само за четене." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Засечи по разширението на файла" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Засечи от файла" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "Функции" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Покажи _скритите файлове" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Задайте знаково кодиране:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -456,11 +463,11 @@ "полезно когато знаете, че кодировката на файла не може да бъде засечена." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Задай тип на файла:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -480,25 +487,25 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Запази файла" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 #, fuzzy msgid "R_ename" msgstr "Име на файла:" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 #, fuzzy msgid "Save the file and rename it" msgstr "Съхрани файла и го преименувай" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Oтвори файла в нов подпрозорец" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -507,147 +514,151 @@ "Запази сегашния незапазен файл отворен и отвори новозаписания в нов под-" "прозорец." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Грешка" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Въпрос" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Предупреждение" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Информация" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Не запазвай" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Файлът %s не бе запазен." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Искате ли да го запазите преди затварянето?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Избери шрифт" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" "Имаше грешка и не можах да получа информацията от файла (напр. от нов файл)" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "неизвестен" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Свойства" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Вид:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Размер:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Местоположение:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Само за четене:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(само в Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Кодировка:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(с BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Променен:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Променен:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Последно променян:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Разрешения:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Четене:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Писане:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Изпълни:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Собственик:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Група:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Други:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Затворих файла %s." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Отворих новия файл %s." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Не можах да отворя файла %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -662,12 +673,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файлът %s не е валиден/а/о %s" -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -675,32 +686,32 @@ msgstr "" "Файлът %s не изглежда като текстови файл или кодировката не се поддържа." -#: ../src/document.c:1122 +#: ../src/document.c:1163 #, fuzzy msgid "Spaces" msgstr "Namespaces" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Под-прозорци" -#: ../src/document.c:1128 +#: ../src/document.c:1169 #, fuzzy msgid "Tabs and Spaces" msgstr "_Замени табулациите с интервали" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Режим на автоматичния отстъп:" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Неправилно име на файл" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Файлът %s е презареден." @@ -708,21 +719,21 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Отворих файла %s(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", само за четене" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "Грешка при записването на файла." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, fuzzy, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -732,7 +743,7 @@ "бъде запазен.\n" "Съобщение на грешката: %s\n" -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -741,52 +752,52 @@ "Съобщение за грешка: %s\n" "Има грешка в \"%s\" (ред: %d, колона: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, fuzzy, c-format msgid "Error message: %s." msgstr "Грешка при записването на файла (%s)" -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Грешка при записването на файла." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Грешка при записването на файла (%s)" -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Запазих файла %s." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "Не успях да намеря %s." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Да пробвам ли отново с търсенето?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, fuzzy, c-format msgid "No matches found for \"%s\"." msgstr "Няма намерени съвпадения за '%s'." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, fuzzy, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d пъти замених \"%s\" със \"%s\"." msgstr[1] "%s: %d пъти замених \"%s\" със \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Искате ли да го презаредите?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -795,24 +806,29 @@ "Файлът '%s' на диска е по-скорошен от\n" "този в паметта." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Опит да запая файла отново?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, fuzzy, c-format -msgid "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Не успях да намеря %s." -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 #, fuzzy msgid "Enter Tab Width" msgstr "Широчина на табулацията" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Въведете брой на интервалите, които да бъдат заменени от бутон tab." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Келтски" @@ -924,618 +940,676 @@ msgid "Without encoding" msgstr "Без кодиране" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Западно-европейски" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Източно-европейски" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Източно_азиатски" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_ЮИ и ЮЗ азиатски" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Средно-европейски" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, fuzzy, c-format msgid "%s source file" msgstr "Изходен файл на С" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "Изходен файл на С" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Без" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell скрипт" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 #, fuzzy msgid "XML document" msgstr "XML документ" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 #, fuzzy msgid "Cascading StyleSheet" msgstr "CSS" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump файл" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Файл с настройки (Config)" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 #, fuzzy msgid "Gettext translation file" msgstr "отговорник по поддържането на превода" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, fuzzy, c-format msgid "%s script file" msgstr "%s скриптов файл" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Езици за _програмиране" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Скриптови езици" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Markup езици" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 #, fuzzy msgid "M_iscellaneous Languages" msgstr "Други езици" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Задай _тип на файла" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Всички изходни файлове" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Всички файлове" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "неозагалвен" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Не можах да намеря файла '%s'." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "Из_бери цвят" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Файл" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Нов (с _шаблон)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "невидим" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Отвори избрания фа_йл" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Последно отваряни _файлове" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Запази _всички" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Пр_езареди като" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "невидим" + +#: ../src/interface.c:388 #, fuzzy msgid "Page Set_up" msgstr "Настройки на страни_цата" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 #, fuzzy msgid "Close Ot_her Documents" msgstr "Затвори текущия файл" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "_Затвори Всички" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Редактиране" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Формат" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 #, fuzzy msgid "T_oggle Case of Selection" msgstr "_Удвои реда или избрания текст" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Принтира текущия файл" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Коментирай ред(ове)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Откоментирай ред(ове)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Об_ърни коментирането на реда" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "_Удвои реда или избрания текст" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "У_величи отстъпа" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Намали отстъпа" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "Из_прати избрания текст на" +msgid "_Smart Line Indent" +msgstr "Умно вмъкване на реда" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Из_прати избрания текст на" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Команда" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Затвори текущия файл" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Компилирай текущия файл" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Затвори текущия файл" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "_Удвои реда или избрания текст" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Избери текущата дума" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Избери текущата дума" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Вмъкни другия празен символ" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Отиди до следващия маркер" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Отиди до предишния маркер" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "Из_прати избрания текст на" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Вмъкн_и коментари" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Вмъкни запис в дневника на промените" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 #, fuzzy msgid "Insert File _Header" msgstr "Вмъкни хедър" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 #, fuzzy msgid "Insert _Function Description" msgstr "Вмъква коментар на функция" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Вмъква многоредов коментар" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 #, fuzzy msgid "Insert _GPL Notice" msgstr "Вмъква GPL бележка" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Вмъкнва BSD лиценз" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Вмъкни да_та" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Вмъ_кни \"include·<...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "Предпочитания" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Предпочитания" + +#: ../src/interface.c:720 msgid "_Search" msgstr "Тър_си" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Намери с_ледващото" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Наимери _предишния" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Намери въф _файлове" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Замени" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Намери в _избрания текст" -#: ../src/interface.c:661 +#: ../src/interface.c:760 #, fuzzy msgid "Find Pre_vious Selected" msgstr "Намери преди_шното избрано" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "След_ващо съобщение" -#: ../src/interface.c:674 +#: ../src/interface.c:773 #, fuzzy msgid "Pr_evious Message" msgstr "Следващо съобщение" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Отско_чи до ред" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Промени _Шрифта" -#: ../src/interface.c:711 +#: ../src/interface.c:810 #, fuzzy msgid "To_ggle All Additional Widgets" msgstr "Промяеня всички допълнителни Widget-и" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Цял екран" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Покажи _прозореза за съобщения" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Покажи _лентата с инструменти" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Покажи _страничната лента" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Редактор" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Покажи _отстъпа за отбелязване" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "Показвай интервали и табулации" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "Показвай края на редовете" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "Показвай ориентировачни занци за отстъп" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Документ" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Ре_жим на пренасяне" -#: ../src/interface.c:792 +#: ../src/interface.c:891 #, fuzzy msgid "Line _Breaking" msgstr "Пренасяне на редове" -#: ../src/interface.c:796 +#: ../src/interface.c:895 #, fuzzy msgid "_Auto-indentation" msgstr "Използва_й автоматично подравняване" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Ви_д на вмъкването" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 #, fuzzy msgid "_Tabs" msgstr "Под-прозорци" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 #, fuzzy msgid "_Spaces" msgstr "Интервали" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 #, fuzzy msgid "T_abs and Spaces" msgstr "_Замени табулациите с интервали" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Само за _четене" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Напиши Unicode·BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Задай _тип на файла" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Задай ко_дировка" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Задай кра_й на редовете" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Преобразувай и сложи на _CR/LF·(Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Преобразувай и сложи на _LF·(Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Преобразувай и сложи на CR·(_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 #, fuzzy msgid "_Strip Trailing Spaces" msgstr "Махни излишните символи на края" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Замени табулациите с интервали" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 #, fuzzy msgid "Replace Spaces b_y Tabs" msgstr "_Замени табулациите с интервали" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "С_гъни всички" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Отсгъни всички" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Премахни _бележките" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Премахни бележките за _грешка" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Проект" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Но_в" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Отвори" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "Отвори проект" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "За_твори" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Инструменти" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "Не успях да компилирам." + +#: ../src/interface.c:1107 #, fuzzy msgid "_Color Chooser" msgstr "Из_бери цвят" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Б_рояч на думи" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Зареди при_бавки" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Помощ" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "И_нтернет сайт" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Кл_авишни комбинации" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 #, fuzzy msgid "_Debug Messages" msgstr "Съобщения" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Символи" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 #, fuzzy msgid "Documents" msgstr "_Документ" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Състояние" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Компилатор" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Съобщения" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Бележник" -#: ../src/interface.c:1727 ../src/interface.c:3286 -#, fuzzy -msgid "Images _and Text" -msgstr "Изображения и текст" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -#, fuzzy -msgid "_Images Only" -msgstr "Само изображения" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -#, fuzzy -msgid "_Text Only" -msgstr "Само текст" - -#: ../src/interface.c:1748 ../src/interface.c:3302 +#: ../src/interface.c:1887 #, fuzzy -msgid "_Large Icons" -msgstr "Големи икони" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -#, fuzzy -msgid "_Small Icons" -msgstr "Малки икони" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Малки икони" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Скрий лентата с инструментите" +msgid "_Toolbar Preferences" +msgstr "Предпочитания" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 #, fuzzy msgid "_Hide Toolbar" msgstr "Скрий лентата с инструментите" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 #, fuzzy msgid "Find _Usage" msgstr "Намери къде се използва" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 #, fuzzy msgid "Find _Document Usage" msgstr "Намери къде се използва" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 #, fuzzy msgid "Go to _Tag Definition" msgstr "Отиди до дефиницията на тага" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Отиди до декларацията на тага" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 #, fuzzy msgid "Conte_xt Action" msgstr "Контекстно действие" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Предпочитания" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Зареждай файловете от последната сесия" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "При стартиране отваря файловете от последната сесия" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 #, fuzzy msgid "Load virtual terminal support" msgstr "Зареди истински терминален имитатор при стартиране" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1544,44 +1618,44 @@ "Дали да се зарежда истиски терминален имитатор (VTE) при стартиране. " "Изключете го ако не ви трябва." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Разреши поддръжката на плъгини." -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 #, fuzzy msgid "Startup" msgstr "Странична лента" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Запазай мястото и размерите на прозореца" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Запазва позицията и размерите на прозореца и ги възстановява при стартиране" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Потвръждение при излизане." -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Питай за потвръждение на излизане от програмата." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 #, fuzzy msgid "Shutdown" msgstr "Изключване" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 #, fuzzy msgid "Startup path:" msgstr "Основен път:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1590,40 +1664,40 @@ "файлове. Трябва да е абсолютна. Ако полето е празно, ще се използва " "работната директория." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Файлове на проекта:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Път с който да започвам когато отварям файловете на проекта." -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 #, fuzzy msgid "Extra plugin path:" msgstr "Разреши поддръжката на плъгини." -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Пътища" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "Състояние" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Пиукай когато има грешки или когато свърши компилирането" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1631,11 +1705,11 @@ msgstr "" "Дали да издава звуков сигнал ако има грешка или когато компилацията приключи." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Превключи на списъка със състояния при ново съобщение." -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1644,11 +1718,11 @@ "Превключи на лентата за съобщения за състоянието (на дъното на прозореца-" "белебник) ако се появи ново съобщение" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Не показвай съобщения в лентата за съобщения" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1656,12 +1730,12 @@ "Премахва всички съобщения от лентата за съобщения. Съобщенията пак се " "показват в прозореца за съобщения." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Автоматичен фокус на прозорците (фокусът следва мишката)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1671,15 +1745,25 @@ "редактора, прозореца за бележки, търсенето в лентата за инструменти и отиди " "до, както и за VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Разни" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Винаги търси наново и крий диалога за търсене" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1688,32 +1772,32 @@ "Винаги търси наново в документа и крий прозореца за търсене след натискане " "на Намери следващото/предишното" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Неправилна директория за търсене във файлове." -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 #, fuzzy msgid "Search" msgstr "Странична лента" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 #, fuzzy msgid "Use project-based session files" msgstr "Проектни файлове на Geany" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1722,12 +1806,12 @@ "Дали файловете от сесията на проекта да се съхраняват и да се зареждат " "отново, когато пак се отвори." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Да създам ли основната директория на проекта?" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 #, fuzzy msgid "" "When enabled, a project file is stored by default inside the project base " @@ -1740,80 +1824,104 @@ "една директория над базовата директория. Вие все още може да промени пътя на " "проекта файл в диалоговия прозорец Нов проект." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 #, fuzzy msgid "Projects" msgstr "Проекти" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "Разни" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Общи" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Покажи списъка със символите" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Включи/изключи списъка със символите" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 #, fuzzy msgid "Show documents list" msgstr "Показвай списък с отворените файлове" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 #, fuzzy msgid "Toggle the documents list on and off" msgstr "Включи/изключи списъка с отворените файлове" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Покажи _страничната лента" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Описание:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Ляво" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Дясно" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Странична лента" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Списък със символите:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Прозорец за съобщения:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Редактор:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Задава шрифта за прозореца за съобщения" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Задава шрифт за списъка със символи" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Задава шрифт на редактора" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Шрифтове" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Показвай подпрозорците на редактора" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 #, fuzzy msgid "Show close buttons" msgstr "Показвай бутона Избери цвят" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1822,118 +1930,155 @@ "Показва малко х-че във файловите под-прозорци за лесното им затваряне " "(изисква рестарт на Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Положение на подпрозорците с нови файлове:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Ляво" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Файловите подпрозорци ще бъдат слагани отляво на бележника" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Дясно" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Файловите подпрозорци ще бъдат слагани отдясно на бележника" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Запази текущия файл" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Промяеня всички допълнителни джаджи" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Промяеня всички допълнителни джаджи" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 #, fuzzy msgid "Editor tabs" msgstr "Шрифтове" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Горе" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Долу" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Странична лента:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 #, fuzzy msgid "Tab positions" msgstr "Местоположение:" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 #, fuzzy msgid "Show status bar" msgstr "Покажи лентата на състоянието" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Дали да показва лентата на състоянието на дъното на главния прозорец" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Интерфейс" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "Показвай лентата с инструментите" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy -msgid "Toolbar" -msgstr "Пътища на инструментите" +msgid "Customize Toolbar" +msgstr "Покажи _лентата с инструменти" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Стил на иконите:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Големина на иконите:" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Външен вид" +#: ../src/interface.c:3368 +#, fuzzy +msgid "Images _and Text" +msgstr "Изображения и текст" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3376 #, fuzzy -msgid "Customize Toolbar" -msgstr "Покажи _лентата с инструменти" +msgid "_Images Only" +msgstr "Само изображения" + +#: ../src/interface.c:3384 +#, fuzzy +msgid "_Text Only" +msgstr "Само текст" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Шрифтове" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +#, fuzzy +msgid "_Small Icons" +msgstr "Малки икони" + +#: ../src/interface.c:3429 +#, fuzzy +msgid "_Very Small Icons" +msgstr "Малки икони" + +#: ../src/interface.c:3437 +#, fuzzy +msgid "_Large Icons" +msgstr "Големи икони" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Размер:" + +#: ../src/interface.c:3450 +#, fuzzy +msgid "Toolbar" +msgstr "Пътища на инструментите" -#: ../src/interface.c:3363 +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Лента с инсрументи" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Пренасяне на редове" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1943,11 +2088,11 @@ "пренасянето на редове може доста да спъне производителността за големи " "документи и по тази причина е добре да бъде изключено на по-слаби машини." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Разреши \"умен\" home клавиш" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1960,11 +2105,11 @@ "Ако е забранен, home винаги връща в началото на реда - независимо от " "настоящата му позиция." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Изключи Влачене и Спускане." -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1974,20 +2119,20 @@ "не е възможнода се влачат и спускат избрани текстове в или извън прозореца " "на редактода." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Разреши сгъването" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Дали да разреши сгъването на кода" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Отсгъни всички дъщерни на точка за сгъване" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1996,11 +2141,11 @@ "Сгъни или разгъни всички деца на точка за сгъване. Ако се натисне shift " "докато се сгъва, ще се наблюдава обратното поведение." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Използвай показатели за грешките при компилирането" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -2009,159 +2154,150 @@ "Дали да използва показатели (вълнисто подчертаване) за открояване на " "редовете,където компилаторът е открил предупреждение или грешка." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Махни излишните символи на края" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Разреши новия ред да маха всички излишни символи от предния ред." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "Включи/изключи маркера" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Свойства" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 #, fuzzy msgid "Features" msgstr "Свойства" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 #, fuzzy msgid "Auto-indent mode:" msgstr "Режим на автоматичния отстъп:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Основен" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Текущи символи" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 #, fuzzy msgid "Match braces" msgstr "Отиди до съвпадащата скоба" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Вид:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 #, fuzzy msgid "Width:" msgstr "Писане:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 #, fuzzy msgid "The width in chars of a single indent" msgstr "Широчината, в символи, която ще заема една табулация" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Широчина на табулацията" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Дали да засече вида на вмъкване от съдържанието на файла при отваряне." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 #, fuzzy msgid "Tab key indents" msgstr "Умно вмъкване на реда" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 #, fuzzy msgid "Indentation" msgstr "Контекстна команда" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "Контекстна команда" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 #, fuzzy msgid "Snippet completion" msgstr "Не завършвай блоковете" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "Въведете съкращение, което да се разширява с натискане на един бутон." -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Автоматично завършване на XML-тагове" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 #, fuzzy msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Автоматично завършване на отворени XML-тагове (това включва и HTML-тагове)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2169,28 +2305,28 @@ "Автоматично завършване на познати символи от отворените файлове (това са " "имена на функции,глобални променливи и т.н.)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Съкращения за разширяване:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " @@ -2198,130 +2334,129 @@ msgstr "" "Броят на съкращенията, които да бъдат показани в списък за подсказване." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "" "Броя на редовете, които да бъдат показани в списъка за автоматично " "завършване." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Броя на редовете, които да бъдат показани в списъка за автоматично " "завършване." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 #, fuzzy msgid "Completions" msgstr "Автоматично завършване" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 #, fuzzy msgid "Completions" msgstr "Автоматично завършване" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 #, fuzzy msgid "Invert syntax highlighting colors" msgstr "Обърни наопъки цветовете за открояване на синтаксиса" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Използвай бял текст на черен фон." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Показвай ориентировачни занци за отстъп" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Показва малки точкови линии за да ви покогнат да използвате подходящия " "отстъп." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Показвай интервали и табулации" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Отбелязва интервалите с точки и табулациите със стрелки." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Показвай края на редовете" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "Показва символа за край на ред" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Показва или скрива лентата с номерата на редовете" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 #, fuzzy msgid "Show markers margin" msgstr "Покажи _отстъпа за отбелязване" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2330,37 +2465,39 @@ "Показва или скрива малката лентичка (отстъп) от дясно на номерата на " "редовете, която се използва за отбелязване на редовете." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 #, fuzzy msgid "Stop scrolling at last line" msgstr "Компилирай текущия файл" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Покажи" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Отбелязвай дългите редове с:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Цвят на маркера за дълъг ред:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Дружество:" + +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Цвят" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Задава цвета на маркера за дълъг ред" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Избери цвят" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2372,11 +2509,11 @@ "тази стойност на стойност по-голяма от 0, за да укажете къде да се появи " "тази права." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Ред" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2385,11 +2522,11 @@ "Принтира вертикална права в прозореца на редкактора на дадената позиция " "(вижте отдолу)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2400,148 +2537,175 @@ "промея на цвета, зададен долу (Това се препоръчва ако използвате " "пропорционални шрифтове)" -#: ../src/interface.c:3902 +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Разреши" + +#: ../src/interface.c:3976 ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Маркер за дълъг ред" + +#: ../src/interface.c:3995 ../src/interface.c:5309 msgid "Disabled" msgstr "Изключен" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Маркер за дълъг ред" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Премахва табулациите, интервалите в края на реда" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Пътища на инструментите" -#: ../src/interface.c:3913 +#: ../src/interface.c:4021 #, fuzzy msgid "Display" msgstr "Покажи" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 #, fuzzy msgid "Default end of line characters:" msgstr "Кодиране по подразбиране:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Нови·файлове" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "Задава кодирането по подразбиране на новосъздадените файлове." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 #, fuzzy msgid "Default encoding (new files):" msgstr "Кодиране по подразбиране:" -#: ../src/interface.c:4007 -#, fuzzy -msgid "Default encoding (existing files):" -msgstr "Кодиране по подразбиране:" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" +msgid "Sets the default encoding for newly created files" msgstr "Задава кодирането по подразбиране на новосъздадените файлове." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Използвай определено кодиране при отваряне на файлове." -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Тази настройка премахва автоматичното засичане на файловото кодиране при " "отваряне на файлове и зарежда файла с точно определена кодировка (обикновено " "ненужно.)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Кодиране по подразбиране:" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Задава кодирането по подразбиране на новосъздадените файлове." + +#: ../src/interface.c:4136 #, fuzzy msgid "Encodings" msgstr "Кодировка:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Сложи нов ред в края на файла" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Ако файлът не завършва с празен ред, такъв ще се вмъкне автоматично" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Махни излишните символи на края" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Премахва табулациите, интервалите в края на реда" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Замени табулацията с интервали" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Заменя всички табулации в документа с интервали" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Запазване на файлове" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Големина на списъка със скоро отваряни файлове:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Указва броя на файловете, които се съхраняват в списъка със скоро отваряни " "файлове:" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Файлове" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Терминал:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Браузър:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Път и опции за програмата make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2549,24 +2713,24 @@ "Имитатор на терминал, подобно на xterm,·gnome-terminal·или·konsole (трябва " "да приема като аргумент -е)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Път (и вероятно допълнителни аргументи) към любимия ви браузър" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Пътища на инструментите" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 #, fuzzy msgid "Context action:" msgstr "Контекстно действие" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, fuzzy, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2576,73 +2740,73 @@ "Контекстна команда. Избраната дума може да бъде използвана с %s. Тя може да " "бъде навсякъде в дадената команда и ще бъде заменена преди изпълнението." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 #, fuzzy msgid "Commands" msgstr "" "\n" "Команди за тагове\n" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Инструменти" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "адрес на електронната поща на разработчика" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Инициали на името на разработчика" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 #, fuzzy msgid "Initial version:" msgstr "Първоначална версия:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Версия, която новия файл има по подразбиране" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Име на дружеството" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Разработчик:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Дружество:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Пощенски адрес:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Инициали:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Име на разработчика" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 #, fuzzy msgid "Year:" msgstr "Странична лента:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 #, fuzzy msgid "Date:" msgstr "Make:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2652,7 +2816,7 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2662,7 +2826,7 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2672,69 +2836,69 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Информация за шаблона" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Шаблони" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 #, fuzzy msgid "C_hange" msgstr "Промени" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Клавишни комбинации" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Комбинации" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 #, fuzzy msgid "Command:" msgstr "Команда" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Път до командата за принтиране на файлове (използвайте %f за името на файла)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Използвай външна програма за принтиране" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 #, fuzzy msgid "Print line numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Следвай пътя до текущия файл" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 #, fuzzy msgid "Print page numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 #, fuzzy msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Номерирай страниците в дъното. Отнема 2 реда." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 #, fuzzy msgid "Print page header" msgstr "Основен път:" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2743,22 +2907,22 @@ "Добавя текст към началото на страницата, съдържащ номера на страницата, " "името на файла и отнема 3 реда (виж долу)." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 #, fuzzy msgid "Use the basename of the printed file" msgstr "Следвай пътя до текущия файл" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Следвай пътя до текущия файл" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 #, fuzzy msgid "Date format:" msgstr "Потребителски формат за дата" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 #, fuzzy msgid "" "Specify a format for the date and time stamp which is added to the page " @@ -2769,606 +2933,624 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Използвай отпечатването на GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Кодировка:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 #, fuzzy msgid "Printing" msgstr "Разпечатай (принтирай)" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Свойства на проекта" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Покажи" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Изрежи" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 #, fuzzy msgid "File" msgstr "_Файл" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Нов" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Отвори" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Отвори избрания файл" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Запази" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Запази като" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Запази всички" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Разпечатай (принтирай)" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Затвори" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Затвори всички" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Презареди файла" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 #, fuzzy msgid "Project" msgstr "_Проект" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Свойства на проекта" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Отмени" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Направи отново" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Удвои ред или избраното" - -#: ../src/keybindings.c:239 -#, fuzzy -msgid "Delete current line(s)" -msgstr "Затвори текущия файл" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Затвори текущия файл" -#: ../src/keybindings.c:244 -#, fuzzy -msgid "Transpose current line" -msgstr "Принтира текущия файл" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 #, fuzzy msgid "Scroll to current line" msgstr "Компилирай текущия файл" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 #, fuzzy msgid "Scroll up the view by one line" msgstr "Компилирай текущия файл" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Прелисти надолу с един ред" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 #, fuzzy msgid "Complete snippet" msgstr "Завърши блока" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 #, fuzzy msgid "Suppress snippet completion" msgstr "Не завършвай блоковете" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Контекстно действие" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Завърши думата" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Покажи сподсказка" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Покажи списъка с макроси" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Не завършвай блоковете" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Коментирай ред(ове)" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Коментирай ред(ове)" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Изрежи" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 #, fuzzy msgid "Copy" msgstr "Дружество:" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Постави" -#: ../src/keybindings.c:276 -#, fuzzy -msgid "Copy current line(s)" -msgstr "Компилирай текущия файл" - -#: ../src/keybindings.c:278 -#, fuzzy -msgid "Cut current line(s)" -msgstr "Затвори текущия файл" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 #, fuzzy msgid "Select" msgstr "Избери всичко" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Избери всичко" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Избери текущата дума" -#: ../src/keybindings.c:287 +#: ../src/keybindings.c:334 #, fuzzy -msgid "Select current line(s)" -msgstr "Избери текущата дума" +msgid "Select to previous word part" +msgstr "Отиди до предишния маркер" -#: ../src/keybindings.c:289 +#: ../src/keybindings.c:336 #, fuzzy -msgid "Select current paragraph" -msgstr "Избери текущата дума" +msgid "Select to next word part" +msgstr "Отиди до следващия маркер" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 #, fuzzy msgid "Format" msgstr "_Формат" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 #, fuzzy msgid "Toggle Case of Selection" msgstr "Коментирай/откоментирай реда" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Коментирай/откоментирай реда" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Коментирай ред(ове)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Откоментирай ред(ове)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Увеличи отстъпа" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Намали отстъпа" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 #, fuzzy msgid "Increase indent by one space" msgstr "Увеличи отстъпа" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 #, fuzzy msgid "Decrease indent by one space" msgstr "Намали отстъпа" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Умно вмъкване на реда" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Изпрати на потребителска команда 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Изпрати на потребителска команда 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Изпрати на потребителска команда 3" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "Из_прати избрания текст на" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 #, fuzzy msgid "Insert" msgstr "_Вмъкни" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Вмъкни дата" -#: ../src/keybindings.c:332 -#, fuzzy -msgid "Insert alternative white space" -msgstr "Вмъкни другия празен символ" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 #, fuzzy msgid "Settings" msgstr "Раздел" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 #, fuzzy msgid "Search" msgstr "Тър_си" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Намери" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Намери следващото" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Намери предишното" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Намери следващото избрано" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Намери предишното избрано" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Замени" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 #, fuzzy msgid "Find in Files" msgstr "Намери въф _файлове" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Следващо съобщение" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 #, fuzzy msgid "Previous Message" msgstr "Следващо съобщение" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Намери къде се използва" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" msgstr "Намери къде се използва" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "_Направи всички (make)" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 #, fuzzy msgid "Go to" msgstr "Прескочи до ред" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 #, fuzzy msgid "Navigate back a location" msgstr "Върни назад" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 #, fuzzy msgid "Navigate forward a location" msgstr "Премести напред" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 #, fuzzy msgid "Go to matching brace" msgstr "Отиди до съвпадащата скоба" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Включи/изключи маркера" -#: ../src/keybindings.c:385 -#, fuzzy -msgid "Go to next marker" -msgstr "Отиди до следващия маркер" - -#: ../src/keybindings.c:388 -#, fuzzy -msgid "Go to previous marker" -msgstr "Отиди до предишния маркер" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Отиди до дефиницията на тага" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Отиди до декларацията на тага" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 #, fuzzy msgid "Go to Start of Line" msgstr "Прескочи до ред" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 #, fuzzy msgid "Go to End of Line" msgstr "Прескочи до ред" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Прескочи до ред" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 #, fuzzy msgid "Go to Previous Word Part" msgstr "Отиди до предишния маркер" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 #, fuzzy msgid "Go to Next Word Part" msgstr "Отиди до следващия маркер" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Изглед" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 #, fuzzy msgid "Toggle All Additional Widgets" msgstr "Промяеня всички допълнителни джаджи" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Цял екран" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Покажи/скрий прозореца за съобщения" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Покажи/скрий страничната лента" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Увеличи шрифта" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Намали шрифта" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Намали шрифта" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Превключи към редактора" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Превключи към бележника" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Превключи към конзолата" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Превключи към страничната лента" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 #, fuzzy msgid "Switch to Sidebar" msgstr "Превключи към страничната лента" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 #, fuzzy msgid "Switch to Compiler" msgstr "Превключи към страничната лента" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Превключи към страничната лента" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Покажи _прозореза за съобщения" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Превключи към левия документ" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Превключи към страничната лента" + +#: ../src/keybindings.c:498 #, fuzzy msgid "Notebook tab" msgstr " команди" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Превключи към левия документ" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Превключи към десния документ" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Превключи към последно-използвания документ" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 #, fuzzy msgid "Move document left" msgstr "цял документ" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 #, fuzzy msgid "Move document right" msgstr "цял документ" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 #, fuzzy msgid "Move document first" msgstr "цял документ" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 #, fuzzy msgid "Move document last" msgstr "цял документ" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 #, fuzzy msgid "Document" msgstr "_Документ" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 #, fuzzy msgid "Toggle Line wrapping" msgstr "Пренасяне на редове" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 #, fuzzy msgid "Toggle Line breaking" msgstr "Об_ърни коментирането на реда" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Замени табулациите с интервали" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 #, fuzzy msgid "Toggle current fold" msgstr "Избери текущата дума" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Сгъни всички" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Отсгъни всички" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Презареди списъка със символите" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Премахни _бележките" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Премахни бележките за _грешка" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Построй" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Компилирай" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Направи всички" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Направи потербителска цел" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Направи обект" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Следваща грешка" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 #, fuzzy msgid "Previous error" msgstr "Преводачи" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Изпълни" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Изпълни (друга команда)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Настройки на построяването" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 #, fuzzy msgid "Show Color Chooser" msgstr "Покажи избор на цвят" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 #, fuzzy msgid "Help" msgstr "_Помощ" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 #, fuzzy msgid "Keyboard Shortcuts" msgstr "Кл_авишни комбинации" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 #, fuzzy msgid "The following keyboard shortcuts are configurable:" msgstr "Следните клавишни комбинации са определени:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "Превключи към левия документ" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Въведете тук каквото желаете, използвайте го като бележник" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Не успях да отворя един или повече от сесийните файлове" @@ -3377,7 +3559,12 @@ msgid "Debug Messages" msgstr "Съобщения" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "Тър_си" + +#: ../src/main.c:122 #, fuzzy msgid "" "Set initial column number for the first opened file (useful in conjunction " @@ -3386,95 +3573,104 @@ "слага първоначалния брой на колоните за първия отворен файл (полезно в " "комбинация с --line0" -#: ../src/main.c:125 +#: ../src/main.c:123 #, fuzzy msgid "Use an alternate configuration directory" msgstr "използвай алтернативна конфигурационна директория" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Отпечатай вътрешните имена на видовете файлове." -#: ../src/main.c:128 +#: ../src/main.c:125 #, fuzzy msgid "Generate global tags file (see documentation)" msgstr "изпълнява файла с глобалите тагове (виж документацията)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 #, fuzzy msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "не отваряй файлове във вече отворена програмата, принудително отвори нова" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 #, fuzzy msgid "Set initial line number for the first opened file" msgstr "сложи първоначалния брой за първия отворен файл" -#: ../src/main.c:135 +#: ../src/main.c:133 #, fuzzy msgid "Don't show message window at startup" msgstr "не показвай прозореца за съобщения при зареждане" -#: ../src/main.c:136 +#: ../src/main.c:134 #, fuzzy msgid "Don't load auto completion data (see documentation)" msgstr "" "не зареждай информацията за автоматично завършване (виж документацията)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Не зареждай приставки" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Отпечатай инсталационната представка на Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "не зареждай файловете от предишната сесия" -#: ../src/main.c:143 +#: ../src/main.c:141 #, fuzzy msgid "Don't load terminal support" msgstr "не зареждай поддръжката за терминали" -#: ../src/main.c:144 +#: ../src/main.c:142 #, fuzzy msgid "Filename of libvte.so" msgstr "има на файла libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 #, fuzzy msgid "Show version and exit" msgstr "покажи версията и излез" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[Файлове...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(компилиран на·%s·с·GTK·%d.%d.%d,·GLib·%d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3483,14 +3679,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3501,52 +3697,57 @@ "Може да възникат проблеми с Geany без конфигурационна директория.\n" "Да стартирам ли Geany все пак?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Не можах да намеря файла '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Това е Geany·%s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Не можах да създам конфигурационната директория (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 #, fuzzy msgid "Configuration files reloaded." msgstr "Не успях да компилирам." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Съобщения за състоянието" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Дружество:" + +#: ../src/msgwindow.c:533 #, fuzzy msgid "Copy _All" msgstr "_Затвори Всички" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Скрий прозореца за съобщенията" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Премахва всички бележки, които показват грешки в документа." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 #, fuzzy msgid "_Plugin Manager" msgstr "Управител на приставките" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3557,88 +3758,96 @@ "Описание: %s\n" "Автор(и): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 #, fuzzy msgid "Active" msgstr "Действие" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Приставка" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Няма налични приставки." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Приставки" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Наличните приставки са изброени в списъка долу. Изберете тези, които искате " -"да се заредят със стартирането на Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 #, fuzzy msgid "Plugin details:" msgstr "Контекстна команда" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 #, fuzzy msgid "Grab Key" msgstr "Клавиш за улавяне" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Въведете комбинацията от клавиши, която желаете да използвате за \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "Намери всички" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "_Затвори Всички" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Действие" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Комбинация" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Предефиниране" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Да предефинирам ли тази клавишна комбинация?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, fuzzy, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Комбинацията '%s' е вече заето от \"%s\". Моля изберете друга." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Терминал" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Въведето пътеките до инструментите отдилу. Тези, от които не се нуждаете, " "можете да оставите празни." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3646,7 +3855,7 @@ "Въведете информацията, която да бъде използвана в шаблоните. Вижте " "документацията за подробности." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3657,7 +3866,7 @@ "рестартирате Geany." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3669,7 +3878,7 @@ "кобинацията направо." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3679,7 +3888,7 @@ "нов)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3693,50 +3902,50 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Променен:" -#: ../src/printing.c:375 +#: ../src/printing.c:376 #, fuzzy msgid "Document Setup" msgstr "" "\n" "Меню документ\n" -#: ../src/printing.c:410 +#: ../src/printing.c:411 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Следвай пътя до текущия файл" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Променен:" -#: ../src/printing.c:776 -#, fuzzy, c-format -msgid "Printing of file %s was cancelled." -msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Принтирах файла %s." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" -#: ../src/printing.c:867 +#: ../src/printing.c:875 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "" "Моля първо въведете команда за отпечатване в прозореца с предпочитанията." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3747,38 +3956,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Принтирах файла %s." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "проекти" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Нов Проект" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "С_ъздай" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Име:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Име на файла:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Основен път:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 #, fuzzy msgid "" "Base directory of all files that make up the project. This can be a new " @@ -3788,125 +4002,117 @@ "Основната директория на всички файлове, които съставят проекта. Това може да " "бъденов път или вече съществуваща йерархия от директории." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Изберете основен път за проекта" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Не можах да заредя файла \"%s\" на проекта." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Отвори проект" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Файлове на проекта" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Затворих проекта ·\"%s\"." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Описание:" -#: ../src/project.c:447 -#, fuzzy -msgid "Make in base path" -msgstr "Направи в основната директория" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Команда за изпълнение:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Разд1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Командаата, която да се изпълни в основната директория на проекта. Аргументи " -"могат да се прибавят към командата. Оставете празно, за да се изпълни " -"командата по подразбиране." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Файлови образци:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Искате ли да го затворите преди да продължите?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, fuzzy, c-format msgid "The '%s' project is already open." msgstr "Проектът '%s' е вече отворен." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Даденото име е прекалено късо." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Даденото име е прекалено дълго (най-много %d символа)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Избрали сте неправилно име за проекта." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Да създам ли основната директория на проекта?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Пътят \"%s\" не съществува." -#: ../src/project.c:670 +#: ../src/project.c:705 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Не можах да създам конфигурационната директория (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "Не можах да запиша файла на проекта." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Създадох проекта \"%s\"." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Запазих проекта \"%s\"." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Изберете име за проекта" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Изберете команда за изпълнение на проекта" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Отворих проекта \"%s\"." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Използвай редовни изрази" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3914,16 +4120,16 @@ "Използвай изрази в стил POSIX. За по-подробна информация за редовните изрази," "моля прочетете документацията." -#: ../src/search.c:227 +#: ../src/search.c:244 #, fuzzy msgid "Search _backwards" msgstr "_Търси назад" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Използвай _escape·sequences" -#: ../src/search.c:246 +#: ../src/search.c:263 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3932,431 +4138,453 @@ "Замени ·\\\\,·\\t, \\n, \\r·и·\\uXXXX·(Unicode·символи)·със съответните " "контролни символи." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 #, fuzzy msgid "C_ase sensitive" msgstr "_Зачитане на малки/големи букви" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Само _ако съвпада с цяла дума" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Само ако съвпада с _началото на думата" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Предишен" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Следващ" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 #, fuzzy msgid "_Search for:" msgstr "Търси за:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 #, fuzzy msgid "_Find All" msgstr "Намери всички" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Отбележи" -#: ../src/search.c:433 +#: ../src/search.c:450 #, fuzzy msgid "Mark all matches in the current document" msgstr "Отбелязва всички съвпадения в текущия документ." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "В _Сесията" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "В _Документа" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Затвори _прозореца" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Забранете тази опция, за да оставите прозореца отворен." -#: ../src/search.c:529 +#: ../src/search.c:556 #, fuzzy msgid "Replace & Fi_nd" msgstr "За_мени и намери" -#: ../src/search.c:538 +#: ../src/search.c:565 #, fuzzy msgid "Replace wit_h:" msgstr "Замени със:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 #, fuzzy msgid "Re_place All" msgstr "Замени всички" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "В _избраното" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Замени всички намерени съвпадени е избрания текст" -#: ../src/search.c:696 +#: ../src/search.c:725 #, fuzzy msgid "_Directory:" msgstr "Директория:" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "Задайте знаково кодиране:" -#: ../src/search.c:752 +#: ../src/search.c:781 #, fuzzy msgid "Fixed s_trings" msgstr "С _точно определена големина" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Редовни изрази за _Grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 #, fuzzy msgid "See grep's manual page for more information" msgstr "Виж страницата на ръководството на grep за повече информация." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Разширение редовни изрази" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Рек_урсивно в поддиректории" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "О_бърни наопъки резултатие от търсенето" -#: ../src/search.c:797 +#: ../src/search.c:826 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Обърни наопъки логиката за търсене на съвпадения, за да изберете не-" "съвпадащите редове." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Д_опълнителни настройки:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Други опции, които да се предадат на Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Намерих %d съвпадения за '%s'." msgstr[1] "Намерих %d съвпадения за '%s'." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, fuzzy, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Замених текст в %u файла." -msgstr[1] "Замених текст в %u файла." +msgid "Replaced %u matches in %u documents." +msgstr "Отбелязва всички съвпадения в текущия документ." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Неправилна директория за търсене във файлове." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Няма текст, който да се търси." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Не мога да стартирам програмата grep: '%s'; проверете настройката за пътя в " "Предпочитания" -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "Тър_си" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s·%s·--·%s·(в директория:·%s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Не можах да отворя директорията (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Търсенето се провали." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Търсенето завърши с %d съвпадения" msgstr[1] "Търсенето завърши с %d съвпадения" -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Не открих съвпадения." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Раздел" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Разд1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Разд2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Разд3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Приложение" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Други" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Модул" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 #, fuzzy msgid "Types" msgstr "Вид:" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 #, fuzzy msgid "Type constructors" msgstr "Завърши блока" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Функции" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 #, fuzzy msgid "Sections" msgstr "Раздел" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Клавиши" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Променливи" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Команда" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Среда" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Подраздел" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Под-подраздел" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Надпис" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "Състояние" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Мой" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Местен" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Наш" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +#, fuzzy +msgid "Labels" +msgstr "Надпис" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Константи" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Интерфейси" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Класове" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Константи" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "В _избраното" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "Завърши блока" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 #, fuzzy msgid "Modules" msgstr "Модул" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Методи" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namespaces" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Свойства" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Изнеси" -#: ../src/symbols.c:766 ../src/symbols.c:855 -msgid "Members" -msgstr "Членове" +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "неозагалвен" -#: ../src/symbols.c:806 ../src/symbols.c:829 +#: ../src/symbols.c:761 #, fuzzy -msgid "Labels" -msgstr "Надпис" +msgid "Architectures" +msgstr "Състояние" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Свойства" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Променливи" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Функции" + +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "Членове" -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Макроси" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 #, fuzzy msgid "Defines" msgstr "Линии:" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "Състояние" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Непознато разширение за \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, fuzzy, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Не успях да създам файл с тагова.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4365,7 +4593,7 @@ "Употреба: %s·-g··<Списък от файлове>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4376,186 +4604,204 @@ "CFLAGS=`pkg-config·gtk+-2.0·--cflags`·%s·-g·gtk2.c.tags·/usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Зареди таговете" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Таговови файлове на Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Заредих·%s·таг файл·'%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Не можах да заредя таг-файла '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Не можах да намеря предварителната декларация на %s." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Не успях да намеря дефиницята на %s." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 #, fuzzy msgid "Sort by _Name" msgstr "Външен вид" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 #, fuzzy msgid "Sort by _Appearance" msgstr "Външен вид" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Запази текущия файл" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Запази всички отворени файлове" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Презареди текущия файл от диска" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Затвори текущия файл" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "Затваря всички отворени файлове" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "Обърни малки/главни букви в избрания текст" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "Компилирай текущия файл" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "Обърни малки/главни букви в избрания текст" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Отмени последната промяна" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Направи отново послената промяна" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Компилирай текущия файл" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Изпълни или прегледай текущия файл" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Отваря диалогов прозорец за да изберете цвят от палитрата." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Увеличи размера на шрифта" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Намали размера на шрифта" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 #, fuzzy msgid "Decrease indentation" msgstr "Намали отстъпа" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 #, fuzzy msgid "Increase indentation" msgstr "Увеличи отстъпа" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Намери въведения текст в текуция файл" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "Прескача до въведения ред." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Излез от Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "XML документ" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "Отбелязва всички съвпадения в текущия документ." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Създай нов файл" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Създай нов файл" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Отвори съществуващ файл" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Отвори избрания файл" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Няма повече грешки при построяването." + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "Прескочи до ред" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Покажи" @@ -4581,7 +4827,7 @@ msgid "Custom command failed: %s" msgstr "Не са определени потеребителски команди." -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Задайте потребителски команди" @@ -4593,203 +4839,194 @@ "Можете да предадете текущото избрано до която и да е от тези команди и " "изходътот командата заменя текущото избрано." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Не са определени потеребителски команди." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Броя на думи" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "избор" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "цял документ" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Област:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Линии:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Думи:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Символи:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Не намерих тагове." -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 #, fuzzy msgid "Show S_ymbol List" msgstr "Покажи списъка със символите" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 #, fuzzy msgid "Show _Document List" msgstr "Показвай списък с отворените файлове" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 #, fuzzy msgid "H_ide Sidebar" msgstr "Скрий страничната лента" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Покажи _целия път" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "ред: %d\t кол: %d\t избр: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "ТАБУЛАЦИЯ" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 #, fuzzy msgid "SP" msgstr "ИНТЕРВАЛ" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Задайте кодирането:" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, fuzzy, c-format msgid "filetype: %s" msgstr "Задай тип на файла:" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Шрифтът е обновен (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Стандартна библиотека на С" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO·C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++·(стандартна С библиотека )" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Стандартна С++ библиотека" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++·STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 #, fuzzy msgid "_Set Custom Date Format" msgstr "Задайте потребителски формат за дата" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Изберете папка" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Изберете файл" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "Не успях да компилирам." - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "Запази _всички" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "_Затвори Всички" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win·(CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac·(CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix·(LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Терминал" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 #, fuzzy msgid "_Set Path From Document" msgstr "Превключи към левия документ" -#: ../src/vte.c:553 +#: ../src/vte.c:521 #, fuzzy msgid "_Restart Terminal" msgstr "Терминал" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Метеди за вход" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4797,50 +5034,38 @@ "Имаше грешка при смяната на директория във VTE, най-вероятно защото тя " "съдържа команда." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Надстройка за термнинала" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Тези настройки за джаджата за истински терминален имитатор (VTE) важат само " -"ако може да се зареди VTE библиотеката." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Терминален шрифт:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "Задава шрифта на джаджата за терминал." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Нормален цвят:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Фонов цвят:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 #, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Задава нормалия цвят на текста в джаджата за терминал." -#: ../src/vte.c:775 +#: ../src/vte.c:771 #, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Задава фоновия цвят на текста в джаджата за терминал." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Прелистване назад:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 #, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " @@ -4849,11 +5074,11 @@ "Определя историята в редове, която можете да превъртите назад вджаджата за " "терминал." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Обвивка:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 #, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " @@ -4861,48 +5086,48 @@ msgstr "" "Задава пътя до обвивката, която трябва да се стартира в терминалния имитатор." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Прелиствай при натискане на клавиш." -#: ../src/vte.c:820 +#: ../src/vte.c:816 #, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Дали да прелиствам до дъното ако се натисне клавиш" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Прелиствай при изход" -#: ../src/vte.c:824 +#: ../src/vte.c:820 #, fuzzy msgid "Whether to scroll to the bottom when output is generated" msgstr "Дали да прелиствам до дъното, когато има изход" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "Дали да разреши сгъването на кода" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Смени клавишните комбинации на Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 #, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "Позволява на VTE да получава клавишни команди (освен фокусните)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Изключи комбинацията за меню (F10 по подразбиране)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4912,11 +5137,11 @@ "Изключването й би било полезно ако използвате, например, Midnight Commander " "в VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Следвай пътя до текущия файл" -#: ../src/vte.c:841 +#: ../src/vte.c:837 #, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" @@ -4925,11 +5150,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Не използвай скрипта за стартиране" -#: ../src/vte.c:847 +#: ../src/vte.c:843 #, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " @@ -4938,11 +5163,11 @@ "Не използвай простия скрипт за стартиране, който обикновено се използва, за " "да покаже с кода, който е върнала програмата при изпълнението си." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Изпълнявай програмите във VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 #, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " @@ -4951,106 +5176,139 @@ "Да изпълнявам програмите във VTE, вместо да отварям прозорец на терминален " "емулатор. Моля обърнете внимание, че такива програми не могат да се спират." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Проектни файлове на Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Изпълними файлове" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 #, fuzzy msgid "Class Builder" msgstr "Класове" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Създай изходни файлове за нови видове класове." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 #, fuzzy msgid "Create Class" msgstr "С_ъздай" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:402 #, fuzzy msgid "Class" msgstr "Класове" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 #, fuzzy msgid "Class name:" msgstr "Класове" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 #, fuzzy msgid "Header file:" msgstr "Презареди файла" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 #, fuzzy msgid "Source file:" msgstr "Изходен файл на С" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 #, fuzzy msgid "Inheritance" msgstr "Интерфейс" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 #, fuzzy msgid "Base class:" msgstr "Основен път:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Изходен файл на С" + +#: ../plugins/classbuilder.c:465 #, fuzzy msgid "Base header:" msgstr "Основен път:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Глобални" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 #, fuzzy msgid "Base GType:" msgstr "Основен път:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 #, fuzzy msgid "Options" msgstr "Функции" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 #, fuzzy msgid "Create constructor" msgstr "Завърши блока" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 #, fuzzy msgid "Create destructor" msgstr "Завърши блока" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Singletons" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Конструктор тип GTK+ " -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 #, fuzzy msgid "Create Cla_ss" msgstr "С_ъздай" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 #, fuzzy msgid "_C++ Class" msgstr "Класове" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 #, fuzzy msgid "_GTK+ Class" msgstr "Класове" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Класове" + #: ../plugins/htmlchars.c:38 #, fuzzy msgid "HTML Characters" @@ -5061,54 +5319,60 @@ msgstr "Вмъква HTML символи като '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "Име на разработчика" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML·символи" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO·8859-1·символи" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Гръцки букви" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Математически знаци" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Технически символи" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Знаци за стрелки" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Пунктуационни знаци" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Други символи" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +#, fuzzy +msgid "Plugin configuration directory could not be created." +msgstr "Не можах да създам конфигурационна директория (%s) за плъгина." + +#: ../plugins/htmlchars.c:482 #, fuzzy msgid "Special Characters" msgstr "Специялни символи" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Вмъкни" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -5116,43 +5380,43 @@ "Избери специален символ от списъка долу и щракнете два пъти върху него или " "използвайтебутона за да го въведете в текущата позиция на курсора." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Символ" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML·(име)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Вмъкни специални HTML символи" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "Замени" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Положение на подпрозорците с нови файлове:" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Вмъкни специални HTML символи" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "Специялни символи" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 #, fuzzy msgid "Toggle plugin status" msgstr "Коментирай/откоментирай реда" @@ -5182,116 +5446,115 @@ msgstr "" "Свързва размера на шрифта на документа със сегашното ниво на приближение." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Документът бе успешно изнесен като '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, fuzzy, c-format msgid "File '%s' could not be written (%s)." msgstr "Не можах да запиша файла на проекта." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл с име '%s' вече съществува. Искате ли да го презапишете?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "Изн_еси" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 #, fuzzy msgid "As _HTML" msgstr "Като HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 #, fuzzy msgid "As _LaTeX" msgstr "Като LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 #, fuzzy msgid "File Browser" msgstr "Файлов браузър:" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Добавя отстрани под-прозорец на файлов браузър" -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Прекалено много неща са избрани!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Грешка при изпълнението на външната команда '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Отвори _външно" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 #, fuzzy msgid "_Find in Files" msgstr "Намери във _файлове" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 #, fuzzy msgid "Show _Hidden Files" msgstr "Покажи _скритите файлове" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Нагоре" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Презареди" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 #, fuzzy msgid "Home" msgstr "Домашна директория" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 #, fuzzy msgid "Set path from document" msgstr "Задай пътя на текущия документ" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 #, fuzzy msgid "Clear the filter" msgstr "Изчисти текущия филтър" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 #, fuzzy msgid "Filter:" msgstr "_Филтър" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Фокус на файловия лист" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -#, fuzzy -msgid "Plugin configuration directory could not be created." -msgstr "Не можах да създам конфигурационна директория (%s) за плъгина." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 #, fuzzy msgid "External open command:" msgstr " команди" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, fuzzy, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5305,17 +5568,17 @@ "%f ще се замени с името и пълния път\n" "%d ще се замени с целия път без името\n" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 #, fuzzy msgid "Show hidden files" msgstr "Покажи _скритите файлове" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 #, fuzzy msgid "Hide object files" msgstr "Файлове на проекта" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5323,12 +5586,12 @@ "Не показвай генерираните обектни файлове в браузъра; това са: *.o, *.obj. *." "so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Да създам ли основната директория на проекта?" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 #, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" @@ -5448,40 +5711,200 @@ msgid "Splits the editor view into two windows." msgstr "Раздели редактора на два отделни прозореца" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "Отбелязва всички съвпадения в текущия документ." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Събери редактора" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Раздели прозореца" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Хоризонтално" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 #, fuzzy msgid "Split Horizontally" msgstr "_Хоризонтално" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Задай Включени файлове и аргументи" + #, fuzzy -msgid "Unsplit" -msgstr "_Събери редактора" +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX·->·DVI" + +#, fuzzy +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX·->·PDF" + +#, fuzzy +#~ msgid "_View DVI File" +#~ msgstr "Покажи DVI файл" + +#, fuzzy +#~ msgid "V_iew PDF File" +#~ msgstr "Покажи PDF файл" + +#, fuzzy +#~ msgid "_Set Arguments" +#~ msgstr "Задай аргументи" + +#~ msgid "Set Arguments" +#~ msgstr "Задай аргументи" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Задава програми и опции за компилиране и разглеждане на (La)TeX файлове." + +#~ msgid "DVI creation:" +#~ msgstr "Създаване на DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Създаване на PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Преглед на DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Преглед на PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f ще бъде заменено с името на текущия файл, напр. тестов_файл.c\n" +#~ "%e ще бъде заменено с името на файла без разширението, напр. тестов_файл" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Задава Включвания и Аргументи" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Задава командите за построяване и изпълнение на програми." + +#~ msgid "Compile:" +#~ msgstr "Компилирай:" + +#~ msgid "Build:" +#~ msgstr "Построй:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Не успях да изпълня програмата за преглед" + +#~ msgid "Try to resave the file?" +#~ msgstr "Опит да запая файла отново?" + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "Скрий лентата с инструментите" + +#~ msgid "Icon style:" +#~ msgstr "Стил на иконите:" + +#~ msgid "Icon size:" +#~ msgstr "Големина на иконите:" + +#~ msgid "Appearance" +#~ msgstr "Външен вид" + +#, fuzzy +#~ msgid "Hard tab width:" +#~ msgstr "Широчина на табулацията" + +#~ msgid "Long line marker:" +#~ msgstr "Отбелязвай дългите редове с:" + +#~ msgid "Long line marker color:" +#~ msgstr "Цвят на маркера за дълъг ред:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Път и опции за програмата make" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Удвои ред или избраното" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "Из_прати избрания текст на" + +#~ msgid "Run (alternative command)" +#~ msgstr "Изпълни (друга команда)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Наличните приставки са изброени в списъка долу. Изберете тези, които " +#~ "искате да се заредят със стартирането на Geany." + +#, fuzzy +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" + +#, fuzzy +#~ msgid "Make in base path" +#~ msgstr "Направи в основната директория" + +#~ msgid "Run command:" +#~ msgstr "Команда за изпълнение:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Командаата, която да се изпълни в основната директория на проекта. " +#~ "Аргументи могат да се прибавят към командата. Оставете празно, за да се " +#~ "изпълни командата по подразбиране." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Изберете команда за изпълнение на проекта" + +#, fuzzy +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Замених текст в %u файла." +#~ msgstr[1] "Замених текст в %u файла." + +#~ msgid "My" +#~ msgstr "Мой" + +#~ msgid "Local" +#~ msgstr "Местен" + +#~ msgid "Our" +#~ msgstr "Наш" + +#~ msgid "Terminal plugin" +#~ msgstr "Надстройка за термнинала" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Тези настройки за джаджата за истински терминален имитатор (VTE) важат " +#~ "само ако може да се зареди VTE библиотеката." + +#~ msgid "Terminal font:" +#~ msgstr "Терминален шрифт:" + +#, fuzzy +#~ msgid "Unsplit" +#~ msgstr "_Събери редактора" #~ msgid "Diff file" #~ msgstr "Diff файл" @@ -5649,9 +6072,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Маха сгъването където го има" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Премахва всички бележки, които показват грешки в документа." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5669,9 +6089,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Показва списък със всички клавишни комбинации в Geany." -#~ msgid "Color" -#~ msgstr "Цвят" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Въведете номер на реда и прескочете до него." @@ -5782,9 +6199,6 @@ #~ msgid "Items" #~ msgstr "Предмети" -#~ msgid "Use white text on a black background." -#~ msgstr "Използвай бял текст на черен фон." - #, fuzzy #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "изпълнява в режим за премахване на грешки (тоест по-многословно)" @@ -5805,9 +6219,6 @@ #~ "Управлява начина по който терминалния имитатор трябва да се държи. Не " #~ "променяйте тази стойност,освен ако не сте наоълно сигурни какво вършите." -#~ msgid "Search failed." -#~ msgstr "Търсенето се провали." - #, fuzzy #~ msgid "Found %d matches for \"%s\"." #~ msgid_plural "Found %d matches for \"%s\"." diff -Nru geany-0.18/po/ca.po geany-0.19/po/ca.po --- geany-0.18/po/ca.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/ca.po 2010-06-02 22:38:48.000000000 +0100 @@ -1,15 +1,15 @@ # Catalan translations for Geany package. -# Copyright (C) 2007 by Geany's COPYRIGHT HOLDER +# Copyright (C) 2007-2010 by Geany's COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# toni , 2007-2009. +# toni , 2007-2010. # # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-12 23:58+0100\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-06-01 23:59+0100\n" "Last-Translator: Toni Garcia-Navarro \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -21,7 +21,9 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE lleuger i veloç que usa GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:281 +#: ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,424 +31,424 @@ msgid "Integrated Development Environment" msgstr "Entorn Integrat de Desenvolupament" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Quant a Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Un IDE lleuger i veloç" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(compilat el %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Informació" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Desenvolupadors" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "mantenidor" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "desenvolupador" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "coordinador de traduccions" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Traductors" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Antics Traductors" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Col·laboradors" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Alguns dels col·laboradors (per a més detalls, veieu el fitxer %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Crèdits" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Llicència" -#: ../src/about.c:391 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"No s'ha pogut trobar el text de la llicència, per favor visiteu http://www." -"gnu.org/licenses/gpl-2.0.txt per veure-la online." +#: ../src/about.c:397 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "No s'ha pogut trobar el text de la llicència, per favor visiteu http://www.gnu.org/licenses/gpl-2.0.txt per veure-la online." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"No s'ha trobat el terminal '%s' (comproveu la ruta del Terminal a les " -"Preferències)" +msgid "failed to substitute %%p, no project active" +msgstr "error en substituir %%p, no hi ha cap projecte actiu" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "El procés ha fallat, no hi ha directori de treball" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "" -"S'ha produït un error en executar \"%s\" (és possible que el script d'inici " -"no s'hagi creat)" +msgid "%s (in directory: %s)" +msgstr "%s (al directori: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 +#: ../src/build.c:944 +#: ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Ha fallat el procés (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (al directori: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "S'ha produït un error en canviar al directori \"%s\"" -#: ../src/build.c:707 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"No s'ha pogut executar el fitxer en l'emulador de terminal virtual (VTE), " -"probablement perquè ja conté una ordre en execució." +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "S'ha produït un error en executar \"%s\" (és possible que el script d'inici no s'hagi creat)" + +#: ../src/build.c:873 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "No s'ha pogut executar el fitxer en l'emulador de terminal virtual (VTE), probablement perquè ja conté una ordre en execució." + +#: ../src/build.c:911 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "No s'ha trobat el terminal '%s' (comproveu la ruta del Terminal a les Preferències)" -#: ../src/build.c:914 +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Ha fallat la compilació." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "La compilació ha acabat sense errors." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compila" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Munta" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Munta-ho _Tot" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "M_ake..." - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _Object" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Text a Mida" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Introdueix text ací, el text introduït serà postposat a l'ordre." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Error Següent" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Error _Anterior" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "E_specifica 'Includes' i Arguments" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Visualitza DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_isualitza el PDF" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "E_specifica Ordre de Muntatge" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "E_specifica els Arguments" - -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Especifica els Arguments" +#: ../src/build.c:1623 +#: ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Compila el fitxer" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Indica els programes i opcions per a compilar i visualitzar fitxers (La)TeX." +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Compila el fitxer amb l'eina make i l'objectiu per defecte" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Compila el fitxer amb l'eina make i l'objectiu especificat" + +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Compila el fitxer actual amb l'eina Make" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Creació del DVI:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "No es pot aturar el procés (%s)." -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Creació del PDF:" +#: ../src/build.c:1685 +#: ../src/build.c:1697 +msgid "No more build errors." +msgstr "No hi ha més errors de compilació." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "previsualització del DVI:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Especifica l'etiqueta de l'element del menú" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Element" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "previsualització del PDF:" +#: ../src/build.c:1789 +#: ../src/symbols.c:650 +msgid "Label" +msgstr "Etiqueta" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f serà reemplaçat pel nom complet del fitxer, i.e. test_file.c\n" -"%e serà reemplaçat pel nom del fitxer sense extensió, i.e. test_file" +#: ../src/build.c:1790 +#: ../src/symbols.c:645 +msgid "Command" +msgstr "Ordre" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Especifica 'Includes' i Arguments" +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Directori de treball" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Especifica les ordres per muntar i executar els programes." +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Neteja" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Clica per a especificar l'etiqueta de l'element del menú" + +#: ../src/build.c:1904 +#: ../src/build.c:1906 #, c-format -msgid "%s commands" -msgstr "%s ordres" +msgid "%s Commands" +msgstr "%s Ordres" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compila:" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Sense Tipus de Fitxer" -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Munta:" +#: ../src/build.c:1914 +#: ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Error en l'Expressió Regular:" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Execució:" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Ordres (sense tipus de fitxer)" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Compila el fitxer" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Nota: Element 2 obre un diàleg i postposa la resposta a l'ordre." -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make..." +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Executa les Ordres" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "Indica les opcions que es passaran a l'ordre make." +#: ../src/build.c:1992 +#, c-format +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p es substitueixen en els capms directori i ordre, per a més detalls veieu el manual." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Compila el fitxer amb l'eina make i l'objectiu per defecte" +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Especifica Ordre de Muntatge" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Compila el fitxer amb l'eina make i l'objectiu especificat" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compila" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compila el fitxer actual amb l'eina Make" +#. build the code +#: ../src/build.c:2406 +#: ../src/build.c:2669 +#: ../src/interface.c:1075 +msgid "_Build" +msgstr "_Munta" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "S'ha produït un error en executar el visualitzador" +#: ../src/build.c:2413 +#: ../src/build.c:2443 +#: ../src/build.c:2636 +msgid "_Execute" +msgstr "_Executa" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "No es pot aturar el procés (%s)." +#. build the code with make custom +#: ../src/build.c:2458 +#: ../src/build.c:2634 +#: ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "M_ake..." -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "No hi ha més errors de compilació." +#. build the code with make object +#: ../src/build.c:2460 +#: ../src/build.c:2635 +#: ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make _Object" + +#: ../src/build.c:2462 +#: ../src/build.c:2633 +msgid "_Make" +msgstr "_Munta" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Munta-ho _Tot" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "_Especifica Ordres de Muntatge Pròpies" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Esteu segurs de voler sortir?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d fitxer desat." +msgstr[1] "%d fitxers desats." + +#: ../src/callbacks.c:488 +#: ../src/document.c:2895 +#: ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "A_ctualitza" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Qualsevol canvi no guardat es perdrà!" -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Esteu segurs que voleu actualitzar '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 +#: ../src/keybindings.c:428 msgid "Go to Line" msgstr "Vés a la Línia" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Introdueix la línia on vols anar:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 -msgid "" -"Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1296 +#: ../src/callbacks.c:1321 +msgid "Please set the filetype for the current file before using this function." msgstr "Heu d'indicat el tipus de fitxer abans d'utilitzar aquesta funció." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 +#: ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 +#: ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 +#: ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 +#: ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 +#: ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.aaaa hh.mm.ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 +#: ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 +#: ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Usa Format de Data Propi" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Format de Data" -#: ../src/callbacks.c:1498 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Indiqueu el format de la data i l'hora. Podeu utilitzar qualsevol variable " -"suportada per la funció ANSI C strftime." +#: ../src/callbacks.c:1447 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Indiqueu el format de la data i l'hora. Podeu utilitzar qualsevol variable suportada per la funció ANSI C strftime." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "El format de data no pot ser convertit (probablement és massa llarg)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 +#: ../src/callbacks.c:1699 msgid "No more message items." msgstr "No hi ha més missatges." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 +#: ../src/dialogs.c:229 msgid "Open File" msgstr "Obre un Fitxer" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 +#: ../src/interface.c:790 msgid "_View" msgstr "_Visualitza" -#: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Obre el fitxer en mode només lectura. Si trieu més d'un fitxer, tots seran " -"oberts en aquest mode." +#: ../src/dialogs.c:151 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Obre el fitxer en mode només lectura. Si trieu més d'un fitxer, tots seran oberts en aquest mode." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Detecta per l'extensió del fitxer" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 +#: ../src/interface.c:3651 +#: ../src/interface.c:5263 msgid "Detect from file" msgstr "Detecta pel fitxer" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Més Opcions" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Mostra els fitxers _ocults" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Estableix la codificació dels caràcters:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Defineix explícitament la codificació del fitxer, si aquesta no pot ser " -"determinada. Açò és útil quan coneixes la codificació i Geany no la " -"determina correctament.\n" +"Defineix explícitament la codificació del fitxer, si aquesta no pot ser determinada. Açò és útil quan coneixes la codificació i Geany no la determina correctament.\n" "Si trieu més d'un fitxer, tots s'obriran amb aquesta codificació." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Especifica el tipus de fitxer:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" "Defineix explícitament el tipus de fitxer, si aquest no pot ser determinat.\n" "Si trieu més d'un fitxer, tots s'obriran com a aquest tipus." @@ -459,224 +461,227 @@ msgid "Filename already exists!" msgstr "El nom del fitxer ja existeix!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 +#: ../src/dialogs.c:552 msgid "Save File" msgstr "Desa el Fitxer" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "R_eanomena" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Desa el fitxer i reanomena'l" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Obre un fitxer en una pestanya nova" -#: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Mantingues el document actual sense desar i obre el fitxer desat en una " -"pestanya nova." +#: ../src/dialogs.c:442 +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Mantingues el document actual sense desar i obre el fitxer desat en una pestanya nova." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 +#: ../src/win32.c:681 msgid "Error" msgstr "Error" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 +#: ../src/dialogs.c:1443 +#: ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Pregunta" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 +#: ../src/win32.c:693 msgid "Warning" msgstr "Advertència" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 +#: ../src/win32.c:699 msgid "Information" msgstr "Informació" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" -msgstr "_No desis" +msgstr "_No deseu" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "El fitxer '%s' no s'ha desat." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Voleu desar abans de tancar?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Tria la font" -#: ../src/dialogs.c:1005 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"S'ha produït un error o no es pot accedir a la informació del fitxer (p.e. " -"d'un fitxer nou)." - -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1057 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "S'ha produït un error o no es pot accedir a la informació del fitxer (p.e. d'un fitxer nou)." + +#: ../src/dialogs.c:1076 +#: ../src/dialogs.c:1077 +#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1745 +#: ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "desconegut" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 +#: ../src/symbols.c:800 msgid "Properties" msgstr "Propietats" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tipus:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Mida:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Ubicació:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Només lectura:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(només dins Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Codificació:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 +#: ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(amb BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(sense BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modificat:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Canviat:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Accedit:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Permisos:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Lectura:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Escriptura:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Execució:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Propietari:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Altres:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Fitxer %s tancat." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "S'ha obert el fitxer nou \"%s\"." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 +#: ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "No s'ha pogut obrir el fitxer %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"El fitxer \"%s\" no es pot obrir i ha quedat truncat. Açò pot passar si el " -"fitxer conté un byte NULL. Aneu amb compte, si el guardeu es poden perdre " -"dades.\n" +"El fitxer \"%s\" no es pot obrir i ha quedat truncat. Açò pot passar si el fitxer conté un byte NULL. Aneu amb compte, si el guardeu es poden perdre dades.\n" "El fitxer s'ha posat en mode només lectura." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "El fitxer \"%s\" no és %s vàlid." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"El fitxer \"%s\" no sembla un fitxer de text o la codificació no està " -"suportada." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "El fitxer \"%s\" no sembla un fitxer de text o la codificació no està suportada." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Espais" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulacions" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabulacions i Espais" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Activant mode de sagnat %s per a %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Nom de fitxer invàlid" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "S'ha actualitzat el fitxer %s." @@ -684,29 +689,25 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "S'ha obert el fitxer %s (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", només lectura" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "S'ha produït un error en renomenar el fitxer." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"S'ha produït un error en convertir el fitxer de UTF-8 a \"%s\". El fitxer no " -"s'ha desat." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "S'ha produït un error en convertir el fitxer de UTF-8 a \"%s\". El fitxer no s'ha desat." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -715,52 +716,59 @@ "Missatge d'error: %s\n" "Error en \"%s\" (línia: %d, columna: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Missatge d'error: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 +#: ../src/document.c:1833 msgid "Error saving file." msgstr "S'ha produït un error en desar el fitxer." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "S'ha produït un error en desar el fitxer (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "S'ha desat el fitxer %s." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 +#: ../src/document.c:1982 +#: ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "No s'ha trobat \"%s\"" -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Tornar a començar la cerca des del principi?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 +#: ../src/search.c:1127 +#: ../src/search.c:1171 +#: ../src/search.c:1875 +#: ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "No s'ha trobat '%s'." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 +#: ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: S'ha reemplaçat %d coincidència de \"%s\" amb \"%s\"." msgstr[1] "%s: S'han reemplaçat %d coincidències de \"%s\" amb \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Voleu actualitzar-la?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -769,29 +777,34 @@ "El fitxer '%s' al disc és més recent que\n" "l'actual en memòria." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Intentar desar el fitxer de nou?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Tanca _sense desar" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "No s'ha trobat \"%s\" al disc!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "No s'ha trobat el fitxer \"%s\" al disc! Tornem a desar el fitxer?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Amplada de la Tabulació:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "" -"Introdueix la quantitat d'espais que s'ha de reemplaçar amb una tabulació." +msgstr "Introdueix la quantitat d'espais que s'ha de reemplaçar amb una tabulació." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Advertència: amplada de tabulació no estàndard: %d != 8!" #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celta" -#: ../src/encodings.c:77 ../src/encodings.c:78 +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 msgid "Greek" msgstr "Grec" @@ -803,22 +816,31 @@ msgid "South European" msgstr "Sudeuropeu" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 #: ../src/encodings.c:84 msgid "Western" msgstr "Occidental" -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Baltic" msgstr "Bàltic" -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 msgid "Central European" msgstr "Centreeuropeu" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 msgid "Cyrillic" msgstr "Ciríl·lic" @@ -834,12 +856,16 @@ msgid "Romanian" msgstr "Romanès" -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 msgid "Arabic" msgstr "Àrab" #. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 msgid "Hebrew" msgstr "Hebreu" @@ -859,36 +885,53 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Turkish" msgstr "Turc" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 msgid "Vietnamese" msgstr "Vietnamita" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 msgid "Unicode" msgstr "Unicode" #. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" msgstr "Xinès simplificat" -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 msgid "Chinese Traditional" msgstr "Xinès tradicional" -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 #: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonès" -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 #: ../src/encodings.c:145 msgid "Korean" msgstr "Coreà" @@ -897,2262 +940,2325 @@ msgid "Without encoding" msgstr "Sense codificació" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Europeu _occidental" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Europeu oriental" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "_Asiàtic oriental" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Asiàtic _sud-oriental i sud-occidental" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Orient _Mitjà" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Codi font %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "fitxer %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Cap" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Fitxer de Script" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Full d'estil en cascada (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Fitxer SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Fitxer de configuració" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Fitxer de traduccions de gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "fitxer de script %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Llenguatges de _Programació" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Llenguatges de _Script" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Llenguatges de _Marcatge" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Llenguatges _Diversos" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Tipus del Fitxer _Predeterminat" + +#: ../src/filetypes.c:1403 +#: ../src/win32.c:105 msgid "All Source" msgstr "Tot Codi Font" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 +#: ../src/project.c:285 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Tots els fitxers" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expressió regular incorrecta per al tipus de fitxer %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "sense títol" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 +#: ../src/main.c:802 +#: ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "No s'ha pogut trobar el fitxer '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Esquemes de _Color" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Predeterminat" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Fitxer" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nou (des de plan_tilla)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisible" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 +#: ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Obre el F_itxer Seleccionat" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Fitxers Recents" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Desa-ho _Tot" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Ac_tualitza com a..." -#: ../src/interface.c:376 +#: ../src/interface.c:371 +#: ../src/interface.c:553 +#: ../src/interface.c:682 +#: ../src/interface.c:696 +#: ../src/interface.c:950 +#: ../src/interface.c:960 +#: ../src/interface.c:2090 +#: ../src/interface.c:2104 +msgid "invisible" +msgstr "invisible" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "_Configuració de la pàgina" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 +#: ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Tanca Altres _Documents" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 +#: ../src/notebook.c:219 msgid "C_lose All" msgstr "_Tanca-ho Tot" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Edita" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 +#: ../src/interface.c:2031 msgid "_Format" msgstr "_Formata" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 +#: ../src/keybindings.c:372 +#, fuzzy +msgid "_Reflow Lines/Block" +msgstr "_Reflow Lines/Block" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "C_anvia la Caixa de la Selecció" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 +#: ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Transposa la Línia(es) Actual" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Comenta la Línia" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Descomenta la Línia" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Activa o Desactiva els Comentaris de _Línia" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_plica la Línia o Selecció" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Incrementa el Sagnat" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Redueix el Sagnat" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Envia la Selecció al Terminal" +#: ../src/interface.c:537 +#: ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Sagnat de Línia Intel·ligent" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Envia la Selecció a..." -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 +#: ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Ordres" + +#: ../src/interface.c:563 +#: ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Talla la Línia(es) Actual" + +#: ../src/interface.c:571 +#: ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copia la Línia(es) Actual" + +#: ../src/interface.c:579 +#: ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Suprimeix la Línia(es) Actual" + +#: ../src/interface.c:583 +#: ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "Du_plica la Línia o Selecció" + +#: ../src/interface.c:592 +#: ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Selecciona la Línia(es) Actual" + +#: ../src/interface.c:596 +#: ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Selecciona el Paràgraf Actual" + +#: ../src/interface.c:605 +#: ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Insereix Espai en Blanc Alternatiu" + +#: ../src/interface.c:614 +#: ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Ves a la Marca _Següent" + +#: ../src/interface.c:618 +#: ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Ves a la Marca _Anterior" + +#: ../src/interface.c:627 +#: ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Envia la Selecció al Terminal" + +#: ../src/interface.c:636 +#: ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "I_nsereix Comentari" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 +#: ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Insereix Entrada al _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 +#: ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Insereix C_apçalera de Fitxer" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 +#: ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Insereix Descripció de la _Funció" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 +#: ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Insereix Comentari _Multilínia" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 +#: ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Insereix Text _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 +#: ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Insereix Text de Llicència _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 +#: ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Insereix _Data" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 +#: ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Insereix \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Preferèncie_s" -#: ../src/interface.c:621 +#: ../src/interface.c:712 +#: ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "_Preferències dels Plugins" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Cerca" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Cerca el _Següent" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Cerca l'_Anterior" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Cerca en els F_itxers" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 +#: ../src/search.c:551 msgid "_Replace" msgstr "_Reemplaça" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Troba el _Seleccionat" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Troba l'_Anterior Seleccionat" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Missatge Següent" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Missatge _Anterior" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 +#: ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Vés a la Línia" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Canvia el _Tipus de Lletra" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Mostra o Amaga _Tots els Extres" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Pantalla _Completa" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Mostra la _Finestra de Missatges" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Mostra la Barra d'Ei_nes" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Mostra la _Barra Lateral" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 +#: ../src/interface.c:4025 +#: ../src/interface.c:5347 +#: ../src/keybindings.c:260 +#: ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Mostra el Marge de _Marques" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Mostra els Números de _Línia" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Mostra _Espais en Blanc" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Mostra el _Final de Línia" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Mostra _Guies de Sagnat" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Trencament de _Línia" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "T_rencament de línia" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Sagnat _Automàtic" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Tipus de Sagnat" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 +#: ../src/interface.c:3633 +#: ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabulacions" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 +#: ../src/interface.c:3624 +#: ../src/interface.c:5236 msgid "_Spaces" msgstr "E_spais" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 +#: ../src/interface.c:3642 +#: ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abulacions i Espais" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Només _Lectura" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Escriu BOM Unicode" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Indica el _Tipus del Fitxer" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Estableix la _Codificació dels Caràcters" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Defineix l'_Acabament de Línia" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Converteix i Especifica a _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Converteix i Especifica a _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Converteix i Especifica a CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Elimina espais _sobrants" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Reemplaça Tabulacions per Espais" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Ree_mplaça Espais per Tabulacions" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Plega-ho Tot" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Desplega-ho Tot" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Elimina les _Marques" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Suprimeix els _Indicadors d'Error" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projecte" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nou" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Obrir" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Projectes _Recents" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Tancar" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Eines" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Recarrega la Configuració" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Fitxer de C_onfiguració" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Selector de _Color" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Recompte de Paraules" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Carrega _Etiquetes" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Recarrega la Configuració" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 +#: ../src/interface.c:1130 msgid "_Help" msgstr "A_juda" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Pàgina _Web" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Dreceres de Teclat" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Missatges de _Depuració" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 +#: ../src/sidebar.c:130 msgid "Symbols" msgstr "Símbols" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documents" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Estat" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Missatges" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Notes" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Imatges _i Text" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Només _Imatges" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Només _Text" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Icones _Grans" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Icones _Xicotetes" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Icones _Molt Xicotetes" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Personalitza la Barra d'Eines" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Preferències de la _Barra d'Eines" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "A_maga la Barra d'Eines" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Ús de la _Cerca" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Ús de la Cerca de Documents" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Vés a la Definició de l'_Etiqueta" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Vés a la _Declaració de l'Etiqueta" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Acció Conte_xtual" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 +#: ../src/keybindings.c:387 msgid "Preferences" msgstr "Preferències" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Carrega els fitxers de l'última sessió" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Obre a l'inici els fitxers de l'última sessió" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Carrega l'emulació de terminal virtual" -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Indica si l'emulació de terminal virtual (VTE) s'ha de carregar a l'inici. " -"Desactiva-ho si no et cal" - #: ../src/interface.c:2712 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Indica si l'emulació de terminal virtual (VTE) s'ha de carregar a l'inici. Desactiva-ho si no et cal" + +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Activa el suport de connectors" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Inici" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Conserva la mida i posició de la finestra" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Desa la mida i posició de la finestra i la restaura a l'inici" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Confirma la sortida" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Mostra un diàleg de confirmació en sortir" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Tancament" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Directori base:" -#: ../src/interface.c:2778 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Directori on començar quan s'obren o desen fitxers. Ha de ser un directori " -"absolut. Deixeu-lo en blanc per usar el directori actual." +#: ../src/interface.c:2780 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Directori on començar quan s'obren o desen fitxers. Ha de ser un directori absolut. Deixeu-lo en blanc per usar el directori actual." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Fitxers del projecte:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Directori on començar quan s'obren fitxers del projecte" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Ruta de connectors:" -#: ../src/interface.c:2828 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Geany busca, per defecte, al directori global de la instal·lació i al " -"directori de configuració. El directori especificat serà inspeccionat " -"posteriorment en busca de plugins. Deixeu-lo en blanc per desactivar-la." +#: ../src/interface.c:2830 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Geany busca, per defecte, al directori global de la instal·lació i al directori de configuració. El directori especificat serà inspeccionat posteriorment en busca de plugins. Deixeu-lo en blanc per desactivar-la." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Rutes" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Inici" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Avís sonor als errors o quan finalitza la compilació" -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Indica si cal emetre un so quan apareix un error o quan finalitza el procés " -"de compilació" +#: ../src/interface.c:2874 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Indica si cal emetre un so quan apareix un error o quan finalitza el procés de compilació" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Canvia a la llista de missatges quan hi ha un missatge nou" -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Canvia a la pestanya de missatges (a la part de baix de la finestra) quan " -"s'escriu un nou missatge d'estat" +#: ../src/interface.c:2879 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Canvia a la pestanya de missatges (a la part de baix de la finestra) quan s'escriu un nou missatge d'estat" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" -msgstr "No mostris els missatges d'estat a la barra d'estat" +msgstr "No mostreu els missatges d'estat a la barra d'estat" -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Suprimeix tots els missatges de la barra d'estat. Els missatges encara es " -"mostraran a la finestra de missatges d'estat." +#: ../src/interface.c:2884 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Suprimeix tots els missatges de la barra d'estat. Els missatges encara es mostraran a la finestra de missatges d'estat." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofocus (el focus segueix el ratolí)" -#: ../src/interface.c:2886 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Dóna el focus als elements sota el ratolí. Funciona per a la finestra " -"principal, el bloc de notes, els camps de la barra d'eines i l'Emulador de " -"Terminal." - -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2889 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Dóna el focus als elements sota el ratolí. Funciona per a la finestra principal, el bloc de notes, els camps de la barra d'eines i l'Emulador de Terminal." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Utilitza el diàlegs d'Obrir/Desar" + +#: ../src/interface.c:2894 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Defineix si s'utilitzen els diàlegs d'Obrir/Desar nadius o els diàlegs predeterminats GTK" + +#: ../src/interface.c:2896 +#: ../src/interface.c:3275 +#: ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Miscel·lània" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Torna a començar la cerca i amaga el diàleg sempre" -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Torna a començar sempre la cerca des del principi del document i amaga la " -"finestra de Cerca en prémer Cerca Anterior/Següent" +#: ../src/interface.c:2918 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Torna a començar sempre la cerca des del principi del document i amaga la finestra de Cerca en prémer Cerca Anterior/Següent" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usa la paraula sota el cursor per als diàlegs de Cerca" -#: ../src/interface.c:2916 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Usa la paraula sota el cursor per als diàlegs de Cerca, Cerca en els Fitxers " -"o Reemplaça quan no hi ha cap selecció" +#: ../src/interface.c:2923 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Usa la paraula sota el cursor per als diàlegs de Cerca, Cerca en els Fitxers o Reemplaça quan no hi ha cap selecció" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Useu el directori del fitxer actual per a la Cerca en Fitxers" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Cerca" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Usa fitxers de sessió basats en projecte" -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"Indica si es desaran fitxers de sessió de projecte i si s'obriran en reobrir " -"el projecte" +#: ../src/interface.c:2951 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Indica si es desaran fitxers de sessió de projecte i si s'obriran en reobrir el projecte" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Desa el fitxer de projecte dins el directori base del projecte" -#: ../src/interface.c:2949 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Si està activat, el fitxer de projecte es desa dins el directori base del " -"projecte en crear un nou project, en comptes de ser creat un directori per " -"damunt del directori base. Enacara és possible canviar la ruta del fitxer de " -"projecte al diàleg de Nou Projecte." +#: ../src/interface.c:2956 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Si està activat, el fitxer de projecte es desa dins el directori base del projecte en crear un nou project, en comptes de ser creat un directori per damunt del directori base. Enacara és possible canviar la ruta del fitxer de projecte al diàleg de Nou Projecte." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projectes" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Miscel·lània" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 +#: ../src/prefs.c:1525 msgid "General" msgstr "General" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Mostra la llista de símbols" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Activa o desactiva la llista de símbols" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Mostra la llista de documents" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Activa o desactiva la llista de documents" -#: ../src/interface.c:2993 -msgid "Sidebar" +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Mostra la barra lateral" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Posició:" + +#: ../src/interface.c:3026 +#: ../src/interface.c:3149 +#: ../src/interface.c:3210 +#: ../src/interface.c:3228 +#: ../src/interface.c:3246 +msgid "Left" +msgstr "Esquerra" + +#: ../src/interface.c:3033 +#: ../src/interface.c:3157 +#: ../src/interface.c:3211 +#: ../src/interface.c:3229 +#: ../src/interface.c:3247 +msgid "Right" +msgstr "Dreta" + +#: ../src/interface.c:3039 +msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Llista de símbols:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 +#: ../src/interface.c:3197 msgid "Message window:" msgstr "Finestra de missatges:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 +#: ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Especifica la font de la finestra de missatges" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Especifica la font de la llista de símbols" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Especifica la font de l'editor" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Tipus de lletra" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Mostra les pestanyes de l'editor" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Mostra el botó del tancament" -#: ../src/interface.c:3084 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Mostra un botó a les pestanyes per tancar fàcilment els fitxers clicant en " -"ell (cal reiniciar Geany)" +#: ../src/interface.c:3130 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Mostra un botó a les pestanyes per tancar fàcilment els fitxers clicant en ell (cal reiniciar Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Posició de noves pestanyes:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Esquerra" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Les noves pestanyes se situaran a l'esquerra de la llista de pestanyes" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Dreta" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Les noves pestanyes se situaran a la dreta de la llista de pestanyes" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Següent a l'actual" + +#: ../src/interface.c:3169 +#, fuzzy +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Whether to place file tabs next to the current tab rather than at the edges of the notebook" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Doble-clic amaga tots els extres addicionals" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Crida la comanda Visualitza->Mostra o Amaga Tots els Extres" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Pestanyes de l'editor" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 +#: ../src/interface.c:3230 +#: ../src/interface.c:3248 msgid "Top" msgstr "Part superior" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 +#: ../src/interface.c:3231 +#: ../src/interface.c:3249 msgid "Bottom" msgstr "Part inferior" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Ubicació de les pestanyes:" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Mostra la barra d'estat" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "" -"Indica si s'ha de mostrar la barra d'estat a la part de baix de la finestra" +msgstr "Indica si s'ha de mostrar la barra d'estat a la part de baix de la finestra" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 +#: ../src/prefs.c:1527 msgid "Interface" msgstr "Interfície" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Mostra la _Barra d'Eines" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Annexar a la Barra d'Eines del Menú" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" -"Empaqueta la barra d'eines al menú principal per estalviar espai vertical" - -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Barra d'eines" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Estil de les icones:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Mida de la icona:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Aparença" +msgstr "Empaqueta la barra d'eines al menú principal per estalviar espai vertical" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 +#: ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "_Personalitza la Barra d'Ei_nes" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "_Predeterminat del Sistema" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Imatges _i Text" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Només _Imatges" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Només _Text" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Estil d'Icones" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Predeterminat del _Sistema" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Icones _Xicotetes" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Icones _Molt Xicotetes" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Icones _Grans" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Mida de les Icones:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra d'eines" + +#: ../src/interface.c:3455 +#: ../src/prefs.c:1529 msgid "Toolbar" msgstr "Barra d'Eines" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Ajust de línia" -#: ../src/interface.c:3393 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Trenca les línies al final de la finestra i continua-les a la línia següent. " -"Aquesta opció és molt costosa per a document llargs, per tant convé " -"desactivar-la en màquines amb pocs recursos." +#: ../src/interface.c:3485 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Trenca les línies al final de la finestra i continua-les a la línia següent. Aquesta opció és molt costosa per a document llargs, per tant convé desactivar-la en màquines amb pocs recursos." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Activa la tecla d'inici \"intel·ligent\"" -#: ../src/interface.c:3398 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Quan està activat l'inici \"intel·ligent\", la tecla INICI (HOME) desplaça " -"el cursor al primer caràcter de la línia que no sigui un espai en blanc o un " -"tabulador, en cas contrari va al principi de la línia. Quan està desactivat, " -"la tecla INICI sempre desplaça el cursor al principi de la línia actual, " -"independentment de la seva posició." +#: ../src/interface.c:3490 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Quan està activat l'inici \"intel·ligent\", la tecla INICI (HOME) desplaça el cursor al primer caràcter de la línia que no sigui un espai en blanc o un tabulador, en cas contrari va al principi de la línia. Quan està desactivat, la tecla INICI sempre desplaça el cursor al principi de la línia actual, independentment de la seva posició." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Desactiva l'Arrossega i Solta" -#: ../src/interface.c:3403 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Desactiva arrossega i solta (drag and drop) a la finestra de l'editor, així " -"no serà possible arrossegar text des de l'editor a cap a ell" +#: ../src/interface.c:3495 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Desactiva arrossega i solta (drag and drop) a la finestra de l'editor, així no serà possible arrossegar text des de l'editor a cap a ell" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Activa el col·lapsat" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Activa el col·lapse del codi" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Desplega o plega recursivament un punt plegat" -#: ../src/interface.c:3413 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Plega i desplega tots els fills d'un mateix punt. Prement la tecla " -"Majúscules mentre cliqueu un símbol plegat actua de forma contrària." +#: ../src/interface.c:3505 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Plega i desplega tots els fills d'un mateix punt. Prement la tecla Majúscules mentre cliqueu un símbol plegat actua de forma contrària." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Utilitza indicacions per mostrar els errors de compilació" -#: ../src/interface.c:3418 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Usa indicadors (un subratllat ondulat) per ressaltar les línies on el " -"compilador ha generat un avís o error" +#: ../src/interface.c:3510 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Usa indicadors (un subratllat ondulat) per ressaltar les línies on el compilador ha generat un avís o error" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Elimina espais sobrants en introduir un salt de línia" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "" -"En introduir un salt de línia, s'eliminen els espais sobrants de l'anterior" +msgstr "En introduir un salt de línia, s'eliminen els espais sobrants de l'anterior" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Columna on trenca la línia:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Marcador de comentaris:" -#: ../src/interface.c:3450 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." +#: ../src/interface.c:3542 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." msgstr "Una cadena que s'afegirà quan es canvie una línia a comentada." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Funcionalitats" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Funcionalitats" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 +#: ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Mode autosagnat:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 +#: ../src/interface.c:5207 msgid "Basic" msgstr "Bàsic" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 +#: ../src/interface.c:5208 msgid "Current chars" msgstr "Caràcters actuals" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 +#: ../src/interface.c:5209 msgid "Match braces" msgstr "Marca parèntesis" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 +#: ../src/interface.c:3925 +#: ../src/interface.c:5211 msgid "Type:" msgstr "Tipus:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 +#: ../src/interface.c:5218 msgid "Width:" msgstr "Amplada:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 +#: ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "L'amplada, en caracters, de cada nivell de sagnat" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 +#: ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Usa espais en inserir un nivell de sagnat" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 +#: ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Utilitza una tabulació per al sagnat" -#: ../src/interface.c:3554 ../src/interface.c:5122 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Usa espais si el sagnat total és menor que l'amplada de la tabulació, en cas " -"contrari usa ambdós" - -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Amplada de cada tabulació:" +#: ../src/interface.c:3647 +#: ../src/interface.c:5259 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Usa espais si el sagnat total és menor que l'amplada de la tabulació, en cas contrari usa ambdós" -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"L'amplada de cada tabulació quan Tabulacions i Espais està activat en un " -"document" - -#: ../src/interface.c:3587 ../src/interface.c:5155 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Indica si s'ha de detectar el tipus de sagnat a partir del contingut del " -"fitxer quan s'obre" +#: ../src/interface.c:3656 +#: ../src/interface.c:5268 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Indica si s'ha de detectar el tipus de sagnat a partir del contingut del fitxer quan s'obre" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Sagnat amb tabulacions" -#: ../src/interface.c:3592 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Prement el tabulador o majúscula+tabulador sagna en comptes d'inserir " -"tabulacions" +#: ../src/interface.c:3661 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Prement el tabulador o majúscula+tabulador sagna en comptes d'inserir tabulacions" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Sagnat" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 +#: ../src/interface.c:5270 msgid "Indentation" msgstr "Sagnat" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Acabament de construccions" -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Escriu un seqüència curta de caràcters i completat-la a una de més complexa " -"amb una sola polsació de teclat" +#: ../src/interface.c:3694 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Escriu un seqüència curta de caràcters i completat-la a una de més complexa amb una sola polsació de teclat" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Autocompletat d'etiquetes XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" -msgstr "" -"Acabament i tancament automàtic d'etiquetes XML obertes (inclou les " -"etiquetes HTML)" +msgstr "Acabament i tancament automàtic d'etiquetes XML obertes (inclou les etiquetes HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Continuació auntomàtica dels comentaris multilínia" -#: ../src/interface.c:3635 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Continua automàticament els comentaris multilínia en llenguatges com C, C++ " -"i Java quan comença una nova línia dins un comentari" +#: ../src/interface.c:3704 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Continua automàticament els comentaris multilínia en llenguatges com C, C++ i Java quan comença una nova línia dins un comentari" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Autocompleta els símbols" -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Autocompletat de símbols coneguts en el fitxers oberts (noms de funcions, " -"variables globals, ...)" +#: ../src/interface.c:3709 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Autocompletat de símbols coneguts en el fitxers oberts (noms de funcions, variables globals, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Autocompleta totes les paraules del document" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Suprimeix la resta de la paraula al completar" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Màxim número de noms de símbols:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Mida de la llista d'autocompletat:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Caràcters a escriure per l'autocompletat:" -#: ../src/interface.c:3683 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" -msgstr "" -"Quantitat de caràcters necessaris per a mostrar la llista d'autocompletat de " -"símbols" +#: ../src/interface.c:3752 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" +msgstr "Quantitat de caràcters necessaris per a mostrar la llista d'autocompletat de símbols" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Nombre de files mostrades en la llista d'autocompletat" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Nombre màxim de files mostrades en la llista d'autocompletat" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Acabaments" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Parèntesis ()" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Tanca automàticament el parèntesi, quan se n'obre un" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Cometes senzilles ' ' " -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Tanca automàticament les cometes senzilles, quan se n'obre una" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Claus { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Tanca automàticament les claus, quan se n'obre una" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Cluadàtors [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Tanca automàticament els claudàtors, quan se n'obre un" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Cometes dobles \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Tanca automàticament les cometes dobles, quan se n'obre una" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Tancament automàtic de cometes i parèntesis" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Acabaments" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Inverteix els colors de la coloració de la sintaxi" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Usa lletra blanca sobre fons negre i inverteix tots els colors, aquesta " -"opció requereix un reinici de Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Inverteix els colors, per defecte utilitza text blanc sobre fons negre" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Mostra les guies de sagnat" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Mostra línies de punts com a guia al sagnat" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Mostra espais en blanc" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca els espais en blanc amb punts i les tabulacions amb fletxes" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Mostra el final de línia" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Mostra el caràcter de final de línia (EOL)" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Mostra els números de línia" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Mostra o amaga el marge amb els Números de Línia" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Mostra el marge de marques" -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Mostra o amaga el marge a la dreta dels números de línia, que s'usa per " -"marcar les línies" +#: ../src/interface.c:3883 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Mostra o amaga el marge a la dreta dels números de línia, que s'usa per marcar les línies" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Atura el desplaçament a l'última línia" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "" -"Indica si aturar el desplaçament en passar una pàgina de l'última l'inia del " -"document" +msgstr "Indica si aturar el desplaçament en passar una pàgina de l'última l'inia del document" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Visualització" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Barra de marques:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Color de la barra de marques:" +#: ../src/interface.c:3911 +#: ../src/interface.c:5302 +msgid "Column:" +msgstr "Columna:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Color:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Especifica els color de la barra de marques" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 +#: ../src/toolbar.c:71 +#: ../src/tools.c:717 +#: ../src/vte.c:765 +#: ../src/vte.c:772 msgid "Color Chooser" msgstr "Selector de Color" -#: ../src/interface.c:3878 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"La marca de línia llarga és una línia estreta vertical a l'editor. Serveix " -"per marcar les línies llargues, o com a suggeriment on tallar-les. Indiqueu " -"un valor major que 0 per a especificar la columna on ha d'aparèixer." +#: ../src/interface.c:3946 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "La marca de línia llarga és una línia estreta vertical a l'editor. Serveix per marcar les línies llargues, o com a suggeriment on tallar-les. Indiqueu un valor major que 0 per a especificar la columna on ha d'aparèixer." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Línia" -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Mostra una línia vertical a l'editor en la posició indicada (veieu més avall)" +#: ../src/interface.c:3959 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Mostra una línia vertical a l'editor en la posició indicada (veieu més avall)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Fons" -#: ../src/interface.c:3898 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"S'ha canviat el color de fons dels caràcters després de la posició donada " -"(veieu més avall) al color indicat més avall. (Recomanable quan s'usen fonts " -"de mida proporcional)" +#: ../src/interface.c:3966 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "S'ha canviat el color de fons dels caràcters després de la posició donada (veieu més avall) al color indicat més avall. (Recomanable quan s'usen fonts de mida proporcional)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Activat" + +#: ../src/interface.c:3976 +#: ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Barra de marques" -#: ../src/interface.c:3902 +#: ../src/interface.c:3995 +#: ../src/interface.c:5309 msgid "Disabled" msgstr "Inhabilitada" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Barra de marques" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "No mostreu els espais virtuals" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Només per a seleccions rectangulars" + +#: ../src/interface.c:4005 +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Mostra només els espais virtuals al final de línia en seleccionar rectangles" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Sempre" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Mostra sempre els espais virtuals a final de línia" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Espais virtuals" -#: ../src/interface.c:3913 +#: ../src/interface.c:4021 msgid "Display" msgstr "Visualització" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Obre documents nous des de l'intèrpret d'ordres" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "" -"Inicia un nou fitxer per a cada nom de fitxer passat com a argument que no " -"existeix" +msgstr "Inicia un nou fitxer per a cada nom de fitxer passat com a argument que no existeix" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Caracter de final de línia per defecte:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Fitxers nous" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Especifica la codificació per defecte per a fitxers de nova creació" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Codificació per defecte (fitxers nous):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Codificació per defecte (fitxers existents):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Especifica la codificació per defecte per a fitxers ja existents" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Especifica la codificació per defecte per a fitxers de nova creació" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Usa codificació de caràcters fixa en obrir fitxers" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Usa codificació fixa en obrir fitxers no Unicode" + +#: ../src/interface.c:4116 +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Aquesta opció deshabilita la detecció automàtica de la codificació en obrir fitxers nous no Unicode i obre els fitxers amb la codificació especificada (normalment no és necessari)" -#: ../src/interface.c:4030 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" -msgstr "" -"Aquesta opció deshabilita la detecció automàtica de la codificació en obrir " -"fitxers nous i obre els fitxers amb la codificació especificada (normalment " -"no és necessari)" +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codificació per defecte (fitxers existents no Unicode):" -#: ../src/interface.c:4032 +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Especifica la codificació per defecte per a fitxers ja existents no Unicode" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Codificacions" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Assegura el salt de línia al final del fitxer" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Assegura que al final del fitxer hi ha una línia en blanc" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Elimina espais i tabulacions sobrants" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Elimina els espais i tabulacions sobrants a final de línia" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 +#: ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Reemplaça tabulacions per espais" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Reemplaça totes les tabulacions al document per espais" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Desant fitxers" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Mostra la llista de fitxers oberts:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "" -"Indica el número de fitxers que s'emmagatzemen a la llista de Fitxers Recents" +msgstr "Indica el número de fitxers que s'emmagatzemen a la llista de Fitxers Recents" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Temps d'espera del disc:" -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Amb quina freqüència (en segons) s'han de buscar canvis als documents del " -"disc. Useu el valor 0 per a desactivar aquesta opció." - -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4226 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Amb quina freqüència (en segons) s'han de buscar canvis als documents del disc. Useu el valor 0 per a desactivar aquesta opció." + +#: ../src/interface.c:4235 +#: ../src/prefs.c:1533 +#: ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Fitxers" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Explorador:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Ruta i opcions per a l'eina make" - -#: ../src/interface.c:4197 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Un emulador de terminal com xterm, gnome-terminal o konsole (cal que accepti " -"l'argument -e)" +#: ../src/interface.c:4287 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Un emulador de terminal com xterm, gnome-terminal o konsole (cal que accepti l'argument -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (i opcions) per al navegador" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Ruta a les eines" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Acció contextual:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Ordre d'acció contextual. La paraula seleccionada pot ser utilitzada amb %s. " -"Pot estar a qualsevol part de l'ordre donada i serà reemplaçada abans de " -"l'execució." +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Ordre d'acció contextual. La paraula seleccionada pot ser utilitzada amb %s. Pot estar a qualsevol part de l'ordre donada i serà reemplaçada abans de l'execució." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Ordres" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 +#: ../src/keybindings.c:560 +#: ../src/prefs.c:1535 msgid "Tools" msgstr "Eines" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "adreça de correu electrònic del desenvolupador" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Inicials del desenvolupador" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Versió inicial:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Número de versió, per a fitxers nous" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Nom de l'empresa" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Desenvolupador:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Adreça de correu electrònic:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Inicials:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "El nom del desenvolupador" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Any:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Data i Hora:" -#: ../src/interface.c:4434 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Indiqueu el format del comodí {datetime}. Podeu utilitzar qualsevol variable " -"suportada per la funció ANSI C strftime." +#: ../src/interface.c:4518 +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Indiqueu el format del comodí {datetime}. Podeu utilitzar qualsevol variable suportada per la funció ANSI C strftime." -#: ../src/interface.c:4441 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Indiqueu el format del comodí {year}. Podeu utilitzar qualsevol variable " -"suportada per la funció ANSI C strftime." +#: ../src/interface.c:4525 +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Indiqueu el format del comodí {year}. Podeu utilitzar qualsevol variable suportada per la funció ANSI C strftime." -#: ../src/interface.c:4448 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Indiqueu el format del comodí {date}. Podeu utilitzar qualsevol variable " -"suportada per la funció ANSI C strftime." +#: ../src/interface.c:4532 +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Indiqueu el format del comodí {date}. Podeu utilitzar qualsevol variable suportada per la funció ANSI C strftime." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Dades de plantilla" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 +#: ../src/prefs.c:1537 msgid "Templates" msgstr "Plantilles" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Can_via" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Dreceres de teclat" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 +#: ../src/prefs.c:1539 msgid "Keybindings" msgstr "Tecles" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Ordre:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" -msgstr "" -"Ruta a l'ordre per imprimir fitxers (utilitzeu %f per indicar el nom del " -"fitxer)" +msgstr "Ruta a l'ordre per imprimir fitxers (utilitzeu %f per indicar el nom del fitxer)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Usa una ordre externa per a imprimir" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 +#: ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimeix els números de línia" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 +#: ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Afegeix números de línia a les pàgines impreses" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 +#: ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimeix els números de pàgina" -#: ../src/interface.c:4570 ../src/printing.c:387 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Afegeix números de pàgina a la part de baix. Ocupa 2 línies de la pàgina." +#: ../src/interface.c:4665 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Afegeix números de pàgina a la part de baix. Ocupa 2 línies de la pàgina." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 +#: ../src/printing.c:391 msgid "Print page header" msgstr "Imprimeix la capçalera de la pàgina" -#: ../src/interface.c:4575 ../src/printing.c:392 -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Afegeix a cada pàgina una capçalera amb el número de pàgina, el nom del " -"fitxer i la data actual (veure més avall). Ocupa 3 línies per pàgina." +#: ../src/interface.c:4670 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Afegeix a cada pàgina una capçalera amb el número de pàgina, el nom del fitxer i la data actual (veure més avall). Ocupa 3 línies per pàgina." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 +#: ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usa el nom base del fitxer imprés" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimeix només el nom base (sense el directori) del fitxer imprés" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 +#: ../src/printing.c:417 msgid "Date format:" msgstr "Format de data:" -#: ../src/interface.c:4608 ../src/printing.c:422 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Indiqueu el format de la data i l'hora que s'afegeix a la capçalera de cada " -"pàgina. Podeu utilitzar qualsevol variable suportada per la funció ANSI C " -"strftime." +#: ../src/interface.c:4703 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Indiqueu el format de la data i l'hora que s'afegeix a la capçalera de cada pàgina. Podeu utilitzar qualsevol variable suportada per la funció ANSI C strftime." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Usa la impressió nativa de GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Impressió:" + +#: ../src/interface.c:4717 +#: ../src/prefs.c:1541 msgid "Printing" msgstr "Impressió" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Propietats del Projecte" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Pantalla:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "A mida" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Utilitzeu les preferències globals" + +#: ../src/keybindings.c:227 +#: ../src/plugins.c:1171 msgid "File" msgstr "Fitxer" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nou" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Obre" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Obre el fitxer seleccionat" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Desa" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Desa com" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Desa-ho tot" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Imprimeix" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Tanca" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Tanca-ho tot" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Actualitza el fitxer" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Reobre l'ultima pestanya oberta" + +#: ../src/keybindings.c:255 +#: ../src/project.c:519 msgid "Project" msgstr "Projecte" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Propietats del projecte" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Desfer" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Refer" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplica la línia i la selecció" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Suprimeix la línia(es) actual" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Suprimeix fins al final de la línia" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Transposa la línia(es) actual" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Desplaça la línia actual" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Desplaça cap a dalt la vista en una línia" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Desplaça cap a baix la vista en una línia" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Acaba la construcció" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Desplaça el cursor en la construcció (snippet)" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Suprimeix el completat de construccions" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Acció Contextual" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Acaba la paraula" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Mostra els prototips de funció" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Mostra la llista de macros" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Acabament de paraules" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Mou la línia(es) amunt" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Mou la línia(es) avall" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Porta-retalls" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Talla" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copia" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Enganxa" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copia la línia(es) actual" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Talla la línia(es) actual" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Selecciona" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Selecciona-ho Tot" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Selecciona la paraula actual" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Selecciona la línia(es) actual" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Selecciona el paràgraf actual" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Ves a la paraula anterior" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Ves a la paraula següent" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Canvia la Caixa de la Selecció" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Activa o desactiva els comentaris de línia" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Comenta la línia(es)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Descomenta la línia(es)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Incrementa el sagnat" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Redueix el sagnat" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Incrementa el sagnat en un espai" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Redueix el sagnat en un espai" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Sagnat de línia \"intel·ligent\"" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Envia a l'Ordre Pròpia 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Envia a l'Ordre Pròpia 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Envia a l'Ordre Pròpia 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Envia la Selecció al Terminal" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Insereix" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Insereix la data" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Insereix espai en blanc alternatiu" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Preferències" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 +#: ../src/toolbar.c:381 msgid "Search" msgstr "Cerca" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 +#: ../src/search.c:396 msgid "Find" msgstr "Cerca" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Cerca el Següent" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Cerca l'Anterior" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Cerca el Següent Seleccionat" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Cerca·l'Anterior·Seleccionat" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 +#: ../src/search.c:541 msgid "Replace" msgstr "Reemplaça" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 +#: ../src/search.c:715 msgid "Find in Files" msgstr "Cerca en els Fitxers" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Missatge Següent" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Missatge Anterior" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Ús de la Cerca" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Ús de la Cerca de Documents" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Marca-ho Tot" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Vés a" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 +#: ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Ves enrere" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 +#: ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Ves avant" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Vés al parèntesi corresponent" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Activa o desactiva les marques" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Ves a la marca següent" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Ves a la marca anterior" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Vés a la Definició de l'Etiqueta" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Vés a la Declaració de l'Etiqueta" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Vés a l'Inici de la Línia" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Vés al Final de la Línia" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Vés al Final de la Línia" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Ves a la Part de la Paraula Anterior" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Ves a la Part de la Paraula Següent" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Visualitza" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Mostra o Amaga Tots els Extres" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Mostra o Amaga la Finestra de Missatges" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Mostra o Amaga la Barra Lateral" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Apropa" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Allunya" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Elimina el Zoom" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Canvia a l'Editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Canvia al Bloc de Notes" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Canvia a l'Emulador de Terminal" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Canvia a la Barra de Cerca" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Canvia a la Barra Lateral" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Canvia al Compilador" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Canvia als Missatges" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Canvia a la Finestra de Missatges" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Canvia a la Barra de Document" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Canvia a la Barra de Símbols" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Pestanya de notes" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Canvia al document de l'esquerra" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Canvia al document de la dreta" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Canvia a l'últim document utilitzat" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Canvia al document de l'esquerra" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Canvia al document de la dreta" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Canvia al primer document" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Canvia a l'últim document" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Activa o desactiva l'Ajust de línia" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Activa o desactiva el Trencament de línia" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Reemplaça espais per tabulacions" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Desplega/plega el punt actual" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Plega-ho tot" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Desplega-ho tot" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Actualitza la llista de símbols" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Elimina les Marques" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Suprimeix els Indicadors d'Error" + +#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 +#: ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Munta" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 +#: ../src/toolbar.c:69 msgid "Compile" msgstr "Compila" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Compila-ho tot" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Compila amb make (objectiu especificat)" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Compila amb 'make object'" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Error següent" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Error anterior" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Executa" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Executa una ordre definida" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Opcions per muntar" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Mostra el Selector de Color" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Help" msgstr "Ajuda" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Dreceres de Teclat" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Les dreceres de teclat següents són configurables:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Canvia al Document" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Escriviu el que vulgueu, es pot usar com a bloc d'anotacions" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Hi ha hagut un error en carregar un o més fitxers de sessió." @@ -3160,113 +3266,112 @@ msgid "Debug Messages" msgstr "Missatges de Depuració" -#: ../src/main.c:124 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"Indica el número de columna inicial per al primer fitxer obert (és útil " -"conjuntament amb --line)" +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "_Neteja" + +#: ../src/main.c:122 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Indica el número de columna inicial per al primer fitxer obert (és útil conjuntament amb --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Utilitza un directori de configuració alternatiu" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Sigues més explicatiu (verbose)" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Imprimeix els noms dels tipus de fitxers interns" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Genera el fitxer d'etiquetes globals (veieu la documentació)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "No processes els fitxers de codi C/C++ quan generes les etiquetes" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" -"No obris fitxers en una instància en execució, força a obrir-los en una nova " -"instància" +msgstr "No obris fitxers en una instància en execució, força a obrir-los en una nova instància" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Utilitzeu aquest nom de sòcol per a comunicar amb una instància de Geany en execució" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Torna una llista de documents oberts en una instància en execució de Geany" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Especifica el número de línia inicial per al primer fitxer obert" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" -msgstr "No mostris la finestra de missatges a l'inici" +msgstr "No mostreu la finestra de missatges a l'inici" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" -msgstr "No carreguis les dades d'autocompletat (veieu la documentació)" +msgstr "No carregueu les dades d'autocompletat (veieu la documentació)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" -msgstr "No carreguis els connectors" +msgstr "No carregueu els connectors" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Mostra el prefix d'instal·lació de Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "No carreguis els fitxers de l'última sessió" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "No carreguis el suport de terminal" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Nom del fitxer libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Sigues més explicatiu (verbose)" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Mostra la versió i surt" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FITXERS...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(compilat el %s amb GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Desplaçar ara?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany necessita moure el directori de configuració abans d'iniciar-se." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." -msgstr "" -"El directori de configuració s'ha mogut correctament de \"%s\" to \"%s\"." +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." +msgstr "El directori de configuració s'ha mogut correctament de \"%s\" to \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"El directori de configuració \"%s\" no s'ha pogut moure a \"%s\" (%s). Per " -"favor, moveu el directori manualment a la nova ubicació." +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "El directori de configuració \"%s\" no s'ha pogut moure a \"%s\" (%s). Per favor, moveu el directori manualment a la nova ubicació." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3277,51 +3382,51 @@ "Pot haver problemes si useu Geany sense un directori de configuració.\n" "Voleu iniciar Geany?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "No s'ha pogut trobar el fitxer '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "No s'ha pogut crear el directori de configuració (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "S'ha recarregat el fitxer de configuració." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Missatges d'estat" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "C_opia" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "_Copia-ho Tot" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Amaga la Finestra de Missatges" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 #, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"El plugin \"%s\" no és un binari compatible amb aquesta versió de Geany - " -"l'haureu de recompilar." +msgid "Could not find file '%s' - trying the current document path." +msgstr "No sha pogut trobar el fitxer %s - provant a la ruta actual de documents." + +#: ../src/plugins.c:464 +#, c-format +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "El plugin \"%s\" no és un binari compatible amb aquesta versió de Geany - l'haureu de recompilar." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "_Gestor de Connectors" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3332,128 +3437,114 @@ "Descripció:·%s\n" "Autor(s):·%s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Actiu" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Connector" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "No hi ha connectors disponibles." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Connectors" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Aquesta és la llista de connectors disponibles. Selecciona els connectors " -"que es carregaran a l'inici." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Trieu quins plugins carregar a l'inici:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Detalls del connector:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configura Plugins" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Captura la combinació de tecles" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Premeu la combinació de tecles que s'utilitzarà per a \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 +#: ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Expandeix-ho Tot" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 +#: ../src/symbols.c:1871 msgid "_Collapse All" msgstr "_Plega-ho Tot" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Acció" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Drecera" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Permet" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Sobrescriu" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Sobrescriure la drecera?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinació '%s' ja s'està utilitzant per \"%s\"." +#: ../src/prefs.c:1543 +#: ../src/vte.c:269 +#: ../src/vte.c:723 +#: ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Introdueix la ruta a les eines. Les eines que no et calguin les pots deixar " -"en blanc." +msgstr "Introdueix la ruta a les eines. Les eines que no et calguin les pots deixar en blanc." #. page Templates -#: ../src/prefs.c:1519 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" -"Indiqueu la informació per a les plantilles. Veieu la documentació per a més " -"detalls." - -#: ../src/prefs.c:1523 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany or force the reload of the settings using Tools->Reload Configuration." -"" -msgstr "" -"Avís: Qualsevol canvi que feu en aquesta finestra no tindrà efecte fins " -"que reinicieu Geany. o forceu la recàrrega de les preferències des de Eines -" -"> Recarrega Configuració." +#: ../src/prefs.c:1624 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Indiqueu la informació per a les plantilles. Veieu la documentació per a més detalls." + +#: ../src/prefs.c:1628 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." +msgstr "Avís: Qualsevol canvi que feu en aquesta finestra no tindrà efecte fins que reinicieu Geany. o forceu la recàrrega de les preferències des de Eines -> Recarrega Configuració." #. page Keybindings -#: ../src/prefs.c:1529 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Ací podeu canviar les dreceres de teclat per a algunes accions. Seleccioneu-" -"ne una i premeu el botó Canvia per introduir una nova drecera, o feu doble " -"clic en una acció per editar la representació de la drecera." +#: ../src/prefs.c:1634 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Ací podeu canviar les dreceres de teclat per a algunes accions. Seleccioneu-ne una i premeu el botó Canvia per introduir una nova drecera, o feu doble clic en una acció per editar la representació de la drecera." #. page Printing -#: ../src/prefs.c:1534 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" -"Avís: La impressió nativa de GTK només està disponible si Geany ha estat " -"compilat amb suport GTK 2.10 (o superior) i Geany s'està executant " -"amb GTK 2.10 (o superior)." +#: ../src/prefs.c:1639 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Avís: La impressió nativa de GTK només està disponible si Geany ha estat compilat amb suport GTK 2.10 (o superior) i Geany s'està executant amb GTK 2.10 (o superior)." #. page Editor->Indentation -#: ../src/prefs.c:1540 -msgid "" -"Warning: these settings are overridden by the current project. See " -"Project->Properties." -msgstr "" -"Advertència: aquestes preferències estan sent sobreescrites pel projecte " -"actual. Veieu Projecte->Propietats." +#: ../src/prefs.c:1645 +msgid "Warning: these settings are overridden by the current project. See Project->Properties." +msgstr "Advertència: aquestes preferències estan sent sobreescrites pel projecte actual. Veieu Projecte->Propietats." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" @@ -3463,46 +3554,44 @@ msgid "Text will be wrongly spaced." msgstr "El text no serà correctament espaiat." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Pàgina %d de %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Configuració del Document" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Imprimeix només el nom base (sense el directori) del fitxer imprés" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Pàgina %d de %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "S'ha cancel·lat la impressió del fitxer %s." +msgid "Did not send document %s to the printing subsystem." +msgstr "No s'ha enviat el document %s al subsistema d'impressió." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "S'ha imprès el fitxer '%s'." +msgid "Document %s was sent to the printing subsystem." +msgstr "El document %s ha estat enviat al subsistema d'impressió." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Ha fallat la impressió de %s (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." -msgstr "" -"Per favor, abans especifiqueu una ordre d'impressió al diàleg de " -"preferències." +msgstr "Per favor, abans especifiqueu una ordre d'impressió al diàleg de preferències." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3513,589 +3602,665 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Ha fallat la impressió de \"%s\" (codi de retorn: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "S'ha imprès el fitxer '%s'." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projectes" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Projecte Nou" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "C_rea" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 +#: ../src/project.c:413 msgid "Name:" msgstr "Nom:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 +#: ../src/project.c:426 msgid "Filename:" msgstr "Nom de fitxer:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 +#: ../src/project.c:456 msgid "Base path:" msgstr "Directori base:" -#: ../src/project.c:171 ../src/project.c:438 -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." +#: ../src/project.c:170 +#: ../src/project.c:465 +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." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 +#: ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Tria Directori Base del Projecte" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 +#: ../src/project.c:263 +#: ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "No s'ha pogut carregar el fitxer de projecte \"%s\"." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 +#: ../src/project.c:269 msgid "Open Project" msgstr "Obre un Projecte" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Fitxers del projecte" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "S'ha tancat el projecte \"%s\"." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Descripció:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Munta en el directori base" - -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Ordre d'execució:" - -#: ../src/project.c:461 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" -"Ordre a executar en el directori base del projecte. Es poden afegir opcions " -"a l'ordre. Deixeu-ho en blanc per usar l'ordre per defecte." +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Especifica els directoris de treball de Muntatge (sense tipus de fitxer) que s'utilitzaran al directori base:" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Especifica" + +#: ../src/project.c:486 +msgid "Set the working directories (on the Build tab) for the non-filetype build commands to use the base path" +msgstr "Especifica els directoris de treball (a la pestanya de Muntatge) per a les ordres de muntatge (sense tipus de fitxer) que 'sutilitzaran al directori base" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Patrons de fitxer:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Voleu tancar-lo abans de procedir?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "El projecte '%s' ja està obert." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "El nom de projecte especificat és massa curt." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "El nom de projecte especificat és massa llarg (màxim %d caràcters)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Heu especificat un nom de fitxer per al projecte invàlid." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Voleu crear el directori base per al projecte?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "El directori \"%s\" no existeix." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "No s'ha pogut crear el directori base del projecte (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "No es pot escriure el fitxer de projecte (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "S'ha creat el projecte \"%s\"." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "S'ha desat el projecte \"%s\"." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 +#: ../src/project.c:872 msgid "Choose Project Filename" msgstr "Tria Nom de Fitxer del Projecte" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Tria l'Ordre per Executar el Projecte" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "S'ha obert el projecte \"%s\"." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Utilitza expressions regulars" -#: ../src/search.c:220 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" -"Utilitza expressions regulars tipus POSIX. Per a informació detallada sobre " -"expressions regulars, llegiu la documentació." +#: ../src/search.c:237 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Utilitza expressions regulars tipus POSIX. Per a informació detallada sobre expressions regulars, llegiu la documentació." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Cerca cap e_nrere" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Usa seqüències d'_escapament" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" msgstr "" -"Reemplaça \\\\, \\t, \\n, \\r i \\uXXXX (caràcters Unicode) amb les " -"seqüències de control corresponents" +"Reemplaça \\\\, \\t, \\n" +", \\r i \\uXXXX (caràcters Unicode) amb les seqüències de control corresponents" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 +#: ../src/search.c:810 msgid "C_ase sensitive" msgstr "Sensible a _majúscules" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 +#: ../src/search.c:816 msgid "Match only a _whole word" msgstr "Cerca només _paraules completes" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Cerca només el p_rincipi de la paraula" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Anterior" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Següent" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 +#: ../src/search.c:562 +#: ../src/search.c:740 msgid "_Search for:" msgstr "_Cerca:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Cerca-ho Tot" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Marca" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Marca totes les coincidències en el document" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 +#: ../src/search.c:622 msgid "In Sessi_on" msgstr "A la _Sessió" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 +#: ../src/search.c:627 msgid "_In Document" msgstr "Al _Document" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 +#: ../src/search.c:640 msgid "Close _dialog" msgstr "Tanca el _diàleg" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 +#: ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Desactiva aquesta opció i mantingues obert el diàleg" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Cerca _i Reemplaça" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Reem_plaça amb:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Reemplaça-ho _Tot" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "A la Se_lecció" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Reemplaça totes les ocurrències en el text seleccionat" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Directori:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "_Codificació:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Cadenes _fixes" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep amb expressions regulars" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 +#: ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Veieu el manual de 'grep' per a més informació" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Utilitza expressions regulars esteses" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Opera _recursivament als subdirectoris" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Inverteix els resultats de la cerca" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" -msgstr "" -"Inverteix el sentit de la cerca, per a seleccionar les línies que no " -"contenen el text" +msgstr "Inverteix el sentit de la cerca, per a seleccionar les línies que no contenen el text" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Opcions e_xtra:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Altres opcions per a Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 +#: ../src/search.c:1881 +#: ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "S'ha trobat %d coincidència de \"%s\"." msgstr[1] "S'han trobat %d coincidències de \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "S'ha reemplaçat el text en %u fitxer." -msgstr[1] "S'ha reemplaçat el text en %u fitxers." +msgid "Replaced %u matches in %u documents." +msgstr "Reemplaçades %u ocurrències en %u documents." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "El directori per cercar als fitxers no és vàlid." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "No hi ha text per cercar." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" -"No s'ha pogut executar l'eina 'grep' '%s'; comproveu la ruta a Preferències." +msgstr "No s'ha pogut executar l'eina 'grep' '%s'; comproveu la ruta a Preferències." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Cercant..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (al directori: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "No s'ha pogut obrir el directori (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"La cerca ha fallat (veieu Ajuda->Missatges de Depuració per a obtindre més " -"detalls)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Ha fallat la cerca." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "S'ha finalitzat la cerca amb %d coincidència." msgstr[1] "S'ha finalitzat la cerca amb %d coincidències." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "No s'han trobat coincidències." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Expressió regular incorrecta: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany ha tractat d'accedir el sòcol Unix d'una instància d'un altre usuari.\n" +"Aquest error no permet continuar i finalitzarà." + +#: ../src/symbols.c:611 +#: ../src/symbols.c:651 +#: ../src/symbols.c:718 msgid "Chapter" msgstr "Capítol" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 +#: ../src/symbols.c:647 +#: ../src/symbols.c:719 msgid "Section" msgstr "Secció" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Apèndix" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 +#: ../src/symbols.c:652 +#: ../src/symbols.c:668 +#: ../src/symbols.c:679 +#: ../src/symbols.c:766 +#: ../src/symbols.c:777 +#: ../src/symbols.c:789 +#: ../src/symbols.c:803 +#: ../src/symbols.c:815 +#: ../src/symbols.c:827 +#: ../src/symbols.c:842 +#: ../src/symbols.c:887 msgid "Other" msgstr "Altres" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 +#: ../src/symbols.c:835 +#: ../src/symbols.c:867 msgid "Module" msgstr "Mòdul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 +#: ../src/symbols.c:762 +#: ../src/symbols.c:813 +#: ../src/symbols.c:825 +#: ../src/symbols.c:840 +#: ../src/symbols.c:852 msgid "Types" msgstr "Tipus" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Constructors de tipus" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 +#: ../src/symbols.c:638 +#: ../src/symbols.c:659 +#: ../src/symbols.c:667 +#: ../src/symbols.c:676 +#: ../src/symbols.c:688 +#: ../src/symbols.c:697 +#: ../src/symbols.c:750 +#: ../src/symbols.c:799 +#: ../src/symbols.c:822 +#: ../src/symbols.c:837 +#: ../src/symbols.c:874 msgid "Functions" msgstr "Funcions" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 +#: ../src/symbols.c:637 msgid "Sections" msgstr "Seccions" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Tecles" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 +#: ../src/symbols.c:690 +#: ../src/symbols.c:751 +#: ../src/symbols.c:776 +#: ../src/symbols.c:801 +#: ../src/symbols.c:814 +#: ../src/symbols.c:823 +#: ../src/symbols.c:839 +#: ../src/symbols.c:886 msgid "Variables" msgstr "Variables" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Ordre" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Entorn" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 +#: ../src/symbols.c:720 msgid "Subsection" msgstr "Subsecció" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 +#: ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubsecció" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etiqueta" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Estructures" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 +#: ../src/symbols.c:759 +#: ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Paquet" -#: ../src/symbols.c:655 -msgid "My" -msgstr "El meu" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "El nostre" +#: ../src/symbols.c:677 +#: ../src/symbols.c:826 +#: ../src/symbols.c:849 +msgid "Labels" +msgstr "Etiquetes" + +#: ../src/symbols.c:678 +#: ../src/symbols.c:689 +#: ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constants" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 +#: ../src/symbols.c:785 +#: ../src/symbols.c:797 +#: ../src/symbols.c:810 +#: ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfícies" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 +#: ../src/symbols.c:708 +#: ../src/symbols.c:729 +#: ../src/symbols.c:739 +#: ../src/symbols.c:748 +#: ../src/symbols.c:786 +#: ../src/symbols.c:798 +#: ../src/symbols.c:811 +#: ../src/symbols.c:873 msgid "Classes" msgstr "Classes" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Constants" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Àncores" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Capçalera (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Capçalera (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Capçalera (H3)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Selectors de ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Selectors de Tipus" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 +#: ../src/symbols.c:774 msgid "Modules" msgstr "Mòduls" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 +#, fuzzy msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 +#: ../src/symbols.c:740 +#: ../src/symbols.c:749 +#: ../src/symbols.c:787 +#: ../src/symbols.c:812 msgid "Methods" msgstr "Mètodes" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 +#: ../src/symbols.c:870 msgid "Namespaces" msgstr "Espais de noms" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Procediments" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Importacions" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entitats" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Arquitectures" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funcions / Procediments" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variables / Senyals" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Processos / Components" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Esdeveniments" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funcions / Tasques" + +#: ../src/symbols.c:788 +#: ../src/symbols.c:875 msgid "Members" msgstr "Membres" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Etiquetes" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subrutines" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blocs" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 +#: ../src/symbols.c:859 +#: ../src/symbols.c:883 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Definicions" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Objectius" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Tipus de fitxer desconegut per a \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "" -"S'ha produït un error en crear el fitxer d'etiquetes. Potser, no hi ha " -"etiquetes definides.\n" +msgstr "S'ha produït un error en crear el fitxer d'etiquetes. Potser, no hi ha etiquetes definides.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4104,197 +4269,203 @@ "Ús: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" msgstr "" "Exemple:\n" -"CFLAGS=`pkg-config·gtk+-2.0·--cflags`·%s·-g·gtk2.c.tags·/usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config·gtk+-2.0·--cflags`·%s·-g·gtk2.c.tags·/usr/include/gtk-2.0/gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Carrega les Etiquetes" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Fitxers d'etiquetes de Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Carregat(s) %s fitxer(s) d'etiquetes '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "No s'ha pogut carregar el fitxer d'etiquetes '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "No s'ha trobat la declaració de \"%s\"." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "No s'ha trobat la definició de \"%s\"." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Ordena per _Nom" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Ordena per _Aparença" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Antic" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Desa el fitxer" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Desa tots els fitxers oberts" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Actualitza el fitxer des del disc" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Tanca el fitxer" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Tanca tots els fitxers oberts" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Talla el text de la selecció actual" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Copia el text de la selecció actual" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Enganxa el contingut del portaretalls" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Esborra el text de la selecció actual" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Desfés l'ultima modificació" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Refés l'última modificació" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compila el fitxer" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Executa o visualitza el fitxer" -#: ../src/toolbar.c:70 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette" +#: ../src/toolbar.c:71 +msgid "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Obre un selector de color per a triar-ne un de la paleta" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Amplia" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Redueix" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Redueix el sagnat" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Incrementa el sagnat" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 +#: ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Cerca el text al fitxer" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 +#: ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Vés al número de línia introduït" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Mostra el diàleg de preferències" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Surt de Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Imprimeix el document" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Reemplaça el text en el document actual" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Crea un nou fitxer" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Crea un nou fitxer a partir d'una plantilla" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Obre un fitxer existent" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Obre un fitxer recent" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Tria més accions de muntage" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Vés a" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Separador" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Separador ---" -#: ../src/toolbar.c:897 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"Selecciona els elements mostrats a la barra d'eines. Els elements poden ser " -"ordenats arrossegant-los." +#: ../src/toolbar.c:946 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Selecciona els elements mostrats a la barra d'eines. Els elements poden ser ordenats arrossegant-los." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Elements Disponibles" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Elements Mostrats" #: ../src/tools.c:153 #, c-format -msgid "" -"The executed custom command returned an error. Your selection was not " -"changed. Error message: %s" -msgstr "" -"L'ordre pròpia executada ha finalitzat incorrectament. La vostra selecció no " -"ha canviat. Missatge d'error: %s" +msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" +msgstr "L'ordre pròpia executada ha finalitzat incorrectament. La vostra selecció no ha canviat. Missatge d'error: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4310,438 +4481,418 @@ msgid "Custom command failed: %s" msgstr "S'ha produït un error en executar l'ordre pròpia: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 +#: ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Indica Ordre Pròpia" #: ../src/tools.c:311 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" -"Podeu enviar la selecció actual a qualsevol d'aquestes ordres i la sortida " -"de l'ordre reemplaçarà la selecció actual." +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "Podeu enviar la selecció actual a qualsevol d'aquestes ordres i la sortida de l'ordre reemplaçarà la selecció actual." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "No hi ha ordres pròpies definides." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Recompte de Paraules" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "selecció" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "tot el document" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Rang:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Línies:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Paraules:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Caràcters:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "No s'han trobat etiquetes" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Mostra la Llista de _Símbols" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Mostra la Llista de _Documents" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 +#: ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Amaga la Barra _Lateral" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Mostra les _Rutes" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "línia: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "línia: %d / %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "LEC " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "SOB" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "mode: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "codificació: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "tipus de fitxer: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "objectiu: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Font actualitzada (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Llibreria Estàndard de C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Llibreria Estàndard de C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Llibreria Estàndard de C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "STL de C++" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Especifica el Format de Data Propi" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Selecciona Directori" -#: ../src/ui_utils.c:1644 -msgid "Select File" -msgstr "Selecciona Fitxer" - -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Fitxer de C_onfiguració" +#: ../src/ui_utils.c:1659 +msgid "Select File" +msgstr "Selecciona Fitxer" -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Desa-ho Tot" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Tanca-ho Tot" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Especifica el Directori del Document" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Reinicia el Terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Mètodes d'_Entrada" -#: ../src/vte.c:670 -msgid "" -"Could not change the directory in the VTE because it probably contains a " -"command." -msgstr "" -"No es pot canviar el directori en l'Emulador de Terminal, probablement " -"s'està executant una ordre." - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Connector de terminal" +#: ../src/vte.c:638 +msgid "Could not change the directory in the VTE because it probably contains a command." +msgstr "No es pot canviar el directori en l'Emulador de Terminal, probablement s'està executant una ordre." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Font:" -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Aquestes opcions per a l'emulador de terminal virtual (VTE) només s'apliquen " -"la llibreria VTE pot ser carregada." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Tipus de lletra del terminal:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Especifica la font del terminal" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Color del primer pla:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Color de fons:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Especifica el color del text del terminal" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Especifica el color de fons del terminal" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Desplaçament lateral de línies:" -#: ../src/vte.c:790 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget" -msgstr "" -"Indica el nombre de línies d'història que podeu fer enrere a la finestra del " -"terminal" +#: ../src/vte.c:786 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget" +msgstr "Indica el nombre de línies d'història que podeu fer enrere a la finestra del terminal" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Intèrpret d'ordres:" -#: ../src/vte.c:802 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation" -msgstr "" -"Indica la ruta a l'intèrpret d'ordres que s'ha d'executar a l'emulador de " -"terminal" +#: ../src/vte.c:798 +msgid "Sets the path to the shell which should be started inside the terminal emulation" +msgstr "Indica la ruta a l'intèrpret d'ordres que s'ha d'executar a l'emulador de terminal" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Desplaça en teclejar" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Desplaçar a la part de baix quan es prem alguna tecla" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Desplaça en aparèixer text" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Desplaçar a la part de baix quan apareix text nou" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Parpelleig del cursor" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Activa el parpelleig del cursor" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Sobrescriu les dreceres de Geany" -#: ../src/vte.c:833 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" -"Permet a l'Emulador de Terminal rebre les dreceres de teclat (a més del " -"focus)" +#: ../src/vte.c:829 +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "Permet a l'Emulador de Terminal rebre les dreceres de teclat (a més del focus)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Inhabilita la tecla d'accés al menú (F10 per defecte)" -#: ../src/vte.c:837 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" -"Aquesta opció desactiva la tecla per fer flotar la barra de menú (per " -"defecte és F10). Açò pot ser útil si esteu utilitzant, per exemple, Midnight " -"Commander al VTE." +#: ../src/vte.c:833 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Aquesta opció desactiva la tecla per fer flotar la barra de menú (per defecte és F10). Açò pot ser útil si esteu utilitzant, per exemple, Midnight Commander al VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 +#: ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Segueix la ruta del fitxer" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Executa \"cd $path\" en canviar entre fitxers oberts" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "No usa l'script d'execució" -#: ../src/vte.c:847 -msgid "" -"Don't use the simple run script which is usually used to display the exit " -"status of the executed program" -msgstr "" -"No usa l'script d'execució, que s'usa normalment per mostrar el valor " -"d'estat retornat pel programa executat" +#: ../src/vte.c:843 +msgid "Don't use the simple run script which is usually used to display the exit status of the executed program" +msgstr "No usa l'script d'execució, que s'usa normalment per mostrar el valor d'estat retornat pel programa executat" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Executa els programes a l'Emulador de Terminal" -#: ../src/vte.c:851 -msgid "" -"Run programs in VTE instead of opening a terminal emulation window. Please " -"note, programs executed in VTE cannot be stopped" -msgstr "" -"Executa programes al VTE en comptes d'obrir una finestra de terminal. " -"Tingueu en compte que els programes executats al VTE no poden ser detinguts" +#: ../src/vte.c:847 +msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped" +msgstr "Executa programes al VTE en comptes d'obrir una finestra de terminal. Tingueu en compte que els programes executats al VTE no poden ser detinguts" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Fitxers de projecte de Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Executables" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Constructor de Classes" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Crea fitxers font per als nous tipus de classes." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Crea Classe" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Espai de noms" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Espai de noms:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nom de la classe:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Fitxer de capçalera:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Codi font:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Herència" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Classe base:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Codi Base:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Capçalera base:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "GType base:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementa:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Opcions" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Crea constructor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Crea destructor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +#, fuzzy +msgid "Is abstract" +msgstr "És abstracte" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "És singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Tipus de constructor GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Crea Cla_sse" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Classe _GTK+" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "Classe _PHP" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caràcters HTML" @@ -4750,94 +4901,99 @@ msgid "Inserts HTML character entities like '&'." msgstr "Insereix les entitats HTML com '&'." -#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/htmlchars.c:39 +#: ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 +#: ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "L'equip de desenvolupament de Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Caràcters HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Caràcters ISO-8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Caràcters grecs" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Caràcters matemàtics" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Caràcters tècnics" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Caràcters de fletxa" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Símbols de puntuació" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Caràcters diversos" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 +#: ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "No s'ha pogut crear el directori de configuració de connectors." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Caràcters especials" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Insereix" -#: ../plugins/htmlchars.c:458 -msgid "" -"Choose a special character from the list below and double click on it or use " -"the button to insert it at the current cursor position." -msgstr "" -"Tria un caràcter especial de la llista i fes doble clic per inserir-lo a la " -"posició actual del cursor." +#: ../plugins/htmlchars.c:493 +msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." +msgstr "Tria un caràcter especial de la llista i fes doble clic per inserir-lo a la posició actual del cursor." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Caràcter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nom)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Insereix Caràcter Especial HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Reemplaç d'HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 +#, fuzzy msgid "_HTMLToggle" -msgstr "" +msgstr "_HTMLToggle" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Reemplaçament en massa de caràcters especials" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Insereix Caràcters Especials HTML" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Reemplaça els caràcters especials" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Activa o desactiva el plugin d'estat" @@ -4858,148 +5014,137 @@ msgstr "_Usa el nivell de zoom actual" #: ../plugins/export.c:185 -msgid "" -"Renders the font size of the document together with the current zoom level" +msgid "Renders the font size of the document together with the current zoom level" msgstr "Ajusta la mida de la font del document al nivell del zoom" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "El document ha estat exportat amb èxit com a '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "No es pot escriure el fitxer '%s' (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "El fitxer '%s' ja existeix. Voleu sobreescriure'l?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exporta" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Com a _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Com a _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Explorador de Fitxers" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Afegeix a la barra lateral una pestanya amb el navegador de fitxers." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Massa elements seleccionats!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "No s'ha pogut executar l'ordre externa '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Obre _externament" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Cerca en els Fitxers" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Mostra els Fitxers _Ocults" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Dalt" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Actualitza" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Inici" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Especifica el directori pel document" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Neteja el filtre" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtre:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtra els teus fitxers amb els comodins habituals" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Enfoca la Llista de Fitxers" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Enfoca el Quadre de la Ruta" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "No s'ha pogut crear el directori de configuració de connectors." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Ordre Externa per Obrir:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, 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" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Mostra els fitxers ocults" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Oculta els fitxers objecte" -#: ../plugins/filebrowser.c:1117 -msgid "" -"Don't show generated object files in the file browser, this includes *.o, *." -"obj. *.so, *.dll, *.a, *.lib" -msgstr "" -"No mostris els fitxers objecte generats en el navegador de fitxers, açò " -"inclou *.o, *.obj. *.so, *.dll, *.a, *.lib" +#: ../plugins/filebrowser.c:1212 +msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +msgstr "No mostris els fitxers objecte generats en el navegador de fitxers, açò inclou *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Usa el directori base del projecte" -#: ../plugins/filebrowser.c:1132 -msgid "" -"Change the directory to the base directory of the currently opened project" -msgstr "" -"Canvia el directori al directori base del projecte del projecte obert " -"actualment" +#: ../plugins/filebrowser.c:1227 +msgid "Change the directory to the base directory of the currently opened project" +msgstr "Canvia el directori al directori base del projecte del projecte obert actualment" #: ../plugins/saveactions.c:39 msgid "Save Actions" @@ -5007,9 +5152,7 @@ #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." -msgstr "" -"Aquest plugin proveeix diferents accions relacionades amb el tancament de " -"fitxers." +msgstr "Aquest plugin proveeix diferents accions relacionades amb el tancament de fitxers." #: ../plugins/saveactions.c:169 #, c-format @@ -5041,14 +5184,14 @@ #: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." -msgstr "" -"El Directori de Còpia de Seguretat no existeix o no es pot escriure en ell." +msgstr "El Directori de Còpia de Seguretat no existeix o no es pot escriure en ell." #: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Auto Desa" -#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:545 +#: ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Activa" @@ -5091,9 +5234,7 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "" -"Format de Data/_Hora per als fitxers de còpia de seguretat (veieu \"man " -"strftime\"):" +msgstr "Format de Data/_Hora per als fitxers de còpia de seguretat (veieu \"man strftime\"):" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" @@ -5107,50 +5248,166 @@ msgid "Splits the editor view into two windows." msgstr "Divideix la vista de l'editor en dues finestres." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Mostra el document actual" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 +#: ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Unifica la Finestra" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Divideix la Finestra" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horitzontalment" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Verticalment" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Divideix Horitzontalment" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Divideix Verticalment" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Unifica" - +#~ msgid "_Set Includes and Arguments" +#~ msgstr "E_specifica 'Includes' i Arguments" +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" +#~ msgid "_View DVI File" +#~ msgstr "_Visualitza DVI" +#~ msgid "V_iew PDF File" +#~ msgstr "V_isualitza el PDF" +#~ msgid "_Set Arguments" +#~ msgstr "E_specifica els Arguments" +#~ msgid "Set Arguments" +#~ msgstr "Especifica els Arguments" +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Indica els programes i opcions per a compilar i visualitzar fitxers (La)" +#~ "TeX." +#~ msgid "DVI creation:" +#~ msgstr "Creació del DVI:" +#~ msgid "PDF creation:" +#~ msgstr "Creació del PDF:" +#~ msgid "DVI preview:" +#~ msgstr "previsualització del DVI:" +#~ msgid "PDF preview:" +#~ msgstr "previsualització del PDF:" +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f serà reemplaçat pel nom complet del fitxer, i.e. test_file.c\n" +#~ "%e serà reemplaçat pel nom del fitxer sense extensió, i.e. test_file" +#~ msgid "Set Includes and Arguments" +#~ msgstr "Especifica 'Includes' i Arguments" +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Especifica les ordres per muntar i executar els programes." +#~ msgid "Compile:" +#~ msgstr "Compila:" +#~ msgid "Build:" +#~ msgstr "Munta:" +#~ msgid "Failed to execute the view program" +#~ msgstr "S'ha produït un error en executar el visualitzador" +#~ msgid "Try to resave the file?" +#~ msgstr "Intentar desar el fitxer de nou?" +#~ msgid "_Customize Toolbar" +#~ msgstr "_Personalitza la Barra d'Eines" +#~ msgid "Icon style:" +#~ msgstr "Estil de les icones:" +#~ msgid "Icon size:" +#~ msgstr "Mida de la icona:" +#~ msgid "Appearance" +#~ msgstr "Aparença" +#~ msgid "Hard tab width:" +#~ msgstr "Amplada de cada tabulació:" +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "L'amplada de cada tabulació quan Tabulacions i Espais està activat en un " +#~ "document" +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Usa lletra blanca sobre fons negre i inverteix tots els colors, aquesta " +#~ "opció requereix un reinici de Geany" +#~ msgid "Long line marker:" +#~ msgstr "Barra de marques:" +#~ msgid "Long line marker color:" +#~ msgstr "Color de la barra de marques:" +#~ msgid "Path and options for the make tool" +#~ msgstr "Ruta i opcions per a l'eina make" +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplica la línia i la selecció" +#~ msgid "Send Selection to Terminal" +#~ msgstr "Envia la Selecció al Terminal" +#~ msgid "Run (alternative command)" +#~ msgstr "Executa una ordre definida" +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Aquesta és la llista de connectors disponibles. Selecciona els connectors " +#~ "que es carregaran a l'inici." +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "S'ha cancel·lat la impressió del fitxer %s." +#~ msgid "Make in base path" +#~ msgstr "Munta en el directori base" +#~ msgid "Run command:" +#~ msgstr "Ordre d'execució:" +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Ordre a executar en el directori base del projecte. Es poden afegir " +#~ "opcions a l'ordre. Deixeu-ho en blanc per usar l'ordre per defecte." +#~ msgid "Choose Project Run Command" +#~ msgstr "Tria l'Ordre per Executar el Projecte" +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "S'ha reemplaçat el text en %u fitxer." +#~ msgstr[1] "S'ha reemplaçat el text en %u fitxers." +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "La cerca ha fallat (veieu Ajuda->Missatges de Depuració per a obtindre " +#~ "més detalls)." +#~ msgid "My" +#~ msgstr "El meu" +#~ msgid "Local" +#~ msgstr "Local" +#~ msgid "Our" +#~ msgstr "El nostre" +#~ msgid "Terminal plugin" +#~ msgstr "Connector de terminal" +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Aquestes opcions per a l'emulador de terminal virtual (VTE) només " +#~ "s'apliquen la llibreria VTE pot ser carregada." +#~ msgid "Terminal font:" +#~ msgstr "Tipus de lletra del terminal:" +#~ msgid "Unsplit" +#~ msgstr "Unifica" #~ msgid "Diff file" #~ msgstr "Fitxer de diferències" - #~ msgid "reStructuredText file" #~ msgstr "Fitxer reStructuredText" - #~ msgid "Select _All" #~ msgstr "Selecciona-ho _Tot" - #~ msgid "Automatic symbol completion" #~ msgstr "Autoacabament de símbols" - #~ msgid "" #~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." #~ "xml'. Please see the documentation for details." @@ -5158,281 +5415,190 @@ #~ "Avís: Per personalitzar els elements de la barra d'eines, editeu el " #~ "fitxer 'ui_toolbar.xml'. Per favor, veieu la documentació per a obtindre " #~ "més detalls." - #~ msgid "" #~ "For all changes you make in this file to take effect, you need to restart " #~ "Geany." #~ msgstr "" #~ "Per aplicar el canvis fets en aquest fitxer, cal que reinicieu Geany." - #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "" #~ "S'ha produït un error en visualitzar %s (comproveu que estiga compilat)" - #~ msgid "" #~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" #~ msgstr "" #~ "Afegeix números de pàgina a la part de baix. Ocupa 2 línies de la pàgina" - #~ msgid "Jump to the entered line number." #~ msgstr "Vés al número de línia introduït." - #~ msgid "Version Diff" #~ msgstr "Diferències de la versió" - #~ msgid "Creates a patch of a file against version control." #~ msgstr "Crea un pegat del fitxer." - #~ msgid "Input conversion of the diff output failed." #~ msgstr "S'ha produït un error en convertir l'entrada de la comanda diff." - #~ msgid "" #~ "%s exited with an error: \n" #~ "%s." #~ msgstr "" #~ "%s ha finalitzat amb un error: \n" #~ "%s." - #~ msgid "No changes were made." #~ msgstr "No s'ha fet cap canvi." - #~ msgid "unknown error while trying to spawn a process for %s" #~ msgstr "s'ha produït un error quan es tractava d'iniciar un procés per a %s" - #~ msgid "An error occurred (%s)." #~ msgstr "S'ha produït un error (%s)." - #~ msgid "_Version Diff" #~ msgstr "Diferències de la _versió" - #~ msgid "From Current _File" #~ msgstr "Del _Fitxer Actual" - #~ msgid "Make a diff from the current active file" #~ msgstr "Mostra les diferències del fitxer actiu" - #~ msgid "From Current _Directory" #~ msgstr "Del _Directori Actual" - #~ msgid "Make a diff from the directory of the current active file" #~ msgstr "Mostra les diferències del directori del fitxer actiu" - #~ msgid "From Current _Project" #~ msgstr "Del _Projecte Actual" - #~ msgid "Make a diff from the current project's base path" #~ msgstr "Mostra les diferències del directori base del projecte" - #~ msgid "Command stopped because the current file has no extension." #~ msgstr "L'ordre s'ha detingut perquè el fitxer no té extensió." - #~ msgid "Failed to execute \"%s\" (make sure it is already built)" #~ msgstr "" #~ "S'ha produït un error en executar %s (comproveu que estiga compilat)" - #~ msgid "Compiles the current file" #~ msgstr "Compila el fitxer" - #~ msgid "Builds the current file (generate an executable file)" #~ msgstr "Compila el fitxer (genera un executable)" - #~ msgid "Compiles the current file using the make tool" #~ msgstr "Compila el fitxer de codi usant make" - #~ msgid "" #~ "Sets the includes and library paths for the compiler and the program " #~ "arguments for execution" #~ msgstr "" #~ "Indiqueu els includes i rutes de les llibreries per al compilador, així " #~ "com els arguments per a l'execució" - #~ msgid "Compiles the current file into a DVI file" #~ msgstr "Compila el fitxer i genera un DVI" - #~ msgid "Compiles the current file into a PDF file" #~ msgstr "Compila el fitxer i genera un PDF" - #~ msgid "Compile and view the current file" #~ msgstr "Compila i visualitza el fitxer actual" - #~ msgid "Sets the program paths and arguments" #~ msgstr "Especifiqueu les rutes i arguments del programa" - #~ msgid "Saves all open files" #~ msgstr "Desar tots els fitxers oberts" - #~ msgid "Prints the current file" #~ msgstr "Imprimeix el fitxer" - #~ msgid "Inserts a typical ChangeLog entry in the current file" #~ msgstr "Insereix una Entrada de ChangeLog típica al fitxer" - #~ msgid "Inserts a file header at the beginning of the file" #~ msgstr "Insereix una mica d'informació a l'inici del fitxer" - #~ msgid "Inserts a description before the current function" #~ msgstr "Insereix una descripció abans de la funció actual" - #~ msgid "Inserts a multiline comment" #~ msgstr "Insereix un comentari multilínia" - #~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" #~ msgstr "Insereix un text GPL (ha d'estar a l'inici del fitxer)" - #~ msgid "" #~ "Inserts a BSD license notice (should be done at the beginning of the file)" #~ msgstr "Insereix un text de llicència BSD (ha d'estar a l'inici del fitxer)" - #~ msgid "Change the default font" #~ msgstr "Canvia la font per defecte" - #~ msgid "Toggle the window with status and compiler messages on and off" #~ msgstr "" #~ "Activa o desactiva la finestra amb l'estat i els missatges del compilador" - #~ msgid "Toggle the toolbar on and off" #~ msgstr "Activa o desactiva la barra d'eines" - #~ msgid "Treat this file as read-only. No changes can be made." #~ msgstr "Tracta el fitxer com a només lectura. No es podran fer canvis." - #~ msgid "Replaces all spaces in the document by tab characters." #~ msgstr "Reemplaça tots els espais al document per tabulacions." - #~ msgid "Folds all contractible code blocks" #~ msgstr "Plega tots els blocs de codi que es poden col·lapsar" - #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Desplega tots els blocs de codi col·lapsats" - -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Elimina tots els indicadors d'error del document." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" #~ msgstr "Compta les paraules i caràcters de la selecció o de tot el document" - #~ msgid "Load global tags file" #~ msgstr "Carrega el fitxer global d'etiquetes" - #~ msgid "" #~ "Reload configuration data like snippets, templates and filetype " #~ "extensions." #~ msgstr "" #~ "Recarrega les dades de configuració com per exemple codi, plantilles i " #~ "extensions de tipus de fitxer." - #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Mostra la llista de dreceres de teclat de Geany." - -#~ msgid "Color" -#~ msgstr "Color" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Introdueix un número de línia i vés-hi." - #~ msgid "Go to the entered line" #~ msgstr "Vés a la línia introduïda" - #~ msgid "Show full path name in documents list" #~ msgstr "Mostra la ruta completa a la llista de documents" - #~ msgid "Show file operation buttons" #~ msgstr "Mostra els botons d'operació dels fitxers" - #~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" #~ msgstr "" #~ "Mostra els botons Nou, Obre, Tanca, Desa i Actualitza a la barra d'eines" - #~ msgid "Show Redo and Undo buttons" #~ msgstr "Mostra els botons Refés i Desfés" - #~ msgid "Display the Redo and Undo buttons in the toolbar" #~ msgstr "Mostra els botons Refés i Desfés a la barra d'eines" - #~ msgid "Show Back and Forward buttons" #~ msgstr "Mostra els botons Avant i Enrere" - #~ msgid "" #~ "Display the Back and Forward buttons in the toolbar used for code " #~ "navigation" #~ msgstr "" #~ "Mostra els botons Avant i Enrere usats per a la navegació a la barra " #~ "d'eines" - #~ msgid "Show Compile and Run buttons" #~ msgstr "Mostra els botons Compila i Executa" - #~ msgid "Display the Compile and Run buttons in the toolbar" #~ msgstr "Mostra els botons Compila i Executa a la barra d'eines" - #~ msgid "Show Color Chooser button" #~ msgstr "Mostra el botó del Selector de Colors" - #~ msgid "Display the Color Chooser button in the toolbar" #~ msgstr "Mostra el botó del Selector de Colors en la barra d'eines" - #~ msgid "Show Zoom In and Zoom Out buttons" #~ msgstr "Mostra els botons de Zoom" - #~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" #~ msgstr "Mostra els botons Amplia i Redueix a la barra d'eines" - #~ msgid "Show Increase and Decrease Indentation buttons" #~ msgstr "Mostra els botons Incrementa i Redueix Sagnat" - #~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" #~ msgstr "Mostra els botons d'Augmentar i Reduïr el Sagnat a la barra d'eines" - #~ msgid "Show Search field" #~ msgstr "Mostra el camp de Cerca" - #~ msgid "Display the search field and button in the toolbar" #~ msgstr "Mostra el camp de la cerca i el botó en la barra d'eines" - #~ msgid "Show Go to Line field" #~ msgstr "Mostra el camp 'Vés-hi a'" - #~ msgid "Display the line number field and button in the toolbar" #~ msgstr "Mostra el camp del número de línia i el botó a la barra d'eines" - #~ msgid "Show Quit button" #~ msgstr "Mostra el botó de Sortir" - #~ msgid "Display the quit button in the toolbar" #~ msgstr "Mostra el botó de Sortir a la barra d'eines" - #~ msgid "Items" #~ msgstr "Elements" - -#~ msgid "Use white text on a black background." -#~ msgstr "Utilitza text blanc sobre fons negre." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Executa en mode de depuració (implica més informació)" - -#~ msgid "Search failed." -#~ msgstr "Ha fallat la cerca." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "No es pot trobar el fitxer del mapa de píxels (pixmap): %s" - #~ msgid "JavaScript functions" #~ msgstr "Funcions Javascript" - #~ msgid "Heading (H2)" #~ msgstr "Capçalera (H2)" - #~ msgid "Heading (H3)" #~ msgstr "Capçalera (H3)" - #~ msgid "Structs / Typedefs" #~ msgstr "Estructures / Definicions de tipus" - #~ msgid "Terminal emulation:" #~ msgstr "Emulació de terminal:" - #~ msgid "" #~ "Controls how the terminal emulator should behave. Do not change this " #~ "value unless you know exactly what you are doing." @@ -5445,196 +5611,137 @@ #~ msgid_plural "Found %d matches for \"%s\"." #~ msgstr[0] "S'han trobat %d coincidències de \"%s\"." #~ msgstr[1] "S'han trobat %d coincidències de \"%s\"." - #~ msgid "Failed to execute the terminal program" #~ msgstr "S'ha produït un error en executar el terminal" - #~ msgid "Save automatically all open files in a given time interval." #~ msgstr "" #~ "Desa automàticament tots els fitxers oberts en un interval de temps." - #~ msgid "Whether to use tabs or spaces when indentation is inserted." #~ msgstr "Especifica si s'usaran tabulacions o espais per al sagnat." - #~ msgid "Rows of symbol completion list:" #~ msgstr "Files de la llista d'autoacabament de símbols:" - #~ msgid "Could not parse the output of the diff" #~ msgstr "No es pot interpretar la sortida de l'ordre diff" - #~ msgid "Something very strange is occurred, could not stat %s (%s)." #~ msgstr "Ha succeït alguna cosa estranya, no es pot accedir a %s (%s)." - #~ msgid "Insert Comments" #~ msgstr "Insereix Comentari" - #~ msgid "Insert \"include <...>\"" #~ msgstr "Insereix \"include <...>\"" - #~ msgid "File menu" #~ msgstr "Menú Fitxer" - #~ msgid "Edit menu" #~ msgstr "Menú Edita" - #~ msgid "Search menu" #~ msgstr "Menú Cerca" - #~ msgid "View menu" #~ msgstr "Menú Visualitza" - #~ msgid "Document menu" #~ msgstr "Menú Document" - #~ msgid "Build menu" #~ msgstr "Menú Munta" - #~ msgid "Tools menu" #~ msgstr "Menú Eines" - #~ msgid "Help menu" #~ msgstr "Menú Ajuda" - #~ msgid "Focus commands" #~ msgstr "Ordres de focus" - #~ msgid "Editing commands" #~ msgstr "Ordres d'edició" - #~ msgid "Tag commands" #~ msgstr "Ordres d'etiquetes" - #~ msgid "Other commands" #~ msgstr "Altres ordres" - #~ msgid "Something went really wrong." #~ msgstr "Alguna cosa ha anat molt malament." - #~ msgid "_VCdiff" #~ msgstr "_Diferència VC" - #~ msgid "Mixins" #~ msgstr "Mixins" #, fuzzy #~ msgid "C source file" #~ msgstr "Codi font C#" - #~ msgid "C++ source file" #~ msgstr "Codi font C++" - #~ msgid "C# source file" #~ msgstr "Codi font C#" - #~ msgid "D source file" #~ msgstr "Codi font D" - #~ msgid "Java source file" #~ msgstr "Codi font Java" - #~ msgid "Pascal source file" #~ msgstr "Codi font Pascal" - #~ msgid "Assembler source file" #~ msgstr "Ensamblador" - #~ msgid "FreeBasic source file" #~ msgstr "Codi font FreeBasic" - #~ msgid "Fortran source file (F77)" #~ msgstr "Codi font Fortran (F77)" - #~ msgid "(O)Caml source file" #~ msgstr "Codi font (O)Caml" - #~ msgid "Perl source file" #~ msgstr "Codi font Perl" - #~ msgid "PHP source file" #~ msgstr "Codi font PHP" - #~ msgid "Python source file" #~ msgstr "Codi font Python" - #~ msgid "Ruby source file" #~ msgstr "Codi font Ruby" - #~ msgid "Tcl source file" #~ msgstr "Codi font Tcl" - #~ msgid "Lua source file" #~ msgstr "Codi font Lua" - #~ msgid "Ferite source file" #~ msgstr "Codi font Ferite" - -#~ msgid "Haskell source file" -#~ msgstr "Codi font Haskell" - #~ msgid "Docbook source file" #~ msgstr "Docbook" - #~ msgid "HTML source file" #~ msgstr "Document HTML" - #~ msgid "LaTeX source file" #~ msgstr "Codi font LaTeX" - #~ msgid "O-Matrix source file" #~ msgstr "Codi font O-Matrix" - #~ msgid "VHDL source file" #~ msgstr "Codi font VHDL" - #~ msgid "Haxe source file" #~ msgstr "Codi font Haxe" - #~ msgid "Open files" #~ msgstr "Fitxers oberts" #, fuzzy #~ msgid "Show open files list" #~ msgstr "Mostra la llista de fitxers oberts" - #~ msgid "" #~ "Whenever some whitespace is inserted by Geany it will use tabs when " #~ "enabled otherwise Geany will use just spaces." #~ msgstr "" #~ "Usa tabulacions quan s'insereixen espais en blanc si està activat, en cas " #~ "contrari s'usen espais en blanc normalment." - #~ msgid "Unfold all children of a fold point when unfolding it." #~ msgstr "Desplega recursivament un punt plegat en desplegar-lo." - #~ msgid "Construct autocompletion" #~ msgstr "Autoacabament de construccions" - #~ msgid "Automatic completion of often used constructs like if and for" #~ msgstr "Completat automàtic de construccions usuals com 'if' i 'for'" #, fuzzy #~ msgid "Symbol autocompletion" #~ msgstr "Autoacabament de construccions" - #~ msgid "Print:" #~ msgstr "Imprimeix:" - #~ msgid "Find in files" #~ msgstr "Cerca als fitxers" - #~ msgid "Go to line" #~ msgstr "Vés a la línia" #, fuzzy #~ msgid "Complete construct" #~ msgstr "Crea constructor" - #~ msgid "Go to tag definition" #~ msgstr "Vés a la definició de l'etiqueta" - #~ msgid "Go to tag declaration" #~ msgstr "Vés a la declaració de l'etiqueta" - #~ msgid "" #~ "Directory to run Make All from. Leave blank to use the default command." #~ msgstr "" @@ -5644,10 +5751,8 @@ #, fuzzy #~ msgid "Hide" #~ msgstr "Amaga" - #~ msgid "Reload" #~ msgstr "Actualitza" - #~ msgid "" #~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " #~ "%s filetype: %s scope: %s" @@ -5662,23 +5767,14 @@ #, fuzzy #~ msgid "Do you want to save all opened files before processing?" #~ msgstr "Voleu desar abans de tancar?" - -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "_Directori:" - #~ msgid "Convert Selection to _Lower-case" #~ msgstr "Converteix el text seleccionat a mi_núscules" - #~ msgid "Convert Selection to _Upper-case" #~ msgstr "Converteix el text seleccionat a ma_júscules" - #~ msgid "Convert Selection to lower-case" #~ msgstr "Converteix el text seleccionat a mi_núscules" - #~ msgid "Convert Selection to upper-case" #~ msgstr "Converteix el text seleccionat a ma_júscules" - #~ msgid "Advanced" #~ msgstr "Avançat" @@ -5687,22 +5783,16 @@ #~ msgstr "" #~ "\n" #~ "Menú Edita\n" - #~ msgid "Behaviour" #~ msgstr "Comportament" - #~ msgid "Misc." #~ msgstr "Miscel·lània" - #~ msgid "language" #~ msgstr "llengua" - #~ msgid "XML source file" #~ msgstr "Codi font XML" - #~ msgid "Insert BSD license Notice" #~ msgstr "Insereix Text de Llicència BSD" - #~ msgid "" #~ "Selects the indentation mode. Use None to disable auto indentation " #~ "completely. Basic indents new lines with the same indentation as the " @@ -5711,22 +5801,18 @@ #~ "Indica el mode de sagnat. Useu Cap per desactivar l'autosagnat, Bàsic per " #~ "sagnar les línies noves a la mateixa alçada que les anteriors i Avançat " #~ "per afegir un nivell de sagnat amb els parèntesis." - #~ msgid "Print command:" #~ msgstr "Ordre d'impressió:" - #~ msgid "" #~ "\n" #~ "Focus commands\n" #~ msgstr "" #~ "\n" #~ "Ordres del focus\n" - #~ msgid "Keyboard shortcuts" #~ msgstr "Dreceres de teclat" - #~ msgid " - A fast and lightweight IDE" #~ msgstr " - Un IDE lleuger i veloç" - #~ msgid "Function" #~ msgstr "Funció" + diff -Nru geany-0.18/po/ChangeLog geany-0.19/po/ChangeLog --- geany-0.18/po/ChangeLog 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/ChangeLog 2010-06-07 18:44:11.000000000 +0100 @@ -1,3 +1,282 @@ +2010-06-07 Frank Lanitz + + * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami. + + +2010-06-04 Frank Lanitz + + * sv.po: Update of Swedish translation. Thanks to Tony Mattsson. + + +2010-06-03 Frank Lanitz + + * de.po: Minor update of German translation. + * gl.po: Update of Galician translation. Thanks to José Manuel + Castroagudín Silva. + * sl.po: Update of Slovenian translation. Patch by Jože Klepec, thanks. + + +2010-06-02 Frank Lanitz + + * ca.po: Update of Catalan translation. Thanks to Toni Garcia-Navarro. + * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami. + * pt_BR.po: Update of Brasilian Portuguese translation. + Thanks to Adrovane Marques Kade. + + +2010-06-01 Frank Lanitz + + * fr.po: Update of French translation. Thanks Jean-Philippe Moal. + * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami. + * pt.po: Update of Portugese translation. Thanks to André Glória for + providing + + +2010-05-31 Frank Lanitz + + * pt.po: Update of Portugese translation. Thanks to André Glória for + providing + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +2010-05-30 Peter Scholtens + + * nl.po: Update of Dutch translation. + + +2010-05-29 Frank Lanitz + + * zh_CN.po: Update of simplified Chinese translation. Thanks to + Xhacker Liu. + + +2010-05-28 Frank Lanitz + + * gl.po: Update of Galician translation. Thanks to José Manuel + Castroagudín Silva. + + +2010-05-24 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Lucas Vieites. + + +2010-05-23 Frank Lanitz + + * en_GB.po: Update British English translation (Thanks to Jeff Bailes) + + +2010-05-22 Frank Lanitz + + * *.po: Update for upcoming string freeze of Geany 0.19 + + +2010-05-21 Frank Lanitz + + * be.po: Update of Belarusian translation. Thanks to Yura Siamashka + for providing + * de.po: Update of German translation. + + +2010-05-15 Frank Lanitz + + * de.po: Minor update of German translation. + + +2010-05-07 Frank Lanitz + + * de.po: Minor update of German translation. + + +2010-04-21 Frank Lanitz + + * de.po: Minor update of German translation. + + +2010-04-15 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Lucas Vieites. + + +2010-03-20 Frank Lanitz + + * de.po: Update of German translation. + + +2010-03-17 Frank Lanitz + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +2010-03-13 Frank Lanitz + + * sv.po: Update of Swedish translation. Thanks to Tony Mattsson. + + +2010-03-05 Frank Lanitz + + * ast.po: Added Asturian translation. Thanks to Marcos Costales for providing. + + +2010-02-21 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Antonio Jiménez + González. + * sl.po: Update of Slovenian translation (patch by Jože Klepec, thanks). + + +2010-02-20 Peter Scholtens + + * nl.po: Removed undetermined article in Dutch translation. Thanks + to Ayke van Laëthem. + + +2010-02-19 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Antonio Jiménez + González. + + +2010-02-14 Frank Lanitz + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +2010-01-14 Frank Lanitz + + * fr.po: Fix a spelling mistake on French translation. Thanks to + Olivier Cuenot for reporting + + +2010-01-03 Frank Lanitz + + * ru.po: Correction of some minor typos. Reported by Michael Borisov. Thanks. + + +2009-12-07 Frank Lanitz + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +2009-12-02 Peter Scholtens + + * nl.po: Corrected typo's. Changed letters of invisible mnemonic keys _g + + +2009-11-27 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Antonio Jiménez + González. + + +2009-11-26 Frank Lanitz + + * de.po: Minor update of German translation. + * nl.po: Update of Dutch translation. Thanks to Peter Scholtens and + Ayke van Laethem + + +2009-11-23 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Antonio Jiménez + González. + + +2009-11-18 Frank Lanitz + + * nl.po: Update of Dutch translation. Thanks to Peter and + Ayke for sending the update. + + +2009-11-15 Frank Lanitz + + * es.po: Update of Spanish translation. Thanks to Maz for providing. + + +2009-11-07 Enrico Tröger + + * nl.po: + Update Dutch translation (patch by Peter Scholtens, thanks). + + +2009-11-03 Enrico Tröger + + * sl.po: + Update Slovenian translation (patch by Jože Klepec, thanks). + + +2009-10-30 Frank Lanitz + + * gl.po: Update of Galician translation. Thanks to José Manuel + Castroagudín Silva. + + +2009-10-29 Frank Lanitz + + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec for providing. + + +2009-10-19 Frank Lanitz + + * gl.po: Update of Galician translation. Thanks to José Manuel Castroagudín Silva. + * zh_CN.po: Update of simplified Chinese translation. Thanks to Xhacker Liu. + + +2009-10-17 Frank Lanitz + + * Minor update of German translation. + + +2009-10-12 Frank Lanitz + + * de.po: Minimal update of German translation. + * gl.po: Added Galician translation. Thanks to José Manuel Castroagudín Silva. + * ru.po: Minor update of Russian translation. Thanks to Alexey Antipov. + + +2009-10-11 Frank Lanitz + + * nl.po: Update of Dutch translation. Thanks to Peter Scholtens for providing. + + +2009-10-03 Frank Lanitz + + * de.po: Update of German translation. + + +2009-09-29 Frank Lanitz + + * vi.po: Update of Vietnamese translation. Thanks to Clytie Siddall for + providing the update. + + +2009-09-15 Frank Lanitz + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +2009-09-07 Frank Lanitz + + * sv.po: Update of Swedish translation. Thanks to Tony Mattsson. + + +2009-09-01 Frank Lanitz + + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec. + + +2009-08-24 Frank Lanitz + + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec. + + +2009-08-19 Frank Lanitz + + * pt.po: Rename Portuguese translation file so it can work as a fall + back for all Portuguese based languages. + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec. + + 2009-08-16 Enrico Tröger * de.po: @@ -6,7 +285,7 @@ * *.po, geany.pot: Regenerate message catalog template. Remove a fuzzy mark from all translations. - + * New release: Geany 0.18 "Kaine". 2009-08-13 Frank Lanitz @@ -29,7 +308,7 @@ 2009-08-11 Frank Lanitz * fr.po: Update of French translation (Thanks Jean-Philippe Moal). - * sl.po: Update of Slovenian translation. Thanks to Joze Klepec. + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec. 2009-08-08 Frank Lanitz @@ -45,7 +324,7 @@ 2009-08-05 Frank Lanitz * ru.po: Update of Russian translation. Thanks to John Wehin. - * sl.po: Update of Slovenian translation. Thanks to Joze Klepec. + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec. 2009-08-05 Frank Lanitz @@ -68,7 +347,7 @@ 2009-08-02 Frank Lanitz - * sl_SI.po: Update of Slovenian translation. Thanks to Joze Klepec. + * sl_SI.po: Update of Slovenian translation. Thanks to Jože Klepec. * sl.po: Rename Slovenian translation file. @@ -79,13 +358,13 @@ 2009-07-27 Frank Lanitz - * sl_SI.po: Update of Slovenian translation. Thanks to Joze Klepec. + * sl_SI.po: Update of Slovenian translation. Thanks to Jože Klepec. 2009-07-25 Frank Lanitz * sl_SI.po: Added a first Slovenian translation. - Thanks to Joze Klepec. + Thanks to Jože Klepec. 2009-07-24 Frank Lanitz diff -Nru geany-0.18/po/cs.po geany-0.19/po/cs.po --- geany-0.18/po/cs.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/cs.po 2010-05-23 09:08:49.000000000 +0100 @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-05-26 19:05+0100\n" "Last-Translator: Karel Kolman \n" "Language-Team: Czech \n" @@ -34,7 +34,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Rychlé a lehké IDE pro GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -42,67 +42,67 @@ msgid "Integrated Development Environment" msgstr "Integrované vývojové prostředí" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "O Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Rychlé a lehké IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(sestaveno na nebo po %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Informace" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Vývojáři" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "správce" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "vývojář" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "správce překladu" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Překladatelé" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Předchozí překladatelé" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Přispěvatelé" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Někteří z mnoha přispěvatelů (pro podrobný seznam, viz soubor %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Autoři" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licence" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -110,275 +110,290 @@ "Text licence nenalezen, prosím, navštivte http://www.gnu.org/licenses/gpl-" "2.0.txt, abyste si ji prohlédli online." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Nebyl nalezen terminál \"%s\" (zkontrolujte cestu k terminálu zadanou v " -"Nastavení)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Selhala změna pracovního adresáře na \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Selhalo spuštění \"%s\" (startovací skript nemohl být vytvořen)" +msgid "%s (in directory: %s)" +msgstr "%s (v adresáři: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Proces selhal (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (v adresáři: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Selhala změna pracovního adresáře na \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Selhalo spuštění \"%s\" (startovací skript nemohl být vytvořen)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Nelze spustit soubor ve VTE, protože to pravděpodobně obsahuje příkaz." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Nebyl nalezen terminál \"%s\" (zkontrolujte cestu k terminálu zadanou v " +"Nastavení)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Překlad selhal." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Překlad skončil úspěšně." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Přeložit" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "S_estavit" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make All" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make _vlastní cíl" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Make vlastní cíl" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _objekt" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Zadejte zde vlastní volby, všechen zadaný text bude předán příkazu make." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Další chyba" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "_Předchozí chyba" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Nastavit _Include a argumenty" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Zobrazit soubor DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Zobraz_it PDF soubor" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Nastavit vlastní příkazy" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Nastavit argumenty" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Sestavit aktuální soubor" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Nastavit argumenty" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Sestavit aktuální soubor nástrojem Make s výchozím cílem" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Nastavte program a volby pro přeložení a zobrazení (La)TeX souborů." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Sestavit aktuální soubor nástrojem Make se specifikovaným cílem" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Tvorba DVI:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Přeložit aktuální soubor nástrojem Make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Tvorba PDF:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Proces nemohl být přerušen (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Náhled DVI:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Žádné další chyby sestavení." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Náhled PDF:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f bude nahrazeno celým názvem souboru, např. test_file.c\n" -"%e bude nahrazeno názvem souboru bez přípony, např. test_file" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Nastavení Include a argumentů" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Label" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Příkaz" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Nastavte příkazy pro sestavení a spouštění programů." +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "_Adresář:" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Překladač" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "Příkazy pro %s" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Přeložit:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Sestavit:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Nastavit _typ souboru" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Spustit" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "Regulární výrazy _grepu" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Sestavit aktuální soubor" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make vlastní cíl" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" + +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Nastavit vlastní příkazy" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Zadejte zde vlastní volby, všechen zadaný text bude předán příkazu make." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Sestavit aktuální soubor nástrojem Make s výchozím cílem" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Nastavit vlastní příkazy" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Sestavit aktuální soubor nástrojem Make se specifikovaným cílem" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Přeložit" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Přeložit aktuální soubor nástrojem Make" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "S_estavit" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Selhalo spuštění zobrazovacího programu." +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Spustit" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Proces nemohl být přerušen (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make _vlastní cíl" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Žádné další chyby sestavení." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make _objekt" + +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" -#: ../src/callbacks.c:152 +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make All" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Nastavit vlastní příkazy" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Opravdu chcete ukončit program?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Soubor %s uložen." +msgstr[1] "Soubor %s uložen." +msgstr[2] "Soubor %s uložen." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Znovu načíst soubo_r" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Neuložené změny budou ztraceny." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Opravdu chcete znovu načíst '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Přejít na řádek" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Zadejte číslo řádku, na který chcete jít:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Prosím zadejte typ aktuálního souboru před použitím této funkce." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.rrrr" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.rrrr" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "rrrr/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.rrrr hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.rrrr hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "rrrr/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Použít vlastní formát data" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Vlastní formát data" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -386,24 +401,23 @@ "Zadejte vlastní formát data a času. Můžete použít stejné konverzní " "specifikátory jako v ANSI C funkci strftime." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Formát data nemohl být převeden (možná je příliš dlouhý)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Žádné další zprávy." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Otevřít soubor" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "Zo_brazit" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -411,28 +425,28 @@ "Otevře soubor v režimu pouze pro čtení. Pokud vyberete pro otevření více než " "jeden soubor, všechny budou otevřeny jen pro čtení." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Zjistit podle přípony souboru" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Zjistit podle souboru" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Další volby" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Zobrazovat _skryté soubory" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Nastavit kódování:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -444,11 +458,11 @@ "Pokud otevřete více souborů, všechny budou otevřeny ve zvoleném kódování." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Typ souboru:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -467,25 +481,25 @@ msgid "Filename already exists!" msgstr "Soubor s tímto jménem již existuje!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Uložit soubor" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "_Přejmenovat" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Uložit soubor a přejmenovat ho." # Možná přeložit "tab" jako záložce? nebo okně? Nutné zkontrolovat! -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Otevřít soubor v nové záložce" # Překlad "ponechat" anebo "nechat". Dále "nověji? uložený"? Zkontrolovat! -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -493,41 +507,41 @@ "Ponechat aktuální neuložený dokument otevřený a otevřít nově uložený v nové " "záložce" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Chyba" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Otázka" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Varování" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Informace" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Neukládat" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Soubor '%s' není uložen." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Chcete ho před zavřením uložit?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Vybrat písmo" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -535,106 +549,110 @@ "Nastala chyba nebo informace o souboru nemohla být získána (např. z " "prázdného souboru)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "neznámý" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Vlastnosti" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Velikost:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Umístění:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Jen pro čtení:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(pouze pro Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kódování:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(s BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(bez BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Upraveno:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Změněno:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Poslední přístup:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Oprávnění:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Číst" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Zapisovat" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Spustit" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Vlastník:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Skupina:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Ostatní:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Soubor %s uzavřen." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Nový soubor \"%s\" otevřen." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Soubor %s nemohl být otevřen (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -650,12 +668,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Soubor \"%s\" není platné %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -664,30 +682,30 @@ "Soubor \"%s\" nevypadá jako textový soubor nebo není podporováno jeho " "kódování." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Mezery" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabelátory" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabelátory a mezery" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Nastavuji mód odsazování %s pro %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Neplatný název souboru" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Soubor %s znovu načten." @@ -695,20 +713,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Otevřen soubor %s (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", jen pro čtení" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Chyba při přejmenování souboru." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -716,7 +734,7 @@ msgstr "Nastala chyba při konverzi z UTF-8 do \"%s\". Soubor nebyl uložen." # Lze přeložit také "Chybová zpráva". -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -725,41 +743,41 @@ "Chybové hlášení: %s\n" "Objevila se chyba v \"%s\" (řádek: %d, sloupec: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Chybová zpráva: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Chyba při ukládání souboru." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Chyba při ukládání souboru (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Soubor %s uložen." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nebyl nalezen." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Rozšířit hledání na celý dokument a hledat znovu?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Nebyly nalezeny žádné výskyty \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -767,11 +785,11 @@ msgstr[1] "%s: nahrazeny %d výskyty \"%s\" za \"%s\"." msgstr[2] "%s: nahrazeno %d výskytů \"%s\" za \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Chcete ho znovu načíst?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -780,23 +798,28 @@ "Soubor '%s' na disku je novější než\n" "aktuální otevřený." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Pokusit se soubor znovu uložit ?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Soubor \"%s\" nebyl nalezen!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Zadejte šířku tabelátoru" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Zadejte kolik znaků mezery nahradit znakem tabelátoru" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltské" @@ -907,581 +930,643 @@ msgid "Without encoding" msgstr "Bez kódování" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Západoevropské" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Východoevropské" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Východo_asijské" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_JV a JZ Asie" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Střední Východ" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" # Dále "source file" je také "prvotní soubor". - Obvykle jsou "zdrojáky" psány v jazyce C, ale přeložit "source file" jako "C zdrojový kód" je poněkud unáhlené ... -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s zdrojový soubor" # Dále "source file" je také "prvotní soubor". - Obvykle jsou "zdrojáky" psány v jazyce C, ale přeložit "source file" jako "C zdrojový kód" je poněkud unáhlené ... -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "%s soubor" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Žádné" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell skript" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML dokument" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Kaskádové styly" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL soubor" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Konfigurační soubor" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext jazykový soubor" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s skript" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Programovací Jazyky" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Skriptovací Jazyky" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Značkovací Jazyky" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "_Různé jazyky" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Nastavit _typ souboru" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Všechny soubory se zdrojovým kódem" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Všechny soubory" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Špatný regulární výraz pro souborový typ %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "bezejmenný" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Soubor \"%s\" nebyl nalezen." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "_Výběr barvy" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Soubor" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nový (ze š_ablony)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "neviditelný" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Otevřít označený _soubor" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Nedávné _soubory" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Uložit vš_e" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Znovu načíst s kódování_m" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "neviditelný" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Nastavení Strán_ky" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Zavřít os_tatní soubory" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Zavří_t vše" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Upravit" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Transformovat" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +#, fuzzy +msgid "_Reflow Lines/Block" +msgstr "Přeformátovat řádky/blok" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Změnit _velikost písmen ve výběru" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Přemístit aktuální řádek" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Zakomentovat řádek" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Odkomentovat řádek" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Invertovat za_komentování" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Z_duplikovat řádek nebo výběr" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Odsad_it" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Z_rušit odsazení" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "Poslat výběr do _terminálu" +#: ../src/interface.c:537 ../src/keybindings.c:361 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Chytré odsazení" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Po_slat výběr do" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Příkaz" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Vyjmout aktuální řádek (řádky)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Zkopírovat aktuální řádek (řádky)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Vymazat aktuální řádek (řádky)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "Z_duplikovat řádek nebo výběr" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Vybrat aktuální řádek (řádky)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Vybrat aktuální odstavec" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Vložit alternativní bílé znaky" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Přejít na další značku" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Přejít na předchozí značku" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Poslat výběr do _terminálu" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Vložit _komentáře" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Vložit záznam _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Vložit _hlavičku souboru" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Vložit popis _funkce" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Vložit víceřádkový ko_mentář" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Vložit poznámku o _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Vložit poznámku o _BSD licenci" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Vložit d_atum" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Vložit \"_include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "_Nastavení" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Nastavení" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Hledat" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Najít _další" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Najít v _souborech" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Nahradit" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Najít _označené" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Najít př_edchozí označené" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Další zpráva" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "_Předchozí zpráva" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Jít na _řádek..." -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Změnit _písmo" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Skrýt/zobrazit _všechny ostatní panely" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Celá obrazovka" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Okno _zpráv" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "_Panel nástrojů" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Po_stranní panel" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Okno editoru" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Zobrazit _označovací okraj" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Čísla _řádků" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Zobrazovat _bílé znaky" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Zobrazovat _konce řádků" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Zobrazovat o_dsazení" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Dokument" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Za_lamování řádků" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Rozdě_lování dlouhých řádků" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Automatické odsazování" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Typ O_dsazení" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabelátory" # Možná zvolit jiné písmeno u "Záložky" i "Mezery" (akcelerátor "_"), aby nebylo stejné v rámci jedné nabídky nebo jednoho (dialogového) okna!! -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Mezery" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abelátory a mezery" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "J_en pro čtení" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Zapsat _Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Nastavit _typ souboru" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Nastavit _kódování" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Nastavit uk_ončování řádků" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Převést a nastavit na _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Převést a nastavit na _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Převést a nastavit na CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Odstranit bílé znaky na konci řádků" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Nahradit tabelátory _mezerami" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Nahradit mezery t_abelátory" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Složit vše" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Rozložit vše" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Odstranit _značky" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Odstranit _indikátory chyb" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nový" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Otevřít" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "_Nedávné projekty" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Zavřít" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "Nás_troje" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Přenačíst konfiguraci" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "K_onfigurační soubory" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Výběr barvy" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Počet slov" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Načíst ta_gy" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Přenačíst konfiguraci" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Nápověda" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Webové stránky" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Klávesové zkratky" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Debug zprávy" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symboly" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "_Dokumenty" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Stav" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Překladač" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Zprávy" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Poznámky" -# Zkontrolovat! Má být "Images" opravdu "Ikony" a ne "Obrázky"?! -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Ikony _a text" - -# Zkontrolovat! Má být "Images" opravdu "Ikony" a ne "Obrázky"?! -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Pouze _ikony" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Pouze _text" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Velké ikony" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Malé ikony" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "V_elmi malé ikony" - -# Původní nepřesný překlad zněl "nástrojová lišta". "toolbar" je "panel nástrojů". -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Přizpůsobit panel nástrojů" +#: ../src/interface.c:1887 +#, fuzzy +msgid "_Toolbar Preferences" +msgstr "Nastavení" # Původní nepřesný překlad zněl "nástrojová lišta". "toolbar" je "panel nástrojů". -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Skrýt panel nástrojů" # Další možnost překladu "usage" je "používání". -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Najít po_užití" # Další možnost překladu "usage" je "používání". -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Najít použití v _dokumentu" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Přejít na definici _tagu" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Přejít na deklaraci t_agu" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Konte_xtová akce" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Nastavení" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Načíst soubory z posledního sezení" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Při spuštění otevře soubory, které byly otevřeny při minulém ukončení." -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Načíst podporu virtuálního terminálu" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1489,39 +1574,39 @@ "Zda má být při spuštění nahrán emulátor virtuálního terminálu (VTE). " "Vypněte, pokud jej nepotřebujete." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Zapnout podporu pluginů" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Při spuštění" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Uložit pozici a rozměry okna" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Uloží pozici a rozměry okna a použije je při příštím spuštění" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Potvrzovat ukončení" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Zobrazí potvrzovací okno při ukončení" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Při ukončení" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Výchozí cesta:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1529,19 +1614,19 @@ "Výchozí cesta při otevírání a ukládání souborů. Musí jít o absolutní cestu. " "Ponechte prázdnou, pokud chcete používat aktuální pracovní adresář." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Projektové soubory:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Výchozí cesta při otevírání souborů projektu" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Extra cesta pro pluginy:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1550,29 +1635,29 @@ "Geany hledá v globální instalační cestě a v adresáři s konfigurací. Cesta " "zde zadaná bude prohledávána dodatečně. Pro vypnutí ponechte prázdnou." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Cesty" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Při spuštění" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Pípnout při chybě nebo při dokončení kompilace" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Zda pípnout při výskytu chyby nebo po skončení procesu kompilace." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Přepnout do seznamu stavových zpráv při nové zprávě" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1580,11 +1665,11 @@ "Přepne do záložky stavových zpráv (v dolním okně) při příchodu nové stavové " "zprávy." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Potlačit stavové zprávy ve stavovém řádku" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1592,11 +1677,11 @@ "Nezobrazuje žádné zprávy ve stavovém řádku. Zprávy jsou místo toho " "zobrazovány v okně pro stavové zprávy." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Automaticky zaostřit panely (ohnisko sleduje myš)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1606,15 +1691,25 @@ "editor, poznámkový blok, pole \"hledání\" a \"jdi na řádek\" v panelu " "nástrojů a ve VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Různé" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Vždy hledat v celém dokumentu a skrýt dialogové okno Najít" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1622,11 +1717,11 @@ "Hledání bude vždy rozšířeno na celý dokument a dialogové okno Najít bude " "skryto po kliknutí na Najít další/předchozí" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Použít aktuální slovo pod kurzorem pro dialogové okno Najít" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1634,20 +1729,20 @@ "Použít aktuální slovo pod kurzorem, když je otevřeno dialogové okno Najít, " "Najít v souborech nebo Nahradit a není označen žádný text." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Použít adresář aktuálního souboru pro dialogové okno Najít v souborech" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Hledání" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Používat soubory v sezení dle projektu" # Překlad "session" je i spojení, relace. -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1655,11 +1750,11 @@ "Zda ukládat soubory projektového sezení a otevřít je, když je projekt znovu " "otevřen." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Projektový soubor ukládat v kořenovém adresáři projektu" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1670,75 +1765,99 @@ "soubor ukládán v kořenovém adresáři projektu namísto o adresářovou úroveň " "výš. Tuto cestu přesto můžete změnit v dialogu vytváření Nového projektu." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projekty" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Různé" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Hlavní" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Zobrazovat seznam symbolů" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Zapne nebo vypne zobrazování seznamu symbolů" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Zobrazovat seznam otevřených souborů" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Zapne nebo vypne zobrazování seznamu souborů" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Po_stranní panel" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Popis:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Vlevo" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Vpravo" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Postranní panel" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Seznam symbolů:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Okno zpráv:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Nastavení písma pro okno zpráv" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Nastavení písma pro seznam symbolů" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Nastavení písma editoru" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Písma" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Zobrazovat záložky editoru" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Zobrazovat zavírací tlačítka" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1746,110 +1865,143 @@ "Zobrazuje křížky v záložkách souborů pro jednoduché zavření kliknutím " "(restart Geany nutný)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Umístění nových záložek souborů:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Vlevo" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Nová záložka souboru bude umístěna v seznamu záložek vlevo." -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Vpravo" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Nová záložka souboru bude umístěna v seznamu záložek vpravo." -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Uložit aktuální soubor" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Dvojklikem skrýt všechny ostatní panely" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Volá funkci menu Zobrazit->Skrýt/zobrazit všechny ostatní panely" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Záložky editoru" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Nahoře" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Dole" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Postranní panel:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Umístění záložek" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Zobrazovat stavový řádek" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Zda zobrazovat stavový řádek u spodní hrany okna" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Rozhraní" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Zobrazovat panel _nástrojů" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Připojit panel nástrojů k menu" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Připojit panel nástrojů k hlavnímu menu pro ušetření vertikálního místa" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Panel nástrojů" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Styl ikon:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Velikost ikon:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Vzhled" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Přizpůsobení panelu nástrojů" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +# Zkontrolovat! Má být "Images" opravdu "Ikony" a ne "Obrázky"?! +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Ikony _a text" + +# Zkontrolovat! Má být "Images" opravdu "Ikony" a ne "Obrázky"?! +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Pouze _ikony" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Pouze _text" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Písma" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Malé ikony" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "V_elmi malé ikony" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Velké ikony" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Velikost:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Panel nástrojů" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Panel nástrojů" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Zalamování řádků" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1859,11 +2011,11 @@ "zalamování řádků v dlouhých souborech je pomalé a mělo by být vypnuto na " "slabším hardwaru." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Zapnout \"chytrou\" klávesu home" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1876,11 +2028,11 @@ "začátek rádku. Je-li tato volba vypnuta, stisknutí klávesy HOME posune " "kurzor vždy na začátek aktuálního řádku, nehledě na polohu kurzoru." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Vypnout Drag and Drop" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1888,19 +2040,19 @@ "Úplné vypnutí drag and drop v okně editoru, takže nebude možné přesunovat " "označený text myší." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Povolit skládání bloků kódu" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Zda povolit skládání bloků kódu" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Při rozbalení složeného kódu rozbalit i vnořené" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1908,11 +2060,11 @@ "Sbalit/rozbalit všechny potomky bloku skládání. Kliknutím na symbol skládání " "se současným stiskem klávesy Shift je docíleno opačného chování." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Používat indikátory k zobrazení chyb při kompilaci" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1920,24 +2072,24 @@ "Zobrazování indikátorů (vlnovité podtržení) ke zvýraznění řádků, u kterých " "překladač oznámil varování nebo chybu." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Nová řádka odstraní mezery na konci řádku" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Při vytvoření nové řádky odstraňuje bílé znaků na konci předchozí řádky" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Rozdělovat řádky delší než:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Označení přepínacího komentáře:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1945,95 +2097,87 @@ "Řetězec, který je přidán při zakomentování řádku ve zdrojovém kódu " "přepnutím, je používán k indikaci toho, že jde o přepínací komentář." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Vlastnosti" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Vlastnosti" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Mód automatického odsazování:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Základní" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Současné znaky" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Přejít na odpovídající závorku" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Šířka:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Šířka jednoho odsazení ve znacích" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Používat mezery při vkládání odsazení" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Používat jeden tabelátor na jedno odsazení" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Používat mezery pokud je celkové odsazení menší než šířka tabelátoru, jinak " "používat kombinaci obojí" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Šířka tabelátoru:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Šířka tabelátoru při použití volby Tabelátory a mezery" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Zda detekovat typ odsazování z obsahu souboru po jeho otevření." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Klávesa tabelátor odsazuje" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Stisknutí tab/shift-tab odsadí/smaže odsazení namísto vkládání znaku " "tabelátoru" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Odsazování" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Odsazování" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Doplňování kousků kódu" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2041,20 +2185,20 @@ "Napište uživatelsky definovanou krátkou znakovou sekvenci a doplňte ji na " "komplexnější řetězec pomocí jediného stisknutí tlačítka" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Autokompletace XML značek" # completion=doplňování? -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Automatické doplňování a uzavírání XML tagů (včetně HTML tagů)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Automatické pokračování víceřádkových komentářů" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2062,11 +2206,11 @@ "Automatické pokračování víceřádkových komentářů v jazycích jako C, C++ a " "Java v okamžiku vložení nového řádku uprostřed psaní komentáře" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Autokompletace symbolů" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2074,142 +2218,139 @@ "Automatické doplňování známých symbolů v otevřených souborech (názvy funkcí, " "globální proměnné, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Autokompletace všech slov v dokumentu" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Po kompletaci zahodit zbytek slova" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Maximální počet navržených symbolů" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Výška seznamu doplňování:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Počet napsaných znaků pro doplňování" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Počet znaků potřebných k zobrazení seznamu automatického doplňování" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Počet viditelných řádků v seznamu automatické kompletace." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Maximální počet položek v seznamu automatické kompletace" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Automatické doplňování" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Závorky ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automaticky zavírat závorku po napsání levé" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Jednoduché uvozovky ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Automaticky zavírat jednoduchou uvozovku po napsání levé" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Složené závorky { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automaticky zavírat složenou závorku po napsání levé" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Hranaté závorky [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Automaticky zavírat hranatou závorku po napsání levé" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Dvojité uvozovky \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Automaticky zavírat dvojitou uvozovku po napsání levé" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Automatické zavírání uvozovek a závorek" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Doplňování" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Invertovat barvy pro zvýraznění syntaxe" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Používat bílý text na černém pozadí a invertovat všechny barvy, tato volba " -"vyžaduje restart programu Geany" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Použít bílý text na černém podkladu." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Zobrazovat odsazení" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Zobrazí malé tečkované čáry, které mohou pomoci používat správné odsazení." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Zobrazovat bílé znaky" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Označí mezery tečkami a tabelátory šipkami." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Zobrazovat konce řádků" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Zobrazí znak konce řádku" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Zobrazovat čísla _řádků" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Zobrazení nebo skrytí okraje s čísly řádků" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Zobrazovat označovací okraj" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2217,36 +2358,38 @@ "Zobrazení nebo skrytí malého okraje vpravo od čísel řádků, který se používá " "k označování řádků" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Zastavit rolování na posledním řádku" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Zda zastavit rolování stránku za poslední řádek dokumentu" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Zobrazení" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Označení pravého okraje:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Barva označení pravého okraje:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Společnost:" + +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Barva" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Nastaví barvu pravého okraje" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Výběr barvy" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2256,21 +2399,21 @@ "jako nápověda pro přerušení řádku. Nastavte tuto hodnotu větší než 0 pro " "určení sloupce, kde se okraj objeví." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Čára" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "Zobrazí svislou čáru v okně editoru na dané pozici kurzoru (viz dole)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Pozadí" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2279,110 +2422,147 @@ "Barva pozadí znaků za danou pozicí kurzoru (viz dole) se změní na níže " "nastavenou barvu. (Doporučeno, pokud používáte proporciální písmo.)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Vypnuto" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Povolit" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Pravý okraj" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Vypnuto" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Odstraní mezery a tabelátory na konci řádků" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Cesty k nástrojům" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Zobrazení" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Otevřít nové dokumenty z příkazové řádky" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Otevře nový soubor pro každý argument spuštění z příkazové řádku, pro který " "neexistuje soubor" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Výchozí znaky ukončení řádku:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nové soubory" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Nastaví výchozí kódování pro nově vytvořené soubory." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Výchozí kódování (nových souborů):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Výchozí kódování (existujících souborů):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Nastaví výchozí kódování pro otevírání existujících souborů." +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Nastaví výchozí kódování pro nově vytvořené soubory." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Použít pevně nastavené kódování při otevírání souborů" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Tato volba zakáže automatickou detekci kódování otevíraných souborů. Soubory " "se otevírají se zadaným kódováním (většinou není potřebné)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Výchozí kódování (existujících souborů):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Nastaví výchozí kódování pro otevírání existujících souborů." + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Kódování:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Vkládat nový řádek na konec souboru" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Zajistí, že soubor bude končit znakem nového řádku" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Odstranit mezery a tabelátory na konci řádků" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Odstraní mezery a tabelátory na konci řádků" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Nahrazovat tabelátory mezerami" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Nahradí všechny tabelátory v dokumentu mezerami" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Ukládání souborů" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Délka seznamu nedávných souborů:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Počet souborů, které budou zobrazeny v seznamu Nedávné soubory." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Interval kontroly změn souborů na disku" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2390,27 +2570,20 @@ "Jak často kontrolovat změny souborů na disku, v sekundách. Nulová hodnota " "vypne kontrolování." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Soubory" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminál:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Webový prohlížeč:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Cesta a volby pro nástroj make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2418,23 +2591,23 @@ "Emulátor terminálu, jako např. xterm, gnome-terminal nebo konsole (měl by " "přijímat argument -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Cesta (a případné volby) k vašemu oblíbenému prohlížeči" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Cesty k nástrojům" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Kontextová akce:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2444,67 +2617,67 @@ "Příkaz kontextové akce. Aktuálně označené slovo může být použito s %s. Může " "být použito kdekoli v daném příkazu a bude nahrazeno před spuštěním." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Příkazy" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Nástroje" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "Emailová adresa vývojáře" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Iniciály jména vývojáře" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Výchozí verze:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Číslo verze, které bude mít zpočátku nový soubor" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Název společnosti" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Jméno:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Společnost:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Emailová adresa:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Iniciály:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Jméno vývojáře" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Rok:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Datum a čas" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2512,7 +2685,7 @@ "Zadejte formát pro {datetime} symbol šablony. Můžete použít stejné konverzní " "specifikátory jako v ANSI C funkci strftime." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2520,7 +2693,7 @@ "Zadejte formát pro {year} symbol šablony. Můžete použít stejné konverzní " "specifikátory jako v ANSI C funkci strftime." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2528,65 +2701,65 @@ "Zadejte formát pro {date} symbol šablony. Můžete použít stejné konverzní " "specifikátory jako v ANSI C funkci strftime." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Umístění šablon" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Šablony" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Změnit" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Klávesové zkratky" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Přiřazení kláves" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Příkaz:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Cesta k příkazu pro tisk souborů (použijte %f pro název souboru)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Pro tisk používat externí příkaz" # Nepřesný překlad zněl jen "Čísla řádků", zkontrolovat! -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Tisknout čísla řádků" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Přidat čísla řádků k tištěné stránce." # Původní nepřesný překlad: "Čísla _řádků". -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Tisknout čísla stránek" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Přidat číslo stránky na konec každé stránky, používá 2 řádky na stránce" # Původní nepřesný překlad: "Základní hlavička:". -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Tisknout hlavičku stránky" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2594,19 +2767,19 @@ "Přidá na každou stránku hlavičku s číslem stránky, názvem souboru a " "aktuálním datem (viz dole). Používá 3 řádky na stránce." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Pouze jméno tisknutého souboru" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Tisknout pouze jméno souboru tisknutého dokumentu (bez cesty)" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Formát data:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2615,552 +2788,580 @@ "Zadejte formát data a času pro přidání do tisknuté hlavičky. Můžete použít " "stejné konverzní specifikátory jako v ANSI C funkci strftime." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Používat nativní tisk GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Kódování:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Tisk" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Vlastnosti projektu" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Zobrazení" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Vyjmout" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Soubor" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nový" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Otevřít" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Otevřít zvolený soubor" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Uložit" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Uložit jako" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Uložit vše" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Vytisknout" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Zavřít" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Zavřít vše" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Znovu načíst soubor" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Vlastnosti projektu" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Zpět" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Znovu" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Zduplikovat řádek nebo výběr" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Vymazat aktuální řádek (řádky)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Vymazat do konce řádku" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Přemístit aktuální řádek" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Přejít k aktuálnímu řádku" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Rolovat nahoru o jeden řádek" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Rolovat dolů o jeden řádek" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Doplnit kousek kódu" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Přesunout kurzor dovnitř kousku kódu" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Zakázat kompletaci kousku kódu" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Kontextová akce" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Dokončit slovo" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Zobrazit calltip" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Zobrazit seznam maker" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Doplňování kousků kódu" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Zakomentovat řádek" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Zakomentovat řádek" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Schránka" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Vyjmout" # Původní nepřesný překlad: "Společnost:". -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopírovat" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Vložit" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Zkopírovat aktuální řádek (řádky)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Vyjmout aktuální řádek (řádky)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Vybrat" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Vybrat vše" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Vybrat aktuální slovo" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Vybrat aktuální řádek (řádky)" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Přejít na předchozí část slova" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Vybrat aktuální odstavec" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Přejít na další část slova" # Původní nepřesný překlad zněl "_Transformovat". -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Formát" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Změnit výšku písmen ve vybraném textu" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Přepínací řádkový komentář" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Zakomentovat řádek" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Odkomentovat řádek" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Odsadit" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Zrušit odsazení" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Odsadit o jednu mezeru" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Zmenšit odsazení o jednu mezeru" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Chytré odsazení" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Použít Vlastní příkaz 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Použít Vlastní příkaz 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Použít Vlastní příkaz 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Poslat výběr do terminálu" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "Přeformátovat řádky/blok" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Vložit" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Vložit datum" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Vložit alternativní bílé znaky" - # Původní nepřesný překlad je "Sekce". -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Nastavení" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Hledat" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Najít" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Najít další" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Najít předchozí" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Najít další výběr" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Najít předchozí výběr" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Nahradit" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Najít v souborech" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Další zpráva" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Předchozí zpráva" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Najít použití" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Najít použití v dokumentu" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Označit všechny výskyty" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Přejít na" # Překlad "location" může být i umístění, paměťové místo, adresa, vyhledávání. Zkontrolovat (také překlad "Navigate")! -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Navigovat na adresu zpět" # Překlad "location" může být i umístění, paměťové místo, adresa, vyhledávání. Zkontrolovat (také překlad "Navigate")! -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Navigovat na adresu vpřed" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Přejít na odpovídající závorku" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Označit řádek" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Přejít na další značku" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Přejít na předchozí značku" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Přejít na definici" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Přejít na deklaraci" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Přejít na začátek řádku" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Přejít na konec řádku" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Přejít na konec zobrazené části řádku" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Přejít na předchozí část slova" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Přejít na další část slova" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Zobrazit" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Skrýt/zobrazit všechny ostatní panely" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Celá obrazovka" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Zobrazit/skrýt okno zpráv" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Zobrazit/skrýt postranní panel" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Zvětšit" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Zmenšit" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Zmenšit" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Fokus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Přepnout do editoru" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Přepnout na Poznámky" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Přepnout do terminálu" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Přepnout na Vyhledávání" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Přepnout na postranní panel" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Přepnout na překladač" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Přepnout na postranní panel" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Okno _zpráv" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Přepnout na dokument" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Přepnout na postranní panel" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Záložky dokumentů" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Přejít do levého dokumentu" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Přejít do pravého dokumentu" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Přejít do předchozího dokumentu" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Posunout dokument doleva" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Posunout dokument doprava" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Posunout dokument na začátek" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Posunout dokument na konec" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Přepnout zalamování řádků" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Přepnout rozdělování dlouhých řádků" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Nahradit mezery tabelátory" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Sbalit/rozbalit aktuální blok" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Složit vše" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Rozložit vše" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Obnovit seznam symbolů" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Odstranit _značky" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Odstranit _indikátory chyb" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Sestavit" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Přeložit" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make vlastní cíl" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make objekt" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Další chyba" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Předchozí chyba" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Spustit" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Spustit (alternativní příkaz)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Volby sestavení" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Zobrazit Výběr barev" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Nápověda" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Klávesové zkratky" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Následující klávesové zkratky jsou konfigurovatelné:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Přepnout na dokument" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Pište sem cokoliv, použijte toto jako poznámkový blok." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Chyba při otevírání jednoho či více souborů sezení." @@ -3168,7 +3369,12 @@ msgid "Debug Messages" msgstr "Debug zprávy" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Hledat" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3176,84 +3382,93 @@ "Nastavit výchozí počet sloupců pro poprvé otevřené soubory (užitečné ve " "spojení s --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Použít alternativní konfigurační adresář" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Upovídaný mód" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Vypisovat interní názvy typů souborů" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Generovat globální soubor tagů (viz dokumentaci)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Zakázat C/C++ preprocesor při generování vlastního souboru tagů" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Pro otevření souborů vytvořit novou instanci programu" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Nastavit výchozí počet řádek pro poprvé otevřené soubory" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Nezobrazovat po startu okno se zprávami" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Nenahrávat autokompletační data (viz dokumentace)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Nenahrávat pluginy" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Vypsat prefix Geany instalace" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Neotevírat soubory z posledního sezení" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Nenahrávat podporu terminálu" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Cesta k souboru libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Upovídaný mód" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Vypsat číslo verze a ukončit" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[SOUBORY...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(sestaveno %s s GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Přesunout nyní ?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany potřebuje před startem přesunout váš starý konfigurační adresář." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3262,7 +3477,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3271,7 +3486,7 @@ "Váš starý konfigurační adresář \"%s\" nemohl být přesunut do \"%s\" (%s). " "Přesuňte prosím adresář na nové místo manuálně." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3282,38 +3497,44 @@ "Mohly by se vyskytnout problémy při používání Geany bez tohoto adresáře.\n" "Chcete přesto spustit Geany?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Soubor \"%s\" nebyl nalezen." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Vítejte v Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurační adresář nemohl být vytvořen (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Konfigurační soubory přenačteny." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Stavové zprávy" -#: ../src/msgwindow.c:515 +# Původní nepřesný překlad: "Společnost:". +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Kopírovat" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Kopírovat _vše" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Skrýt okno zpráv" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Odstranění všech indikátorů chyb v aktuálním dokumentu" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3322,11 +3543,11 @@ "Plugin \"%s\" není binárně kompatibilní s touto verzí Geany - překompilujte " "jej, prosím." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "_Správce pluginů" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3337,82 +3558,90 @@ "Popis: %s\n" "Autoři: %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Aktivní" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Žádné pluginy k dispozici." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Pluginy" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Zde je seznam dostupných pluginů. Zvolte pluginy, které mají být načteny při " -"startu Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Detaily o pluginu" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Zadání klávesové zkratky" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Stiskněte kombinaci kláves, kterou chcete použít pro \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Rozbalit vše" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "_Sbalit vše" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Akce" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Zkratka" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Přepsat" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Přepsat tuto klávesovou zkratku ?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Kombinace '%s' je již použita pro \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminál" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Zadejte cesty k nástrojům.\n" "Pokud nástroj nepotřebujete, nechte prázdné." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3420,7 +3649,7 @@ "Zadejte údaje, které chcete použít v šablonách.\n" "Pro detaily viz dokumentaci." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3431,7 +3660,7 @@ "konfiguraci." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3442,7 +3671,7 @@ "textové reprezentace zkratky." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3452,7 +3681,7 @@ "s GTK 2.10 (nebo vyšší verzí)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3469,46 +3698,45 @@ msgstr "Text bude nekorektně rozhozen." # Původní nepřesný překlad byl "Změněno:". -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Stránka %d z %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Nastavení dokumentu" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Tisknout pouze jméno souboru tisknutého dokumentu (bez cesty)" # Původní nepřesný překlad byl "Změněno:". -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Stránka %d z %d" -# Původní nepřesný překlad byl "tisk souboru ... selhal." -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Tisk souboru %s byl ukončen." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Soubor %s byl vytištěn." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Tisk souboru %s selhal (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Nejdříve nastavte příkaz k tisku v okně nastavení" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3519,38 +3747,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Tisk souboru \"%s\" selhal (návratový kód: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Soubor %s byl vytištěn." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projekty" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Nový projekt" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "_Vytvořit" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Název:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Soubor projektu:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Základní cesta:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3560,123 +3793,117 @@ "novou cestu nebo o již existující strom adresářů. Můžete použít cestu " "relativní k projektovému souboru." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Zvolte základní cestu projektu" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Soubor projektu \"%s\" nemohl být načten." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Otevřít projekt" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Soubory projektu" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" zavřen." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Popis:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Sestavit v základní cestě" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Příkaz pro spuštění:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Sect1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Příkaz pro spuštění v adresáři projektu. K příkazu mohou být připojeny " -"argumenty. Ponechejte prázdné pro výchozí hodnotu." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Vzor souborů:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Chcete ho před pokračováním zavřít?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Projekt '%s' je již otevřen." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Zadaný název projektu je příliš krátký." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Zadaný název projektu je příliš dlouhý (max. %d znaků)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Zadali jste neplatný název souboru projektu." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Vytvořit adresář projektu?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Cesta \"%s\" neexistuje." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Kořenový adresář projektu nemohl být vytvořen (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Soubor projektu nemohl být zapsán (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" vytvořen." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" uložen." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Zvolte soubor projektu" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Zvolte příkaz pro spuštění projektu" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" otevřen." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Použít _regulární výrazy" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3684,15 +3911,15 @@ "Použití POSIXových regulárních výrazů. Pro detailní informace o jejich " "použití nahlédněte do dokumentace." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Hledat zpě_tně" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Použít _escape sekvence" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3700,126 +3927,126 @@ "Nahradit \\\\, \\t, \\n, \\r a \\uXXXX (Unicode znaky) odpovídajícími " "kontrolními znaky." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Rozlišovat _velikost písmen" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Hledat pouze _celé slovo" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Hledat od _začátku slova" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Předchozí" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Následující" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Hledat:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Najít vše" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "Oz_načit" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Označit všechny výskyty v aktuálním dokumentu." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "Ve všech _otevřených souborech" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "V _dokumentu" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Z_avřít okno" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Vypněte tuto volbu pro zachování tohoto okna otevřeného." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Nahra_dit a najít" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Nahradit z_a:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Nahra_dit vše" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "_Ve výběru" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Nahradí všechny výskyty v aktuálně označeném textu" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Adresář:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "_Kódování:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "_Jednoduché řetězce" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Regulární výrazy _grepu" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Pro více informací viz manuál programu grep." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Rozšířené _regulární výrazy" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_Rekurzivně v podadresářích" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Obrátit výsledky hledání" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Obrácení smyslu hledání, k označení nevyhovujících řádků." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "_Dodatečné volby:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Další volby grepu" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -3827,47 +4054,44 @@ msgstr[1] "Nalezeny %d výskyty \"%s\"." msgstr[2] "Nalezeno %d výskytů \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Text nahrazen v %u souboru." -msgstr[1] "Text nahrazen v %u souborech." -msgstr[2] "Text nahrazen v %u souborech." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Nahradit text v aktuálním dokumentu." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Neplatný adresář pro hledání souborů." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Žádný text k prohledání." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Nemohu spustit nástroj grep '%s'; zkontrolujte nastavení cest v Nastavení." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Hledám..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (v adresáři: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Adresář nemohl být otevřen (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Hledání selhalo (detaily viz menu Nápověda->Debug zprávy)" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Hledání selhalo." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3875,238 +4099,262 @@ msgstr[1] "Hledání dokončeno s %d nalezenými výskyty." msgstr[2] "Hledání dokončeno s %d nalezenými výskyty." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Žádné výskyty nebyly nalezeny." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Špatný regulární výraz pro souborový typ %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Kapitola" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sekce" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Appendix" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Ostatní" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Moduly" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Typy" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Konstruktory typů" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funkce" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Sekce" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Klíče" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Proměnné" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Příkaz" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Prostředí" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Podsekce" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Podpodsekce" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Label" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Struktury" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Balíček" -#: ../src/symbols.c:655 -msgid "My" -msgstr "My" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +# Basic, ASM +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Návěští" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Konstanty" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Rozhraní" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Třídy" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Konstanty" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1 hlavičky" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2 hlavičky" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3 hlavičky" # CSS -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID selektory" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Typové selektory" # Ruby -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Moduly" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletony" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Metody" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namespaces" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Procedury" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Importy" +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "bezejmenný" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Struktury" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Procedury" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Proměnné" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Funkce" + # Java atd. -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "" -# Basic, ASM -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Návěští" - # Fortran -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Podrutiny" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Bloky" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Makra" # ASM -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "" # Makefiles -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Cíle" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Struktury" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Neznámý tep souboru pro příponu \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Selhalo vytvoření souboru tagů, možná proto, že žádné tagy nebyly nalezeny.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4115,7 +4363,7 @@ "Použití: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4126,163 +4374,181 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Načíst tagy" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany soubor tagů (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Načten soubor %s tagů '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Nemohl být načten soubor tagů \"%s\"." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Deklarace \"%s\" nebyla nalezena." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definice \"%s\" nebyla nalezena." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Setřídit podle _názvu" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Setřídit podle _pořadí v souboru" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Uložit aktuální soubor" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Uložit všechny otevřené soubory" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Znovu načíst aktuální soubor z disku" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Zavřít aktuální soubor" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Zavřít všechny otevřené soubory" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Vyjmout označený text" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Kopírovat označený text" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Vložit obsah schránky" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Vymazat označený text" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Vrátí zpět poslední akci" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Provede znovu vrácenou akci" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Přeloží (zkompiluje) aktuální soubor" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Spustit nebo zobrazit aktuální soubor" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Otevřít okno výběru barev, pro interaktivní výběr barev z palety" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Zvětšit text" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Zmenšit text" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Zmenšit odsazení" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Zvětšit odsazení" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Hledat zadaný řetězec v aktuálním souboru" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Přejít na zadané číslo řádku" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Zobrazit okno nastavení" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Ukončí Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Tisknout dokument" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Nahradit text v aktuálním dokumentu." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Vytvořit nový soubor" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Vytvořit nový soubor" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Otevřít existující soubor" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Otevřít zvolený soubor" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Žádné další chyby sestavení." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Přejít na" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Oddělovač" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Oddělovač ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4290,11 +4556,11 @@ "Vyberte položky k zobrazení v panelu nástrojů. Položky mohou být seřazeny " "přetahováním." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Položky k dispozici" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Zobrazené položky" @@ -4321,7 +4587,7 @@ msgid "Custom command failed: %s" msgstr "Vlastní příkaz selhal: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Nastavit vlastní příkazy" @@ -4333,194 +4599,186 @@ "Můžete poslat aktuálně vybraný text jakémukoli z těchto příkazů, výstup " "příkazu nahradí aktuální výběr." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Žádné vlastní příkazy nejsou definovány." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Počet slov" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "výběr" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "celý dokument" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Rozsah:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Řádky:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Slova:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Znaky:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Nenalezeny žádné tagy" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Zobrazovat seznam _symbolů" # Původní nepřesný překlad byl "Zobrazovat seznam otevřených souborů". -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Zobrazovat s_eznam dokumentů" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "S_krýt postranní panel" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Zobrazovat _cesty" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "řádek: %d\t sloupec: %d\t výběr: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "PŘE" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "VLO" # indentation TAB = tabulators, SP = spaces -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "MEZ" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/M" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "mód: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "kódování: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "typ souboru: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "ZMĚ" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "rámec: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Písmo aktualizováno (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Nastavit vlastní formát data" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Vybrat složku" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Vybrat soubor" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "K_onfigurační soubory" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Uložit vš_e" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Zavřít vše" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminál" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Nastavit _cestu z dokumentu" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Restartovat terminál" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Vstupní _metody" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4528,102 +4786,90 @@ "V terminálu se nepodařilo se změnit adresář, pravděpodobně je spouštěn " "příkaz nebo není vstupní řádka prázdná" -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Plugin terminálu" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Tato nastavení emulátoru virtuálního terminálu (VTE) budou aplikovány pouze " -"pokud knihovna VTE bude moci být nahrána." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Písmo terminálu:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Nastaví písmo terminálu." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Barva textu:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Barva pozadí:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Nastaví barvu textu v okně terminálu." -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Nastaví barvu pozadí v okně terminálu." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Řádků pro rolování:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Nastaví počet řádků, které můžete v terminálu zpětně zobrazit." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Nastaví cestu k shellu, který se má spouštět v emulátoru terminálu." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Rolovat při stisku klávesy" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Zda při stisku klávesy rolovat okno terminálu na konec" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Rolovat při výstupu" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Zda při každém generování výstupu rolovat okno terminálu na konec" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Blikající kurzor" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Zda nastavit blikání kurzoru" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Ignorovat klávesové zkratky Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Povolí terminálu zachytávat klávesové zkratky (kromě zkratek nastavení " "fokusu)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Zrušení klávesové zkratky pro menu (standardně F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4633,22 +4879,22 @@ "klávesa F10). Toto nastavení může být užitečné například pro ovládání " "Midnight Commanderu uvnitř VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Následovat cestu aktuálního otevřeného souboru" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Zda provádět příkaz \"cd $cesta\" při přepínání mezi otevřenými soubory." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Nepoužívat spouštěcí skript" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4656,11 +4902,11 @@ "Nepoužívat jednoduchý spouštěcí skript, který obvykle zobrazuje výsledný " "stavový kód spouštěného programu" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Spouštět programy v emulátoru terminálu" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4668,90 +4914,123 @@ "Programy budou spouštěny v emulátoru terminálu místo v nově otevřeném okně " "terminálu. Pozor, programy spuštěné v terminálu nemohou být zastaveny." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany soubor projektu" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Spustitelné" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Tvořič tříd" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Vytváří zdrojové soubory pro nové třídy." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Vytvořit třídu" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Třída" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Název třídy:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Hlavičkový soubor:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Zdrojový soubor:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Dědičnost" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Základní třída:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Haskell zdrojový kód" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Základní hlavička:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Globální" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Základní GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Volby" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Vytvořit konstruktor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Vytvořit destruktor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Singletony" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ typ konstruktoru" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "_Vytvořit třídu" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ třída" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ třída" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "_C++ třída" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML znaky" @@ -4761,52 +5040,57 @@ msgstr "Vkládat HTML znakové entity jako '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Tým vývojářů Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML znaky" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 znaky" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Řecké znaky" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Matematické symboly" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Technické symboly" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Šipky" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Interpunkce" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Různé znaky" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Konfigurační adresář pluginu nemohl být vytvořen." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Speciální znaky" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "Vlož_it" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4814,40 +5098,40 @@ "Vyberte speciální znak ze seznamu a dvakrát na něj klikněte nebo použijte " "tlačítko pro vložení znaku na aktuální pozici kurzoru." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Znak" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (entita)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Vložit _speciální HTML znak" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML nahrazení" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_Zapnuto" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Nahradit speciální znaky" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Vložit speciální HTML znaky" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Nahradit speciální znaky" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Přepnout stav pluginu" @@ -4873,105 +5157,105 @@ msgstr "" "Nastaví velikost písma exportovaného dokumentu podle současné úrovně zvětšení" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument byl úspěšně exportován jako '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Soubor '%s' nemohl být zapsán (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Soubor '%s' již existuje. Chcete ho přepsat?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Export" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Jako _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Jako _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Prohlížeč souborů" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Připojí záložku prohlížeče souborů k postranní liště" -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Vybráno příliš mnoho položek !" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Spuštění externího příkazu '%s' selhalo (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Otevřít _externě" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Najít v souborech" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Zobrazovat _skryté soubory" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "O úroveň výš" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Obnovit" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Domovská složka" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Adresář otevřeného dokumentu" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Vymazat filtr" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtr:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Fokus seznamu souborů" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Fokus řádku s cestou" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Konfigurační adresář pluginu nemohl být vytvořen." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Příkaz externího otevření:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4985,15 +5269,15 @@ "%f bude nahrazeno názvem souboru včetně cesty\n" "%d bude nahrazeno cestou k vybranému souboru bez samotného jména souboru" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Zobrazovat skryté soubory" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Skrýt objektové soubory" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5001,11 +5285,11 @@ "Nezobrazovat v prohlížeči vygenerované objektové soubory, zahrnuje soubory s " "příponami *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Následovat kořenový adresář projektu" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Měnit adresář podle kořenového adresáře aktuálně otevřeného projektu" @@ -5113,37 +5397,200 @@ msgid "Splits the editor view into two windows." msgstr "Rozdělí okno editoru na dvě části" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Zobrazit aktuální dokument" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Zrušit rozdělení" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Rozdělení okna" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontálně" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Vertikálně" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Rozdělit horizontálně" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Rozdělit vertikálně" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Zrušit rozdělení" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Nastavit _Include a argumenty" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_Zobrazit soubor DVI" + +#~ msgid "V_iew PDF File" +#~ msgstr "Zobraz_it PDF soubor" + +#~ msgid "_Set Arguments" +#~ msgstr "_Nastavit argumenty" + +#~ msgid "Set Arguments" +#~ msgstr "Nastavit argumenty" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "Nastavte program a volby pro přeložení a zobrazení (La)TeX souborů." + +#~ msgid "DVI creation:" +#~ msgstr "Tvorba DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Tvorba PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Náhled DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Náhled PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f bude nahrazeno celým názvem souboru, např. test_file.c\n" +#~ "%e bude nahrazeno názvem souboru bez přípony, např. test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Nastavení Include a argumentů" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Nastavte příkazy pro sestavení a spouštění programů." + +#~ msgid "Compile:" +#~ msgstr "Přeložit:" + +#~ msgid "Build:" +#~ msgstr "Sestavit:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Selhalo spuštění zobrazovacího programu." + +#~ msgid "Try to resave the file?" +#~ msgstr "Pokusit se soubor znovu uložit ?" + +# Původní nepřesný překlad zněl "nástrojová lišta". "toolbar" je "panel nástrojů". +#~ msgid "_Customize Toolbar" +#~ msgstr "_Přizpůsobit panel nástrojů" + +#~ msgid "Icon style:" +#~ msgstr "Styl ikon:" + +#~ msgid "Icon size:" +#~ msgstr "Velikost ikon:" + +#~ msgid "Appearance" +#~ msgstr "Vzhled" + +#~ msgid "Hard tab width:" +#~ msgstr "Šířka tabelátoru:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "Šířka tabelátoru při použití volby Tabelátory a mezery" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Používat bílý text na černém pozadí a invertovat všechny barvy, tato " +#~ "volba vyžaduje restart programu Geany" + +#~ msgid "Long line marker:" +#~ msgstr "Označení pravého okraje:" + +#~ msgid "Long line marker color:" +#~ msgstr "Barva označení pravého okraje:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Cesta a volby pro nástroj make" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Zduplikovat řádek nebo výběr" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Poslat výběr do terminálu" + +#~ msgid "Run (alternative command)" +#~ msgstr "Spustit (alternativní příkaz)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Zde je seznam dostupných pluginů. Zvolte pluginy, které mají být načteny " +#~ "při startu Geany." + +# Původní nepřesný překlad byl "tisk souboru ... selhal." +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Tisk souboru %s byl ukončen." + +#~ msgid "Make in base path" +#~ msgstr "Sestavit v základní cestě" + +#~ msgid "Run command:" +#~ msgstr "Příkaz pro spuštění:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Příkaz pro spuštění v adresáři projektu. K příkazu mohou být připojeny " +#~ "argumenty. Ponechejte prázdné pro výchozí hodnotu." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Zvolte příkaz pro spuštění projektu" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Text nahrazen v %u souboru." +#~ msgstr[1] "Text nahrazen v %u souborech." +#~ msgstr[2] "Text nahrazen v %u souborech." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Hledání selhalo (detaily viz menu Nápověda->Debug zprávy)" + +#~ msgid "My" +#~ msgstr "My" + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Our" +#~ msgstr "Our" + +#~ msgid "Terminal plugin" +#~ msgstr "Plugin terminálu" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Tato nastavení emulátoru virtuálního terminálu (VTE) budou aplikovány " +#~ "pouze pokud knihovna VTE bude moci být nahrána." + +#~ msgid "Terminal font:" +#~ msgstr "Písmo terminálu:" + +#~ msgid "Unsplit" +#~ msgstr "Zrušit rozdělení" #~ msgid "Diff file" #~ msgstr "Diff soubor" @@ -5309,9 +5756,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Rozložení všech složených bloků kódu" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Odstranění všech indikátorů chyb v aktuálním dokumentu" - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5323,9 +5767,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Zobrazí seznam všech klávesových zkratek v Geany" -#~ msgid "Color" -#~ msgstr "Barva" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Zadejte číslo řádku, na který chcete přejít" @@ -5414,15 +5855,9 @@ #~ msgid "Items" #~ msgstr "Položky" -#~ msgid "Use white text on a black background." -#~ msgstr "Použít bílý text na černém podkladu." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Spuštění v debug módu (upovídaný režim)" -#~ msgid "Search failed." -#~ msgstr "Hledání selhalo." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Nebyl nalezen soubor pixmap: %s" @@ -5559,9 +5994,6 @@ #~ msgid "Ferite source file" #~ msgstr "Ferite zdrojový kód" -#~ msgid "Haskell source file" -#~ msgstr "Haskell zdrojový kód" - #~ msgid "Docbook source file" #~ msgstr "Docbook soubor" @@ -5656,10 +6088,6 @@ #~ msgid "Do you want to save all opened files before processing?" #~ msgstr "Chcete ho před zavřením uložit?" -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "_Adresář:" - #~ msgid "Convert Selection to _Lower-case" #~ msgstr "Převést výběr na _malá písmena" diff -Nru geany-0.18/po/de.po geany-0.19/po/de.po --- geany-0.18/po/de.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/de.po 2010-06-03 22:12:47.000000000 +0100 @@ -1,19 +1,19 @@ # German translations for geany package. -# Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2006-20010 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # Enrico Tröger 2006 - 2009 -# Frank Lanitz 2006 - 2009 +# Frank Lanitz 2006 - 2010 # Dominic Hopf 2008 - 2009 # # Basic guidelines for this translation: http://i18n.xfce.org/wiki/team_de # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-16 01:11+0100\n" -"Last-Translator: Dominic Hopf \n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-05-22 01:01+0100\n" +"Last-Translator: Frank Lanitz \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -27,7 +27,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -35,53 +35,53 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(kompiliert am %s oder später)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -89,15 +89,15 @@ "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " "detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Credits" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Lizenz" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -105,279 +105,283 @@ "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www." "gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in " -"den Einstellungen überprüfen)" +msgid "failed to substitute %%p, no project active" +msgstr "konnte %%p nicht ersetzen. Kein Projekt aktiv." + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Ausführung fehlgeschlagen. Kein Arbeitsverzeichnis gefunden." -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" +msgid "%s (in directory: %s)" +msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (im Verzeichnis: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Konnte nicht in das Arbeitsverzeichnis »%s« wechseln" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein " "Befehl auf der Kommandozeile." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in " +"den Einstellungen überprüfen)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Kompilierung fehlgeschlagen." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Kompilierung erfolgreich beendet." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Kompilieren" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Erstellen" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make all" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make (eigenes _Target)" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Freitext" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _Objekt-Datei" +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " +"wird." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Nächster _Fehler" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "_Vorheriger Fehler" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Include-Parameter und Argumente angeben" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_DVI-Datei anzeigen" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "_PDF-Datei anzeigen" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "_Kommandos zum Erstellen konfigurieren" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Programm-Parameter angeben" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Kompiliert die aktuelle Datei" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Programmparameter angeben" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Kompiliert die aktuelle Datei mit »make« und dem Standard-Target" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" -"TeX-Dateien." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Kompiliert die aktuelle Datei mit »make« und dem angegebenem Target" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI-Erstellung:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Kompiliert die aktuelle Datei mit make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF-Erstellung:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI-Vorschau:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Keine weiteren Fehlermeldungen." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF-Vorschau:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Bezeichnung für den Menüeintrag definieren" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Eintrag" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: Meine_Datei.c\n" -"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " -"Meine_Datei" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Label" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Kommando" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Include-Parameter und Argumente angeben" +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Arbeitsverzeichnis" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Legt die Kommandos zum Erstellen und Ausführen von Programmen fest." +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Leeren" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" + +#: ../src/build.c:1904 ../src/build.c:1906 #, c-format -msgid "%s commands" +msgid "%s Commands" msgstr "Kommandos für %s" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Kompilieren:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Erstellen:" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Kein Dateityp" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Ausführen:" +#: ../src/build.c:1914 ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Regulärer Ausdruck für Fehlermeldungen:" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Kompiliert die aktuelle Datei" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Dateitypunhängige Befehle" + +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" +"Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " +"Kommandos an" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make (eigenes Target)" +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Befehle zum Ausführen" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "Alles was Sie hier angeben, wird direkt an »make« übergeben." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" +"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " +"- Details gibt es in der Dokumentation." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Kompiliert die aktuelle Datei mit »make« und dem Standard-Target" +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Kompiliert die aktuelle Datei mit »make« und dem angegebenem Target" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Kompilieren" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Kompiliert die aktuelle Datei mit make" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Erstellen" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Konnte das Programm zum Anzeigen nicht ausführen." +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +msgid "_Execute" +msgstr "_Ausführen" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Der Prozess konnte nicht angehalten werden (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make (eigenes _Target)" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Keine weiteren Fehlermeldungen." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make _Objekt-Datei" + +#: ../src/build.c:2462 ../src/build.c:2633 +msgid "_Make" +msgstr "_Make" -#: ../src/callbacks.c:152 +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make all" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "Kommandos zum Erstellen konfigurieren" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d Datei gespeichert." +msgstr[1] "%d Dateien gespeichert." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Neu laden" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen werden verloren gehen." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -386,25 +390,24 @@ "können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " "»strftime« zum Einsatz kommen können." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Ansicht" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -412,28 +415,28 @@ "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien zum Öffnen " "wählen, werden alle schreibgeschützt geöffnet." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Aus Datei lesen" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Weitere Optionen" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Zeichenkodierung festlegen:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -447,11 +450,11 @@ "gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -471,23 +474,23 @@ msgid "Filename already exists!" msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Datei speichern" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "_Umbenennen" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Speichert und benennt die Datei um" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Datei in einem neuen Reiter öffnen" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -495,41 +498,41 @@ "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " "neuen Reiter." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Information" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Nicht speichern" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "»%s« wurde nicht gespeichert." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Möchten Sie vor dem Schließen speichern?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Schriftart auswählen" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -537,106 +540,110 @@ "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " "werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Eigenschaften" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Dateityp:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Größe:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Ort:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kodierung:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(mit BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(ohne BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modifiziert:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Geändert:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Zugriff:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Zugriffsrechte:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Lesen:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Schreiben:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Ausführen:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Gruppe:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Andere:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Datei »%s« wurde geschlossen." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -651,12 +658,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei »%s« ist kein gültiges %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -665,30 +672,30 @@ "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " "wird nicht unterstützt." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabulatoren und Leerzeichen" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." @@ -696,20 +703,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -718,7 +725,7 @@ "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " "Die Datei wird nicht gespeichert." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -727,52 +734,52 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -781,25 +788,32 @@ "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " "Version." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Versuchen die Datei erneut zu speichern?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Schließen _ohne Speichern" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "»%s« wurde nicht auf dem Datenträger gefunden." +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "" +"»%s« wurde nicht auf dem Datenträger gefunden. Soll die Datei neu gespeichert " +"werden?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " "werden sollen." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltisch" @@ -910,572 +924,620 @@ msgid "Without encoding" msgstr "Ohne Zeichenkodierung" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Westeuropäisch" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Osteuropäisch" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Ost_asiatisch" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_SO- & SW-Asiatisch" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Nahöstlich" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Keiner" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shellskript Datei" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML-Dokument" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Konfigurationsdatei" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext-Übersetzungsdatei" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "_Benutzerdefinierte Dateitypen" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "unbenannt" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Konnte die Datei »%s« nicht finden." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "_FarbsSchemata" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Standard" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Datei" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "unsichtbar" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "dummy" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Zuletzt geöffnet" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "A_lle speichern" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "unsichtbar" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Neuformatieren der Zeile/des Abschnitts" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "Aktuelle Zeile _tauschen" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "_Zeile oder Auswahl duplizieren" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Auswahl an Terminal senden" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "Intelligentes _Einrücken" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Kommandos" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "Aktuelle Zeile(n) _ausschneiden" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "Aktuelle Zeile(n) _kopieren" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "Aktuelle Zeile(n) _löschen" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Zeile oder Auswahl duplizieren" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "Aktuelle Zeile(n) a_uswählen" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "Aktuellen Absatz au_swählen" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "Alternatives _Leerzeichen einfügen" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Zur _nächsten Markierung springen" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Zur _vorherigen Markierung springen" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Auswahl an Terminal senden" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Plugin-_Einstellungen" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Suchen" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "_Nächstes" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "_Vorheriges" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Ersetzen" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Auswahl _finden" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Auswahl finden (_rückwärts)" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Nä_chste Nachricht" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "_Schriftart ändern" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Zusätzliche _Infofenster ein-/ausblenden" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Vollbild" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "_Meldungsfenster anzeigen" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "W_erkzeugleiste anzeigen" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "_Leerzeichen anzeigen" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Zeile_nenden anzeigen" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Zeige _Einrückungshinweise" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "D_okument" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "_Leerzeichen durch Tabulatoren ersetzen" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Neu" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "Ö_ffnen" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "_Zuletzt geöffnete Projekte" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "S_chließen" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Werkzeuge" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Einstellungen erneut laden" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "_Konfigurationsdateien" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Einstellungen erneut laden" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Hilfe" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Webseite" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Dokumente" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Status" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Meldungen" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Symbole _und Text" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Nur _Symbole" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Nur _Text" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Große Symbole" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Werkzeugleisteneinstellungen" -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Kleine Symbole" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "_Sehr kleine Symbole" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Werkzeugleiste anpassen" - -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "Werkzeugleiste _verbergen" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Gehe zur T_agdeklaration" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1484,41 +1546,41 @@ "soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " "deaktiviert werden." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Speichert die Fensterposition und die Fenstergröße und stellt sie beim " "nächsten Start wieder her." -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Beenden " -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1527,19 +1589,19 @@ "muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " "Sie das Feld leer." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1550,19 +1612,19 @@ "wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " "ignoriert, falls es leer ist." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Pfade" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1570,11 +1632,11 @@ "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " "ausgegeben werden soll" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1582,11 +1644,11 @@ "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " "wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1594,11 +1656,11 @@ "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " "weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1609,15 +1671,27 @@ "das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " "Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Benutze den Windows Datei öffnen/speichern Dialog" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-" +"Dialogs genutzt werden soll." + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1625,30 +1699,30 @@ "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " "Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Verzeichnis der aktuellen Datei für »In Dateien suchen« benutzen" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Suche" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1656,11 +1730,11 @@ "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " "und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1672,75 +1746,97 @@ "angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " "angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projekte" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Seitenleiste anzeigen" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Position:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Links" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Rechts" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Seitenleiste" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Schriftarten" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1748,115 +1844,145 @@ "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer " "Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Links" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Rechts" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Reiter neben aktuellem öffnen" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der " +"Liste eingefügt werden." + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "" "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " "an" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "" "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " "werden soll oder nicht" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen " "Platz zu sparen." -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Werkzeugleiste" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Symbolstil:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Symbolgröße:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Aussehen" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "S_ystemvorgabe" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Symbole _und Text" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Nur _Symbole" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Nur _Text" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Symbolstil" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "S_ystemvorgabe" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Kleine Symbole" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Sehr kleine Symbole" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Große Symbole" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Symbolgröße:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Werkzeugleiste" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1866,11 +1992,11 @@ "fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " "Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home) aktivieren" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1884,11 +2010,11 @@ "ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " "Position Rücksicht zu nehmen." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1896,19 +2022,19 @@ "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " "markierter Text mit der Maus verschoben werden kann." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Quelltext-Ausblendung aktivieren" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quelltextes auszublenden" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1917,11 +2043,11 @@ "gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " "Symbol geklickt wird." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1929,26 +2055,26 @@ "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " "sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim " "Wechseln in eine neue Zeile entfernt werden sollen" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" # TODO woah, hier muss noch was anderes her :D -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1957,68 +2083,58 @@ "Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " "werden kann." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Benutzt Leerzeichen, falls die Einrückung kleiner ist als die " "Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Tabulatorenbreite:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"Die Breite eines Tabulators, wenn »Tabulatoren & Leerzeichen« für das " -"Dokument ausgewählt ist" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2027,30 +2143,30 @@ "(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " "bestimmen" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein " "Tabulatorzeichen einzufügen" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2058,19 +2174,19 @@ "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " "komplexeren Text erweitert werden" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XML-Tag Autovervollständigung" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2078,11 +2194,11 @@ "Verlängert die Kommentarzeilen in den Sprachen C, C++ und Java, wenn eine " "neue Zeile innerhalb eines Kommentars hinzugefügt wird." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2090,150 +2206,148 @@ "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " "aus den geöffneten Dateien" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Autovervollständigung aller Wörter im Dokument" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Die Anzahl der Zeichen, die nötig sind um die Vorschläge anzuzeigen" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste " "angezeigt wird" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " "öffnenden" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " "Klammer" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " "öffnenden" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Automatisches Schließen von Klammern und Anführungszeichen" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Schreibt weißen Text auf schwarzem Hintergrund und invertiert alle Farben. " -"Dies erfordert einen Neustart von Geany." +"Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf " +"einem schwarzen Hintergrund genutzt." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Macht Zeilenenden mit einem Sonderzeichen sichtbar" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Zeigt oder versteckt den Rand mit den Zeilennummern" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Markierungsrand anzeigen" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2241,38 +2355,38 @@ "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher " "zum Anzeigen von Markierungen genutzt wird" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter rollen" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten " "gerollt werden kann oder nicht" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Zeilenlänge markieren bei:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Farbe der Markierung:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Spalte:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Farbe:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2283,11 +2397,11 @@ "notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in " "der die Linie angezeigt werden soll." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2295,11 +2409,11 @@ "Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position " "(nur sinnvoll mit dicktengleichen Schriften)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2309,111 +2423,147 @@ "(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " "für proportionale Schriftarten)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Deaktiviert" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Aktiviert" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Deaktiviert" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Keine virtuellen Leerzeichen anzeigen" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Nur für rechteckige Auswahl" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine " +"rechteckige Auswahl statt findet." + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Immer" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Immer virtuelle Leerzeichen am Ende der Zeilen anzeigen" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Imaginäre Freiräume" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile " "angegeben wurde aber nicht geöffnet werden konnte" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Neue Dateien" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Standardzeichenkodierung (existierende Dateien):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Setzt die Standardzeichenkodierung für zu öffnende Dateien" - -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer Dateien" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" + +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "" +"Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-" +"Dateien" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " -"öffnet die ausgewählten Dateien mit der angegebenen Kodierung. (Wird nur in " -"Ausnahmen benötigt)" +"öffnet die ausgewählten nicht Unicode-Dateien mit der angegebenen Kodierung. " +"(Wird nur in Ausnahmen benötigt)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Standardzeichenkodierung (nicht Unicode-Dateien):" -#: ../src/interface.c:4032 +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein " +"Unicode (z.B. UTF-8) zur Anwendung kommt" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Zeichenkodierungen:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an, falls keine vorhanden ist" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Speichern" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Anzahl der »Zuletzt geöffneten Dateien«" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Gibt die Länge der Liste der zuletzt geöffneten Dateien an" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2421,27 +2571,20 @@ "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " "deaktiviert die Funktion." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Pfad und spezielle Optionen für »make« angeben" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2449,23 +2592,23 @@ "Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie " "sollte die Option -e akzeptieren)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2475,67 +2618,67 @@ "Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in " "der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "E-Mailadresse des Entwicklers" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "E-Mail-Adresse:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Jahr:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Datum / Zeit:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2544,7 +2687,7 @@ "alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« " "zum Einsatz kommen können." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2553,7 +2696,7 @@ "Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " "Einsatz kommen können." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2562,63 +2705,63 @@ "Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " "Einsatz kommen können." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Vorlagen" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Ä_ndern" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Tastenkürzel" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Befehl:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Pfad zum Druckbefehl (benutzen Sie %f für den Dateinamen)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Füge jeder Seite die Seitenzahlen hinzu. Dazu werden zwei Zeilen der Seite " "benutzt." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2626,21 +2769,21 @@ "Fügt drei Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, " "den Dateinamen sowie das Datum)." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Basisnamen der aktuellen Datei benutzen" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "" "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " "verwenden" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2650,548 +2793,561 @@ "können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " "»strftime« zum Einsatz kommen können." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "GTK-Druckunterstützung benutzen" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Drucken" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Drucken" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Projekteigenschaften" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Anzeige:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Benutzerdefiniert" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Benutze globale Einstellungen" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Datei" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Neu" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Öffnen" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Markierte Datei öffnen" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Speichern unter" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Alle speichern" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Drucken" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Schließen" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Alle Schließen" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Neu laden" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Zuletzt geschlossenes Dokument wieder öffnen" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Projekteigenschaften" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Zurück" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Wiederholen" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Zeile duplizieren" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Aktuelle Zeile(n) löschen" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Bis zum Ende der Zeile löschen" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Aktuelle Zeile tauschen" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Zu der aktuellen Zeile rollen" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Rollt um eine Zeile nach oben" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Rollt um eine Zeile nach unten" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Vervollständige (Code-)Schnipsel" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Bewege den Cursor im Schnipsel" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln unterdrücken" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Kontextaktion" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Vervollständige Wort" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Calltip anzeigen" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Zeige Makroliste" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Automatische Wortergänzung" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Zeile(n) nach oben bewegen" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Zeile(n) nach unten bewegen" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Zwischenablage" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Ausschneiden" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopieren" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Einfügen" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Aktuelle Zeile(n) kopieren" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Aktuelle Zeile(n) ausschneiden" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Auswahl" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Alles ersetzen" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Aktuelles Wort auswählen" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Aktuelle Zeile(n) auswählen" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Aktuellen Absatz auswählen" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Zum nächsten Teilwort springen" + +#: ../src/keybindings.c:338 msgid "Format" msgstr "Formatierung" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Groß- und Kleinschreibung bei Auswahl vertauschen" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Kommentierung umschalten" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Zeile(n) kommentieren" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Kommentarzeichen entfernen" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Einzug erhöhen" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Einzug verringern" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Einzug um ein Leerzeichen erhöhen" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Einzug um ein Leerzeichen verringern" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Intelligentes Einrücken" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Zum 1. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Zum 2. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Zum 3. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Auswahl an Terminal senden" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "Neuformatieren der Zeile/des Abschnitts" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Einfügen" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Datum einfügen" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Alternatives Leerzeichen einfügen" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Einstellungen" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Suchen" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Suchen" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Weitersuchen" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Auswahl vorwärts im Dokument finden" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Auswahl rückwärts im Dokument finden" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "In Dateien suchen" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Nächste Nachricht" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Vorherige Nachricht" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Auftreten finden" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Auftreten im Dokument finden" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "_Alles markieren" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Gehe zu" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Navigiert eine Position nach hinten" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Navigiert eine Position nach vorne" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Springe zur passenden Klammer" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Markierung setzen" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Zur nächsten Markierung springen" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Zur vorherigen Markierung springen" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Gehe zur Tagdefinition" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Gehe zur Tagdeklaration" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Gehe zum Zeilenanfang" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Gehe zum Zeilenende" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Gehe zum Zeilenende" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Zum nächsten Teilwort springen" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Ansicht" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Vollbild" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Hineinzoomen" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Herauszoomen" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Vergrößerung zurücksetzen" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Fokus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Zur VTE wechseln" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Zu dem Suchfenster wechseln" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Zur Seitenleiste wechseln" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Wechsle zum Compiler" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Zu den Meldungen wechseln" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Meldungsfenster anzeigen" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Zur Dokumentenliste der Seitenleiste springen" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Zur Symbolliste der Seitenleiste springen" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Dateireiter" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Zum letzten Dokument wechseln" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Dateireiter nach links verschieben" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Dateireiter nach rechts verschieben" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Dateireiter an den Anfang verschieben" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Dateireiter ans Ende verschieben" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Visuellen Zeilenumbruch umschalten" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Automatischen Zeilenumbruch umschalten" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Leerzeichen durch Tabulatoren ersetzen" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Aktuelle Faltung umschalten" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" -msgstr "Alles einblenden" +msgstr "Alle einblenden" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" -msgstr "Alles ausblenden" +msgstr "Alle ausblenden" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Symbolliste neuladen" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Markierungen entfernen" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Fehlermarkierungen entfernen" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Kompilieren" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make Objekt-Datei" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Nächster Fehler" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Vorheriger Fehler" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Ausführen" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Ausführen (alternativer Befehl)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Farbwähler öffnen" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Hilfe" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Zum Dokument wechseln" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -3201,7 +3357,11 @@ msgid "Debug Messages" msgstr "Debug-Meldungen" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "_Leeren" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3209,89 +3369,101 @@ "Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in " "Kombination mit der Option -l oder --line" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" -# siehe http://en.de.open-tran.eu/suggest/be verbose -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "ausführliche Ausgabe" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Listet die unterstützen Dateitypen auf" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Erstelle globale Tag-Datei (Dokumentation beachten)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "C/C++ Präprozessor überspringen, wenn eine Tag-Datei erstellt wird" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " "Instanz öffnen" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" +"Benutze diesen Socket-Namen für die Kommunikation mit einer bereits " +"laufenden Instanz von Geany" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" +"Gibt eine Liste mit in dieser Instanz von Geany geöffneten Dokumenten aus" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Setzt die Zeilennummer in der zuerst geöffneten Datei" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Kein Meldungsfenster beim Starten anzeigen" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Autovervollständigungsdaten nicht laden (Dokumentation beachten)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Plugins nicht laden" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Geanys Installationsverzeichnis ausgeben" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Dateien aus der letzten Sitzung nicht laden" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Das integrierte Terminal (VTE) nicht starten" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Name der libvte.so" -#: ../src/main.c:147 +# siehe http://en.de.open-tran.eu/suggest/be verbose +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "ausführliche Ausgabe" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[Dateien...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Soll es jetzt verschoben werden?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Geany muss Ihr aktuelles Konfigurationsverzeichnis an einen neuen Ort " "verschieben, bevor es gestartet wird." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3301,7 +3473,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3310,7 +3482,7 @@ "Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben " "werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3321,38 +3493,43 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Konnte die Datei »%s« nicht finden." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Meldungen" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "_Kopieren" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "_Alles kopieren" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Meldungs_fenster ausblenden" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" +"Konnte die Datei »%s« nicht finden - Versuche den aktuellen Dokumentenpfad." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3361,11 +3538,11 @@ "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " "kompilieren." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" -msgstr "_Plugin Manager" +msgstr "_Plugin-Verwaltung" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3376,81 +3553,90 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Wählen Sie die Plugins aus, die beim Starten von Geany geladen werden sollen." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Plugins, die beim Starten geladen werden sollen:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Plugindetails" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Plugins konfigurieren" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Aktion" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Zulassen" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für »%s« verwendet." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an. Programme die nicht " "benötigt werden, können freigelassen werden." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3460,7 +3646,7 @@ "Konsultieren Sie die Dokumentation, um mehr über die Funktionsweise von " "Vorlagen zu erfahren." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3471,7 +3657,7 @@ "erneut laden« auf." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3483,7 +3669,7 @@ "Sie die Tastenkombinationen auch direkt eingeben." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3493,7 +3679,7 @@ "ausgeführt wird." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3509,47 +3695,47 @@ msgid "Text will be wrongly spaced." msgstr "Der Text wird falsch eingerückt." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Dokument einrichten" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "" "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " "verwenden" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Drucken der Datei »%s« wurde abgebrochen." +msgid "Did not send document %s to the printing subsystem." +msgstr "Das Dokument %s wurde NICHT an das Drucksystem weiter gegeben." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Datei »%s« wurde gedruckt." +msgid "Document %s was sent to the printing subsystem." +msgstr "Das Dokument %s wurde zum Drucken an das Drucksystem übergeben" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Drucken der Datei »%s« ist fehlgeschlagen (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" "Bitte geben Sie zuerst einen Befehl zum Drucken in den Einstellungen an." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3560,38 +3746,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Drucken der Datei »%s« ist fehlgeschlagen (Rückgabewert: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Datei »%s« wurde gedruckt." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "Projekte" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Neues Projekt erstellen" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "_Erstellen" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Name:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Dateiname:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Basisverzeichnis:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3602,124 +3793,120 @@ "Verzeichnis angeben. Weiterhin kann es sowohl in relativer als auch " "absoluter Form eingegeben werden." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Auswahl des Projektbasisverzeichnisses" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Die Projektdatei »%s« konnte nicht geladen werden." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Projekt öffnen" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Projektdateien" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt »%s« geschlossen." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Beschreibung:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "»Make« im Basispfad ausführen" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" +"Arbeitsverzeichnis für nicht spezifizierte Dateitypen auf den Basispfad " +"setzen:" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Kommando ausführen:" +#: ../src/project.c:484 +msgid "Set" +msgstr "Setzen" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Kommando, das im Projektbasisverzeichnis ausgeführt werden kann. Parameter " -"können hinter dem Befehl folgen. Lassen Sie das Feld leer, um den " -"Standardbefehl zu verwenden." +"Setzt das Arbeitsverzeichnis für typlose Dateien (innerhalb des Übersetzens) " +"auf den Basispfad. " -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Dateinamenmuster:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Möchten Sie das Projekt schließen bevor Sie fortfahren?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Das Projekt »%s« ist bereits geöffnet." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Der eingegebene Projektname ist zu kurz." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Der eingegebene Projektname ist zu lang (max. %d Zeichen)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Sie haben einen ungültigen Dateinamen angegeben." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Soll das Projektbasisverzeichnis erstellt werden?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Der Pfad »%s« existiert nicht." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektdatei konnte nicht geschrieben werden (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projekt »%s« erstellt." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt »%s« gespeichert." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Auswahl des Projektdateinamens" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Wählen Sie das Kommando zum Ausführen des Projektes" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke _benutzen" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3727,15 +3914,15 @@ "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über " "reguläre Ausdrücke konsultieren Sie bitte die Dokumentation." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "_Rückwärts suchen" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "S_onderzeichen maskieren" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3743,407 +3930,427 @@ "Ersetzt \\\\, \\t, \\n, \\r und \\uXXXX (Unicode-Zeichen) mit den " "entsprechenden Sonderzeichen" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "_Groß-/Kleinschreibung beachten" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "N_ur ganze Wörter finden" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "_Wortanfänge finden" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Vorheriges" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Nächstes" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "Suc_he nach:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Alle finden" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Markieren" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Markiert alle Treffer innerhalb des aktuellen Dokumentes" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "In Sit_zung" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "_Im Dokument" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "_Diesen Dialog schließen" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Deaktivieren Sie diese Option um das Dialogfenster offen zu halten." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Ersetzen und _Finden" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Erse_tzen durch:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "_Alle ersetzen" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "I_n Auswahl" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Verzeichnis:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "_Kodierung" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "_Feste Zeichenketten" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Reguläre Ausdrücke _benutzen (grep)" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "" "Für mehr Informationen konsultieren Sie bitte die Dokumentation von »grep«" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Erweiterte Reguläre Ausdrücke benutzen" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_In Unterverzeichnissen" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Su_chmuster umkehren" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Invertiert die Trefferliste" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "_Zus. Optionen:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Andere Argumente, die an grep übergeben werden sollen" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d Treffer für »%s« gefunden." msgstr[1] "%d Treffer für »%s« gefunden." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Text wurde in %u Datei ersetzt." -msgstr[1] "Text wurde in %u Dateien ersetzt." +msgid "Replaced %u matches in %u documents." +msgstr "%u Treffer in %u Dokumenten ersetzt" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Ungültiges Verzeichnis." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Kein Text zum Suchen angegeben." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Konnte das grep Kommando »%s« nicht finden (Pfad zum Grep Kommando in den " "Einstellungen überprüfen)." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Suchen..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (im Verzeichnis: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"Suche fehlgeschlagen (Sie finden Details in »Hilfe -> Debug Meldungen«)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Suche fehlgeschlagen." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Such mit %d Treffer abgeschlossen." msgstr[1] "Such mit %d Treffern abgeschlossen." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Fehler in Ausdruck: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany hat versucht, den Unix Domain Socket einer anderen Instanz zu " +"benutzen.\n" +" Dies ist ein schwerwiegendes Problem, so dass Geany nun beendet werden " +"muss. " + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Abschnitt" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Anhang" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Sonstiges" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Typen" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Typkonstruktoren" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funktionen" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Abschnitte" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Indizes" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variablen" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Kommando" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Umgebung" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Unterabschnitt" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Unterunterabschnitt" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Label" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Strukturen" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Package" -#: ../src/symbols.c:655 -msgid "My" -msgstr "My" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Label" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Konstanten" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Klassen" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Konstanten" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Anker" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Überschrift (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Überschrift (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Überschrift (H3)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Typ" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namensräume" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Prozeduren" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Importe" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entitäten" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Architekturen" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funktionen/Prozeduren" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variablen/Signale" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Prozesse/Komponenten" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Ereignisse" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funktionen" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Instanzvariablen" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Label" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subroutinen" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blöcke" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Makros" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Definitionen" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Strukturen" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typendefinition und Enumerates" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateierweiterung für »%s«.\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Die Tag-Datei konnte nicht erstellt werden, möglicherweise konnten keine " "Tags gefunden werden.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4152,7 +4359,7 @@ "Verwendung: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4163,164 +4370,179 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Tags laden" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany Tag-Datei (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei »%s« geladen." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei »%s« nicht laden." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Alt" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Speichert alle geöffnete Dateien" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Schließt alle geöffneten Dateien" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Aktuelle Auswahl ausschneiden" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Aktuelle Auswahl kopieren" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Inhalt der Zwischenablage einfügen" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Aktuelle Auswahl löschen" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" "Öffnet einen Farbauswahldialog zum Auswählen einer Farbe aus einer Palette" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Text vergrößern" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Text verkleinern" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Einzug verringern" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Einzug erhöhen" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Springt zur angegebenen Zeile" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Einstellungsdialog anzeigen" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Geany beenden" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Dokument drucken" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Text im aktuellen Dokument ersetzen" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Legt eine neue Datei an" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Eine Datei aus Vorlage erstellen" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Eine letzte Datei öffnen" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Weitere Aktionen wählen" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Gehe zu" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Trenner" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "---- Trenner ----" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4328,11 +4550,11 @@ "Wählt die Symbole, die in der Werkzeugliste angezeigt werden. Die Symbole " "können per Maus in die richtige Position verschoben werden." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Vorhandene Einträge" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Angezeigte Einträge" @@ -4359,7 +4581,7 @@ msgid "Custom command failed: %s" msgstr "Benutzerdefiniertes Kommando war nicht erfolgreich: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Benutzerdefiniertes Kommandos einstellen" @@ -4371,192 +4593,184 @@ "Sie können die aktuelle Auswahl an ein benutzerdefiniertes Kommando senden. " "Die aktuelle Auswahl wird durch die Ausgabe des Kommandos ersetzt." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Keine Kommandos definiert." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Wörter zählen" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "Auswahl" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "Vollständiges Dokument" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Bereich:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Zeilen:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Wörter:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Buchstaben:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Keine Symbole gefunden" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "S_ymbolliste anzeigen" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "_Dokumentenliste anzeigen" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "_Pfade anzeigen" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "Zeile: %d\t Spalte: %d\t Markiert: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "Zeile: %d/%d\t Spalte: %d\t Markiert: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "ÜBER" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "EINFG" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "Tab" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "Leer" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/L" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "Modus: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "Zeichensatz: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "Dateityp: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "Bereich: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Benutzerdefiniertes Datumsformat einstellen" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Ordner wählen" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Datei wählen" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "_Konfigurationsdateien" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" -msgstr "Alles speichern" +msgstr "Alle speichern" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Alle schließen" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Pfad des Dokumentes _übernehmen" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "Terminal _neustarten" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Eingabe_methoden" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4564,104 +4778,92 @@ "Konnte das Verzeichnis in der VTE nicht wechseln. Eventuell steht ein Befehl " "auf der Kommandozeile." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminalplugin" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Die Einstellungen für das integrierte Terminal werden nur wirksam, wenn die " -"VTE-Bibliothek erfolgreich geladen werden konnte." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Terminalschriftart:" +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Schriftart:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Ändert die Schriftart des Terminals" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Vordergrundfarbe:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Hintergrundfarbe:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Setzt die Vordergrundfarbe für das Terminal" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Setzt die Hintergrundfarbe für das Terminal" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Zeilen zum Zurückrollen:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Gibt die Anzahl der Zeilen an, die man im Terminal zurückrollen kann" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Bei Tastendruck rollen" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "" "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gerollt werden " "soll" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Bei Ausgabe rollen" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Legt fest, ob das Fenster bei einer Ausgabe gerollt werden soll" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Blinkender Cursor" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Legt fest, ob der Cursor blinken soll" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Geanys Tastenkombination überschreiben" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Erlaubt das integrierte Terminal über Tastenkürzel anzusprechen (mit " "Ausnahme der Fokus Kommandos)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4671,11 +4873,11 @@ "Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight " "Commander in der VTE benutzen möchten." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Legt fest, ob »cd $path« in der VTE ausgeführt werden soll, wenn Sie zwischen " @@ -4683,11 +4885,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Das Run-Skript nicht benutzen" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4695,11 +4897,11 @@ "Das Run-Skript, welches gewöhnlich zur Ausgabe des Rückgabe-Wertes eines " "ausgeführten Programms genutzt wird, nicht benutzen" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Führe Programme in der VTE aus" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4708,90 +4910,118 @@ "Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt " "werden." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany Projektdateien" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Ausführbare Dateien" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Klassengenerator" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Erstellt neue Klassen in einer neuen Datei" -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Klasse erstellen" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Namensraum" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Namensraum:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Klasse" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Klassenname:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Headerdatei:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Quelldatei:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Typ der Vererbung:" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Basisklasse:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Quellen für Basis:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Basis Headerdatei:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Basis GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementiert:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Optionen" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Konstruktor erstellen" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Dekonstruktor erstellen" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Abstrahiert" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+-Konstruktor Typ" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Klasse _erstellen" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++-Klasse" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+-Klasse" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP-Klasse" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Zeichen für HTML" @@ -4801,52 +5031,57 @@ msgstr "Fügt HTML-Sonderzeichen wie »&« ein." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Das Geany-Entwicklerteam" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Zeichen für HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Zeichen nach ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Griechische Buchstaben" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Mathematische Symbole" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Technische Symbole" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Pfeilsymbole" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Zeichen für Interpunktion" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Sonstige Zeichen" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Sonderzeichen" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Einfügen" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4855,40 +5090,40 @@ "einem Doppelklick oder über den Button »Einfügen« in Ihr aktuelles Dokument " "ein." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Zeichen" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (Name)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_HTML-Sonderzeichen einfügen" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Ersetzen von HTML-Sonderzeichen" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_Eingabeersetzung für Sonderzeichen ein-/ausschalten" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Sonderzeichen ersetzen" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "HTML-Sonderzeichen einfügen" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Sonderzeichen ersetzen" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Ein-/Ausschalten der Eingabeersetzung" @@ -4913,105 +5148,105 @@ "Renders the font size of the document together with the current zoom level" msgstr "Vergrößerungsstufe in das exportierte Dokument übernehmen" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument erfolgreich als »%s« exportiert." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Die Datei »%s« konnte nicht geschrieben werden (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei »%s« existiert bereits. Soll sie überschrieben werden?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exportieren" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Als _HTML exportieren" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Als _LaTeX exportieren" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Dateibrowser" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Fügt einen Dateimanager in die Seitenleiste ein." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Zu viele Elemente ausgewählt!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kann angegebenen externen Befehl »%s« nicht ausführen (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Mit _externer Anwendung öffnen" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "In _Dateien suchen" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "V_ersteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Aufwärts" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Neu laden" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Persönliches Verzeichnis" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Filter löschen" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtern der Dateien mit den gewohnten Platzhaltern" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Dateiliste in den Vordergrund" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Pfad in den Vordergrund" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Externes öffnen Kommando:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5026,15 +5261,15 @@ "%d wird durch den Pfadnamen der ausgewählten Datei ersetzt (ohne den " "Dateinamen)." -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Objektdateien verbergen" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5042,11 +5277,11 @@ "Erzeugte Objektdateien nicht im Dateibrowser anzeigen (*.o, *.obj. *.so, *." "dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Das Projekt-Basisverzeichnis nutzen" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "" @@ -5154,34 +5389,205 @@ msgid "Splits the editor view into two windows." msgstr "Teilt das Editorfenster in zwei Teilfenster." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Zeige das aktuelle Dokument" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "Teilung _aufheben" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Fenster _teilen" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontal" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Vertikal" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Horizontal teilen" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Vertikal teilen" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Teilung aufheben" +#~ msgid "Hard tab width:" +#~ msgstr "Tabulatorenbreite:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "Die Breite eines Tabulators, wenn »Tabulatoren & Leerzeichen« für das " +#~ "Dokument ausgewählt ist" + +#~ msgid "_Customize Toolbar" +#~ msgstr "_Werkzeugleiste anpassen" + +#~ msgid "Icon style:" +#~ msgstr "Symbolstil:" + +#~ msgid "Icon size:" +#~ msgstr "Symbolgröße:" + +#~ msgid "Appearance" +#~ msgstr "Aussehen" + +#~ msgid "Try to resave the file?" +#~ msgstr "Versuchen die Datei erneut zu speichern?" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Zeile duplizieren" + +#~ msgid "Long line marker:" +#~ msgstr "Zeilenlänge markieren bei:" + +#~ msgid "Long line marker color:" +#~ msgstr "Farbe der Markierung:" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Auswahl an Terminal senden" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Text wurde in %u Datei ersetzt." +#~ msgstr[1] "Text wurde in %u Dateien ersetzt." + +#~ msgid "Terminal plugin" +#~ msgstr "Terminalplugin" + +#~ msgid "Terminal font:" +#~ msgstr "Terminalschriftart:" + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Drucken der Datei »%s« wurde abgebrochen." + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Die Einstellungen für das integrierte Terminal werden nur wirksam, wenn " +#~ "die VTE-Bibliothek erfolgreich geladen werden konnte." + +#~ msgid "Unsplit" +#~ msgstr "Teilung aufheben" + +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Include-Parameter und Argumente angeben" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_DVI-Datei anzeigen" + +#~ msgid "V_iew PDF File" +#~ msgstr "_PDF-Datei anzeigen" + +#~ msgid "_Set Arguments" +#~ msgstr "_Programm-Parameter angeben" + +#~ msgid "Set Arguments" +#~ msgstr "Programmparameter angeben" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von " +#~ "(La)TeX-Dateien." + +#~ msgid "DVI creation:" +#~ msgstr "DVI-Erstellung:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF-Erstellung:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI-Vorschau:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF-Vorschau:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: Meine_Datei." +#~ "c\n" +#~ "%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " +#~ "Meine_Datei" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Include-Parameter und Argumente angeben" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Legt die Kommandos zum Erstellen und Ausführen von Programmen fest." + +#~ msgid "Compile:" +#~ msgstr "Kompilieren:" + +#~ msgid "Build:" +#~ msgstr "Erstellen:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Konnte das Programm zum Anzeigen nicht ausführen." + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr "dummy" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Schreibt weißen Text auf schwarzem Hintergrund und invertiert alle " +#~ "Farben. Dies erfordert einen Neustart von Geany." + +#~ msgid "Path and options for the make tool" +#~ msgstr "Pfad und spezielle Optionen für »make« angeben" + +#~ msgid "Run (alternative command)" +#~ msgstr "Ausführen (alternativer Befehl)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Wählen Sie die Plugins aus, die beim Starten von Geany geladen werden " +#~ "sollen." + +#~ msgid "Make in base path" +#~ msgstr "»Make« im Basispfad ausführen" + +#~ msgid "Run command:" +#~ msgstr "Kommando ausführen:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Kommando, das im Projektbasisverzeichnis ausgeführt werden kann. " +#~ "Parameter können hinter dem Befehl folgen. Lassen Sie das Feld leer, um " +#~ "den Standardbefehl zu verwenden." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Wählen Sie das Kommando zum Ausführen des Projektes" + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "Suche fehlgeschlagen (Sie finden Details in »Hilfe -> Debug Meldungen«)." + +#~ msgid "My" +#~ msgstr "My" + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Our" +#~ msgstr "Our" diff -Nru geany-0.18/po/el.po geany-0.19/po/el.po --- geany-0.18/po/el.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/el.po 2010-05-23 09:08:49.000000000 +0100 @@ -6,9 +6,9 @@ # Stavros Temertzidis , 2008. msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2008-02-01 12:02+0200\n" "Last-Translator: Stavros Temertzidis \n" "Language-Team: Greek\n" @@ -22,7 +22,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Γρήγορο και ελαφρύ GTK2 IDE" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -30,68 +30,68 @@ msgid "Integrated Development Environment" msgstr "Ενιαίο Περιβάλλον Ανάπτυξης" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Περί Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Γρήγορο και ελαφρύ IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(δημιουργήθηκε την ή μετά %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Πληροφορίες" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Δημιουργοί" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "υπεύθυνος" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "δημιουργός" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "υπεύθυνος μετάφρασης" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Μεταφραστές" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Προηγούμενοι Μεταφραστές" -#: ../src/about.c:332 +#: ../src/about.c:338 #, fuzzy msgid "Contributors" msgstr "Δημιουργία κατασκευής" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Μνεία" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Άδεια Χρήσης" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -99,267 +99,267 @@ "Δεν βρέθηκε το κείμενο της άδειας χρήσης, παρακαλώ επισκεφθείτε το http://" "www.gnu.org/licenses/gpl-2.0.txt να το δείτε online." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Δεν ήταν δυνατόν να βρεθεί το τερματικό \"%s\" (ελέγξτε τη διαδρομή στις " -"ρυθμίσεις εργαλείων του τερματικού στις ιδιότητες)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Αποτυχία μετάβασης στο φάκελο εργασίας \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "" -"Αποτυχία εκτέλεσης \"%s\" (δεν ήταν δυνατόν να δημιουργηθεί το script " -"εκκίνησης)" +msgid "%s (in directory: %s)" +msgstr "%s (στο φάκελο: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Η διαδικασία απέτυχε (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (στο φάκελο: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Αποτυχία μετάβασης στο φάκελο εργασίας \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "" +"Αποτυχία εκτέλεσης \"%s\" (δεν ήταν δυνατόν να δημιουργηθεί το script " +"εκκίνησης)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Δεν ήταν δυνατόν να εκτελεστεί το αρχείο στο VTE επειδή πιθανόν να " "περιλαμβάνει μια εντολή." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Δεν ήταν δυνατόν να βρεθεί το τερματικό \"%s\" (ελέγξτε τη διαδρομή στις " +"ρυθμίσεις εργαλείων του τερματικού στις ιδιότητες)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Αποτυχία μεταγλώτισης." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Η μεταγλώτιση ολοκληρώθηκε με επιτυχία." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Μεταγλώτιση" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 +#: ../src/build.c:1252 #, fuzzy -msgid "_Build" -msgstr "_Δημιουργία" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Δημιουργία _Όλων" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Δημιουργία _Προσαρμοσμένου Προορισμού" +msgid "Custom Text" +msgstr "Δημιουργία Προσαρμοσμένου Προορισμού" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Δημιουργία _Αντικειμένου" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Εισάγετε τις προσαρμοσμένες επιλογές εδώ, όλο το εισακτέο κείμενο θα " +"μεταφερθεί στην εντολή δημιουργίας" -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Επόμενο Σφάλμα" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 #, fuzzy msgid "_Previous Error" msgstr "_Προηγούμενο" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 +#: ../src/build.c:1343 #, fuzzy -msgid "_Set Includes and Arguments" -msgstr "_Καθορισμός των Περιεχομένων και Επιχειρημάτων" +msgid "_Set Build Commands" +msgstr "Ρύθμιση Προσαρμοσμένων Εντολών" -#. DVI -#: ../src/build.c:1143 +#: ../src/build.c:1623 ../src/toolbar.c:373 #, fuzzy -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI" +msgid "Build the current file" +msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#. PDF -#: ../src/build.c:1152 +#: ../src/build.c:1637 #, fuzzy -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF" +msgid "Build the current file with Make and the default target" +msgstr "" +"Δημιουργεί το τρέχον αρχείο με το εργαλείο δημιουργίας και το προεπιλεγμένο " +"προορισμό" -#. DVI view -#: ../src/build.c:1206 +#: ../src/build.c:1639 #, fuzzy -msgid "_View DVI File" -msgstr "Προβολή Αρχείου DVI" +msgid "Build the current file with Make and the specified target" +msgstr "" +"Δημιουργεί το τρέχον αρχείο με το εργαλείο δημιουργίας και το καθορισμένο " +"προορισμό" -#. PDF view -#: ../src/build.c:1216 +#: ../src/build.c:1641 #, fuzzy -msgid "V_iew PDF File" -msgstr "Προβολή Αρχείου PDF" +msgid "Compile the current file with Make" +msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#. arguments -#: ../src/build.c:1231 -#, fuzzy -msgid "_Set Arguments" -msgstr "Καθορισμός Επιχειρημάτων" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Αδύνατη η διακοπή της διαδικασίας (%s)." -#: ../src/build.c:1306 +#: ../src/build.c:1685 ../src/build.c:1697 #, fuzzy -msgid "Set Arguments" -msgstr "Καθορισμός Επιχειρημάτων" +msgid "No more build errors." +msgstr "Δεν έχει άλλα λάθη στη δημιουργία." -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." +#: ../src/build.c:1778 +msgid "Set menu item label" msgstr "" -"Καθορισμός προγραμμάτων και επιλογών για μεταγλώτιση και προβολή αρχείων (La)" -"TeX" - -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Δημιουργία DVI:" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Δημιουργία PDF:" - -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Προεπισκόπηση DVI:" +#: ../src/build.c:1788 +msgid "Item" +msgstr "" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Προεπισκόπηση PDF:" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Ετικέτα" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f θα αντικατασταθεί με το τρέχον όνομα αρχείου, π.χ. test_file.c\n" -"%e θα αντικατασταθεί με το τρέχον όνομα αρχείου χωρίς προέκταση, π.χ. " -"test_file" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Εντολή" -#: ../src/build.c:1486 +#: ../src/build.c:1791 #, fuzzy -msgid "Set Includes and Arguments" -msgstr "Καθορισμός των Περιεχομένων και των Επιχειρημάτων" +msgid "Working directory" +msgstr "%s (στο φάκελο: %s)" -#: ../src/build.c:1493 +#: ../src/build.c:1792 #, fuzzy -msgid "Set the commands for building and running programs." -msgstr "Καθορισμός των εντολών για δημιουργία και εκτέλεση προγραμμάτων." +msgid "Clear" +msgstr "Μεταγλωτιστής" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "%s εντολές" +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Μεταγλώτιση:" +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" +msgstr "%s εντολές" -#: ../src/build.c:1538 +#: ../src/build.c:1906 #, fuzzy -msgid "Build:" -msgstr "Δημιουργία:" +msgid "No Filetype" +msgstr "Καθορισμός _Τύπου Αρχείου" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Εκτέλεση:" +#: ../src/build.c:1914 ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "" -#: ../src/build.c:1892 ../src/toolbar.c:344 -#, fuzzy -msgid "Build the current file" -msgstr "Μεταγλώτιση του τρέχοντος αρχείου" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Δημιουργία Προσαρμοσμένου Προορισμού" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" + +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Ρύθμιση Προσαρμοσμένων Εντολών" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Εισάγετε τις προσαρμοσμένες επιλογές εδώ, όλο το εισακτέο κείμενο θα " -"μεταφερθεί στην εντολή δημιουργίας" -#: ../src/build.c:1967 +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "" -"Δημιουργεί το τρέχον αρχείο με το εργαλείο δημιουργίας και το προεπιλεγμένο " -"προορισμό" +msgid "Set Build Commands" +msgstr "Ρύθμιση Προσαρμοσμένων Εντολών" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Μεταγλώτιση" -#: ../src/build.c:1970 +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 #, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "" -"Δημιουργεί το τρέχον αρχείο με το εργαλείο δημιουργίας και το καθορισμένο " -"προορισμό" +msgid "_Build" +msgstr "_Δημιουργία" -#: ../src/build.c:1973 +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Compile the current file with Make" -msgstr "Μεταγλώτιση του τρέχοντος αρχείου" +msgid "_Execute" +msgstr "Εκτέλεση:" + +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Δημιουργία _Προσαρμοσμένου Προορισμού" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Αποτυχία εκτέλεσης του προγράμματος προβολής" +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Δημιουργία _Αντικειμένου" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Αδύνατη η διακοπή της διαδικασίας (%s)." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Δημιουργία:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Δημιουργία _Όλων" -#: ../src/build.c:2092 ../src/build.c:2106 +#. arguments +#: ../src/build.c:2709 #, fuzzy -msgid "No more build errors." -msgstr "Δεν έχει άλλα λάθη στη δημιουργία." +msgid "_Set Build Menu Commands" +msgstr "Ρύθμιση Προσαρμοσμένων Εντολών" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Θέλετε πραγματικά να εγκαταλείψετε;" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Το αρχείο %s αποθηκεύτηκε." +msgstr[1] "Το αρχείο %s αποθηκεύτηκε." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Επαναφόρτωση" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Όλες οι αλλαγές που δεν έχουν αποθηκευτεί θα χαθούν." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Είστε σίγουροι ότι θέλετε να επαναφορτώσετε '%s';" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Εισάγετε τη γραμμή που θέλετε να μεταφερθείτε:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 #, fuzzy msgid "" "Please set the filetype for the current file before using this function." @@ -367,39 +367,39 @@ "Παρακαλώ καθορίστε τον τύπο αρχείου για το τρέχον αρχείο πριν τη χρήση αυτής " "της συνάρτησης." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Χρησιμοποιείστε Προσαρμοσμένη Διάταξη Ημερομηνίας" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Προσαρμοσμένη Διάταξη Ημερομηνίας" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -408,26 +408,25 @@ "χρησιμοποιήσετε οποιαδήποτε μετατροπή προσδιορισμού που μπορεί να " "χρησιμοποιηθεί με τη ANSI C strftime συνάρτηση." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Η μορφή της ημερομηνίας δεν ήταν δυνατόν να μετατραπεί (πιθανόν λόγω μεγάλου " "μήκους)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Δεν υπάρχουν άλλα στοιχεία μηνυμάτων." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Άνοιγμα Αρχείου" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Προβολή" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -435,29 +434,29 @@ "Ανοίγει το αρχείο μόνο για ανάγνωση. Αν επιλέξετε περισσότερα από ένα αρχεία " "για άνοιγμα, όλα τα αρχεία θα ανοιχτούν μόνο για ανάγνωση." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Ανίχνευση από την επέκταση αρχείου" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Ανίχνευση από το αρχείο" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "Επιλογές" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Εμφάνιση _κρυφών αρχείων" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Καθορισμός κωδικοποίησης:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -472,11 +471,11 @@ "επιλεγμένη κωδικοποίηση." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Καθορισμός τύπου αρχείου:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -496,24 +495,24 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Αποθήκευση Αρχείου" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Μ_ετονομασία" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 #, fuzzy msgid "Save the file and rename it" msgstr "Αποθήκευση και μετονομασία αρχείου." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Άνοιγμα αρχείου σε νέα ετικέτα" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -522,41 +521,41 @@ "Κρατήστε το τρέχον μη αποθηκευμένο κείμενο ανοιχτό και ανοίξτε το πρόσφατα " "αποθηκευμένο αρχείο σε νέα ετικέτα." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Σφάλμα" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Ερώτηση" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Προειδοποίηση" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Πληροφορία" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Απόρριψη" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Το αρχείο '%s' δεν αποθηκεύτηκε." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Θέλετε να κάνετε αποθήκευση προτού το κλείσετε;" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Επιλογή γραμματοσειράς" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -564,106 +563,110 @@ "Παρουσιάστηκε ένα σφάλμα ή οι πληροφορίες του αρχείου δεν μπόρεσαν να " "ανακτηθούν (π.χ. από ένα νέο αρχείο)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "άγνωστο" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Ιδιότητες" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Τύπος:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Μέγεθος:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Τοποθεσία:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Μόνο για ανάγνωση:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(μόνο εντός Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Κωδικοποίηση:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(με BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(χωρίς BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Τροποποιημένο:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Μεταβλήθηκε:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Προσπελάστηκε:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Δικαιώματα" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Ανάγνωση:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Εγγραφή:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Εκτέλεση:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Κάτοχος:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Ομάδα:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Άλλοι:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Το αρχείο %s έκλεισε." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Ανοίχθηκε νέο αρχείο \"%s\"." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Δεν ήταν δυνατόν το άνοιγμα αρχείου %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -679,12 +682,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Το αρχείο \"%s\" δεν είναι έγκυρο %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -693,31 +696,31 @@ "Το αρχείο \"%s\" δεν φαίνεται να είναι αρχείο κειμένου ή δεν υποστηρίζεται η " "κωδικοποίηση του αρχείου." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Κενά" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Ετικέτες" -#: ../src/document.c:1128 +#: ../src/document.c:1169 #, fuzzy msgid "Tabs and Spaces" msgstr "_Αντικατάσταση των Tab σε Κενά" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Ρύθμιση %s μεθόδου εσοχής" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Λάθος όνομα αρχείου" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Το αρχείο %s επαναφορτώθηκε." @@ -725,21 +728,21 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Το αρχείο %s ανοίχθηκε(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", μόνο για ανάγνωση" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "Σφάλμα στην αποθήκευση αρχείου." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -748,7 +751,7 @@ "Παρουσιάστηκε σφάλμα κατά την μετατροπή του αρχείου από UTF-8 σε \"%s\". Το " "αρχείο παραμένει μη αποθηκευμένο." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -757,52 +760,52 @@ "Μήνυμα σφάλματος: %s\n" "Το σφάλμα παρουσιάστηκε στο \"%s\" (γραμμή: %d, στήλη: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Μήνυμα σφάλματος: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Σφάλμα στην αποθήκευση αρχείου." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Σφάλμα αποθήκευσης αρχείου (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Το αρχείο %s αποθηκεύτηκε." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" δεν βρέθηκε." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Ολοκλήρωση αναζήτησης και εύρεση ξανά;" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Δεν βρέθηκαν αποτελέσματα για \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, fuzzy, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: αντικατάσταση %d εμφανιζόμενου(ων) του \"%s\" με \"%s\"." msgstr[1] "%s: αντικατάσταση %d εμφανιζόμενου(ων) του \"%s\" με \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Θέλετε να το επαναφορτώσετε;" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -811,24 +814,29 @@ "Το αρχείο '%s' στον δίσκο είναι πιο πρόσφατο από\n" "του τρέχοντος buffer." -#: ../src/document.c:2890 -msgid "Try to resave the file?" +#: ../src/document.c:2915 +msgid "Close _without saving" msgstr "" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, fuzzy, c-format -msgid "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "\"%s\" δεν βρέθηκε." -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 #, fuzzy msgid "Enter Tab Width" msgstr "Πλάτος του Tab:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Κελτική" @@ -939,609 +947,667 @@ msgid "Without encoding" msgstr "Χωρίς κωδικοποίηση" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Δυτικής Ευρώπης" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Ανατολικής Ευρώπης" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Ανατολικής Α_σίας" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_ΝΑ & ΝΔ Ασίας" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Μέσης Ανατολής" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Πηγαίο αρχείο %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "Πηγαίο αρχείο %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Κανένα" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Αρχείο Shell script" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Αρχείο δημιουργίας" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Έγγραφο XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump αρχείο" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Αρχείο Config" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 #, fuzzy msgid "Gettext translation file" msgstr "υπεύθυνος μετάφρασης" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, fuzzy, c-format msgid "%s script file" msgstr "Αρχείο Shell script" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Γλώσσες Προγραμματισμού" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Γλώσσες _Scripting" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Γλώσσες _Markup" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "_Διάφορες Γλώσσες" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Καθορισμός _Τύπου Αρχείου" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Όλα τα Πηγαία" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Όλα τα αρχεία" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "χωρίς όνομα" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Δεν ήταν δυνατόν να βρεθεί το αρχείο %s'." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "Επιλογέας _Χρωμάτων" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Αρχείο" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Νέο (με _Πρότυπο)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "αόρατο" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Άνοιγμα _Επιλεγμένου Αρχείου" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Πρόσφατα Αρχεία" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Αποθήκευση Ό_λων" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "_Επαναφόρτωση Ως" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "αόρατο" + +#: ../src/interface.c:388 #, fuzzy msgid "Page Set_up" msgstr "Ρύθμιση σελίδας" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 #, fuzzy msgid "Close Ot_her Documents" msgstr "Κλείσιμο του τρέχοντος αρχείου" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "_Κλείσιμο Όλων" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "Επε_ξεργασία" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Διαμόρφωση" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Ενα_λλαγή Πεζών/Κεφαλαίων των Επιλεγμένων" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Μετάθεση τρέχουσας γραμμής" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Σχολιασμός της/των Γραμμής(ών)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Α-ποσχολιασμός της/των Γραμμής(ών)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Ενεργοποίηση/απενεργοποίηση Γραμμής _Σχολιασμού" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Αντίγραφο της Γραμμής ή της Επιλογής" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Αύξηση Εσο_χής" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Μείωση Εσοχής" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "Απ_οστολή Επιλογής προς" +msgid "_Smart Line Indent" +msgstr "Έξυπνη εσοχή γραμμής" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Απ_οστολή Επιλογής προς" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Εντολή" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Αποκοπή τρέχον γραμμής(ών)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Αντιγραφή τρέχον γραμμής(ών)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Διαγραφή τρέχον γραμμής(ών)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "Αντίγραφο της Γραμμής ή της Επιλογής" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Επιλογή τρέχον γραμμής(ών)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Επιλογή τρέχουσας παραγράφου" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Εισαγωγή εναλλακτικού whitespace" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Πήγαινε στον επόμενο δείκτη" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Πήγαινε στον προηγούμενο δείκτη" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "Απ_οστολή Επιλογής προς" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Εισαγωγή Σχολί_ων" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Εισαγωγή ChangeLog καταχώρησης" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 #, fuzzy msgid "Insert File _Header" msgstr "Εισαγωγή Επικεφαλίδας Αρχείου" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 #, fuzzy msgid "Insert _Function Description" msgstr "Εισαγωγή Περιγραφής της Συνάρτησης" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Εισαγωγή Σχολίου Πολλαπλών Γραμμών" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 #, fuzzy msgid "Insert _GPL Notice" msgstr "Εισαγωγή GPL Σημειώματος" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Εισαγωγή Σημειώματος BSD Άδειας" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Εισαγωγή _Ημερομηνίας" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Εισαγωγή \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "Ιδιότητες" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Ιδιότητες" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Αναζήτηση" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Αναζήτηση _Επόμενου" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Αναζήτηση _Προηγούμενου" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Αναζήτηση στα Α_ρχεία" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Αν_τικατάσταση" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Αναζήτηση Ε_πιλεγμένου" -#: ../src/interface.c:661 +#: ../src/interface.c:760 #, fuzzy msgid "Find Pre_vious Selected" msgstr "Αναζήτηση Προη_γούμενου Επιλεγμένου" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Επόμενο _Μήνυμα" -#: ../src/interface.c:674 +#: ../src/interface.c:773 #, fuzzy msgid "Pr_evious Message" msgstr "Επόμενο Μήνυμα" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Πήγαιν_ε στη Γραμμή" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Αλλαγή Γραμμα_τοσειράς" -#: ../src/interface.c:711 +#: ../src/interface.c:810 #, fuzzy msgid "To_ggle All Additional Widgets" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Πλήρης _Οθόνη" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Προβολή Παράθυρου Μηνυμάτων" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Εμφάνιση _Μπάρας Εργαλείων" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Εμφάνιση Πλε_υρικής Μπάρας" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Επεξεργαστής" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Εμφάνιση _Δεικτών Περιθωρίου" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Εμφάνιση Μ_ετρητή Γραμμών" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "Εμφάνιση των κενών" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "Εμφάνιση τέλους γραμμής" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "Εμφάνιση οδηγών εσοχής" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "Έγγ_ραφο" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Αναδίπλ_ωση Γραμμής" -#: ../src/interface.c:792 +#: ../src/interface.c:891 #, fuzzy msgid "Line _Breaking" msgstr "Αναδίπλωση Γραμμής" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Αυτόματη Εσοχή" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Τύπος Εσοχής" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 #, fuzzy msgid "_Tabs" msgstr "Ετικέτες" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 #, fuzzy msgid "_Spaces" msgstr "Κενά" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 #, fuzzy msgid "T_abs and Spaces" msgstr "_Αντικατάσταση των Tab σε Κενά" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Μόνο για Ανάγ_νωση" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Εγγραφή _Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Καθορισμός _Τύπου Αρχείου" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Καθορισμός Κ_ωδικοποίησης" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Καθορισμός Κατα_λίξεων Γραμμών" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Μετατροπή και Καθορισμός σε _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Μετατροπή και Καθορισμός σε _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Μετατροπή και Καθορισμός σε CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Διαγραφή Λωρίδων Κενών" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Αντικατάσταση των Tab σε Κενά" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 #, fuzzy msgid "Replace Spaces b_y Tabs" msgstr "_Αντικατάσταση των Tab σε Κενά" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Δίπλ-ωση Όλων" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Αναδ-ίπλωση Όλων" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Απομάκρυνση _δεικτών" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Απομάκρυνση _Δεικτών Σφάλματος" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "Έρ_γο" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Νέο" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Άνοιγμα" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "Άνοιγμα Έργου" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Κλείσιμο" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Εργαλεία" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "Αποτυχία μεταγλώτισης." + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Επιλογέας _Χρωμάτων" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Μετρητής Λέξεων" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Φόρτωση Ε_τικετών" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Βοήθεια" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Ιστοσελίδα" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Συντομεύσεις Πληκτρολογίου" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 #, fuzzy msgid "_Debug Messages" msgstr "Μηνύματα" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Σύμβολα" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Έγγραφα" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Κατάσταση" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Μεταγλωτιστής" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Μηνύματα" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Σημειωματάριο" -#: ../src/interface.c:1727 ../src/interface.c:3286 +#: ../src/interface.c:1887 #, fuzzy -msgid "Images _and Text" -msgstr "Εικόνες και κείμενο" +msgid "_Toolbar Preferences" +msgstr "Ιδιότητες" -#: ../src/interface.c:1732 ../src/interface.c:3318 +#: ../src/interface.c:1900 #, fuzzy -msgid "_Images Only" -msgstr "Μόνο εικόνες" +msgid "_Hide Toolbar" +msgstr "Απόκρυψη μπάρας εργαλείων" -#: ../src/interface.c:1737 ../src/interface.c:3310 +#: ../src/interface.c:2112 #, fuzzy -msgid "_Text Only" -msgstr "Μόνο κείμενο" +msgid "Find _Usage" +msgstr "Εύρεση Χρήσης" -#: ../src/interface.c:1748 ../src/interface.c:3302 +#: ../src/interface.c:2120 #, fuzzy -msgid "_Large Icons" -msgstr "Μεγάλα εικονίδια" +msgid "Find _Document Usage" +msgstr "Εύρεση Χρήσης" -#: ../src/interface.c:1753 ../src/interface.c:3294 -#, fuzzy -msgid "_Small Icons" -msgstr "Μικρά εικονίδια" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Μικρά εικονίδια" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Απόκρυψη μπάρας εργαλείων" - -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "Απόκρυψη μπάρας εργαλείων" - -#: ../src/interface.c:2094 -#, fuzzy -msgid "Find _Usage" -msgstr "Εύρεση Χρήσης" - -#: ../src/interface.c:2102 -#, fuzzy -msgid "Find _Document Usage" -msgstr "Εύρεση Χρήσης" - -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 #, fuzzy msgid "Go to _Tag Definition" msgstr "Πήγαινε στον Ορισμό Ετικετών" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Πήγαινε στη Δήλωση Ετικετών" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 #, fuzzy msgid "Conte_xt Action" msgstr "Δράση Πλαισίου" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Ιδιότητες" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Φόρτωσε τα αρχεία από την τελευταία συνεδρία" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Ανοίγει κατά την εκκίνηση τα αρχεία από την τελευταία συνεδρία" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Φόρτωση υποστήριξης virtual terminal" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1550,42 +1616,42 @@ "Εάν και κατά πόσο το virtual terminal emulation (VTE) πρέπει να φορτώνεται " "κατά την εκκίνηση. Απενεργοποιήστε το εάν δεν το χρειάζεστε." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Ενεργοποίηση υποστήριξης επιπρόσθετων" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Εκκίνηση" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Αποθήκευση της θέσης και γεωμετρίας του παραθύρου" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Αποθηκεύει την θέση και γεωμετρία του παραθύρου και τα επαναφέρει κατά την " "εκκίνηση" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Επιβεβαίωση κατά την έξοδο" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Εμφανίζει έναν διάλογο επιβεβαίωσης κατά την έξοδο." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Τερματισμός" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Διαδρομή εκκίνησης:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1594,40 +1660,40 @@ "Πρέπει να είναι απόλυτη διαδρομή. Αφήστε το κενό για χρήση του τρέχοντος " "φακέλου εργασίας." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Αρχεία έργου:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Η διαδρομή από την οποία θα ξεκινά για άνοιγμα των αρχείων του έργου" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 #, fuzzy msgid "Extra plugin path:" msgstr "Ενεργοποίηση υποστήριξης επιπρόσθετων" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Διαδρομές" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "Κατάσταση" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Ηχητικό σήμα σε σφάλματα ή όταν έχει ολοκληρωθεί το compilation" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1636,11 +1702,11 @@ "Εάν θα ακούγεται ηχητικό σήμα στην εμφάνιση λάθους ή όταν η διαδικασία του " "compilation έχει ολοκληρωθεί." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Μετάβαση στη λίστα κατάστασης μηνυμάτων όταν υπάρχει νέο μήνυμα" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1649,12 +1715,12 @@ "Μετάβαση στην ετικέτα κατάστασης μηνυμάτων (κάτω μέρος στο παράθυρο του " "σημειωματαρίου) όταν ένα νέο μήνυμα κατάστασης εμφανιστεί." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "" "Απόκρυψη των μηνυμάτων της κατάστασης λειτουργίας από την γραμμή κατάστασης" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1662,12 +1728,12 @@ "Αφαιρεί όλα τα μηνύματα από την γραμμή κατάστασης. Τα μηνύματα θα συνεχίζουν " "να εμφανίζονται στο παράθυρο μηνυμάτων κατάστασης λειτουργίας." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Widget αυτόματης εστίασης (η εστίαση ακολουθεί το ποντίκι)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1677,17 +1743,27 @@ "Λειτουργεί με τα widget τηςκύριας σύνταξης, τις σημειώσεις, την μπάρα " "εργαλείων, τη γραμμή πήγαινε και το VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Διάφορα" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "" "Να γίνεται πάντα αναδίπλωση της αναζήτησης και απόκρυψη του διαλόγου " "αναζήτησης" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1696,31 +1772,31 @@ "Να γίνεται πάντα αναδίπλωση της αναζήτησης γύρω από το κείμενο και απόκρυψη " "του διαλόγου αναζήτησης μετά από κλικ στο Εύρεση Επόμενο/Προηγούμενο" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Ο φάκελος για αναζήτηση σε αρχεία δεν υπάρχει." -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 #, fuzzy msgid "Search" msgstr "Πλευρική μπάρα" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Χρήση αρχείων συνεδρίας βασισμένα στο έργο" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1729,12 +1805,12 @@ "Εάν θα αποθηκεύει τα αρχεία της συνεδρίας ενός έργου και θα τα ανοίγει όταν " "θα ξανανοίγει το έργο." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1742,76 +1818,100 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Έργα" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "Διάφορα" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Γενικά" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Εμφάνιση λίστας συμβόλων" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Ενεργοποίηση/απενεργοποίηση της λίστας των συμβόλων" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Εμφάνιση λίστας εγγράφων" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Ενεργοποίηση/απενεργοποίηση της λίστας των εγγράφων" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Εμφάνιση Πλε_υρικής Μπάρας" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Περιγραφή:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Αριστερά" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Δεξιά" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Πλευρική μπάρα" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Λίστα συμβόλων:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Παράθυρο μηνυμάτων:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Επεξεργαστής:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Καθορίζει τη γραμματοσειρά για το παράθυρο μηνυμάτων" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Καθορίζει τη γραμματοσειρά για τη λίστα των συμβόλων" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Καθορίζει τη γραμματοσειρά για τον επεξεργαστή" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Γραμματοσειρές" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Εμφάνιση των ετικετών του επεξεργαστή" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Εμφάνιση κουμπιών τερματισμού" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1821,116 +1921,153 @@ "κλείσιμο των αρχείων όταν θα γίνεται κλικ πάνω σ' αυτό (απαιτεί επανεκκίνηση " "του Geany)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Τοποθέτηση των νέων ετικετών αρχείων:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Αριστερά" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Οι ετικέτες αρχείων θα τοποθετούνται στα αριστερά του σημειωματάριου" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Δεξιά" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Οι ετικέτες αρχείων θα τοποθετούνται στα δεξιά του σημειωματάριου" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Αποθήκευση του τρέχοντος αρχείου" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Ετικέτες επεξεργαστή" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Κορυφή" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Κάτω μέρος" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Πλευρική μπάρα:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Θέσεις ετικέτας" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "" "Κατά πόσο θα εμφανίζεται η γραμμή κατάστασης στο κάτω μέρος του κεντρικού " "παραθύρου" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Περιβάλλον εργασίας" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "Εμφάνιση μπάρας εργαλείων" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Μπάρα εργαλείων" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Εμφάνιση _Μπάρας Εργαλείων" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Ύφος εικονιδίων:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Μέγεθος εικονιδίων:" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Εμφάνιση" +#: ../src/interface.c:3368 +#, fuzzy +msgid "Images _and Text" +msgstr "Εικόνες και κείμενο" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3376 #, fuzzy -msgid "Customize Toolbar" -msgstr "Εμφάνιση _Μπάρας Εργαλείων" +msgid "_Images Only" +msgstr "Μόνο εικόνες" -#: ../src/interface.c:3363 +#: ../src/interface.c:3384 +#, fuzzy +msgid "_Text Only" +msgstr "Μόνο κείμενο" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Γραμματοσειρές" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +#, fuzzy +msgid "_Small Icons" +msgstr "Μικρά εικονίδια" + +#: ../src/interface.c:3429 +#, fuzzy +msgid "_Very Small Icons" +msgstr "Μικρά εικονίδια" + +#: ../src/interface.c:3437 +#, fuzzy +msgid "_Large Icons" +msgstr "Μεγάλα εικονίδια" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Μέγεθος:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Μπάρα εργαλείων" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Μπάρα εργαλείων" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Αναδίπλωση Γραμμής" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1940,11 +2077,11 @@ "επόμενη γραμμή. Σημείωση: η αναδίπλωση γραμμής έχει υψηλό κόστος απόδοσης σε " "μεγάλα έγγραφα άρα θα πρέπει να απενεργοποιείται σε αργά μηχανήματα." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Ενεργοποίηση \"smart\" πλήκτρου αρχικού καταλόγου" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1959,11 +2096,11 @@ "παράλειψης στην αρχή της τρέχουσας γραμμής, ανεξάρτητα από τη τρέχουσα θέση " "του." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Απενεργοποίηση του Drag και Drop" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1973,20 +2110,20 @@ "έτσι δεν μπορείτε να κάνετε drag και drop οποιεσδήποτε επιλογές μέσα ή έξω " "από το παράθυρο του επεξεργαστή." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Ενεργοποίηση δίπλωσης" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Εάν θα ενεργοποιείται η δίπλωση του κώδικα" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Δίπλωση/Αναδίπλωση όλων των παράγωγων ενός σημείου δίπλωσης" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1996,11 +2133,11 @@ "πλήκτρο Shift ενώ κάνετε κλικ σε ένα σύμβολο δίπλωσης θα εκτελεστεί η " "αντίθετη συμπεριφορά της ενέργειας αυτής." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Χρήση δεικτών για την εμφάνιση σφαλμάτων του μεταγλωτιστή" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -2009,95 +2146,86 @@ "Εάν θα χρησιμοποιούνται δείκτες (μια καμπυλωτή υπογράμμιση) για να εστιάζουν " "στις γραμμές που ο μεταγλωτιστής βρήκε μια προειδοποίηση ή ένα σφάλμα." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Διαγραφή λωρίδων κενών από το newline" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Ενεργοποιεί το newline να διαγράφει τις λωρίδες κενών από την προηγούμενη " "γραμμή." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "Ενεργοποίηση/απενεργοποίηση δείκτη" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Χαρακτηριστικά" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 #, fuzzy msgid "Features" msgstr "Χαρακτηριστικά" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Μέθοδος αυτόματης εσοχής:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Βασικό" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Τρέχον χαρακτήρες" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Τύπος:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 #, fuzzy msgid "Width:" msgstr "Εγγραφή:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 #, fuzzy msgid "The width in chars of a single indent" msgstr "Το πλάτος σε χαρακτήρες, τους οποίους θα έχει ένας χαρακτήρας tab" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Πλάτος του Tab:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " @@ -2106,30 +2234,30 @@ "Εάν θα ανιχνεύεται ο τύπος της εσοχής από τα περιεχόμενα του αρχείου όταν " "ένα αρχείο θα είναι ανοιχτό." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 #, fuzzy msgid "Tab key indents" msgstr "Έξυπνη εσοχή γραμμής" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Εσοχή" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "Εσοχή" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Ολοκλήρωση αποκομάτων" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " @@ -2138,32 +2266,32 @@ "Πληκτρολογήστε μια καθορισμένη σύντομη ακολουθία χαρακτήρων και ολοκληρώστε " "τη σε μια πιό σύνθετη σειρά χαρακτήρων χρησιμοποιώντας ένα πάτημα πλήκτρου." -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Αυτόματη ολοκλήρωση XML ετικετών" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Αυτόματη ολοκλήρωση και κλείσιμο των XML ετικετών (συμπεριλαμβάνει HTML " "ετικέτες)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2171,28 +2299,28 @@ "Αυτόματη ολοκλήρωση των γνωστών συμβόλων σε ανοιγμένα αρχεία (ονόματα " "συναρτήσεων, γενικές μεταβλητές, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Χαρακτήρες προς τύπωση για ολοκλήρωση:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " @@ -2201,124 +2329,123 @@ "Το πλήθος των χαρακτήρων που είναι απαραίτητα για να εμφανίσουν τη λίστα " "αυτόματηςολοκλήρωσης συμβόλων." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Αριθμός των σειρών που θα εμφανίζει η λίστα αυτόματης ολοκλήρωσης." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "Αριθμός των σειρών που θα εμφανίζει η λίστα αυτόματης ολοκλήρωσης." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Ολοκληρώσεις" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 #, fuzzy msgid "Completions" msgstr "Ολοκληρώσεις" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Αντιστροφή των χρωμάτων υπογράμμισηςτου συντάκτη" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Χρήση λευκού κειμένου σε μαύρο φόντο." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Εμφάνιση οδηγών εσοχής" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Εμφανίζει μικρές γραμμές με κουκκίδες για να σας βοηθήσει να χρησιμοποιείτε " "τη σωστή εσοχής." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Εμφάνιση των κενών" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Μαρκάρει τα κενά με τελείες και τα tab με βελάκια." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Εμφάνιση τέλους γραμμής" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "Εμφανίζει τον χαρακτήρα τέλους γραμμής" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "Εμφάνιση Μ_ετρητή Γραμμών" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Εμφανίζει ή κρύβει τον δείκτη του Μετρητή Γραμμών." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 #, fuzzy msgid "Show markers margin" msgstr "Εμφάνιση _Δεικτών Περιθωρίου" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2327,37 +2454,39 @@ "Εμφανίζει ή κρύβει τα μικρά περιθώρια δεξιά από τους αριθμούς των γραμμών, " "που χρησιμοποιούνται ως δείκτες των γραμμών." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 #, fuzzy msgid "Stop scrolling at last line" msgstr "Κύλιση στη τρέχουσα γραμμή" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Εμφάνιση" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Μεγάλος δείκτης γραμμής:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Χρώμα μεγάλου δείκτη γραμμής:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Εταιρία:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Χρώμα" + +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Καθορίζει το χρώμα του μεγάλου δείκτη γραμμής" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Επιλογέας Χρώματος" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2369,11 +2498,11 @@ "σπάσιμο της γραμμής. Θέστε τη τιμή μεγαλύτερη του 0 για να καθορίσετε που θα " "εμφανίζεται η στήλη." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Γραμμή" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2382,11 +2511,11 @@ "Τυπώνει μια κάθετη γραμμή στο παράθυρο του επεξεργαστή κειμένου στη δοθείσα " "θέση του κέρσορα (δείτε παρακάτω)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Φόντο" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2397,148 +2526,176 @@ "παρακάτω) άλλαξε στο παρακάτω καθορισμένο χρώμα. ( Προτείνεται εάν " "χρησιμοποιείτε ανάλογες γραμματοσειρές)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Απενεργοποιημένο" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "Ενεργοποίηση δίπλωσης" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Μεγάλος δείκτης γραμμής" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Απενεργοποιημένο" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Διαγράφει τις λωρίδες των κενών και των tab στο τέλος των γραμμών" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Διαδρομές εργαλείων" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Εμφάνιση" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 #, fuzzy msgid "Default end of line characters:" msgstr "Προκαθορισμένη κωδικοποίηση (νέα αρχεία):" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Νέα αρχεία" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "" -"Θέτει την προκαθορισμένη κωδικοποίηση για τα πρόσφατα δημιουργημένα αρχεία." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Προκαθορισμένη κωδικοποίηση (νέα αρχεία):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr " προκαθορισμένη κωδικοποίηση (υπάρχοντα αρχεία):" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" +msgid "Sets the default encoding for newly created files" msgstr "" -"Θέτει τη προκαθορισμένη κωδικοποίηση για το άνοιγμα των υπαρχόντων αρχείων." +"Θέτει την προκαθορισμένη κωδικοποίηση για τα πρόσφατα δημιουργημένα αρχεία." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Χρήση σταθερής κωδικοποίησης κατά το άνοιγμα αρχείων" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Αυτή η επιλογή απενεργοποιεί την αυτόματη ανίχνευση της κωδικοποίησης του " "αρχείου κατά το άνοιγμα των αρχείων και ανοίγει το αρχείο με την " "προσδιορισμένη κωδικοποίηση (συνήθως δεν χρειάζεται)." -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr " προκαθορισμένη κωδικοποίηση (υπάρχοντα αρχεία):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Θέτει τη προκαθορισμένη κωδικοποίηση για το άνοιγμα των υπαρχόντων αρχείων." + +#: ../src/interface.c:4136 #, fuzzy msgid "Encodings" msgstr "Κωδικοποίηση:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 #, fuzzy msgid "Ensure new line at file end" msgstr "Σιγούρευση για new line στο τέλος του αρχείου" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 #, fuzzy msgid "Ensures that at the end of the file is a new line" msgstr "Σιγουρεύει ότι υπάρχει στο τέλος του αρχείου το new line" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Διαγραφή λωρίδων κενών" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Διαγράφει τις λωρίδες των κενών και των tab στο τέλος των γραμμών" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Αντικατάσταση των tab με κενά" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Αντικαθιστά όλα τα tab σε κενά." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Αποθήκευση αρχείων" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Μέγεθος λίστας Πρόσφατα αρχεία:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Καθορίζει τον αριθμό των αρχείων που αποθηκεύονται στη λίστα Πρόσφατα αρχεία." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Αρχεία" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Δημιουργία:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Τερματικό:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Φυλλομετρητής:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Διαδρομή και επιλογές για το εργαλείο δημιουργίας" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2546,25 +2703,25 @@ "Ένας προσομοιωτής τερματικού όπως το xterm, gnome-terminal, ή κονσόλα (θα " "πρέπει να δέχεται το επιχείρημα -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Διαδρομή (και πιθανά επιπρόσθετα επιχειρήματα) του αγαπημένου σας " "φυλλομετρητή" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Διαδρομές εργαλείων" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Δράση πλαισίου:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2575,69 +2732,69 @@ "με %s. Μπορεί να εμφανιστεί οπουδήποτε στη δοθείσα εντολή και θα " "αντικαθιστάται πριν την εκτέλεση." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Εντολές" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Εργαλεία" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "διεύθυνση email του δημιουργού" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Αρχικά του ονόματος του δημιουργού" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Αρχική έκδοση:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Αριθμό έκδοσης, τον οποίο αρχικά έχει ένα νέο αρχείο" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Όνομα εταιρίας" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Δημιουργός:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Εταιρία:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Διεύθυνση mail:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Αρχικά:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Το όνομα του δημιουργού" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 #, fuzzy msgid "Year:" msgstr "Πλευρική μπάρα:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 #, fuzzy msgid "Date:" msgstr "Δημιουργία:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2648,7 +2805,7 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2659,7 +2816,7 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2670,55 +2827,55 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Δεδομένα πρότυπου" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Πρότυπα" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Α_λλαγή" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Συντομεύσεις πλήκτων" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Συνδυασμοί πλήκτων" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Εντολή:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Διαδρομή της εντολής εκτύπωσης αρχείων (χρησιμοποιείστε %f για το όνομα " "αρχείου)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Χρησιμοποιείστε μια εξωτερική εντολή για εκτύπωση" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Εκτύπωση αριθμών γραμμών" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Προσθέτει αριθμούς γραμμών στην εκτυπωμένη σελίδα." -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Εκτύπωση αριθμών σελίδας" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 #, fuzzy msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." @@ -2726,11 +2883,11 @@ "Προσθέτει αριθμούς σελίδας στο τέλος της κάθε σελίδας. Καταλαμβάνει 2 " "γραμμές από τη σελίδα." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Εκτύπωση κεφαλής σελίδας" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2740,21 +2897,21 @@ "το όνομα αρχείου και την τρέχουσα ημερομηνία (δείτε παρακάτω). Καταλαμβάνει " "3 γραμμές από τη σελίδα." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Χρήση του βασικού ονόματος του εκτυπώμενου αρχείου" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "" "Εκτυπώνει μόνο το βασικό όνομα (χωρίς τη διαδρομή) του εκτυπώμενου αρχείου." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Μορφή ημερομηνίας:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2765,583 +2922,609 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Χρήση εγγενής εκτύπωσης GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Κωδικοποίηση:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Γίνεται η Εκτύπωση" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Ιδιότητες Έργου" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Εμφάνιση" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Αποκοπή" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Αρχείο" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Νέο" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Άνοιγμα" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Άνοιγμα του επιλεγμένου αρχείου" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Αποθήκευση" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Αποθήκευση ως" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Αποθήκευση όλων" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Εκτύπωση" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Κλείσιμο" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Κλείσιμο όλων" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Επαναφόρτωση αρχείου" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 #, fuzzy msgid "Project" msgstr "Έρ_γο" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Ιδιότητες έργου" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Αναίρεση" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Επανάληψη" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Διπλασιασμός γραμμής ή επιλογής" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Διαγραφή τρέχον γραμμής(ών)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Διαγραφή τρέχον γραμμής(ών)" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Μετάθεση τρέχουσας γραμμής" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Κύλιση στη τρέχουσα γραμμή" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Κύλιση πάνω κατά μια γραμμή" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Κύλιση κάτω κατά μια γραμμή" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 #, fuzzy msgid "Complete snippet" msgstr "Πλήρες απόκομα" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Δράση Πλαισίου" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Πλήρης λέξη" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 #, fuzzy msgid "Show calltip" msgstr "Εμφάνιση calltip" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Εμφάνιση λίστας μακροεντολών" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Ολοκλήρωση αποκομάτων" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Σχολιασμός γραμμής(ών)" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Σχολιασμός γραμμής(ών)" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Αποκοπή" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Αντιγραφή" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Επικόλληση" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Αντιγραφή τρέχον γραμμής(ών)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Αποκοπή τρέχον γραμμής(ών)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 #, fuzzy msgid "Select" msgstr "Επιλογή Όλων" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Επιλογή Όλων" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Επιλογή τρέχουσας λέξης" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Επιλογή τρέχον γραμμής(ών)" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Πήγαινε στον προηγούμενο δείκτη" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Επιλογή τρέχουσας παραγράφου" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Πήγαινε στον επόμενο δείκτη" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 #, fuzzy msgid "Format" msgstr "_Διαμόρφωση" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 #, fuzzy msgid "Toggle Case of Selection" msgstr "Εναλλαγή πεζών/κεφαλαίων των επιλεγμένων" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Ενεργοποίηση/απενεργοποίηση σχολίων γραμμής" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Σχολιασμός γραμμής(ών)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Αποσχολιασμός γραμμής(ών)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Αύξηση εσοχής" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Μείωση εσοχής" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Αύξηση εσοχής κατά ένα κενό" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Μείωση εσοχής κατά ένα κενό" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Έξυπνη εσοχή γραμμής" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Αποστολή στη Προσαρμοσμένη Εντολή 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Αποστολή στη Προσαρμοσμένη Εντολή 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Αποστολή στη Προσαρμοσμένη Εντολή 3" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "Απ_οστολή Επιλογής προς" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 #, fuzzy msgid "Insert" msgstr "_Εισαγωγή" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Εισαγωγή ημερομηνίας" -#: ../src/keybindings.c:332 -#, fuzzy -msgid "Insert alternative white space" -msgstr "Εισαγωγή εναλλακτικού whitespace" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 #, fuzzy msgid "Settings" msgstr "Ενότητες" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 #, fuzzy msgid "Search" msgstr "_Αναζήτηση" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Εύρεση" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Εύρεση Επόμενου" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Εύρεση Προηγούμενου" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Εύρεση Επόμενων Επιλεγμένων" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Εύρεση Προηγούμενων Επιλεγμένων" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Αντικατάσταση" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Εύρεση σε Αρχεία" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Επόμενο Μήνυμα" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 #, fuzzy msgid "Previous Message" msgstr "Επόμενο Μήνυμα" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Εύρεση Χρήσης" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" msgstr "Εύρεση Χρήσης" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "Δημιουργία _Όλων" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 #, fuzzy msgid "Go to" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Πλοήγηση μια θέση πίσω" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Πλοήγηση μια θέση μπρος" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Ενεργοποίηση/απενεργοποίηση δείκτη" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Πήγαινε στον επόμενο δείκτη" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Πήγαινε στον προηγούμενο δείκτη" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Πήγαινε στον Ορισμό Ετικετών" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Πήγαινε στη Δήλωση Ετικετών" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 #, fuzzy msgid "Go to Start of Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 #, fuzzy msgid "Go to End of Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 #, fuzzy msgid "Go to Previous Word Part" msgstr "Πήγαινε στον προηγούμενο δείκτη" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 #, fuzzy msgid "Go to Next Word Part" msgstr "Πήγαινε στον επόμενο δείκτη" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 #, fuzzy msgid "View" msgstr "_Προβολή" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Πλήρης Οθόνη" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Ενεργοποίηση Παράθυρου Μηνυμάτων" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Ενεργοποίηση Πλευρικής Μπάρας" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Μεγέθυνση" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Σμίκρυνση" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Σμίκρυνση" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Μετάβαση στον Επεξεργαστή" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Μετάβαση στο Σημειωματάριο" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Μετάβαση στο VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Μετάβαση στη Μπάρα Αναζήτησης" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 #, fuzzy msgid "Switch to Sidebar" msgstr "Μετάβαση στη Μπάρα Αναζήτησης" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 #, fuzzy msgid "Switch to Compiler" msgstr "Μετάβαση στη Μπάρα Αναζήτησης" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Μετάβαση στη Μπάρα Αναζήτησης" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Προβολή Παράθυρου Μηνυμάτων" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Μετάβαση στο αριστερό έγγραφο" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Μετάβαση στη Μπάρα Αναζήτησης" + +#: ../src/keybindings.c:498 #, fuzzy msgid "Notebook tab" msgstr "Εντολές ετικετών σημειωματάριου" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Μετάβαση στο αριστερό έγγραφο" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Μετάβαση στο δεξί έγγραφο" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Μετάβαση στο τελευταία χρησιμοποιημένο έγγραφο" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Μετακίνηση εγγράφου αριστερά" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Μετακίνηση εγγράφου δεξιά" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Μετακίνηση εγγράφου ως πρώτο" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Μετακίνηση εγγράφου ως τελευταίο" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 #, fuzzy msgid "Document" msgstr "Έγγ_ραφο" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 #, fuzzy msgid "Toggle Line wrapping" msgstr "Αναδίπλωση Γραμμής" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 #, fuzzy msgid "Toggle Line breaking" msgstr "Ενεργοποίηση/απενεργοποίηση Γραμμής _Σχολιασμού" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Αντικατάσταση των Tab σε Κενά" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 #, fuzzy msgid "Toggle current fold" msgstr "Επιλογή τρέχουσας λέξης" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Δίπλωση όλων" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Αναδίπλωση όλων" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Επαναφόρτωση λίστας συμβόλων" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Απομάκρυνση _δεικτών" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Απομάκρυνση _Δεικτών Σφάλματος" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 #, fuzzy msgid "Build" msgstr "Δημιουργία" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Μεταγλώτιση" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Δημιουργία όλων" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Δημιουργία Προσαρμοσμένου Προορισμού" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Δημιουργία αντικειμένου" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Επόμενο σφάλμα" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 #, fuzzy msgid "Previous error" msgstr "Προηγούμενοι Μεταφραστές" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Εκτέλεση" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Εκτέλεση (εναλλακτική εντολή)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 #, fuzzy msgid "Build options" msgstr "Επιλογές δημιουργίας" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Εμφάνιση Επιλογέα Χρωμάτων" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Βοήθεια" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Συντομεύσεις Πληκτρολογίου" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Οι ακόλουθες συντομεύσεις πληκτρολογίου είναι διαμορφώσιμες:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "Μετάβαση στο αριστερό έγγραφο" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Πληκτρολογείστε εδώ ότι θέλετε, χρησιμοποιείστε το ως ένα σημειωματάριο/" "πίνακα μηνυμάτων" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Αποτυχία φόρτωσης ενός ή περισσότερων αρχείων συνεδρίας." @@ -3350,7 +3533,12 @@ msgid "Debug Messages" msgstr "Μηνύματα" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Αναζήτηση" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3358,85 +3546,94 @@ "Καθορισμός αρχικών αριθμών στηλών για το πρώτο ανοιγμένο αρχείο (χρήσιμο σε " "συνδυασμό με το --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Χρήση ενός εναλλακτικού φακέλλου ρυθμίσεων" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Εκτύπωση εσωτερικών ονομάτων τύπων αρχείων" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Παραγωγή γενικού αρχείου ετικετών (δείτε την τεκμηρίωση)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Καθορισμός αρχικών αριθμών γραμμών για το πρώτο ανοιγμένο αρχείο" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Να μην εμφανίζεται το παράθυρο μηνυμάτων στην εκκίνηση" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "" "Να μην φορτώνονται τα αυτόματα δεδομένα πλήρωσης (δείτε την τεκμηρίωση)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Να μην φορτώνονται τα επιπρόσθετα" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Εκτύπωση προθέματος εγκατάστασης του Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "να μην φορτώνονται να προηγούμενα αρχεία συνεδριών" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Να μην φορτώνεται η υποστήριξη τερματικού" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Όνομα αρχείου του libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Εμφάνιση έκδοσης και έξοδος" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(δημιουργήθηκε την %s με GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3445,14 +3642,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3464,52 +3661,57 @@ "ρυθμίσεων.\n" "Να γίνει εκκίνηση του Geany;" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Δεν ήταν δυνατόν να βρεθεί το αρχείο %s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Αυτό είναι το Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 #, fuzzy msgid "Configuration files reloaded." msgstr "Αποτυχία μεταγλώτισης." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Μηνύματα κατάστασης λειτουργίας" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Αντιγραφή" + +#: ../src/msgwindow.c:533 #, fuzzy msgid "Copy _All" msgstr "_Κλείσιμο Όλων" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Απόκρυψη παράθυρου μηνυμάτων" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Απομακρύνει όλους τους δείκτες σφάλματος στο τρέχον έγγραφο." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 #, fuzzy msgid "_Plugin Manager" msgstr "Διαχειριστής Επιπρόσθετων" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3520,85 +3722,93 @@ "Περιγραφή: %s\n" "Δημιουργός(οί): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Ενεργό" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Επιπρόσθετο" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Δεν υπάρχουν διαθέσιμα επιπρόσθετα." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Επιπρόσθετα" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Παρακάτω υπάρχει ένας κατάλογος με τα διαθέσιμα επιπρόσθετα. Επιλέξτε τα " -"επιπρόσθετα που πρέπει να φορτώνονται κατά την εκκίνηση του Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Λεπτομέρειες επιπρόσθετου:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Δώστε τον συνδυασμό πλήκτρων που θέλετε να χρησιμοποιήσετε για το \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "Εύρεση Όλ_ων" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "_Κλείσιμο Όλων" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Δράση" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Συντόμευση" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Ο συνδυασμός '%s' χρησιμοποιείται ήδη για \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Τερματικό" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Εισάγετε παρακάτω τις διαδρομές των εργαλείων. Τα εργαλεία που δεν " "χρειάζονται μπορούν να παραμείνουν κενά." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3606,7 +3816,7 @@ "Καθορίστε τις πληροφορίες που θα χρησιμοποιούνται στα πρότυπα. Δείτε την " "τεκμηρίωση για λεπτομέρειες." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3617,7 +3827,7 @@ "επανεκκινήσετε το Geany για να πραγματοποιηθούν." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3629,7 +3839,7 @@ "απευθείας τη αντίστοιχη συντόμευση." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3639,7 +3849,7 @@ "GTK 2.10 (η μεγαλύτερο)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3653,47 +3863,47 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Σελίδα %d από %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Ρύθμιση Εγγράφου" -#: ../src/printing.c:410 +#: ../src/printing.c:411 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "" "Εκτυπώνει μόνο το βασικό όνομα (χωρίς τη διαδρομή) του εκτυπώμενου αρχείου." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Σελίδα %d από %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Η εκτύπωση του αρχείου %s ακυρώθηκε." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 -#, c-format -msgid "File %s printed." -msgstr "Το αρχείο %s εκτυπώθηκε." +#: ../src/printing.c:783 +#, c-format +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Η εκτύπωση του %s απέτυχε (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "Παρακαλώ καθορίστε πρώτα μια εντολή εκτύπωσης στο διάλογο ιδιοτήτων" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3704,38 +3914,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Η εκτύπωση του \"%s\" απέτυχε (επιστροφή κωδικού: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Το αρχείο %s εκτυπώθηκε." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "έργα" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Νέο Έργο" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Δ_ημιουργία" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Όνομα:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Όνομα αρχείου:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Βασική διαδρομή:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3745,139 +3960,132 @@ "μια νέα διαδρομή, ή ένας υπάρχον φάκελος. Μπορείτε να χρησιμοποιήσετε " "διαδρομές σχετικές με το όνομα του έργου." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Επιλογή Βασικής Διαδρομής Έργου" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Το αρχείο έργου \"%s\" δεν ήταν δυνατόν να φορτωθεί." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Άνοιγμα Έργου" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Αρχεία Έργου" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Το έργο \"%s\" έκλεισε." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Περιγραφή:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Δημιουργία στη βασική διαδρομή" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Εκτέλεση εντολής:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Ενότ1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Η γραμμή εντολής που εκτελείται στη βασική διαδρομή του έργου. Μπορούν να " -"προστεθούν επιλογές στην εντολή. Αφήστε κενό για να χρησιμοποιήσετε την " -"προκαθορισμένη εκτέλεση εντολής." -#: ../src/project.c:476 +#: ../src/project.c:501 #, fuzzy msgid "File patterns:" msgstr "Δομή Αρχείων:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Θέλετε να το κλείσετε πρίν προχωρήσετε;" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Το έργο '%s' είναι ήδη ανοιχτό." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Το καθορισμένο όνομα έργου είναι πολύ μικρό." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Το καθορισμένο όνομα έργου είναι πολύ μεγάλο (max. %d χαρακτήρες)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Καθορίσατε ένα άκυρο όνομα αρχείου του έργου." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Η διαδρομή \"%s\" δεν υπάρχει." -#: ../src/project.c:670 +#: ../src/project.c:705 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Το αρχείο του έργου δεν ήταν δυνατόν να γραφεί (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Το έργο \"%s\" δημιουργήθηκε." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Το έργο \"%s\" αποθηκεύτηκε." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Επιλογή Όνομα Αρχείου Έργου" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Επιλογή Εκτέλεσης Εντολής Έργου" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Το έργο \"%s\" άνοιξε." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "" -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Αναζήτηση προς τα _πίσω" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Χρήση ακολουθιών _διαφυγής" -#: ../src/search.c:246 +#: ../src/search.c:263 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3886,419 +4094,441 @@ "Αντικατάσταση \\\\, \\t, \\n, \\r και \\uXXXX (Unicode χαρακτήρες) με τους " "αντίστοιχους χαρακτήρες ελέγχου." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Δ_ιάκριση κεφαλαίων/πεζών" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Ταίριασμα μόνο _ολόκληρης λέξης" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Ταίριασμα από την _αρχή της λέξης" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Προηγούμενο" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Επόμενο" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "Αναζήτηση για:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Εύρεση Όλ_ων" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Μαρκάρισμα" -#: ../src/search.c:433 +#: ../src/search.c:450 #, fuzzy msgid "Mark all matches in the current document" msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "Στη _Συνεδρία" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "Στο Έγγρα_φο" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Κλείσιμο Διαλόγο_υ" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Απενεργοποίηση αυτής της επιλογής για να παραμένει διάλογος ανοιχτός." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Αντικατάσταση & Εύ_ρεση" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Αντικα_τάσταση με:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Αντι_κατάσταση Όλων" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Στην Επιλο_γή" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Αντικαθιστά τα ευρήματα της αναζήτησης στο τρέχον επιλεγμένο κείμενο." -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Φάκε_λος:" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "Καθορισμός κωδικοποίησης:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Αντιστροφή αποτελεσμάτων αναζήτησης" -#: ../src/search.c:797 +#: ../src/search.c:826 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Αντιστροφή των αποτελεσμάτων αναζήτησης, για επιλογή των γραμμών που δεν " "είχαν αποτελέσματα αναζήτησης." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Έ_ξτρα επιλογές:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Βρέθηκαν %d αποτελέσματα αναζήτησης για \"%s\"." msgstr[1] "Βρέθηκαν %d αποτελέσματα αναζήτησης για \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, fuzzy, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Αντικατάσταση κειμένου σε %u αρχεία." -msgstr[1] "Αντικατάσταση κειμένου σε %u αρχεία." +msgid "Replaced %u matches in %u documents." +msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Ο φάκελος για αναζήτηση σε αρχεία δεν υπάρχει." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Δεν υπάρχει κείμενο για αναζήτηση." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "_Αναζήτηση" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (στο φάκελο: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Δεν ήταν δυνατόν να ανοιχτεί ο φάκελος (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Η αναζήτηση απέτυχε." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Η αναζήτηση ολοκληρώθηκε με %d αποτελέσματα." msgstr[1] "Η αναζήτηση ολοκληρώθηκε με %d αποτελέσματα." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Δεν υπάρχουν αποτελέσματα αναζήτησης." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Κεφάλαιο" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Ενότητα" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Ενότ1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Ενότ2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Ενότ3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Παράρτημα" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Άλλα" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Μονάδα" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Τύποι" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 #, fuzzy msgid "Functions" msgstr "Συναρτήσεις" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Ενότητες" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Πλήκτρα" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Μεταβλητές" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Εντολή" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Περιβάλλον" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Υποενότητα" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 #, fuzzy msgid "Subsubsection" msgstr "Υπο-υποενότητα" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Ετικέτα" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "Κατάσταση" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Πακέτο" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Μου" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Τοπικό" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Μας" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Ετικέτες" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Σταθερές" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Κλάσεις" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Σταθερές" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "Στην Επιλο_γή" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "Επιλογή Όλων" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Μονάδες" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Σίνγκλετον" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Μέθοδοι" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Ιδιότητες" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Εξαγωγή" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "χωρίς όνομα" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Κατάσταση" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Ιδιότητες" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Μεταβλητές" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Συναρτήσεις" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Μέλη" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Ετικέτες" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Μακροεντολές" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 #, fuzzy msgid "Defines" msgstr "Γραμμές:" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "Κατάσταση" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Άγνωστη προέκταση τύπου αρχείου για \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Αποτυχία δημιουργίας αρχείου ετικετών, πιθανόν λόγω του ότι δεν βρέθηκαν " "ετικέτες.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4307,7 +4537,7 @@ "Χρήση: %s -g <Αρχείο Ετικέτας> <Λίστα Αρχείου>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4318,183 +4548,201 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Φόρτωση ετικετών" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Αρχεία ετικέτας Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Φορτωμένες %s ετικέτες αρχείου '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Δεν ήταν δυνατόν να φορτωθεί το αρχείο ετικετών '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Ο καθορισμός του \"%s\" δεν βρέθηκε." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Ταξινόμηση κατά _Όνομα" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Ταξινόμηση κατά _Εμφάνιση" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Αποθήκευση του τρέχοντος αρχείου" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Αποθήκευση όλων των ανοιγμένων αρχείων" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Επαναφόρτωση του τρέχοντος αρχείου από τον δίσκο" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Κλείσιμο του τρέχοντος αρχείου" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "Κλείσιμο όλων των ανοιγμένων αρχείων" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "Μετατροπή σε πεζά/κεφαλαία των επιλεγμένων" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "Μετατροπή σε πεζά/κεφαλαία των επιλεγμένων" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Αναίρεση της τελευταίας τροποποίησης" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Επανάληψη της τελευταίας τροποποίησης" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Εκτελέση ή εμφάνιση του τρέχοντος αρχείου" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" "Ανοίγει έναν επιλογέα χρωμάτων, για να επιλέξετε χρώματα από μια παλέτα." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Μεγέθυνση στο κείμενο" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Σμίκρυνση από το κείμενο" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Μείωση εσοχής" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Αύξηση εσοχής" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr " Βρείτε το εισακτέο κείμενο στο τρέχον αρχείο" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "Μετάβαση στον εισακτέο αριθμό γραμμής." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Κλείσιμου του Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "Έγγραφο XML" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Δημιουργία νέου αρχείου" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Δημιουργία νέου αρχείου" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Άνοιγμα υπάρχοντος αρχείου" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Άνοιγμα του επιλεγμένου αρχείου" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Δεν έχει άλλα λάθη στη δημιουργία." + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "Μετάβαση στη Γραμμή" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Εμφάνιση" @@ -4520,7 +4768,7 @@ msgid "Custom command failed: %s" msgstr "Δεν καθορίστηκαν προσαρμοσμένες εντολές." -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Ρύθμιση Προσαρμοσμένων Εντολών" @@ -4532,199 +4780,190 @@ "Μπορείτε να στείλετε την τρέχουσα επιλογή σε οποιαδήποτε από αυτές τις " "εντολές και το αποτέλεσμα της εντολής αντικαθιστά την τρέχουσα επιλογή." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Δεν καθορίστηκαν προσαρμοσμένες εντολές." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Μέτρηση Λέξεων" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "επιλογή" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "ολόκληρο έγγραφο" -#: ../src/tools.c:640 +#: ../src/tools.c:611 #, fuzzy msgid "Range:" msgstr "Σειρά:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Γραμμές:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Λέξεις:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Χαρακτήρες:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Δεν βρέθηκαν ετικέτες" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Εμφάνιση Λίστας _Συμβόλων" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Εμφάνιση Λίστας Ε_γγράφων" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Από_κρυψη Πλευρικής Μπάρας" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Εμφάνιση _Πλήρης Διαδρομής Ονόματος" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Καθορισμός κωδικοποίησης:" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, fuzzy, c-format msgid "filetype: %s" msgstr "Καθορισμός τύπου αρχείου:" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Η γραμματοσειρά ενημερώθηκε (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Ρύθμιση Προσαρμοσμένης Διάταξης Ημερομηνίας" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Επιλογή Φακέλου" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Επιλογή Αρχείου" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "Αποτυχία μεταγλώτισης." - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "Αποθήκευση Ό_λων" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "_Κλείσιμο Όλων" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Τερματικό" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 #, fuzzy msgid "_Set Path From Document" msgstr "Ρύθμιση Διαδρομής από το Έγγραφο" -#: ../src/vte.c:553 +#: ../src/vte.c:521 #, fuzzy msgid "_Restart Terminal" msgstr "Επανεκκίνηση Τερματικού" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Εισαγωγή Μεθόδων" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4732,50 +4971,38 @@ "Δεν ήταν δυνατόν να αλλαχθεί ο φάκελος στο VTE επειδή πιθανόν περιέχει μια " "εντολή." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Επιπρόσθετο τερματικού" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Αυτές οι ρυθμίσεις για το virtual terminal emulator widget (VTE) θα " -"προστεθούν μόνο εάν ήταν δυνατόν να φορτωθεί η βιβλιοθήκη του VTE." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Γραμματοσειρά τερματικού:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "Καθορίζει την γραμματοσειρά για το τερματικό." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Χρώμα πρώτου πλάνου:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Χρώμα υπόβαθρου:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 #, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Καθορίζει το χρώμα πρώτου πλάνου για το κείμενο του τερματικού." -#: ../src/vte.c:775 +#: ../src/vte.c:771 #, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Καθορίζει το χρώμα υπόβαθρου για το κείμενο του τερματικού." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Ιστορικό γραμμών:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 #, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " @@ -4784,11 +5011,11 @@ "Καθορίζει το ιστορικό των γραμμών, που μπορείτε να γυρίζετε πίσω στο " "τερματικό" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Κέλυφος:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 #, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " @@ -4797,37 +5024,37 @@ "Καθορίζει τη διαδρομή στο κέλυφος από την οποία θα ξεκινά μέσα στην " "εξομοίωση του τερματικού." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "" -#: ../src/vte.c:824 +#: ../src/vte.c:820 #, fuzzy msgid "Whether to scroll to the bottom when output is generated" msgstr "Εάν θα γίνεται χρήση των tab ή των κενών όταν θα εισάγεται μια εσοχή." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "Εάν θα ενεργοποιείται η δίπλωση του κώδικα" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "" -#: ../src/vte.c:833 +#: ../src/vte.c:829 #, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" @@ -4835,11 +5062,11 @@ "Επιτρέπει το VTE να λαμβάνει συντομεύσεις πλήκτρων (εκτός από τις εντολές " "εστίασης)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Απενεργοποίηση συντόμευσης του πλήκτρου μενού (προκαθορισμένο το F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4849,11 +5076,11 @@ "μπάρας του μενού (προκαθορισμένο το F10). Απενεργοποιώντας το μπορεί να " "είναι χρήσιμο, για παράδειγμα, στο Midnight Commander μέσα από το VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Ακολούθησε τη διαδρομή του τρέχοντος αρχείου" -#: ../src/vte.c:841 +#: ../src/vte.c:837 #, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" @@ -4862,11 +5089,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "" -#: ../src/vte.c:847 +#: ../src/vte.c:843 #, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " @@ -4876,11 +5103,11 @@ "χρησιμοποιείται για να εμφανίζει τη κατάσταση εξόδου του εκτελέσιμου " "προγράμματος." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Εκτέλεση προγραμμάτων στο VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 #, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " @@ -4890,94 +5117,127 @@ "τερματικού. Παρακαλώ σημειώστε, προγράμματα που εκτελούνται στο VTE δεν " "είναι δυνατόν να σταματήσουν." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Αρχεία έργου Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Εκτελέσιμα" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Δημιουργός Κλάσης" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Δημιουργεί τα πηγαία αρχεία για το νέο τύπο κλάσης." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Δημιουργία Κλάσης" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Αντικατάσταση" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Όνομα:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Κλάση" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Όνομα κλάσης:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Αρχείο κεφαλής:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Πηγαίο αρχείο:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 #, fuzzy msgid "Inheritance" msgstr "Κληρονομιά" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Βασική κλάση:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Πηγαίο αρχείο %s" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Βασική κεφαλή:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Γενικά" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 #, fuzzy msgid "Base GType:" msgstr "Βασική GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Επιλογές" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Δημιουργία κατασκευής" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Σίνγκλετον" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Δημιουργία Κλά_σης" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 #, fuzzy msgid "_C++ Class" msgstr "C++ Κλάση" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 #, fuzzy msgid "_GTK+ Class" msgstr "GTK+ Κλάση" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "C++ Κλάση" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Χαρακτήρες HTML" @@ -4987,52 +5247,57 @@ msgstr "Εισάγει οντότητες HTML χαρακτήρων όπως &'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Η δημιουργική ομάδα του Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML χαρακτήρες" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 χαρακτήρες" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Ελληνικοί χαρακτήρες" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Μαθηματικοί χαρακτήρες" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Τεχνικοί χαρακτήρες" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Χαρακτήρες στίξης" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Διάφοροι χαρακτήρες" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων των επιπρόσθετων." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Ειδικοί Χαρακτήρες" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Εισαγωγή" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -5041,43 +5306,43 @@ "σε αυτό ή με τη χρήση του κουμπιού εισάγετέ το στην τρέχουσα θέση του " "κέρσορα." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Χαρακτήρας" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (όνομα)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Εισαγωγή Ει_δικών HTML Χαρακτήρων" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "Αντικατάσταση" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Τοποθέτηση των νέων ετικετών αρχείων:" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Εισαγωγή Ειδικών Χαρακτήρων HTML" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "Ειδικοί Χαρακτήρες" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 #, fuzzy msgid "Toggle plugin status" msgstr "Ενεργοποίηση/απενεργοποίηση σχολίων γραμμής" @@ -5106,111 +5371,111 @@ "Αποδίδει το μέγεθος της γραμματοσειράς του εγγράφου μαζί με το τρέχον " "επίπεδο μεγέθυνσης." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Η εξαγωγή του εγγράφου ως '%s'έγινε με επιτυχία." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Το αρχείο '%s' δεν ήταν δυνατόν να γραφεί (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Το αρχείο '%s' υπάρχει ήδη. Θέλετε να αντικατασταθεί;" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Εξαγωγή" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 #, fuzzy msgid "As _HTML" msgstr "Ως HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 #, fuzzy msgid "As _LaTeX" msgstr "Ως LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Φυλλομετρητής Αρχείων" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Προσθέτει μια ετικέτα φιλλομετρητή αρχείων στη πλευρική μπάρα." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Επιλέχθηκαν πάρα πολλά αντικείμενα!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" "Δεν ήταν δυνατόν να εκτελεστεί η προσαρμοσμένη εξωτερική εντολή %s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Άνοιγμα εξωτερι_κά" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Εύρεση σε Αρχεία" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Εμφάνιση Κ_ρυφών Αρχείων" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Πάνω" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Ανανέωση" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Αρχικός Κατάλογος" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Καθορισμός διαδρομής από το έγγραφο" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 #, fuzzy msgid "Clear the filter" msgstr "Κλείσιμο του τρέχοντος αρχείου" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 #, fuzzy msgid "Filter:" msgstr "Αρχείο" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων των επιπρόσθετων." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 #, fuzzy msgid "External open command:" msgstr "Άλλες εντολές" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5226,15 +5491,15 @@ "Το %d θα αντικαθίσταται με το όνομα διαδρομής του επιλεγμένου αρχείου χωρίς " "το όνομα αρχείου" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Εμφάνιση κρυφών αρχείων" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Απόκρυψη αρχείων αντικειμένου" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5242,12 +5507,12 @@ "Να μην εμφανίζονται τα παραγόμενα αρχεία του αντικειμένου στον φυλλομετρητή " "αρχείων, τα οποία συμπεριλαμβάνουν τα *.o, *.obj, *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 #, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" @@ -5363,38 +5628,197 @@ msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "" +#, fuzzy +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Καθορισμός των Περιεχομένων και Επιχειρημάτων" + +#, fuzzy +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> DVI" + +#, fuzzy +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> PDF" + +#, fuzzy +#~ msgid "_View DVI File" +#~ msgstr "Προβολή Αρχείου DVI" + +#, fuzzy +#~ msgid "V_iew PDF File" +#~ msgstr "Προβολή Αρχείου PDF" + +#, fuzzy +#~ msgid "_Set Arguments" +#~ msgstr "Καθορισμός Επιχειρημάτων" + +#, fuzzy +#~ msgid "Set Arguments" +#~ msgstr "Καθορισμός Επιχειρημάτων" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Καθορισμός προγραμμάτων και επιλογών για μεταγλώτιση και προβολή αρχείων " +#~ "(La)TeX" + +#~ msgid "DVI creation:" +#~ msgstr "Δημιουργία DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Δημιουργία PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Προεπισκόπηση DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Προεπισκόπηση PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f θα αντικατασταθεί με το τρέχον όνομα αρχείου, π.χ. test_file.c\n" +#~ "%e θα αντικατασταθεί με το τρέχον όνομα αρχείου χωρίς προέκταση, π.χ. " +#~ "test_file" + +#, fuzzy +#~ msgid "Set Includes and Arguments" +#~ msgstr "Καθορισμός των Περιεχομένων και των Επιχειρημάτων" + +#, fuzzy +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Καθορισμός των εντολών για δημιουργία και εκτέλεση προγραμμάτων." + +#~ msgid "Compile:" +#~ msgstr "Μεταγλώτιση:" + +#, fuzzy +#~ msgid "Build:" +#~ msgstr "Δημιουργία:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Αποτυχία εκτέλεσης του προγράμματος προβολής" + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "Απόκρυψη μπάρας εργαλείων" + +#~ msgid "Icon style:" +#~ msgstr "Ύφος εικονιδίων:" + +#~ msgid "Icon size:" +#~ msgstr "Μέγεθος εικονιδίων:" + +#~ msgid "Appearance" +#~ msgstr "Εμφάνιση" + +#, fuzzy +#~ msgid "Hard tab width:" +#~ msgstr "Πλάτος του Tab:" + +#~ msgid "Long line marker:" +#~ msgstr "Μεγάλος δείκτης γραμμής:" + +#~ msgid "Long line marker color:" +#~ msgstr "Χρώμα μεγάλου δείκτη γραμμής:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Διαδρομή και επιλογές για το εργαλείο δημιουργίας" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Διπλασιασμός γραμμής ή επιλογής" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "Απ_οστολή Επιλογής προς" + +#~ msgid "Run (alternative command)" +#~ msgstr "Εκτέλεση (εναλλακτική εντολή)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Παρακάτω υπάρχει ένας κατάλογος με τα διαθέσιμα επιπρόσθετα. Επιλέξτε τα " +#~ "επιπρόσθετα που πρέπει να φορτώνονται κατά την εκκίνηση του Geany." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Η εκτύπωση του αρχείου %s ακυρώθηκε." + +#~ msgid "Make in base path" +#~ msgstr "Δημιουργία στη βασική διαδρομή" + +#~ msgid "Run command:" +#~ msgstr "Εκτέλεση εντολής:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Η γραμμή εντολής που εκτελείται στη βασική διαδρομή του έργου. Μπορούν να " +#~ "προστεθούν επιλογές στην εντολή. Αφήστε κενό για να χρησιμοποιήσετε την " +#~ "προκαθορισμένη εκτέλεση εντολής." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Επιλογή Εκτέλεσης Εντολής Έργου" + +#, fuzzy +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Αντικατάσταση κειμένου σε %u αρχεία." +#~ msgstr[1] "Αντικατάσταση κειμένου σε %u αρχεία." + +#~ msgid "My" +#~ msgstr "Μου" + +#~ msgid "Local" +#~ msgstr "Τοπικό" + +#~ msgid "Our" +#~ msgstr "Μας" + +#~ msgid "Terminal plugin" +#~ msgstr "Επιπρόσθετο τερματικού" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Αυτές οι ρυθμίσεις για το virtual terminal emulator widget (VTE) θα " +#~ "προστεθούν μόνο εάν ήταν δυνατόν να φορτωθεί η βιβλιοθήκη του VTE." + +#~ msgid "Terminal font:" +#~ msgstr "Γραμματοσειρά τερματικού:" #~ msgid "Diff file" #~ msgstr "Αρχείο Diff" @@ -5543,9 +5967,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Αναδιπλώνει όλες τις στήλες κώδικα" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Απομακρύνει όλους τους δείκτες σφάλματος στο τρέχον έγγραφο." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5560,9 +5981,6 @@ #~ msgstr "" #~ "Εμφανίζει μια λίστα όλων των συμτομεύσεων πληκτρολογίου για το Geany." -#~ msgid "Color" -#~ msgstr "Χρώμα" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Εισάγετε έναν αριθμό γραμμής και μεταβείτε σε αυτήν." @@ -5642,16 +6060,10 @@ #~ msgid "Items" #~ msgstr "Αντικείμενα" -#~ msgid "Use white text on a black background." -#~ msgstr "Χρήση λευκού κειμένου σε μαύρο φόντο." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "" #~ "Εκτελείται σε επίπεδο αποσφαλμάτωσης (που σημαίνει ότι παραμένει σε χρήση)" -#~ msgid "Search failed." -#~ msgstr "Η αναζήτηση απέτυχε." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Δεν βρέθηκε το αρχείο pixmap: %s" diff -Nru geany-0.18/po/en_GB.po geany-0.19/po/en_GB.po --- geany-0.18/po/en_GB.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/en_GB.po 2010-05-23 12:41:46.000000000 +0100 @@ -1,15 +1,15 @@ # British English translation of geany. -# Copyright (C) 2007 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2007-2010 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. -# Jeff Bailes , 2007-2009. +# Jeff Bailes , 2007-2010. # # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-03 21:19+1000\n" +"POT-Creation-Date: 2010-05-23 13:39+0200\n" +"PO-Revision-Date: 2010-05-23 21:33+1000\n" "Last-Translator: Jeff Bailes \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "A fast and lightweight IDE using GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,68 +29,68 @@ msgid "Integrated Development Environment" msgstr "Integrated Development Environment" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "About Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "A fast and lightweight IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(built on or after %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Developers" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "maintainer" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "developer" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "translation maintainer" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Translators" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Previous Translators" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Contributors" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Some of the many contributors (for a more detailed list, see the file %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Credits" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licence" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -98,277 +98,279 @@ "Licence text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" +msgstr "failed to substitute %%p, no project active" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Process failed, no working directory" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Failed to execute \"%s\" (start-script could not be created)" +msgid "%s (in directory: %s)" +msgstr "%s (in directory: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Process failed (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (in directory: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Failed to change the working directory to \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Failed to execute \"%s\" (start-script could not be created)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Could not execute the file in the VTE because it probably contains a command." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" + +#: ../src/build.c:1083 msgid "Compilation failed." msgstr "Compilation failed." -#: ../src/build.c:928 +#: ../src/build.c:1097 msgid "Compilation finished successfully." msgstr "Compilation finished successfully." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compile" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Build" +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "Custom Text" + +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Enter custom text here, all entered text is appended to the command." -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make All" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make Custom _Target" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _Object" - -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1333 msgid "_Next Error" msgstr "_Next Error" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1335 msgid "_Previous Error" msgstr "_Previous Error" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Set Includes and Arguments" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_View DVI File" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_iew PDF File" +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "_Set Build Commands" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Set Arguments" +#: ../src/build.c:1625 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Build the current file" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the default target" +msgstr "Build the current file with Make and the default target" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Set Arguments" +#: ../src/build.c:1641 +msgid "Build the current file with Make and the specified target" +msgstr "Build the current file with Make and the specified target" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Set programs and options for compiling and viewing (La)TeX files." +#: ../src/build.c:1643 +msgid "Compile the current file with Make" +msgstr "Compile the current file with Make" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI creation:" +#: ../src/build.c:1670 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Process could not be stopped (%s)." -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF creation:" +#: ../src/build.c:1687 ../src/build.c:1699 +msgid "No more build errors." +msgstr "No more build errors." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI preview:" +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "Set menu item label" + +#: ../src/build.c:1790 +msgid "Item" +msgstr "Item" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF preview:" +#: ../src/build.c:1791 ../src/symbols.c:650 +msgid "Label" +msgstr "Label" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1792 ../src/symbols.c:645 +msgid "Command" +msgstr "Command" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Set Includes and Arguments" +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "Working directory" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Set the commands for building and running programs." +#: ../src/build.c:1794 +msgid "Clear" +msgstr "Clear" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "Click to set menu item label" + +#: ../src/build.c:1906 ../src/build.c:1908 #, c-format -msgid "%s commands" -msgstr "%s commands" +msgid "%s Commands" +msgstr "%s Commands" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compile:" +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "No Filetype" -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Build:" +#: ../src/build.c:1916 ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "Error Regular Expression:" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Execute:" +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "Non-Filetype Commands" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Build the current file" +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Note: Item 2 opens a dialogue and appends the response to the command." -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make Custom Target" +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "Execute Commands" -#: ../src/build.c:1918 +#: ../src/build.c:1994 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Build the current file with Make and the default target" +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "Set Build Commands" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Build the current file with Make and the specified target" +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "_Compile" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compile the current file with Make" +#. build the code +#: ../src/build.c:2408 ../src/build.c:2671 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Build" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Failed to execute the view program" +#: ../src/build.c:2415 ../src/build.c:2445 ../src/build.c:2638 +msgid "_Execute" +msgstr "_Execute" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Process could not be stopped (%s)." +#. build the code with make custom +#: ../src/build.c:2460 ../src/build.c:2636 ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "Make Custom _Target" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "No more build errors." +#. build the code with make object +#: ../src/build.c:2462 ../src/build.c:2637 ../src/build.c:2699 +msgid "Make _Object" +msgstr "Make _Object" + +#: ../src/build.c:2464 ../src/build.c:2635 +msgid "_Make" +msgstr "_Make" + +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "_Make All" + +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "_Set Build Menu Commands" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Do you really want to quit?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d file saved." +msgstr[1] "%d files saved." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Reload" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Any unsaved changes will be lost." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Are you sure you want to reload '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Go to Line" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Enter the line you want to go to:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Please set the filetype for the current file before using this function." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Use Custom Date Format" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Custom Date Format" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -376,24 +378,23 @@ "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Date format string could not be converted (possibly too long)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "No more message items." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Open File" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_View" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -401,28 +402,28 @@ "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Detect by file extension" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Detect from file" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_More Options" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Show _hidden files" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Set encoding:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -437,11 +438,11 @@ "encoding." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Set filetype:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -461,23 +462,23 @@ msgid "Filename already exists!" msgstr "Filename already exists!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Save File" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "R_ename" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Save the file and rename it" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Open file in a new tab" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -485,41 +486,41 @@ "Keep the current unsaved document open and open the newly saved file in a " "new tab" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Error" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Question" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Warning" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Information" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Don't save" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "The file '%s' is not saved." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Do you want to save it before closing?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Choose font" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -527,106 +528,110 @@ "An error occurred or file information could not be retrieved (e.g. from a " "new file)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "unknown" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Properties" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Type:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Size:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Location:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Read-only:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(only inside Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Encoding:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(with BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(without BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modified:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Changed:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Accessed:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Permissions:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Read:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Write:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Execute:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Owner:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Group:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Other:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "File %s closed." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "New file \"%s\" opened." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Could not open file %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -641,12 +646,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "The file \"%s\" is not valid %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -655,30 +660,30 @@ "The file \"%s\" does not look like a text file or the file encoding is not " "supported." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Spaces" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabs" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabs and Spaces" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setting %s indentation mode for %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Invalid filename" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "File %s reloaded." @@ -686,20 +691,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "File %s opened(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", read-only" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Error renaming file." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -708,7 +713,7 @@ "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -717,52 +722,52 @@ "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Error message: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Error saving file." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Error saving file (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "File %s saved." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" was not found." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Wrap search and find again?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "No matches found for \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgstr[1] "%s: replaced %d occurrences of \"%s\" with \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Do you want to reload it?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -771,24 +776,29 @@ "The file '%s' on the disk is more recent than\n" "the current buffer." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Try to resave the file?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Close _without saving" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "File \"%s\" was not found on disk! Try to resave the file?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Enter Tab Width" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Enter the amount of spaces which should be replaced by a tab character." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Warning: non-standard hard tab width: %d != 8!" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celtic" @@ -899,572 +909,620 @@ msgid "Without encoding" msgstr "Without encoding" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_West European" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_East European" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "East _Asian" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_SE & SW Asian" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Middle Eastern" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s source file" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "%s file" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "None" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell script file" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML document" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump file" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Config file" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext translation file" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s script file" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Programming Languages" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Scripting Languages" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Markup Languages" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "M_iscellaneous Languages" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "_Custom Filetypes" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "All Source" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "All files" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Bad regex for filetype %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "untitled" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Could not find file '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "_Colour Schemes" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Default" + +#: ../src/interface.c:295 msgid "_File" msgstr "_File" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "New (with _Template)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisible" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Open Selected F_ile" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Recent _Files" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Save A_ll" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "R_eload As" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "invisible" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Page Set_up" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Close Ot_her Documents" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "C_lose All" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Edit" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Reflow Lines/Block" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "T_oggle Case of Selection" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Transpose Current Line" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Comment Line(s)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "U_ncomment Line(s)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "_Toggle Line Commentation" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_plicate Line or Selection" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Increase Indent" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Decrease Indent" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Send Selection to Terminal" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Smart Line Indent" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Send Selection to" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Commands" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Cut Current Line(s)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copy Current Line(s)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Delete Current Line(s)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Duplicate Line or Selection" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Select Current Line(s)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Select Current Paragraph" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Insert Alternative White Space" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "_Go to Next Marker" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "_Go to Previous Marker" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Send Selection to Terminal" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "I_nsert Comments" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Insert _ChangeLog Entry" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Insert File _Header" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Insert _Function Description" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Insert _Multiline Comment" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Insert _GPL Notice" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Insert _BSD License Notice" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Insert Dat_e" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Insert \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Preference_s" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "P_lugin Preferences" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Search" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Find _Next" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Find _Previous" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Find in F_iles" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Replace" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Find _Selected" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Find Pre_vious Selected" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Next _Message" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Pr_evious Message" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Go to Line" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Change _Font" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "To_ggle All Additional Widgets" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Full_screen" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Show Message _Window" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Show _Toolbar" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Show Side_bar" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Show _Markers Margin" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Show _Line Numbers" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Show _White Space" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Show Line _Endings" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Show _Indentation Guides" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Line Wrapping" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Line _Breaking" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Auto-indentation" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "In_dent Type" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabs" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Spaces" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abs and Spaces" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Read _Only" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Write Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Set File_type" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Set _Encoding" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Set Line E_ndings" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convert and Set to _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Convert and Set to _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Convert and Set to CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Strip Trailing Spaces" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Replace Tabs by Spaces" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Replace Spaces b_y Tabs" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Fold All" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Unfold All" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Remove _Markers" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Remove Error _Indicators" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Project" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_New" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Open" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "_Recent Projects" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Close" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Tools" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Reload Configuration" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "C_onfiguration Files" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Colour Chooser" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Word Count" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Load Ta_gs" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Reload Configuration" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Help" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Website" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Keyboard Shortcuts" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Debug Messages" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symbols" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documents" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Status" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Messages" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Scribble" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Images _and Text" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "_Images Only" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "_Text Only" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Large Icons" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Small Icons" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "_Very Small Icons" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Customise Toolbar" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "_Toolbar Preferences" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Hide Toolbar" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Find _Usage" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Find _Document Usage" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Go to _Tag Definition" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Go to T_ag Declaration" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Conte_xt Action" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Preferences" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Load files from the last session" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Opens at startup the files from the last session" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Load virtual terminal support" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1472,39 +1530,39 @@ "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Enable plugin support" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Startup" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Save window position and geometry" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Saves the window position and geometry and restores it at the start" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Confirm exit" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Shows a confirmation dialogue on exit" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Shutdown" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Startup path:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1512,19 +1570,19 @@ "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Project files:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Path to start in when opening project files" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Extra plugin path:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1534,19 +1592,19 @@ "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Paths" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Startup" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Beep on errors or when compilation has finished" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1554,11 +1612,11 @@ "Whether to beep if an error occurred or when the compilation process has " "finished" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Switch to status message list at new message" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1566,11 +1624,11 @@ "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Suppress status messages in the status bar" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1578,11 +1636,11 @@ "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Auto-focus widgets (focus follows mouse)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1592,15 +1650,27 @@ "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Use Windows File Open/Save dialogues" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Defines whether to use the native Windows File Open/Save dialogues or " +"whether to use the GTK default dialogues" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Miscellaneous" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Always wrap search and hide the Find dialogue" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1608,11 +1678,11 @@ "Always wrap search around the document and hide the Find dialogue after " "clicking Find Next/Previous" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Use the current word under the cursor for Find dialogues" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1620,19 +1690,19 @@ "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialogue and there is no selection" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Use the current file's directory for Find in Files" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Search" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Use project-based session files" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1640,11 +1710,11 @@ "Whether to store a project's session files and open them when re-opening the " "project" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Store project file inside the project base directory" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1656,75 +1726,97 @@ "directory. You can still change the path of the project file in the New " "Project dialogue." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projects" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Miscellaneous" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "General" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Show symbol list" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Toggle the symbol list on and off" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Show documents list" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Toggle the documents list on and off" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Show sidebar" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Position:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Left" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Right" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Sidebar" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Symbol list:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Message window:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Sets the font for the message window" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Sets the font for the symbol list" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Sets the editor font" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Fonts" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Show editor tabs" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Show close buttons" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1732,109 +1824,139 @@ "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Placement of new file tabs:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Left" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "File tabs will be placed on the left of the notebook" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Right" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "File tabs will be placed on the right of the notebook" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Next to current" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Double-clicking hides all additional widgets" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Calls the View->Toggle All Additional Widgets command" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Editor tabs" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Top" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Bottom" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Sidebar:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Tab positions" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Show status bar" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Whether to show the status bar at the bottom of the main window" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Show T_oolbar" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Append Toolbar to the Menu" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "Pack the toolbar to the main menu to save vertical space" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Toolbar" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Icon style:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Icon size:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Appearance" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Customise Toolbar" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "System _Default" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Images _and Text" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "_Images Only" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "_Text Only" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Icon Style" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "S_ystem Default" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Small Icons" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Very Small Icons" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Large Icons" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Icon Size" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Toolbar" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Toolbar" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Line wrapping" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1844,11 +1966,11 @@ "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Enable \"smart\" home key" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1862,11 +1984,11 @@ "key always moves the caret to the start of the current line, regardless of " "its current position." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Disable Drag and Drop" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1874,19 +1996,19 @@ "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Enable folding" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Whether to enable folding the code" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Fold/unfold all children of a fold point" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1894,11 +2016,11 @@ "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behaviour is used." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Use indicators to show compile errors" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1906,23 +2028,23 @@ "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Newline strips trailing spaces" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Enable newline to strip the trailing spaces on the previous line" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Line breaking column:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Comment toggle marker:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1930,65 +2052,57 @@ "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Features" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Features" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Auto-indent mode:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Basic" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Current chars" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Match braces" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Type:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Width:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "The width in chars of a single indent" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Use spaces when inserting indentation" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Use one tab per indent" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Use spaces if the total indent is less than the tab width, otherwise use both" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Hard tab width:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "The width of a tab when Tabs & Spaces is set for a document" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1996,29 +2110,29 @@ "Whether to detect the indentation type from file contents when a file is " "opened" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Tab key indents" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Snippet completion" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2026,19 +2140,19 @@ "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XML tag autocompletion" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Automatic completion and closing of XML tags (includes HTML tags)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Automatic continuation of multi-line comments" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2046,11 +2160,11 @@ "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Autocomplete symbols" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2058,27 +2172,27 @@ "Automatic completion of known symbols in open files (function names, global " "variables, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Autocomplete all words in document" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Drop rest of word on completion" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Max. symbol name suggestions:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Completion list height:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Characters to type for autocompletion:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" @@ -2086,115 +2200,111 @@ "The amount of characters which are necessary to show the symbol " "autocompletion list" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Display height in rows for the autocompletion list" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Maximum number of entries to display in the autocompletion list" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Completions" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Brackets ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Auto-close brackets when typing an opening one" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Single quotes ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Auto-close simple quote when typing an opening one" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Curly brackets { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Auto-close curly bracket when typing an opening one" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Square brackets [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Auto-close square-bracket when typing an opening one" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Double quotes \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Auto-close double quote when typing an opening one" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Auto-close quotes and brackets" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Completions" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Invert syntax highlighting colours" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Use white text on a black background and invert all colours, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Invert all colours, by default using white text on a black background" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Show indentation guides" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Shows small dotted lines to help you to use the right indentation" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Show white space" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marks spaces with dots and tabs with arrows" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Show line endings" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Shows the line ending character" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Show line numbers" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Shows or hides the Line Number margin" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Show markers margin" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2202,36 +2312,36 @@ "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Stop scrolling at last line" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Whether to stop scrolling one page past the last line of a document" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Display" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Long line marker:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Long line marker colour:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Column:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Colour:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Sets the colour of the long line marker" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Colour Chooser" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2241,11 +2351,11 @@ "long lines, or as a hint to break the line. Set this value to a value " "greater than 0 to specify the column where it should appear." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Line" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2253,11 +2363,11 @@ "Prints a vertical line in the editor window at the given cursor position " "(see below)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Background" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2267,110 +2377,142 @@ "below) changed to the colour set below, (this is recommended if you use " "proportional fonts)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Disabled" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Enabled" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Long line marker" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Disabled" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Do not show virtual spaces" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Only for rectangular selections" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Always" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Always show virtual spaces beyond the end of lines" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Virtual spaces" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Display" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Open new documents from the command-line" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Start a new file for each command-line filename that doesn't exist" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Default end of line characters:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "New files" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Sets the default encoding for newly created files" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Default encoding (new files):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Default encoding (existing files):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Sets the default encoding for opening existing files" - -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Use fixed encoding when opening files" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Sets the default encoding for newly created files" -#: ../src/interface.c:4030 +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Use fixed encoding when opening non-Unicode files" + +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Default encoding (existing non-Unicode files):" -#: ../src/interface.c:4032 +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Sets the default encoding for opening existing non-Unicode files" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Encodings" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Ensure new line at file end" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Ensures that at the end of the file is a new line" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Strip trailing spaces and tabs" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Removes trailing spaces and tabs and the end of lines" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Replace tabs by space" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Replaces all tabs in document by spaces" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Saving files" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Recent files list length:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Specifies the number of files which are stored in the Recent files list" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Disk check timeout:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2378,27 +2520,20 @@ "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Files" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Path and options for the make tool" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2406,23 +2541,23 @@ "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Path (and possibly additional arguments) to your favourite browser" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Tool paths" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Context action:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2433,67 +2568,67 @@ "can appear anywhere in the given command and will be replaced before " "execution." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Commands" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Tools" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "e-mail address of the developer" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Initials of the developer name" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Initial version:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Version number, which a new file initially has" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Company name" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Developer:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Company:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Mail address:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Initials:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "The name of the developer" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Year:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Date:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Date & Time:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2501,7 +2636,7 @@ "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2509,7 +2644,7 @@ "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2517,62 +2652,62 @@ "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Template data" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Templates" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "C_hange" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Keyboard shortcuts" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Keybindings" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Command:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Path to the command for printing files (use %f for the filename)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Use an external command for printing" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Print line numbers" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Add line numbers to the printed page" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Print page numbers" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Print page header" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2580,19 +2715,19 @@ "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Use the basename of the printed file" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Print only the basename (without the path) of the printed file" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Date format:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2602,547 +2737,560 @@ "header on each page. You can use any conversion specifiers which can be used " "with the ANSI C strftime function." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Use native GTK printing" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Printing" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Printing" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Project Properties" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Display:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Custom" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Use global settings" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "File" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "New" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Open" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Open selected file" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Save" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Save as" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Save all" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Print" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Close" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Close all" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Reload file" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Re-open last closed tab" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Project" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Project properties" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Undo" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Redo" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplicate line or selection" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Delete current line(s)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Delete to line end" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Transpose current line" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Scroll to current line" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Scroll up the view by one line" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Scroll down the view by one line" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Complete snippet" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Move cursor in snippet" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Suppress snippet completion" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Context Action" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Complete word" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Show calltip" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Show macro list" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Word part completion" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Move line(s) up" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Move line(s) down" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Clipboard" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Cut" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copy" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Paste" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copy current line(s)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Cut current line(s)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Select" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Select All" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Select current word" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Select current line(s)" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Select current paragraph" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Select to previous word part" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Select to next word part" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Toggle Case of Selection" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Toggle line commentation" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Comment line(s)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Uncomment line(s)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Increase indent" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Decrease indent" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Increase indent by one space" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Decrease indent by one space" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Smart line indent" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Send to Custom Command 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Send to Custom Command 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Send to Custom Command 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Send Selection to Terminal" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "Reflow lines/block" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Insert" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Insert date" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Insert alternative white space" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Settings" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Search" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Find" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Find Next" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Find Previous" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Find Next Selection" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Find Previous Selection" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Replace" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Find in Files" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Next Message" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Previous Message" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Find Usage" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Find Document Usage" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Mark All" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Go to" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Navigate back a location" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Navigate forwards a location" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Go to matching brace" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Toggle marker" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Go to next marker" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Go to previous marker" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Go to Tag Definition" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Go to Tag Declaration" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Go to Start of Line" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Go to End of Line" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Go to End of Display Line" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Go to Previous Word Part" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Go to Next Word Part" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "View" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Toggle All Additional Widgets" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Fullscreen" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Toggle Messages Window" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Toggle Sidebar" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Zoom In" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Zoom Out" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Zoom Reset" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Switch to Editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Switch to Scribble" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Switch to VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Switch to Search Bar" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Switch to Sidebar" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Switch to Compiler" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Switch to Messages" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Switch to Message Window" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Switch to Sidebar Document List" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Switch to Sidebar Symbol List" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Notebook tab" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Switch to left document" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Switch to right document" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Switch to last used document" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Move document left" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Move document right" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Move document first" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Move document last" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Toggle Line wrapping" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Toggle Line breaking" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Replace spaces by tabs" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Toggle current fold" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Fold all" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Unfold all" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Reload symbol list" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Remove Markers" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Remove Error Indicators" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Build" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Compile" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make custom target" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Next error" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Previous error" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Run" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Run (alternative command)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Build options" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Show Colour Chooser" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Help" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Keyboard Shortcuts" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "The following keyboard shortcuts are configurable:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Switch to Document" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Type here what you want, use it as a notice/scratch board" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Failed to load one or more session files." @@ -3150,7 +3298,11 @@ msgid "Debug Messages" msgstr "Debug Messages" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "Cl_ear" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3158,84 +3310,94 @@ "Set initial column number for the first opened file (useful in conjunction " "with --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Use an alternate configuration directory" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Be verbose" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Print internal filetype names" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Generate global tags file (see documentation)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Don't preprocess C/C++ files when generating tags" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Don't open files in a running instance, force opening a new instance" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" +"Use this socket filename for communication with a running Geany instance" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Return a list of open documents in a running Geany instance" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Set initial line number for the first opened file" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Don't show message window at startup" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Don't load auto completion data (see documentation)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Don't load plugins" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Print Geany's installation prefix" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Don't load the previous session's files" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Don't load terminal support" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Filename of libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Be verbose" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Show version and exit" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FILES...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Move it now?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany needs to move your old configuration directory before starting." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3246,7 +3408,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3255,7 +3417,7 @@ "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3266,38 +3428,42 @@ "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Could not find file '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "This is Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Configuration directory could not be created (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Configuration files reloaded." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Status messages" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "C_opy" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Copy _All" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Hide Message Window" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Could not find file '%s' - trying the current document path." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3306,11 +3472,11 @@ "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "_Plugin Manager" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3321,80 +3487,88 @@ "Description: %s\n" "Author(s): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Active" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "No plugins available." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Choose which plugins should be loaded at startup:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Plugin details:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configure Plugins" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Grab Key" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Press the combination of the keys you want to use for \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Expand All" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "_Collapse All" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Action" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Shortcut" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Allow" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Override" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Override that keybinding?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "The combination '%s' is already used for \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "Enter tool paths below. Tools you do not need can be left blank." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3402,7 +3576,7 @@ "Set the information to be used in templates. See the documentation for " "details." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3413,7 +3587,7 @@ "" #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3424,7 +3598,7 @@ "action to edit the string representation of the shortcut directly." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3433,7 +3607,7 @@ "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3449,44 +3623,44 @@ msgid "Text will be wrongly spaced." msgstr "Text will be wrongly spaced." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Document Setup" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Print only the basename(without the path) of the printed file" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Printing of file %s was cancelled." +msgid "Did not send document %s to the printing subsystem." +msgstr "Did not send document %s to the printing subsystem." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "File %s printed." +msgid "Document %s was sent to the printing subsystem." +msgstr "Document %s was sent to the printing subsystem." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Printing of %s failed (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Please set a print command in the preferences dialogue first." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3497,38 +3671,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Printing of \"%s\" failed (return code: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "File %s printed." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projects" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "New Project" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "C_reate" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Name:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Filename:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Base path:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3538,123 +3717,118 @@ "path, or an existing directory tree. You can use paths relative to the " "project filename." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Choose Project Base Path" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Project file \"%s\" could not be loaded." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Open Project" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Project files" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Project \"%s\" closed." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Description:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Make in base path" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Set the Build non-filetype working directories to use base path:" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Run command:" +#: ../src/project.c:484 +msgid "Set" +msgstr "Set" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "File patterns:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Do you want to close it before proceeding?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "The '%s' project is already open." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "The specified project name is too short." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "The specified project name is too long (max. %d characters)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "You have specified an invalid project filename." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Create the project's base path directory?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "The path \"%s\" does not exist." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Project base directory could not be created (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Project file could not be written (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Project \"%s\" created." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Project \"%s\" saved." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Choose Project Filename" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Choose Project Run Command" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Project \"%s\" opened." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Use regular expressions" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3662,15 +3836,15 @@ "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Search _backwards" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Use _escape sequences" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3678,401 +3852,421 @@ "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "C_ase sensitive" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Match only a _whole word" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Match from s_tart of word" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Previous" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Next" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Search for:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Find All" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Mark" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Mark all matches in the current document" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "In Sessi_on" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "_In Document" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Close _dialogue" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Disable this option to keep the dialogue open" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Replace & Fi_nd" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Replace wit_h:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Re_place All" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "In Se_lection" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Replace all matches found in the currently selected text" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Directory:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "E_ncoding:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Fixed s_trings" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep regular expressions" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "See grep's manual page for more information" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Extended regular expressions" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_Recurse in subfolders" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Invert search results" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Invert the sense of matching, to select non-matching lines" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "E_xtra options:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Other options to pass to Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Found %d match for \"%s\"." msgstr[1] "Found %d matches for \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Replaced text in %u file." -msgstr[1] "Replaced text in %u files." +msgid "Replaced %u matches in %u documents." +msgstr "Replaced %u matches in %u documents." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Invalid directory for find in files." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "No text to find." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Cannot execute grep tool '%s'; check the path setting in Preferences." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Searching..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (in directory: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Could not open directory (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Search failed (see Help->Debug Messages for details)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Search failed." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Search completed with %d match." msgstr[1] "Search completed with %d matches." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "No matches found." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Bad regex: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Chapter" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Section" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Appendix" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Other" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Module" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Types" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Type constructors" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Functions" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Sections" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Keys" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variables" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Command" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Environment" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Subsection" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubsection" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Label" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Structures" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Package" -#: ../src/symbols.c:655 -msgid "My" -msgstr "My" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Labels" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constants" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Classes" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Constants" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Anchors" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1 Headings" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2 Headings" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3 Headings" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID Selectors" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Type Selectors" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Modules" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Methods" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namespaces" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Procedures" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Imports" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entities" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Architectures" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Functions / Procedures" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variables / Signals" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Processes / Components" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Events" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Functions / Tasks" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Members" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Labels" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subroutines" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blocks" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Defines" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unknown filetype extension for \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Failed to create tags file, perhaps because no tags were found.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4081,7 +4275,7 @@ "Usage: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4092,164 +4286,179 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Load Tags" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany tag files (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Loaded %s tags file '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Could not load tags file '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Forward declaration \"%s\" not found." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition of \"%s\" not found." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Sort by _Name" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Sort by _Appearance" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Old" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Save the current file" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Save all open files" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Reload the current file from disk" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Close the current file" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Close all open files" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Cut the current selection" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Copy the current selection" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Paste the contents of the clipboard" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Delete the current selection" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Undo the last modification" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Redo the last modification" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compile the current file" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Run or view the current file" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" "Open a colour chooser dialogue, to interactively pick colours from a palette" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Zoom in the text" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Zoom out the text" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Decrease indentation" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Increase indentation" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Find the entered text in the current file" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Jump to the entered line number" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Show the preferences dialogue" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Quit Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Print document" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Replace text in the current document" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Create a new file" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Create a new file from a template" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Open an existing file" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Open a recent file" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Choose more build actions" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Goto" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Separator" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Separator ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4257,11 +4466,11 @@ "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Available Items" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Displayed Items" @@ -4288,7 +4497,7 @@ msgid "Custom command failed: %s" msgstr "Custom command failed: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Set Custom Commands" @@ -4300,192 +4509,184 @@ "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "No custom commands defined." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Word Count" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "selection" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "whole document" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Range:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Lines:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Words:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Characters:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "No tags found" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Show S_ymbol List" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Show _Document List" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "H_ide Sidebar" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Show _Paths" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "line: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "line: %d / %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "mode: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "encoding: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "filetype: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "scope: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Font updated (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Set Custom Date Format" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Select Folder" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Select File" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "C_onfiguration Files" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Save All" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Close All" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "_Set Path From Document" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Restart Terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Input Methods" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4493,47 +4694,35 @@ "Could not change the directory in the VTE because it probably contains a " "command." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminal plugin" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Terminal font:" +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Font:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Sets the font for the terminal widget" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Foreground colour:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Background colour:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Sets the foreground colour of the text in the terminal widget" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Sets the background colour of the text in the terminal widget" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Scrollback lines:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" @@ -4541,11 +4730,11 @@ "Specifies the history in lines, which you can scroll back in the terminal " "widget" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" @@ -4553,45 +4742,45 @@ "Sets the path to the shell which should be started inside the terminal " "emulation" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Scroll on keystroke" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Whether to scroll to the bottom if a key was pressed" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Scroll on output" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Whether to scroll to the bottom when output is generated" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Cursor blinks" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Whether to blink the cursor" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Override Geany keybindings" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Disable menu shortcut key (F10 by default)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4601,21 +4790,21 @@ "Disabling it can be useful if you use, for example, Midnight Commander " "within the VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Follow the path of the current file" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Whether to execute \"cd $path\" when you switch between opened files" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Don't use run script" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4623,11 +4812,11 @@ "Don't use the simple run script which is usually used to display the exit " "status of the executed program" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Execute programs in VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4635,90 +4824,118 @@ "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany project files" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Executables" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Class Builder" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Creates source files for new class types." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Create Class" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Namespace" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Namespace:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Class" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Class name:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Header file:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Source file:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Inheritance" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Base class:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Base source:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Base header:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Base GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implements:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Options" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Create constructor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Create destructor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Is abstract" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Is singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ constructor type" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Create Cla_ss" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ Class" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ Class" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP Class" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML Characters" @@ -4728,52 +4945,57 @@ msgstr "Inserts HTML character entities like '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "The Geany developer team" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML characters" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 characters" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Greek characters" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Mathematical characters" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Technical characters" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Arrow characters" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Punctuation characters" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Miscellaneous characters" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Plugin configuration directory could not be created." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Special Characters" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Insert" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4781,40 +5003,40 @@ "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Character" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (name)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Insert Special HTML Characters" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML Replacement" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTMLToggle" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Bulk replacement of special chars" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Insert Special HTML Characters" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Replace special characters" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Toggle plugin status" @@ -4840,105 +5062,105 @@ msgstr "" "Renders the font size of the document together with the current zoom level" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Document successfully exported as '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "File '%s' could not be written (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "The file '%s' already exists. Do you want to overwrite it?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Export" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "As _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "As _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "File Browser" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Adds a file browser tab to the sidebar." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Too many items selected!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Could not execute configured external command '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Open _externally" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Find in Files" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Show _Hidden Files" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Up" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Refresh" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Set path from document" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Clear the filter" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filter your files with usual wildcards" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Focus File List" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Focus Path Entry" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Plugin configuration directory could not be created." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "External open command:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4953,15 +5175,15 @@ "%d will be replaced with the path name of the selected file without the " "filename" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Show hidden files" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Hide object files" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4969,11 +5191,11 @@ "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Use the project's base directory" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "" @@ -5080,37 +5302,197 @@ msgid "Splits the editor view into two windows." msgstr "Splits the editor view into two windows." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Show the current document" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Unsplit" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Split Window" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontally" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Vertically" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Split Horizontally" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Split Vertically" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Unsplit" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Set Includes and Arguments" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_View DVI File" + +#~ msgid "V_iew PDF File" +#~ msgstr "V_iew PDF File" + +#~ msgid "_Set Arguments" +#~ msgstr "_Set Arguments" + +#~ msgid "Set Arguments" +#~ msgstr "Set Arguments" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "Set programs and options for compiling and viewing (La)TeX files." + +#~ msgid "DVI creation:" +#~ msgstr "DVI creation:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF creation:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI preview:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF preview:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Set Includes and Arguments" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Set the commands for building and running programs." + +#~ msgid "Compile:" +#~ msgstr "Compile:" + +#~ msgid "Build:" +#~ msgstr "Build:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Failed to execute the view program" + +#~ msgid "Try to resave the file?" +#~ msgstr "Try to resave the file?" + +#~ msgid "_Customize Toolbar" +#~ msgstr "_Customise Toolbar" + +#~ msgid "Icon style:" +#~ msgstr "Icon style:" + +#~ msgid "Icon size:" +#~ msgstr "Icon size:" + +#~ msgid "Appearance" +#~ msgstr "Appearance" + +#~ msgid "Hard tab width:" +#~ msgstr "Hard tab width:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "The width of a tab when Tabs & Spaces is set for a document" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Use white text on a black background and invert all colours, this option " +#~ "requires a restart of Geany" + +#~ msgid "Long line marker:" +#~ msgstr "Long line marker:" + +#~ msgid "Long line marker color:" +#~ msgstr "Long line marker colour:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Path and options for the make tool" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplicate line or selection" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Send Selection to Terminal" + +#~ msgid "Run (alternative command)" +#~ msgstr "Run (alternative command)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Printing of file %s was cancelled." + +#~ msgid "Make in base path" +#~ msgstr "Make in base path" + +#~ msgid "Run command:" +#~ msgstr "Run command:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Choose Project Run Command" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Replaced text in %u file." +#~ msgstr[1] "Replaced text in %u files." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Search failed (see Help->Debug Messages for details)." + +#~ msgid "My" +#~ msgstr "My" + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Our" +#~ msgstr "Our" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminal plugin" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." + +#~ msgid "Terminal font:" +#~ msgstr "Terminal font:" + +#~ msgid "Unsplit" +#~ msgstr "Unsplit" #~ msgid "Diff file" #~ msgstr "Diff file" @@ -5276,9 +5658,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Unfolds all contracted code blocks" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Removes all error indicators in the current document." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5299,9 +5678,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Shows a list of all keyboard shortcuts for Geany." -#~ msgid "Color" -#~ msgstr "Colour" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Enter a line number and jump to it." @@ -5380,15 +5756,9 @@ #~ msgid "Items" #~ msgstr "Items" -#~ msgid "Use white text on a black background." -#~ msgstr "Use white text on a black background." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Runs in debug mode (means being verbose)" -#~ msgid "Search failed." -#~ msgstr "Search failed." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Couldn't find pixmap file: %s" @@ -5542,9 +5912,6 @@ #~ msgid "Ferite source file" #~ msgstr "Ferite source file" -#~ msgid "Haskell source file" -#~ msgstr "Haskell source file" - #~ msgid "Docbook source file" #~ msgstr "Docbook source file" @@ -5638,10 +6005,6 @@ #~ msgid "Do you want to save all opened files before processing?" #~ msgstr "Do you want to save it before closing?" -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "Directory:" - #~ msgid "Convert Selection to _Lower-case" #~ msgstr "Convert Selection to _Lower-case" diff -Nru geany-0.18/po/es.po geany-0.19/po/es.po --- geany-0.18/po/es.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/es.po 2010-05-24 10:47:04.000000000 +0100 @@ -1,17 +1,17 @@ -# Spanish translation file for geany -# Copyright (C) 2006 Damián Viano +# Spanish translation file for Geany 0.19 # This file is distributed under the same license as the geany package. # Damián Viano , 2006, 2007. -# Antonio Jiménez González , 2009. -# +# Antonio Jiménez González , 2009, 2010. +# Lucas Vieites , 2010. msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-04-24 16:31+0100\n" -"Last-Translator: Antonio Jimenez \n" -"Language-Team: Spanish \n" +"POT-Creation-Date: 2010-05-24 11:42+0200\n" +"PO-Revision-Date: 2010-05-24 09:26+0200\n" +"Last-Translator: Lucas Vieites \n" +"Language-Team: Geany translations \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,395 +19,388 @@ #: ../geany.desktop.in.h:1 msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE rápido y liviano para GTK2" +msgstr "Un IDE rápido y ligero para GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" #: ../geany.desktop.in.h:3 msgid "Integrated Development Environment" -msgstr "Entorno Integrado de Desarrollo" +msgstr "Entorno de desarrollo integrado" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Acerca de Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" -msgstr "Un IDE rápido y liviano" +msgstr "Un IDE rápido y ligero" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" -msgstr "(construido el o despues del %s)" +msgstr "(compilado el día %s o después)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Información" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Desarrolladores" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "mantenedor" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "desarrollador" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "mantenedor de traducción" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Traductores" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" -msgstr "Traductores Anteriores" +msgstr "Traductores anteriores" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -"Algunos de los muchos colaboradores (para una lista más detallada, véase el " -"archivo %s):" +"Algunos de los muchos colaboradores (vea el archivo %s para una lista más " +"detallada):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licencia" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." msgstr "" -"El texto de la licencia no pudo ser encontrado, por favor visite http://www." -"gnu.org/licenses/gpl-2.0.txt para verlo en linea" +"No se ha podido encontrar el texto de la licencia, visite http://www.gnu.org/" +"licenses/gpl-2.0.txt para verlo en línea." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"No se pudo encontrar la terminal \"%s\" (verifique las rutas para la " -"herramienta de terminal en las Preferencias)" +msgid "failed to substitute %%p, no project active" +msgstr "no se ha podido sustituir %%p, no hay proyecto activo" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "El proceso ha fallado, no hay directorio de trabajo" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Fallo al ejecutar \"%s\" (el guión de inicio no pudo ser creado)" +msgid "%s (in directory: %s)" +msgstr "%s (en el directorio: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" -msgstr "Falló el proceso (%s)" +msgstr "El proceso ha fallado (%s)" -#: ../src/build.c:508 +#: ../src/build.c:790 #, c-format -msgid "%s (in directory: %s)" -msgstr "%s (en directorio: %s)" +msgid "Failed to change the working directory to \"%s\"" +msgstr "Error al cambiar el directorio de trabajo a «%s»" -#: ../src/build.c:613 +#: ../src/build.c:819 #, c-format -msgid "Failed to change the working directory to \"%s\"" -msgstr "Fallo al cambiar el directorio de trabajo a \"%s\"" +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Error al ejecutar «%s» (no se ha podido crear el script de inicio)" -#: ../src/build.c:707 +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" -"No se pudo ejecutar el archivo en la terminal virtual (VTE) probablemente " -"porque contiene un comando." +"No se ha podido ejecutar el archivo en la terminal virtual (VTE) " +"probablemente porque contiene un comando." + +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"No se ha podido encontrar la terminal «%s» (verifique la ruta de la " +"herramienta de terminal en «Preferencias»)" -#: ../src/build.c:914 +#: ../src/build.c:1083 msgid "Compilation failed." -msgstr "La compilación falló." +msgstr "Ha fallado la compilación." -#: ../src/build.c:928 +#: ../src/build.c:1097 msgid "Compilation finished successfully." -msgstr "La compilación terminó con éxito." - -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compilar" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Construir" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make All" +msgstr "La compilación ha terminado con éxito." -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make Obje_tivo Personalizado" +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "Texto personalizado" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _Object" +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Introduzca su texto personalizado, éste se añadirá al comando." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1333 msgid "_Next Error" -msgstr "Siguie_nte Error" +msgstr "Siguie_nte error" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1335 msgid "_Previous Error" msgstr "Error _anterior" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Selecciona Inclusiones y Argumentos" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Ver Archivo DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_er Archivo PDF" +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "Establecer comando_s de construcción" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Seleccionar argumentos" +#: ../src/build.c:1625 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Construir el archivo actual" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Seleccionar argumentos" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the default target" +msgstr "Construir el archivo actual con «make» y el objetivo predeterminado" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Seleccione los programas y opciones para la compilación y visualización de " -"archivos (La)TeX." +#: ../src/build.c:1641 +msgid "Build the current file with Make and the specified target" +msgstr "Construir el archivo actual con «make» y el objetivo indicado" + +#: ../src/build.c:1643 +msgid "Compile the current file with Make" +msgstr "Compilar el archivo actual con «make»" + +#: ../src/build.c:1670 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "No se ha podido detener el proceso (%s)." -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Creación de DVI:" +#: ../src/build.c:1687 ../src/build.c:1699 +msgid "No more build errors." +msgstr "No hay más errores de construcción." -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Creación de PDF:" +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "Establecer etiqueta del elemento de menú" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Previsualización de DVI" +#: ../src/build.c:1790 +msgid "Item" +msgstr "Elem." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Previsualización de PDF" +#: ../src/build.c:1791 ../src/symbols.c:650 +msgid "Label" +msgstr "Etiqueta" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f será reemplazado por el nombre del archivo actual, ej. prueba.c\n" -"%e será reemplazado por el nombre del archivo actual sin extencion, ej. " -"prueba" +#: ../src/build.c:1792 ../src/symbols.c:645 +msgid "Command" +msgstr "Comando" + +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "Directorio de trabajo" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Selecciona Inclusiones y Argumentos" +#: ../src/build.c:1794 +msgid "Clear" +msgstr "Limpiar" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Configure los comandos para construir y ejecutar programas." +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "Pulse para configurar etiqueta el elemento del menú" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1906 ../src/build.c:1908 #, c-format -msgid "%s commands" -msgstr "comandos de %s" +msgid "%s Commands" +msgstr "Comandos de %s" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compilar:" +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "tipo desconocido" -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Construir:" +#: ../src/build.c:1916 ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "Expresión regular de error:" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Ejecución:" +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "Comandos generales para cualquier tipo de archivo" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Compilar el archivo actual" +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Nota: El elemento 2 abre un diálogo y añade la respuesta al comando." -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make Objetivo Personalizado" +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "Ejecutar comandos" -#: ../src/build.c:1918 +#: ../src/build.c:1994 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Ingresar opciones personalizadas aquí, todo el texto ingresado es pasado a " -"la herramienta make" +"Los comodines %d, %e, %f y %p se sustituirán en los campos de comandos y " +"directorios. Consulte el manual para más información." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "" -"Construye el archivo actual con la herramienta make y el objetivo " -"predeterminado" +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "Establecer los comandos de construcción" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "" -"Construye el archivo actual con la herramienta make y el objetivo " -"especificado" +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "_Compilar" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compilar el archivo actual con Make" +#. build the code +#: ../src/build.c:2408 ../src/build.c:2671 ../src/interface.c:1075 +msgid "_Build" +msgstr "Con_struir" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Fallo al ejecutar el programa visualizador" +#: ../src/build.c:2415 ../src/build.c:2445 ../src/build.c:2638 +msgid "_Execute" +msgstr "_Ejecutar" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "El proceso no pudo ser detenido (%s)." +#. build the code with make custom +#: ../src/build.c:2460 ../src/build.c:2636 ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "Compilar obje_tivo personalizado" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "No hay más errores de construción." +#. build the code with make object +#: ../src/build.c:2462 ../src/build.c:2637 ../src/build.c:2699 +msgid "Make _Object" +msgstr "Compilar _objeto" + +#: ../src/build.c:2464 ../src/build.c:2635 +msgid "_Make" +msgstr "_Compilar" + +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "_Compilar todo" -#: ../src/callbacks.c:152 +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "Establecer comando_s del menú «Construir»" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" -msgstr "¿Realmente desea salir?" +msgstr "¿Está seguro de que desea salir?" + +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d archivo guardado." +msgstr[1] "%d archivos guardados." -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Recargar" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Se perderá cualquier cambio no guardado." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" -msgstr "¿Está seguro que quiere recargar '%s'?" +msgstr "¿Está seguro que quiere recargar «%s»?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" -msgstr "Ir a la Línea" +msgstr "Ir a línea" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" -msgstr "Ingrese la línea a la que quiere ir:" +msgstr "Introduzca un número de línea:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" -"Por favor seleccione el tipo de archivo para el archivo actual antes de " -"utilizar esta función." +"Seleccione el tipo de archivo para el archivo actual antes de utilizar esta " +"función." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.aaaa hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" -msgstr "_Usar Formato de Fecha Personalizado" +msgstr "_Usar formato de fecha personalizado" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" -msgstr "Formato de Fecha Personalizado" +msgstr "Formato de fecha personalizado" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Ingrese aquí un formato de fecha y hora personalizado. Puede usar cualquier " -"especificador de conversión que pueda ser usado con la función strftime de " -"ANSI C." +"Introduzca aquí un formato de fecha y hora personalizado. Puede usar " +"cualquier especificador de conversión que pueda ser usado con la función " +"strftime de ANSI C." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" -"El formato de fecha no pudo ser convertido (probablemente sea demasiado " +"No se ha podido convertir el formato de fecha (probablemente sea demasiado " "largo)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." -msgstr "No hay más items de mensajes." +msgstr "No hay más elementos de mensajes." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Abrir archivo" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Ver" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -415,28 +408,28 @@ "Abre el archivo en modo sólo lectura. Si elige más de un archivo todos serán " "abiertos como sólo lectura." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" -msgstr "Detectar por extensión de archivo " +msgstr "Detectar por extensión de archivo" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Detectar desde archivo" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" -msgstr "_Más Opciones" +msgstr "_Más opciones" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Mostrar archivos _ocultos" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" -msgstr "Elegir _codificación:" +msgstr "Establecer codificación:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -444,18 +437,18 @@ "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"Define explicitamente una codificación para el archivo, no se usará la " -"detección automática.Esto es útil cuando se sabe que la codificación de un " -"archivo no puede ser detectada correctamente por Geany.\n" -"Notar que si se seleccionan multiples archivos todos serán abiertos con la " +"Define explícitamente una codificación para el archivo cuando no se detecte " +"automáticamente. Esto es útil cuando Geany no pueda detectar la codificación " +"de un archivo correctamente.\n" +"Fíjese en que si selecciona varios archivos todos serán abiertos con la " "codificación seleccionada." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" -msgstr "Seleccionar tipo de archivo:" +msgstr "Establecer tipo de archivo:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -464,35 +457,34 @@ msgstr "" "Define explícitamente el tipo de archivo, no se usará la detección por " "extensión.\n" -"Notar que si se seleccionan múltiples archivos todos serán abiertos como el " -"tipo seleccionado" +"Fíjese en que si selecciona varios archivos todos serán abiertos con el tipo " +"seleccionado." #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "S_obrescribir" +msgstr "¿Desea sobreescribir?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "El nombre de archivo ya existe." -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" -msgstr "Guardar Archivo" +msgstr "Guardar archivo" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "R_enombrar" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Guardar el archivo y renombrarlo" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Abrir el archivo en una nueva pestaña" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -500,148 +492,152 @@ "Mantener el documento actual (no guardado) abierto y abrir el archivo nuevo " "guardado en una nueva pestaña." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Error" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Pregunta" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Advertencia" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Información" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_No guardar" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." -msgstr "El archivo '%s' no fue guardado." +msgstr "El archivo «%s» todavía no se ha guardado." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" -msgstr "¿Quiere guardarlo antes de cerrar?" +msgstr "¿Desea guardarlo antes de cerrar?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" -msgstr "Elegir fuente" +msgstr "Seleccionar tipografía" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" -"Ocurrió un error o no se pudo obtener información de un archivo (ej. de un " -"archivo nuevo)." +"Ha ocurrido un error o no se ha podido obtener información del archivo (p." +"ej. de un archivo nuevo)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "desconocido" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Propiedades" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Tamaño:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Ubicación:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" -msgstr "Sólo Lectura:" +msgstr "Sólo lectura:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(sólo dentro de Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" -msgstr "Codificación" +msgstr "Codificación:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(con BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(sin BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modificado:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Cambiado:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Accedido:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" -msgstr "Permisos" +msgstr "Permisos:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Lectura:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Escritura:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Ejecución:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" -msgstr "Dueño:" +msgstr "Propietario:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grupo:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Otros:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." -msgstr "El archivo %s fue cerrado." +msgstr "El archivo «%s» ha sido cerrado." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." -msgstr "Nuevo archivo \"%s\" abierto." +msgstr "Se ha abierto un archivo nuevo: «%s»." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" -msgstr "No se pudo abrir el archivo %s (%s)" +msgstr "No se ha podido abrir el archivo %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -649,50 +645,50 @@ "cause data loss.\n" "The file was set to read-only." msgstr "" -"El archivo \"%s\" no pudo ser abierto adecuadamente y probablemente fue " -"recortado. Esto puede ocurrir si el archivo contiene un byte NULL. Por " -"favor, sea consciente de que guardarlo puede provocar la pérdida de datos.\n" -"El archivo fue abierto como sólo lectura." +"No se ha podido abrir el archivo «%s» adecuadamente y probablemente fue " +"recortado. Esto puede ocurrir si el archivo contiene un byte NULL. Guardarlo " +"puede provocar la pérdida de datos.\n" +"El archivo se ha abierto como sólo lectura." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." -msgstr "El archivo \"%s\" no es %s válido." +msgstr "El archivo «%s» no es %s válido." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." msgstr "" -"El archivo \"%s\" no aparenta ser de texto o la codificación no es soportada" +"El archivo «%s» no parece ser de texto o la codificación no es conocida." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Espacios" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulaciones" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" -msgstr "Tabulados y Espacios" +msgstr "Tabulaciones y espacios" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." -msgstr "Estableciendo modo de indentado %s para %s." +msgstr "Estableciendo modo de sangría %s para %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" -msgstr "Nombre de archivo invalido" +msgstr "Nombre de archivo inválido" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Archivo %s recargado." @@ -700,113 +696,120 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Archivo %s abierto(%d%s)" -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", sólo lectura" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Error al renombrar el archivo." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." msgstr "" -"Ocurrió un error mientras se convertía el archivo desde UTF-8 en \"%s\". El " -"archivo no fue guardado.n" +"Ocurrió un error mientras se convertía el archivo desde UTF-8 en «%s». El " +"archivo no fue guardado." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" "Mensaje de error: %s\n" -"El error ocurrió en \"%s\" (linea: %d, columna: %d)." +"El error ocurrió en «%s»(línea: %d, columna: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Mensaje de error: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Error guardando archivo." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." -msgstr "Error guardando archivo (%s)." +msgstr "Error al guardar archivo (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Archivo %s guardado." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." -msgstr "no se encontró \"%s\"." +msgstr "no se ha encontrado «%s»." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" -msgstr "Volver al principio y buscar de nuevo?" +msgstr "¿Volver al principio y buscar de nuevo?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." -msgstr "No se encontraron coincidencias para \"%s\"." +msgstr "No se encontraron coincidencias para «%s»." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "%s: se reemplazó %d ocurrencia de \"%s\" con \"%s\"." -msgstr[1] "%s: se reemplazaron %d ocurrencias de \"%s\" con \"%s\"." +msgstr[0] "%s: se reemplazó %d ocurrencia de «%s» con «%s»." +msgstr[1] "%s: se reemplazaron %d ocurrencias de «%s» con «%s»." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "¿Quiere recargarlo?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "" -"El archivo '%s' del disco es más reciente\n" +"El archivo «%s» del disco es más reciente\n" "que la vista actual." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "¿Intentar volver a salvar el archivo?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Cerrar _sin guardar" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "No se encontró el archivo \"%s\"!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "" +"No se ha encontrado el archivo «%s» en el disco. ¿Desea intentar volver a " +"guardarlo?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" -msgstr "Introduzca el Ancho de Tabulación:" +msgstr "Introduzca el ancho de tabulación:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" -"Introduzca la cantidad de espacios que debería ser reemplazada por una " -"tabulación" +"Introduzca la cantidad de espacios que deberían ser reemplazados por una " +"tabulación." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Advertencia: ancho de tabulación dura no estándar: %d != 8" #: ../src/encodings.c:76 msgid "Celtic" -msgstr "Celta" +msgstr "Céltico" #: ../src/encodings.c:77 ../src/encodings.c:78 msgid "Greek" @@ -862,7 +865,7 @@ #: ../src/encodings.c:109 msgid "Hebrew Visual" -msgstr "Hebreo Visual" +msgstr "Hebreo visual" #: ../src/encodings.c:111 msgid "Armenian" @@ -894,11 +897,11 @@ #: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" -msgstr "Chino Simplificado" +msgstr "Chino simplificado" #: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 msgid "Chinese Traditional" -msgstr "Chino Tradicional" +msgstr "Chino tradicional" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 #: ../src/encodings.c:141 @@ -912,576 +915,622 @@ #: ../src/encodings.c:147 msgid "Without encoding" -msgstr "Sin _codificación" +msgstr "Sin codificación" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" -msgstr "Europeo del _Oeste" +msgstr "Europa _occidental" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" -msgstr "Europeo del _Este" +msgstr "Europa ori_ental" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" -msgstr "Este _Asiático" +msgstr "Este _asiático" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" -msgstr "_SE & SO Asiático" +msgstr "_SE & SO asiático" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" -msgstr "_Cercano Oriente" +msgstr "Oriente _medio" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Archivo de fuente %s" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" -msgstr "Archivo de fuente %s" +msgstr "Archivo %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Ninguno" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" -msgstr "Archivo de guiones shell" +msgstr "Archivo de script shell" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Documento XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" -msgstr "Hojas de estilo en cascada (CSS)" +msgstr "Hoja de estilo en cascada (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Archivo de volcado SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Archivo de configuración" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" -msgstr "Archivo de traducción Gettext" +msgstr "Archivo de traducción gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "Archivo de script %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" -msgstr "Lenguajes de _Programación" +msgstr "Lenguajes de _programación" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" -msgstr "Lenguajes de _Scripts" +msgstr "Lenguajes de _script" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" -msgstr "Lenguajes de _Etiquetas" +msgstr "Lenguajes de _etiquetas" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" -msgstr "Lenguajes M_isceláneos" +msgstr "Lenguajes var_ios" + +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "_Tipos de archivo personalizados" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" -msgstr "Todo codigo fuente" +msgstr "Todo código fuente" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Todos los archivos" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresión regular incorrecta para el tipo de archivo %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "sin título" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "No se ha podido encontrar el archivo «%s»." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Esquemas de _color" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "Pre_determinado" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Archivo" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" -msgstr "Nuevo (desde _Plantilla)" - -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisible" +msgstr "Nuevo (desde _plantilla)" -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" -msgstr "Abrir Archivo Selecc_ionado" +msgstr "Abrir archivo selecc_ionado" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" -msgstr "_Archivos Recientes" +msgstr "_Archivos recientes" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" -msgstr "Guardar _Todo" +msgstr "Guardar _todos" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" -msgstr "R_ecargar Como" +msgstr "R_ecargar como" + +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "invisible" -#: ../src/interface.c:376 +#: ../src/interface.c:388 msgid "Page Set_up" -msgstr "_Configuración de Página" +msgstr "_Configuración de página" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" -msgstr "Cerrar los o_tros documentos" +msgstr "Cerrar los _demás" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" -msgstr "C_errar Todo" +msgstr "C_errar todos" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Formato" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Reestructurar líneas/bloque" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" -msgstr "C_onvertir mayúsculas/minúsculas de la Selección" +msgstr "C_onvertir selección a mayús./minús." -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Transponer línea actual" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" -msgstr "_Comentar Línea(s)" +msgstr "_Comentar línea(s)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" -msgstr "_Descomentar Línea(s)" +msgstr "_Descomentar línea(s)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" -msgstr "Comen_tar/Descomentar" - -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_plicar Línea o Selección" +msgstr "Comen_tar/descomentar línea" -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Incrementar sangría" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" -msgstr "_Decrementar sangría" +msgstr "_Disminuir sangría" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "Mandar _Selección al Terminal" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Sangría inteligente" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" -msgstr "Mandar _Selección a" +msgstr "_Enviar texto seleccionado a" + +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Comandos" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Cortar líneas actuales" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copiar líneas actuales" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Borrar líneas actuales" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Duplicar línea o selección" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Seleccionar líneas actuales" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Seleccionar párrafo actual" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Insertar espacio en blanco alternativo" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "_Ir a la siguiente marca" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "_Ir a la marca anterior" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Enviar texto _seleccionado al terminal" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" -msgstr "I_nsertar Comentarios" +msgstr "I_nsertar comentarios" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" -msgstr "Insertar Entrada de _ChangeLog" +msgstr "Insertar entrada de _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" -msgstr "Insertar _Encabezado de Archivo" +msgstr "Insertar _Cabecera de archivo" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" -msgstr "Insertar Descripción de _Función" +msgstr "Insertar descripción de _función" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" -msgstr "Insertar Comentario _Multilínea" +msgstr "Insertar comentario _multilínea" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" -msgstr "Insertar aviso de licencia _GPL" +msgstr "Insertar nota de licencia _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" -msgstr "Insertar aviso de licencia _BSD" +msgstr "Insertar nota de licencia _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" -msgstr "Insertar F_echa" +msgstr "Insertar f_echa" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Insertar \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Preferencia_s" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Preferencias de comp_lementos" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Buscar" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" -msgstr "Buscar _Siguiente" +msgstr "Buscar _siguiente" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" -msgstr "Buscar _Anterior" +msgstr "Buscar _anterior" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" -msgstr "Buscar en Arch_ivos" +msgstr "Buscar en arch_ivos" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Reemplazar" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" -msgstr "Buscar _Selección" +msgstr "Buscar _selección" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" -msgstr "Buscar Selección Pre_vio" +msgstr "Buscar selección _anterior" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" -msgstr "Próximo _Mensaje" +msgstr "Siguiente _mensaje" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" -msgstr "Mensaje Anterior" +msgstr "Mensaje ant_erior" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" -msgstr "_Ir a la Línea" +msgstr "_Ir a la línea" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" -msgstr "Cambiar _Fuente" +msgstr "Cambiar _fuente" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" -msgstr "M_ostrar/Esconder todos los paneles adicionales" +msgstr "M_ostrar/ocultar todos los componentes adicionales" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Pantalla _completa" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" -msgstr "Mostrar _Ventana de Mensajes" +msgstr "Mostrar _ventana de mensajes" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" -msgstr "Mostrar Barra de _Herramientas" +msgstr "Mostrar barra de _herramientas" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" -msgstr "Mostrar _Barra lateral" +msgstr "Mostrar _barra lateral" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" -msgstr "Mostrar _Marcas de Márgenes" +msgstr "Mostrar margen de _marcas" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" -msgstr "Mostrar Números de _Línea" +msgstr "Mostrar números de _línea" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" -msgstr "Mostrar espacios en _blanco" +msgstr "Mostrar espacio en _blanco" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" -msgstr "Mostrar _terminaciones de línea" +msgstr "Mostrar _fin de línea" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" -msgstr "Mostrar Guías de Indentación" +msgstr "Mostrar _guías de sangría" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" -msgstr "_Cortado de Líneas" +msgstr "Ajuste de _línea" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" -msgstr "Salto de línea" +msgstr "_Salto de línea" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" -msgstr "Formateo de Código _Automático" +msgstr "Sangría _automática" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" -msgstr "Tipo _de formateo" +msgstr "Tipo de _sangría" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabulaciones" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "E_spacios" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" -msgstr "T_abulaciones y Espacios" +msgstr "T_abulaciones y espacios" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" -msgstr "S_olo Lectura" +msgstr "Sólo _lectura" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" -msgstr "_Escribir el BOM Unicode" +msgstr "Escribir _BOM Unicode" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" -msgstr "Elegir _Tipo de Archivo" +msgstr "Establecer _tipo de archivo" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" -msgstr "Elegir _Codificación" +msgstr "Establecer _codificación" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" -msgstr "Elegir Termi_naciones de Línea" +msgstr "Establecer fi_n de línea" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" -msgstr "Convertir a, y Elegir _CR/LF (Win)" +msgstr "Convertir a, y establecer _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" -msgstr "Convertir a, y Elegir _LF (Unix)" +msgstr "Convertir a, y establecer _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" -msgstr "Convertir a, y Elegir CR (_Mac)" +msgstr "Convertir a, y establecer CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" -msgstr "_Borrar espacios al final" +msgstr "_Borrar espacios finales" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" -msgstr "_Reemplazar Tabulaciones por Espacios" +msgstr "_Reemplazar tabulaciones por espacios" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" -msgstr "_Reemplazar Espacios por Tabulaciones" +msgstr "Reemplazar _espacios por tabulaciones" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" -msgstr "_Plegar Todo" +msgstr "_Plegar todo" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" -msgstr "_Desplegar Todo" +msgstr "_Desplegar todo" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" -msgstr "Borrar _Marcas" +msgstr "Borrar _marcas" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" -msgstr "Borrar los _Indicadores de Errores" +msgstr "Borrar _indicadores de errores" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Proyecto" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nuevo" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Abrir" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" -msgstr "Proyectos _Recientes" +msgstr "Proyectos _recientes" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Cerrar" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Herramientas" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Recargar configuración" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Archivos de c_onfiguración" + +#: ../src/interface.c:1107 msgid "_Color Chooser" -msgstr "Selector de _Color" +msgstr "Selector de _color" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" -msgstr "C_ontar Palabras" +msgstr "C_ontar palabras" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" -msgstr "Cargar Ta_gs" +msgstr "Cargar eti_quetas" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Recargar Configuración" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" -msgstr "A_yuda" +msgstr "Ay_uda" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" -msgstr "Sitio _Web" +msgstr "Sitio _web" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" -msgstr "_Atajos de Teclado" +msgstr "_Combinaciones de tecla" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" -msgstr "Mensajes de depuración" +msgstr "Mensajes de _depuración" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Símbolos" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documentos" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Estado" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Mensajes" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Borrador" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Imágenes _y texto" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Sólo _imágenes" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Sólo _texto" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Iconos _grandes" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Iconos _pequeños" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Iconos muy _pequeños" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "_Ocultar barra de herramientas" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Preferencias de barra de herramien_tas" -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Ocultar barra de herramientas" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" -msgstr "Encontrar _Uso" +msgstr "Encontrar _uso" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" -msgstr "Encontrar _Uso del Documento" +msgstr "Encontrar _uso del documento" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" -msgstr "Ir a la Definición del _Tag" +msgstr "Ir a la definición de la eti_queta" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" -msgstr "Ir a la Declaración del T_ag" +msgstr "Ir a la declaración de la eti_queta" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" -msgstr "Acción Conte_xtual" +msgstr "Acción conte_xtual" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Preferencias" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Cargar archivos de la última sesión" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" -msgstr "Abre en el inicio los archivos de la última sesion" +msgstr "Al arrancar abre los archivos de la última sesión" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Cargar emulación de terminal virtual" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1489,82 +1538,82 @@ "Define si se carga o no al inicio la emulación de terminal virtual (VTE). " "Desactive esta opción si no necesita la terminal virtual" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Activar soporte de complementos" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Guardar la posición de la ventana y su geometría" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" -"Guarda la posición de la ventana y su geometría y las restablece al inicio" +"Guarda la posición de la ventana y su tamaño y las restablece al inicio" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Confirmar salida" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" -msgstr "Muestra un dialogo de confirmación al momento de salir" +msgstr "Muestra un diálogo de confirmación al salir" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" -msgstr "Cerrado" +msgstr "Cierre" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Ruta de inicio:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." msgstr "" -"Ruta a iniciar cuando se abren o guardan archivos. Debe ser una ruta " +"Ruta en la que iniciar cuando se abren o guardan archivos. Debe ser una ruta " "absoluta. Dejar en blanco para usar el directorio de trabajo actual." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" -msgstr "Archivos del proyecto:" +msgstr "Archivos de proyecto:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Ruta a iniciar cuando se abran archivos de proyectos" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Ruta para complementos extra:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -"Por defecto, Geany busca en la ruta de instalación global y en el directorio " +"Por defecto Geany busca en la ruta de instalación global y en el directorio " "de configuración. La ruta introducida aquí se usará para buscar más " "complementos. Para desactivar esta opción deje esta casilla en blanco." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Rutas" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Alerta sonora para errores o la finalización de la compilación" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1572,11 +1621,11 @@ "Define si se da una advertencia sonora en los errores o al finalizar el " "proceso de compilación." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Cambiar a la lista de mensajes de estado cuando haya un nuevo mensaje" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1584,24 +1633,23 @@ "Cambia a la pestaña de mensajes de estado (en la ventana de pestañas de " "abajo) cuando llega un nuevo mensaje de estado." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensajes de estado en la barra de estado" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "" -"Remueve todos los mensajes de la barra de estado. Los mensajes son mostrados " +"Elimina todos los mensajes de la barra de estado. Los mensajes se muestran " "de todas formas en la ventana de mensajes de estado." -#: ../src/interface.c:2883 -#, fuzzy +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" -msgstr "Enfocar automáticamente (el foco sigue al ratón)" +msgstr "Foco automático (el foco sigue al ratón)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1609,50 +1657,63 @@ msgstr "" "Dar foco automáticamente a los paneles debajo del cursor del ratón. Funciona " "para el panel de edición principal, el borrador, la barra de búsquedas, el " -"campo ir a y la VTE." +"campo «ir a línea» y la VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Utilizar diálogos «Abrir/Guardar archivo» de Windows" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Define si se utilizarán los diálogos de apertura y guardado de archivos " +"nativos de Windows o los predeterminados de GTK." + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" -msgstr "Misceláneo" +msgstr "Varios" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" -msgstr "Siempre dar la vuelta con la búsqueda y ocultar el dialogo de Buscar" +msgstr "" +"Siempre reiniciar la búsqueda por el principio y ocultar el diálogo de Buscar" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "" -"lSiempre dar la vuelta con la búsqueda y ocultar el dialogo de Buscar luego " -"de hacer click en Buscar Siguiente/Anterior" +"Siempre reiniciar la búsqueda por el principio y ocultar el diálogo de " +"Buscar después de pulsar en «Buscar siguiente/anterior»" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" -msgstr "Usar la palabra actualmente bajo el cursor para los diálogos de Buscar" +msgstr "Usar la palabra bajo el cursor para los diálogos de búsqueda" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -"Usar la palabra actual bajo el cursor, si no hay ninguna selección, al abrir " -"el diálogo de Buscar, Buscar en Archivos o Reemplazar" +"Usar la palabra bajo el cursor, si no hay ninguna selección, al abrir el " +"diálogo de «Buscar», «Buscar en archivos» o «Reemplazar»" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "" -"Usar el directorio del archivo actual para realizar la Búsqueda en Archivos" +"Usar el directorio del archivo actual para realizar la «Búsqueda en archivos»" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Buscar" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Usar archivos de sesión por proyectos" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1660,221 +1721,271 @@ "Define si se almacenan los archivos de sesión de un proyecto y se vuelven a " "abrir cuando se abra el proyecto" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "" "Almacenar el archivo de proyecto dentro del directorio base del proyecto" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " "directory. You can still change the path of the project file in the New " "Project dialog." msgstr "" -"Cuando está activado, el archivo de proyecto se almacena por defecto dentro " -"del directorio base del proyecto al crear nuevos proyectos, en lugar de " +"Cuando está activado, al crear nuevos proyectos el archivo de proyecto se " +"almacena por defecto dentro del directorio base del proyecto, en lugar de " "almacenarse en el directorio superior al directorio base. La ruta del " -"proyecto se puede cambiar en el diálogo Nuevo Proyecto." +"proyecto se puede cambiar en el diálogo «Nuevo proyecto»." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Proyectos" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" -msgstr "Misceláneo" +msgstr "Varios" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "General" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Mostrar la lista de símbolos" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Mostrar/ocultar la lista de símbolos" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Mostrar la lista de documentos" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Mostrar/ocultar la lista de documentos" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Mostrar barra lateral" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Posición:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Izquierda" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Derecha" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Lista de símbolos:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Ventana de mensajes:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Selecciona la fuente para la ventana de mensajes" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Selecciona la fuente para la lista de símbolos" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Selecciona la fuente del editor" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Fuentes" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Mostrar pestañas del editor" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" -msgstr "Mostrar botónes para cerrar" +msgstr "Mostrar botones de cierre" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" msgstr "" -"Muestra un pequeño botón de cruz en las pestañas de archivos, para cerrarlos " -"fácilmente haciendo click en el botón (requiere reiniciar Geany)" +"Muestra un pequeño botón la pestaña de cada archivo, para cerrarlo " +"fácilmente pulsando en él (requiere reiniciar Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" -msgstr "Ubicación de las pestañas de archivos nuevos:" - -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Izquierda" +msgstr "Posición de las pestañas de archivos nuevos:" -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" -msgstr "" -"Las pestañas de archivos serán ubicadas a la izquierda de la lista de " -"pestañas" - -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Derecha" +msgstr "Las pestañas de archivos serán colocadas a la izquierda de la lista" -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" +msgstr "Las pestañas de archivos serán colocadas a la derecha de la lista" + +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Siguiente a la actual" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" msgstr "" -"Las pestañas de archivos serán ubicadas a la derecha de la lista de pestañas" +"Define si se colocan las pestañas de archivos al lado de la pestaña actual " +"en vez de en los laterales de la libreta." -#: ../src/interface.c:3110 +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" -msgstr "Doble click esconde todos los paneles adicionales" +msgstr "Doble pulsación oculta todos los componentes adicionales" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "Ejecuta el comando Ver->Mostrar/Esconder todos los paneles adicionales" +msgstr "" +"Ejecuta el comando «Ver->Mostrar/ocultar todos los componentes adicionales»" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" -msgstr "Pestañas de edición" +msgstr "Pestañas del editor" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Arriba" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Abajo" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Posición de pestañas:" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Mostrar barra de estado" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Define si se muestra la barra de estado debajo de la ventana principal" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Interfaz" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" -msgstr "M_ostrar Barra de Herramientas" +msgstr "M_ostrar barra de herramientas" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" -msgstr "_Añadir la Barra de Herramientas al Menú" +msgstr "_Añadir la barra de herramientas al menú" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -"Emplazar la barra de herramientas en el menú principal para ahorrar espacio" +"Añadir la barra de herramientas en el menú principal para ahorrar espacio " +"vertical" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Barra de Herramientas" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Personalizar barra de _herramientas" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Estilo de icono:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Tamaño de icono:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Apariencia" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Pre_determinado del sistema" -#: ../src/interface.c:3359 ../src/toolbar.c:881 -#, fuzzy -msgid "Customize Toolbar" -msgstr "Mostrar Barra de _Herramientas" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Imágenes _y texto" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Sólo _imágenes" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Sólo _texto" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Estilo de iconos" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Pre_determinado del sistema" -#: ../src/interface.c:3363 +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Iconos _pequeños" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Iconos muy _pequeños" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Iconos _grandes" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Tamaño de iconos" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra de herramientas" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" -msgstr "Barra de Herramientas" +msgstr "Barra de herramientas" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" -msgstr "Cortado de líneas" +msgstr "Ajuste de línea" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." msgstr "" "Cortar la línea en el borde de la ventana y continuarla en la línea " -"siguiente. Nota: esta opción tiene un gran costo en velocidad para " +"siguiente. Nota: esta opción tiene un gran costo en rendimiento para " "documentos grandes así que debería ser desactivada en maquinas lentas." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" -msgstr "Activar la tecla inicio \"inteligente\"" +msgstr "Activar la tecla inicio «inteligente»" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1882,18 +1993,18 @@ "key always moves the caret to the start of the current line, regardless of " "its current position." msgstr "" -"Cuando la tecla de inicio \"inteligente\" está activa, la tecla INICIO " -"moverá el cursor al primer carácter no blanco de la linea, a menos que ya se " -"encuentre allí, en cuyo caso lo mueve al principio absoluto de la linea. " -"Cuando esta funcionalidad está desactivada, la tecla INICIO siempre mueve el " -"cursor al principio de la linea actual, independientemente de su posición " +"Cuando la tecla de inicio «inteligente» está activa, la tecla «Inicio» " +"moverá el cursor al primer carácter no blanco de la línea, a menos que ya se " +"encuentre allí, en cuyo caso lo mueve al principio absoluto de la línea. " +"Cuando esta funcionalidad está desactivada, la tecla «Inicio» siempre mueve " +"el cursor al principio de la línea actual, independientemente de su posición " "actual." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" -msgstr "Desactivar Arrastrar y Soltar (Drag and Drop)" +msgstr "Desactivar arrastrar y soltar" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1902,32 +2013,32 @@ "forma que no se podrá arrastrar o soltar ninguna selección dentro o hacia " "afuera de la ventana del editor" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Activar plegado" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Define si se activa el plegado de código" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Plegar/desplegar todos los hijos de un punto de plegado" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." msgstr "" "Pliega o despliega todos los hijos de un punto de plegado. Se logra el " -"comportamiento inverso apretando la tecla Mayús.(Shift) mientras se hace " -"click en un símbolo de plegado." +"comportamiento inverso pulsando la tecla «Mayús» mientras se pulsa en un " +"símbolo de plegado." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar los errores de compilación" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1935,25 +2046,25 @@ "Define si se usarán indicadores (subrayado ondulado) para resaltar las " "líneas donde el compilador encontró un error o una advertencia" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" -msgstr "Al crear nueva linea, borrar espacios extra" +msgstr "Al crear una nueva línea, borrar espacios extra" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" -"Habilitar que las nuevas lineas borren los espacios extra al final de la " -"linea anterior" +"Habilitar que las nuevas líneas borren los espacios extra al final de la " +"línea anterior" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Columna de salto de línea:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Marcador para activar/desactivar comentarios" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1962,132 +2073,123 @@ "de código fuente, y que se utiliza para marcar el comentario como " "establecido." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Características" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Características" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" -msgstr "Modo de formateo de código:" +msgstr "Modo de sangría automática:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Carácter actual" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Coincidiendo con las llaves correspondientes" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Ancho:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "El ancho en caracteres que ocupará una tabulación" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "El ancho en caracteres que ocupará una tabulación" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" -msgstr "Utilizar un tabulado por indentación" +msgstr "Utilizar una tabulación por sangría" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -"Usar espacios si el indentado total es menor que el ancho de tabulado, de lo " +"Usar espacios si la sangría total es menor que el ancho de tabulación, de lo " "contrario usar ambos" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Ancho de tabulación en espacios:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"El ancho de un tabulado cuando se ajusta Tabulados y Espacios para un " -"documento" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -"Define si detectar, cuando se abre un archivo, el tipo de indentado según el " +"Define si detectar, cuando se abre un archivo, el tipo de sangría según el " "contenido del archivo." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" -msgstr "Usar la tecla Tabulador para realizar la indentación" +msgstr "Usar la tecla Tabulador para realizar la sangría" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -"Al pulsar tabulado/mayúsculas-tabulado se indenta/desindenta en lugar de " -"insertar un carácter de tabulado" +"Al pulsar «Tab/Mayús-Tab» se incrementa/disminuye la sangría en lugar de " +"insertar un carácter de tabulación" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" -msgstr "Indentación" +msgstr "Sangría" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Completado de construcciones" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" -msgstr "Doble click esconde todos los paneles adicionales" +msgstr "" +"Teclee una secuencia corta definida de caracteres y complétela para formar " +"una cadena más compleja con sólo pulsar una tecla" -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" -msgstr "Completado automático de etiquetas XML" +msgstr "Autocompletado de etiquetas XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Completado y cerrado automático de etiquetas XML abiertas (incluye etiquetas " "HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Continuación automática de comentarios de varias líneas" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" "Continuar automáticamente comentarios de varias líneas en lenguajes como C, C" -"++ y Java cuando se introduce una nueva linea dentro del comentario" +"++ y Java cuando se introduce una nueva línea dentro del comentario" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "Autocompletar símbolos" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2095,30 +2197,27 @@ "Completado automática de símbolos conocidos en archivos abiertos (nombres de " "funciones, variables globales, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Autocompletar todas las palabras en el documento" -#: ../src/interface.c:3646 -#, fuzzy +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "Evitar completado de contrucciones" +msgstr "Eliminar caracteres posteriores tras autocompletar" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Número máximo de sugerencias para nombres de símbolos" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Altura de la lista de completado:" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" -msgstr "Caracteres a escribir para el completado:" +msgstr "Caracteres a escribir para el autocompletado:" -#: ../src/interface.c:3683 -#, fuzzy +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" @@ -2126,123 +2225,117 @@ "La cantidad de caracteres que son necesarios para mostrar la lista de " "autocompletado de símbolos" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" -msgstr "Número de líneas a mostrar en la lista de completado automático." +msgstr "Altura en filas de la lista de completado automático." -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "Número de líneas a mostrar en la lista de completado automático" +msgstr "Número máximo de líneas mostradas en la lista de completado automático" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Paréntesis ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" "Cerrar automáticamente paréntesis al escribir un paréntesis de apertura" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Comillas simples ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Cerrar automáticamente comillas simples al escribir una comilla de apertura" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Llaves { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Cerrar automáticamente llaves al escribir una llave de apertura" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Corchetes [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Cerrar automáticamente corchetes al escribir un corchete de apertura" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Comillas dobles \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" "Cerrar automáticamente comillas dobles al escribir una comilla doble de " "apertura" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Cerrar automáticamente comillas y corchetes" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" -msgstr "Invierte los colores de resaltado de sintaxis" +msgstr "Invertir los colores de resaltado de sintaxis" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Usar texto blanco sobre fondo negro e invertir todos los colores, esta " -"opción necesita que se reinicie Geany" +"Invertir todos los colores, usando por defecto texto blanco sobre fondo negro" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" -msgstr "Mostrar guías de formateo automático de código" +msgstr "Mostrar guías de sangría" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" -"Muestra líneas con pequeños puntos para ayudarle a usar la indentación " -"correcta" +"Muestra líneas con pequeños puntos para ayudar a usar la sangría correcta" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" -msgstr "Mostrar espacios en blanco" +msgstr "Mostrar espacio en blanco" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca los espacios con puntos y las tabulaciones con flechas" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" -msgstr "Mostrar terminaciones de línea" +msgstr "Mostrar fin de línea" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Muestra el carácter de fin de línea" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" -msgstr "Mostrar Números de _Línea" +msgstr "Mostrar números de línea" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Muestra u oculta el margen con números de línea" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Muestra el margen de marcas" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2250,52 +2343,53 @@ "Muestra u oculta el pequeño margen a la derecha de los números de líneas que " "se usa para marcar líneas" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" -msgstr "Detiene el scroll hacia abajo cuando se alcanza la última línea" +msgstr "" +"Detiene el desplazamiento hacia abajo cuando se alcanza la última línea" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -"Define si se detiene el scroll de página al sobrepasar la última línea del " -"documento" +"Define si se detiene el desplazamiento de página al sobrepasar la última " +"línea del documento" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Marcador de líneas largas:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Color del marcador de líneas largas:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Columna:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Color:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Selecciona el color del marcador de líneas largas" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Selector de color" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " "greater than 0 to specify the column where it should appear." msgstr "" "El marcador de líneas largas es una fina línea vertical en el editor. Ayuda " -"a marcar las líneas largas, o como sugerencia para cortarlas. Poner un valor " -"mayor a 0 para especificar la columna donde debe aparecer." +"a marcar las líneas largas, o como sugerencia para cortarlas. Ponga un valor " +"mayor a 0 para especificar la columna en la que debe aparecer." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Línea" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2303,11 +2397,11 @@ "Imprime una línea vertical en la ventana de edición en la posición dada del " "cursor (ver debajo)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Fondo" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2317,113 +2411,147 @@ "cursor (ver más abajo) cambió al color seleccionado abajo. (Esto es " "recomendable si se usan fuentes proporcionales)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Deshabilitado" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Activado" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Marcador de líneas largas" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Deshabilitado" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "No mostrar espacios virtuales" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Solo para selecciones rectangulares" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Solamente mostrar espacios virtuales más allá del fin de línea al trazar una " +"selección rectangular" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Siempre" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Siempre mostrar espacios virtuales más allá del fin de línea" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Espacios virtuales" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Abrir nuevos documentos desde la línea de comandos" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -"Crear un archivo nuevo por cada archivo que no exista de los indicados por " -"línea de comandos" +"Crear un archivo nuevo por cada archivo de los indicados por línea de " +"comandos que no exista" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" -msgstr "Caracteres de fin de línea por defecto:" +msgstr "Caracteres de fin de línea predeterminados:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Archivos nuevos" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Selecciona la codificación por omisión para nuevos archivos creados" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" -msgstr "Codificación por omisión (para archivos nuevos):" +msgstr "Codificación predeterminada (para archivos nuevos):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Codificación por omisión (para archivos existentes):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Selecciona la codificación por omisión para abrir archivos existentes" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Selecciona la codificación predeterminada para nuevos archivos creados" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Usar una codificación fija al abrir archivos" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Usar una codificación fija al abrir archivos que no sean Unicode" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" +msgstr "" +"Esta opción desactiva la detección automática de codificación de los " +"archivos cuando se está abriendo un archivo que no sea Unicode, y abre el " +"archivo con la codificación especificada (normalmente no es necesario)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codificación predeterminada (para archivos que no sean Unicode):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "" -"Esta opción deshabilita la detección automática de codificación de los " -"archivos cuando se está abriendo un archivo y abre el archivo con la " -"codificación especificada (esto normalmente no es necesario)" +"Establece la codificación predeterminada para abrir archivos existentes que " +"no sean Unicode" -#: ../src/interface.c:4032 +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Codificaciones" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Asegurar terminación de línea al final del archivo" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Asegura que haya una terminación de línea al final del archivo" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Borrar espacios y tabulaciones al final" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Borra los espacios y tabulaciones al final de las líneas" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Reemplazar tabulaciones por espacios" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Reemplaza todas las tabulaciones en el documento por espacios" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" -msgstr "Guardando archivos" +msgstr "Guardado de archivos" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Longitud de la lista de archivos recientes:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Especifica el número de archivos que se guardan en la lista de archivos " "recientes." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Tiempo de espera para la comprobación en disco" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2431,27 +2559,20 @@ "Frecuencia en segundos para comprobar en el disco los cambios de los " "archivos abiertos. El valor 0 desactiva la comprobación." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Archivos" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Ruta y opciones para la herramienta make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2459,23 +2580,23 @@ "Un emulador de terminal como xterm, gnome-terminal o konsole (debe aceptar " "el argumento -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (y posiblemente argumentos adicionales) a su navegador favorito" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Rutas a las herramientas" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Acción contextual:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2486,722 +2607,733 @@ "usada con %s. Puede estar en cualquier lugar del comando dado y será " "remplazada antes de la ejecución." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Comandos" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Herramientas" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "dirección de correo electrónico del desarrollador" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Iniciales del nombre del desarrollador" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" -msgstr "Version inicial:" +msgstr "Versión inicial:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" -msgstr "Número de version que tiene un archivo nuevo" +msgstr "Número de versión inicial de un archivo nuevo" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" -msgstr "Nombre de la compañia" +msgstr "Nombre de la empresa" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Desarrollador:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" -msgstr "Compañia:" +msgstr "Empresa:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" -msgstr "Dirección de correo electrónico:" +msgstr "Correo electrónico:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Iniciales:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "El nombre del desarrollador" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Año:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Fecha:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Fecha y hora:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Ingrese aquí un formato de fecha y hora. Puede usar cualquier especificador " -"de conversión que pueda ser usado con la función strftime de ANSI C." +"Introduzca aquí un formato de fecha y hora. Puede usar cualquier " +"especificador de conversión que pueda ser usado con la función strftime de " +"ANSI C." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Ingrese aquí un formato de año. Puede usar cualquier especificador de " +"Introduzca aquí un formato de año. Puede usar cualquier especificador de " "conversión que pueda ser usado con la función strftime de ANSI C." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Ingrese aquí un formato de fecha. Puede usar cualquier especificador de " +"Introduzca aquí un formato de fecha. Puede usar cualquier especificador de " "conversión que pueda ser usado con la función strftime de ANSI C." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Datos de plantillas" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Plantillas" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Cambiar" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" -msgstr "Atajos de teclado" +msgstr "Combinaciones de tecla" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" -msgstr "Atajos" +msgstr "Combinaciones" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Ruta al comando para imprimir archivos (usar %f como nombre de archivo)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Usar un comando externo para la impresión" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimir números de línea" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" -msgstr "Añadir números de linea a la página impresa" +msgstr "Añadir números de línea a la página impresa" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimir números de página" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" -"Agregar números de página al final de cada página. Ocupa 2 lineas de la " +"Añadir números de página al final de cada página. Ocupa 2 líneas de la " "página." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Imprimir encabezado de página" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." msgstr "" -"Agrega un pequeño encabezado a cada página conteniendo el número de página, " -"el nombre del archivo y la fecha actual (ver abajo). Ocupa 3 lineas de la " +"Añade un pequeño encabezado a cada página que contiene el número de página, " +"el nombre del archivo y la fecha actual (ver abajo). Ocupa 3 líneas de la " "página." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usar el nombre del archivo impreso" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimir sólo el nombre (sin la ruta) del archivo impreso" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" -msgstr "Formato de Fecha:" +msgstr "Formato de fecha:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " "with the ANSI C strftime function." msgstr "" -"Ingrese aquí un formato de fecha y hora que será agregado al encabezado de " +"Introduzca aquí un formato de fecha y hora que será añadido al encabezado de " "cada página. Puede usar cualquier especificador de conversión que pueda ser " "usado con la función strftime de ANSI C." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Usar la impresión nativa de GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Impresión:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Impresión" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" -msgstr "Propiedades del Proyecto" +msgstr "Propiedades del proyecto" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Mostrar:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Personalizado" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Usar ajustes globales" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Archivo" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nuevo" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Abrir" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" -msgstr "Abrir archivos seleccionados" +msgstr "Abrir archivo seleccionado" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Guardar" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" -msgstr "Guardar Como..." +msgstr "Guardar como..." -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Guardar todo" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Imprimir" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Cerrar" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Cerrar todo" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Recargar archivo" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Volver a abrir la última pestaña cerrada" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Proyecto" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Propiedades del proyecto" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Deshacer" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Rehacer" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplicar línea o selección" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Borrar la(s) linea(s) actual(es)" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "Borrar la(s) linea(s) actual(es)" - -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Transponer la linea actual" +msgstr "Borrar hasta el final de línea" -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" -msgstr "Desplazar a la linea actual" +msgstr "Desplazar a la línea actual" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" -msgstr "Desplazar la vista hacia arriba una linea" +msgstr "Desplazar la vista hacia arriba una línea" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" -msgstr "Desplazar la vista hacia abajo una linea" +msgstr "Desplazar la vista hacia abajo una línea" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Completar construcción" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" -msgstr "Mover cursor dentro de un trozo de texto" +msgstr "Mover cursor dentro de una construcción" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" -msgstr "Evitar completado de contrucciones" +msgstr "Evitar completado de construcciones" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Acción contextual" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Completar palabra" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Mostrar pistas de prototipos" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Mostrar la lista de macros" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Completado de palabra" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Mover línea(s) hacia arriba" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Mover línea(s) hacia abajo" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Portapapeles" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Cortar" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copiar" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Pegar" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copiar la(s) linea(s) actual(es)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Cortar la(s) linea(s) actual(es)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Seleccionar" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" -msgstr "Seleccionar Todo" +msgstr "Seleccionar todo" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Seleccionar palabra actual" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Seleccionar linea(s) actual(es)" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Seleccionar parrafo actual" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Seleccionar hasta el anterior fragmento de palabra" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Seleccionar hasta el siguiente fragmento de palabra" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Formato" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" -msgstr "Intercambiar entre Mayúsculas y minúsculas" +msgstr "Intercambiar entre mayúsculas y minúsculas" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" -msgstr "Comentar/Descomentar" +msgstr "Comentar/descomentar" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" -msgstr "Comentar línea(s)" +msgstr "Comentar líneas" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" -msgstr "Descomentar línea(s)" +msgstr "Descomentar líneas" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Incrementar sangría" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" -msgstr "Decrementar sangría" +msgstr "Disminuir sangría" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Incrementar sangría en un espacio" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" -msgstr "Decrementar sangría en un espacio" +msgstr "disminuir sangría en un espacio" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Sangrado de linea inteligente" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" -msgstr "Enviar al Comando Personalizado 1" +msgstr "Enviar al comando personalizado 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" -msgstr "Enviar al Comando Personalizado 2" +msgstr "Enviar al comando personalizado 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" -msgstr "Enviar al Comando Personalizado 3" - -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Mandar Selección al Terminal" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" +msgstr "Enviar al comando personalizado 3" -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Insertar" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Insertar fecha" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Insertar espacio en blanco alternativo" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Opciones" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Buscar" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" -msgstr "Encontrar" +msgstr "Buscar" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" -msgstr "Buscar Siguente" +msgstr "Buscar siguiente" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" -msgstr "Buscar Anterior" +msgstr "Buscar anterior" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" -msgstr "Buscar Siguiente Selección" +msgstr "Buscar siguiente selección" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" -msgstr "Buscar Anterior Selección" +msgstr "Buscar selección anterior" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Reemplazar" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" -msgstr "Buscar en Archivos" +msgstr "Buscar en archivos" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" -msgstr "Mensaje Siguiente" +msgstr "Mensaje siguiente" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" -msgstr "Mensaje Previo" +msgstr "Mensaje anterior" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Encontrar uso" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" -msgstr "Encontrar Uso de Documento" +msgstr "Encontrar uso del documento" -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "_Make All" +msgstr "Marcar todo" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Ir a" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Navegar una ubicación hacia atrás" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Navegar una ubicación hacia adelante" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Ir a la llave correspondiente" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" -msgstr "Activar/Desactivar marca" - -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Ir a la siguiente marca" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Ir a la marca anterior" +msgstr "Activar/desactivar marca" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" -msgstr "Ir a la Definición del Tag" +msgstr "Ir a la definición de la etiqueta" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" -msgstr "Ir a la Declaración del Tag" +msgstr "Ir a la declaración de la etiqueta" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" -msgstr "Ir al Comienzo de la Línea" +msgstr "Ir al inicio de la línea" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" -msgstr "Ir al Final de la Línea" +msgstr "Ir al final de la línea" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" -msgstr "Ir al Final de la Línea" +msgstr "Ir al final de la línea mostrada" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Ir al anterior fragmento de palabra" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Ir al siguiente fragmento de palabra" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Ver" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" -msgstr "Mostrar/Esconder todos los paneles adicionales" +msgstr "Mostrar/ocultar todos los componentes adicionales" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Mostrar ventana de mensajes" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" -msgstr "Mostrar/Ocultar barra lateral" +msgstr "Mostrar/ocultar barra lateral" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" -msgstr "Acercar el texto" +msgstr "Ampliar texto" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" -msgstr "Alejar el texto" +msgstr "Disminuir texto" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Reiniciar zoom" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" -msgstr "Ir al Editor" +msgstr "Ir al editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" -msgstr "Ir al Borrador" +msgstr "Ir al borrador" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Ir a la VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" -msgstr "Ir a la Barra de Busqueda" +msgstr "Ir a la barra de búsqueda" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" -msgstr "Ir a la Barra Lateral " +msgstr "Ir a la barra lateral " -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" -msgstr "Cambiar a Compilador" +msgstr "Cambiar a compilador" + +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Cambiar a mensajes" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Cambiar a ventana de mensajes" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Cambiar a lista de documentos lateral" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Cambiar a la lista de símbolos lateral" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:498 msgid "Notebook tab" -msgstr "Pestaña de anotador" +msgstr "Pestaña de libreta" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Ir al documento de la izq." -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Ir al documento de la der." -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Ir al último documento usado" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Mover el documento a la izquierda" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Mover el documento a la derecha" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Mover el documento al principio" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Mover el documento al final" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" -msgstr "Activar/Desactivar ajuste de línea" +msgstr "Activar/desactivar ajuste de línea" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" -msgstr "Activar/Desactivar salto de línea" +msgstr "Activar/desactivar salto de línea" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Reemplazar espacios por tabulaciones" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Activar/desactivar plegado actual" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Plegar todo" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Desplegar todo" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Recargar lista de símbolos" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Borrar marcas" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Borrar indicadores de errores" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Construir" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Construye con make (objetivo personalizado)" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Siguiente error" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Error previo" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Ejecutar" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Ejecutar (comando alternativo)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Opciones de construcción" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" -msgstr "Mostrar Selector de Colores" +msgstr "Mostrar selector de colores" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Ayuda" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" -msgstr "Atajos de Teclado" +msgstr "Combinaciones de teclas" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Los siguientes atajos de teclado son configurables:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" -msgstr "Cambiar a Documento" +msgstr "Cambiar a documento" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "Escriba aquí lo que desee, úselo como nota o borrador" +msgstr "Escriba aquí lo que desee, úselo como panel de notas o borrador" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Error al cargar uno o más archivos de la sesión." @@ -3209,174 +3341,191 @@ msgid "Debug Messages" msgstr "Mensajes de depuración" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "_Limpiar" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "" -"Selecciona el número inicial de colúmna para el primer archivo abierto (útil " +"Establece el número inicial de columna para el primer archivo abierto (útil " "en conjunto con --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Usar un directorio de configuración alternativo" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Modo Verbose (amplía la información mostrada)" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Imprimir nombres internos de tipos de archivos" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" -msgstr "Generar archivo global de tags (ver la documentación)" +msgstr "Generar archivo global de etiquetas (ver la documentación)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" -msgstr "No realizar pre-procesado de archivos C/C++ al generar tags" +msgstr "No realizar pre-procesado de archivos C/C++ al generar etiquetas" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" -"No abrir archivos en instancias corriendo, forzar la apertura de una nueva " -"instancia" +"No abrir archivos en una instancia en ejecución, forzar la apertura de una " +"nueva instancia" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" +"Utilice este nombre de archivo de socket para comunicarse con una instancia " +"en ejecución de Geany" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" +"Devolver una lista de documentos abiertos en una instancia en ejecución de " +"Geany" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" -msgstr "Seleccione el número inicial para el primer archivo abierto" +msgstr "Establece el número de línea inicial para el primer archivo abierto" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "No mostrar ventana de mensajes al inicio" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "No cargar los datos de completado automático (ver la documentación)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" -msgstr "No cargar agregados" +msgstr "No cargar complementos" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Imprimir el prefijo de instalación de Geany" -#: ../src/main.c:141 -#, fuzzy +#: ../src/main.c:139 msgid "Don't load the previous session's files" -msgstr "no cargar los archivos de la sesión anterior" +msgstr "No cargar los archivos de la sesión anterior" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "No cargar el soporte de terminal" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Nombre de archivo de libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Mostrar información detallada" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Mostrar versión y salir" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[ARCHIVOS...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" -msgstr "(compilado en %s con GTK %d.%d.%d, GLib %d.%d.%d)" +msgstr "(compilado el %s con GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "¿Moverlo ahora?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Geany necesita mover su directorio de configuración antiguo antes de empezar." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." msgstr "" -"Su directorio de configuración se ha movido correctamente desde \"%s\" hacia " -"\"%s\"." +"Su directorio de configuración se ha movido correctamente desde «%s» hacia " +"«%s»." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -"Su directorio de configuración antiguo \"%s\" no se pudo mover hacia \"%s" -"\" (%s). Por favor, mueva manualmente su antiguo directorio al nuevo lugar " -"correspondiente." +"Su directorio de configuración antiguo «%s» no se ha podido mover hacia " +"«%s» (%s). Mueva manualmente su antiguo directorio a la nueva ubicación." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" msgstr "" -"El directorio de configuración no pudo ser creado (%s).\n" +"No se ha podido crear el directorio de configuración (%s).\n" "Puede haber problemas usando Geany sin un directorio de configuración.\n" -"¿Iniciar Geany de todas formas?" - -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "No se pudo encontrar el archivo '%s'." +"¿Desea iniciar Geany de todas formas?" -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." -msgstr "Este es Geany %s." +msgstr "Esto es Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." -msgstr "El directorio de configuración no pudo ser creada (%s)." +msgstr "No se ha podido crear el directorio de configuración (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Archivos de configuración recargados." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Mensajes de estado" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "C_opiar" + +#: ../src/msgwindow.c:533 msgid "Copy _All" -msgstr "" -"Reemplaza \\\\, \\t, \\n, \\r y \\uXXXX (caracteres Unicode) con el carácter " -"de control correspondiente" +msgstr "Copi_ar todo" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" -msgstr "_Ocultar Ventana de Mensajes" +msgstr "_Ocultar ventana de mensajes" + +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "No se encontró el archivo «%s», probando la ruta del documento actual." -#: ../src/plugins.c:425 +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -"El complemento \"%s\" no es compatible binariamente con esta distribución de " -"Geany - por favor recompilarlo." +"El complemento «%s» no es compatible a nivel binario con esta versión de " +"Geany , intente volver a compilarlo." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" -msgstr "_Administrador de Complementos" +msgstr "_Administrador de complementos" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3387,220 +3536,232 @@ "Descripción: %s\n" "Autor(es): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Activo" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Complemento" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "No hay complementos disponibles." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Complementos" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Debajo se encuentra una lista de complementos disponibles. Seleccione los " -"complementos que deben ser cargados cuando se inicia Geany." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Seleccione los complementos que se activarán al inicio:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" -msgstr "Detalles del complemente:" +msgstr "Detalles del complemento:" + +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configurar complementos" -#: ../src/prefs.c:160 +#: ../src/prefs.c:165 msgid "Grab Key" -msgstr "Capturar Tecla" +msgstr "Capturar tecla" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." -msgstr "Pulse la combinación de teclas que desee usar para \"%s\"." +msgstr "Pulse la combinación de teclas que desee usar para «%s»." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" -msgstr "_Expandir Todo" +msgstr "_Expandir todo" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" -msgstr "_Colapsar Todo" +msgstr "_Colapsar todo" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Acción" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" -msgstr "Atajo" +msgstr "Combinación" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Permitir" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "S_obrescribir" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" -msgstr "Sobrescribir ese atajo?" +msgstr "¿Desea sobrescribir esa combinación de teclas?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." -msgstr "La combinación '%s' está usada por \"%s\"." +msgstr "La combinación «%s» ya se utiliza para «%s»." + +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" -"Ingrese debajo las rutas a las herramientas. Las herramientas que no " +"Introduzca debajo las rutas a las herramientas. Las herramientas que no " "necesite pueden quedar en blanco." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" -"Especificar la información que quiera usar en las plantillas. Para más " -"detalles ver la documentación." +"Establecer la información que quiera usar en las plantillas. Para más " +"detalles vea la documentación." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." "" msgstr "" "Nota: Para que surtan efecto los cambios que realice aquí, deberá " -"reiniciar Geany o forzar la recarga de la configuración usando Herramientas-" -">Recargar Configuración." +"reiniciar Geany o forzar la recarga de la configuración usando «Herramientas-" +">Recargar configuración»." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " "action to edit the string representation of the shortcut directly." msgstr "" -"Aquí puede cambiar los atajos de teclado para varias acciones. Seleccione " -"una y presione el botón de Cambiar para ingresar un nuevo atajo, o haga " -"doble click en una acción para editar directamente el texto que representa " -"el atajo." +"Aquí puede cambiar combinaciones de tecla para varias acciones. Seleccione " +"una acción y pulse el botón «Cambiar» para introducir una nueva combinación " +"de teclas, o haga doble clic en una acción para editar directamente el texto " +"que representa la combinación." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" -"Noticia: La impresión nativa de GTK sólo está disponible si Geany fue " -"compilado con GTK 2.10 (o superior) y Geany está corriendo con GTK " -"2.10 (o superior)." +"1Noticia: La impresión nativa de GTK sólo está disponible si Geany fue " +"compilado con GTK 2.10 (o superior) y Geany se está ejecutando con " +"GTK 2.10 (o superior)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -"Advertencia: Estos ajustes son invalidados por el proyecto actual. " +"Advertencia: Estos ajustes son sobrescritos por el proyecto actual. " "Consulte Proyecto->Propiedades." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "La fuente del editor no es una fuente monoespaciada." #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "El texto no tendrá el espaciado correcto." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" -msgstr "Configuración del Documento" +msgstr "Configuración del documento" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Imprimir sólo el nombre (sin la ruta) del archivo impreso" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "La impresión de %s fue cancelada." +msgid "Did not send document %s to the printing subsystem." +msgstr "No se ha enviado el documento %s al sistema de impresión." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Archivo %s impreso." +msgid "Document %s was sent to the printing subsystem." +msgstr "El documento %s ha sido enviado al sistema de impresión." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "La impresión de %s ha fallado (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" -"Por favor configure primero un comando de impresión en el diálogo " -"Preferencias" +"Configure primero un comando de impresión en el diálogo «Preferencias»." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" "\n" "%s" msgstr "" -"El archivo \"%s\" será impreso con el siguiente comando:\n" +"Se imprimirá el archivo «%s» con el siguiente comando:\n" "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "La impresión de \"%s\" ha fallado (código de retorno: %s)." +msgstr "La impresión de «%s» ha fallado (código de retorno: %s)." + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Archivo %s impreso." #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "proyectos" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" -msgstr "Nuevo Proyecto" +msgstr "Proyecto nuevo" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "C_rear" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Nombre:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" -msgstr "Nombre de Archivo:" +msgstr "Nombre de archivo:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Ruta base:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3610,140 +3771,138 @@ "ser una ruta nueva o un árbol de directorios ya existente. Pueden usarse " "rutas relativas al archivo de proyecto." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" -msgstr "Elija la Ruta Base del Proyecto" +msgstr "Elija la ruta base del proyecto" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." -msgstr "El archivo de proyecto \"%s\" no pudo ser cargado." +msgstr "No se ha podido cargar el archivo de proyecto «%s»." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" -msgstr "Abrir Proyecto" +msgstr "Abrir proyecto" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Archivos del proyecto" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." -msgstr "Proyecto \"%s\" cerrado." +msgstr "Proyecto «%s» cerrado." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Descripción:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Make en el directorio base" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" +"Establecer que los directorios de trabajo de los comandos generales utilicen " +"la ruta base:" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Comando de ejecución:" +#: ../src/project.c:484 +msgid "Set" +msgstr "Fijar" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Linea de comandos a correr en la ruta base del proyecto. Opciones pueden ser " -"agregadas al comando. Dejar en blanco para usar el comando por defecto." +"Usar la ruta base para los directorios de trabajo (en la pestaña " +"«Construir») de los comandos de construir que se aplican a cualquier tipo de " +"archivo (generales)" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Patrones de archivos:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" -msgstr "¿Quiere cerrarlo antes de proceder?" +msgstr "¿Desea cerrarlo antes de proceder?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." -msgstr "El proyecto '%s' ya está abierto. " +msgstr "El proyecto «%s» ya está abierto." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." -msgstr "El nombre de proyecto especificado es muy corto." +msgstr "El nombre de proyecto indicado es demasiado corto." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "" -"El nombre de proyecto especificado es demasiado largo (máx. %d caracteres)." +"El nombre de proyecto indicado es demasiado largo (máx. %d caracteres)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." -msgstr "Ha especificado un nombre de archivo de proyecto inválido." +msgstr "Ha indicado un nombre de archivo de proyecto inválido." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "¿Crear el directorio de la ruta base del proyecto?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." -msgstr "La ruta \"%s\" no existe." +msgstr "La ruta «%s» no existe." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." -msgstr "No se pudo crear el directorio base del proyecto (%s)." +msgstr "No se ha podido crear el directorio base del proyecto (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." -msgstr "El archivo de proyecto no pudo ser escrito (%s)." +msgstr "No se ha podido crear el archivo de proyecto (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." -msgstr "Proyecto \"%s\" creado." +msgstr "Proyecto «%s» creado." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." -msgstr "Proyecto \"%s\" guardado." +msgstr "Proyecto «%s» guardado." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" -msgstr "Elija el Nombre del archivo de Proyecto" - -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Elija el Comando de Ejecución del Proyecto" +msgstr "Elija el nombre del archivo del proyecto" -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." -msgstr "Proyecto \"%s\" abierto." +msgstr "Proyecto «%s» abierto." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Usar expresiones regulares" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "" -"Usar expresiones regulares estilo-POSIX. Por información detallada sobre el " -"uso de expresiones regulares, por favor lea la documentación" +"Usar expresiones regulares estilo-POSIX. Lea la documentación para obtener " +"información detallada sobre el uso de expresiones regulares." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" -msgstr "Buscar hacia _atras" +msgstr "Buscar hacia _atrás" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Usar secuencias de _escape" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3751,422 +3910,436 @@ "Reemplaza \\\\, \\t, \\n, \\r y \\uXXXX (caracteres Unicode) con el carácter " "de control correspondiente" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" -msgstr "_Respetar Mayúsculas y minúsculas" +msgstr "Distinguir m_ayús./minús." -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Sólo _palabras enteras" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Sólo desde el principio de las _palabras" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Anterior" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" -msgstr "_Siguente" +msgstr "_Siguiente" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" -msgstr "_Buscar por:" +msgstr "_Buscar:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" -msgstr "Buscar _Todos" +msgstr "Buscar _todos" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Marcar" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Marcar todas las coincidencias en el documento actual" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" -msgstr "En la _Sesión" +msgstr "En la _sesión" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" -msgstr "En el _Documento" +msgstr "En el _documento" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" -msgstr "Cerrar _dialogo" +msgstr "Cerrar _diálogo" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" -msgstr "Deshabilite esta opción para mantener el dialogo abierto" +msgstr "Deshabilite esta opción para mantener el diálogo abierto" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" -msgstr "Reemplazar y B_uscar" +msgstr "Reemplazar y b_uscar" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Reem_plazar con:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" -msgstr "Reemplazar _Todo" +msgstr "Reemplazar _todo" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" -msgstr "En la Se_lección" +msgstr "En la se_lección" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" -msgstr "" -"Reemplaza todas las ocurrencias encontradas en el texto actualmente " -"seleccionado" +msgstr "Reemplaza todas las ocurrencias encontradas en el texto seleccionado" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Directorio:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "_Codificación:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Cadenas _fijas" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" -msgstr "Expresiones regulares _Grep" +msgstr "Expresiones regulares _grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" -msgstr "Véase la página de manual de grep para más información" +msgstr "Consulte la página de manual de grep para más información" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" -msgstr "Expresiones regulares _Extendidas" +msgstr "_Expresiones regulares extendidas" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" -msgstr "Operar _Recursivamente en los subdirectorios" +msgstr "Ent_rar en los subdirectorios" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Invertir los resultados de la búsqueda" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -"Invierte el sentido de la asociación, seleccionando las líneas no " +"Invierte el sentido de la coincidencia, seleccionando las líneas no " "coincidentes." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" -msgstr "Opciónes e_xtra:" +msgstr "Opciones e_xtra:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" -msgstr "Otras opciones a pasar a Grep" +msgstr "Otras opciones a pasar a grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "Se encontró %d coincidencia para \"%s\"." -msgstr[1] "Se encontraron %d coincidencias para \"%s\"." +msgstr[0] "Se ha encontrado %d coincidencia para «%s»." +msgstr[1] "Se han encontrado %d coincidencias para «%s»." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Texto reemplazado en %u archivo." -msgstr[1] "Texto reemplazado en %u archivos." +msgid "Replaced %u matches in %u documents." +msgstr "Se han reemplazado %u ocurrencias en %u documentos." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Directorio no válido para buscar archivos." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "No hay texto para buscar." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" -"No se pudo encontrar la herramienta grep '%s'; verifique la ruta en las " -"Preferencias." +"No se ha podido encontrar la herramienta grep «%s»; verifique la ruta en " +"«Preferencias»." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Buscando..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (en directorio: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" -msgstr "No se pudo abrir el directorio (%s)" +msgstr "No se ha podido abrir el directorio (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"La búsqueda ha fallado (para más detalles, consulte Ayuda->Mensajes de " -"depuración)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Búsqueda fallida." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Búsqueda completada con %d coincidencia." msgstr[1] "Búsqueda completada con %d coincidencias." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." -msgstr "No se encontraron coincidencias." +msgstr "No se han encontrado coincidencias." + +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Expresión regular incorrecta : %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany ha intentado acceder al socket de dominio Unix de otra instancia " +"ejecutándose como otro usuario.\n" +"Esto es un error grave y Geany se cerrará." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Capítulo" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sección" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sec1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sec2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sec3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Apéndice" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Otro" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Módulo" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Tipos" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Constructores de tipos" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funciones" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" -msgstr "Secciónes" +msgstr "Secciones" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" -msgstr "Teclas" +msgstr "Claves" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variables" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Comando" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Entorno" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Sub-sección" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Sub-sub-sección" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etiqueta" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Estructuras" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Paquete" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Mi" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Nuestro" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Etiquetas" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constantes" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Clases" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Constantes" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Anclas" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Encabezados (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Encabezados (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Encabezados (H3)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Selectores de ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" -msgstr "Selectores de Tipo" +msgstr "Selectores de tipo" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Módulos" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Métodos" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namespaces" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "Propiedades" +msgstr "Procedimientos" -#: ../src/symbols.c:736 -#, fuzzy +#: ../src/symbols.c:752 msgid "Imports" -msgstr "Exportar" +msgstr "Imports" -#: ../src/symbols.c:766 ../src/symbols.c:855 -msgid "Members" -msgstr "Miembros" +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entidades" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Etiquetas" +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Arquitecturas" -#: ../src/symbols.c:818 -msgid "Subroutines" -msgstr "Subrutinas" +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funciones/procedimientos" -#: ../src/symbols.c:821 -msgid "Blocks" -msgstr "Bloques" +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variables/señales" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 -msgid "Macros" -msgstr "Macros" +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Procesos/componentes" -#: ../src/symbols.c:831 +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Eventos" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funciones/tareas" + +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "Miembros" + +#: ../src/symbols.c:838 +msgid "Subroutines" +msgstr "Subrutinas" + +#: ../src/symbols.c:841 +msgid "Blocks" +msgstr "Bloques" + +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 +msgid "Macros" +msgstr "Macros" + +#: ../src/symbols.c:851 msgid "Defines" msgstr "Defines" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Objetivos" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" -msgstr "Structs" +msgstr "Estructuras" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" -msgstr "Typedefs / Enums" +msgstr "Typedefs/enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" -msgstr "Extención de archivo desconocide para \"%s\".\n" +msgstr "Extensión de archivo desconocida para «%s».\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" -"Fállo al crear el archivo de tags, tal vez proque no se encontró ningún " -"tag.\n" +"Error al crear el archivo de etiquetas, tal vez porque no se ha encontrado " +"ninguna etiqueta.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" -"Uso: %s -g \n" +"Uso: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4177,177 +4350,193 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" -msgstr "Cargar Tags" +msgstr "Cargar etiquetas" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" -msgstr "Archivos de tags de Geany (*.tags)" +msgstr "Archivos de etiquetas de Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." -msgstr "Cargado %s archivo de tags '%s'." +msgstr "Cargado %s archivo de etiquetas «%s»." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." -msgstr "No se pudo cargar el archivo de tags '%s'." +msgstr "No se ha podido cargar el archivo de etiquetas «%s»." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." -msgstr "Declaración de \"%s\" no encontrada" +msgstr "Declaración de «%s» no encontrada" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." -msgstr "Definición de \"%s\" no encontrada" +msgstr "Definición de «%s» no encontrada" -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" -msgstr "Ordenar por _Nombre" +msgstr "Ordenar por _nombre" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" -msgstr "Ordenar por _Aparición" +msgstr "Ordenar por _aparición" + +#: ../src/templates.c:278 +msgid "Old" +msgstr "Antiguo" #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Guardar el archivo actual" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Guardar todos los archivos abiertos" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" -msgstr "Recarga el archivo actual desde el disco" +msgstr "Recargar el archivo actual desde el disco" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Cerrar el archivo actual" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Cerrar todos los archivos abiertos" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Cortar la selección actual" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Copiar la selección actual" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" -msgstr "Pega los contenidos del portapapeles" +msgstr "Pegar el contenido del portapapeles" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Eliminar la selección actual" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Deshacer la última modificación" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Rehacer la última modificación" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compilar el archivo actual" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Ejecutar o ver el archivo actual" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" -msgstr "Abrir un diálogo selector de colores para elegir colores de una paleta" +msgstr "" +"Abrir un diálogo de selección de colores para elegir colores de una paleta" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Acercar el texto" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Alejar el texto" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Decrementar sangría" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Incrementar sangría" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" -msgstr "Buscar el texto ingresado en el archivo actual" +msgstr "Buscar el texto introducido en el archivo actual" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Saltar al número de línea introducido" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" -msgstr "Muestra el diálogo Preferencias" +msgstr "Mostrar el diálogo «Preferencias»" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Salir de Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Imprimir documento" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "Marcar todas las coincidencias en el documento actual" +msgstr "Reemplazar texto en el documento actual" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Crear un archivo nuevo" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Crear un archivo nuevo a partir de una plantilla" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Abrir un archivo existente" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Abrir un archivo reciente" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Elegir más acciones de construcción" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Ir a" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "Separador" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- Separador ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" +"Seleccione los elementos que se mostrarán en la barra de tareas. Estos " +"elementos se pueden reordenar arrastrando y soltándolos" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "Elementos disponibles" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "Mostrar" +msgstr "Elementos mostrados" #: ../src/tools.c:153 #, c-format @@ -4355,8 +4544,8 @@ "The executed custom command returned an error. Your selection was not " "changed. Error message: %s" msgstr "" -"El comando personalizado ejecutado retornó error. Su selección no ha sido " -"modificada. Mensaje de error: %s" +"El comando personalizado ejecutado devolvió un error. Su selección no ha " +"sido modificada. Mensaje de error: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4370,11 +4559,11 @@ #: ../src/tools.c:290 #, c-format msgid "Custom command failed: %s" -msgstr "Falló el comando personalizado: %s" +msgstr "Ha fallado el comando personalizado: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" -msgstr "Configurar Comandos Personalizados" +msgstr "Establecer comandos personalizados" #: ../src/tools.c:311 msgid "" @@ -4382,331 +4571,309 @@ "of the command replaces the current selection." msgstr "" "Puede enviar la selección actual a cualquiera de estos comandos y la salida " -"del comando remplaza la selección actual." +"del comando reemplaza la selección actual." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "No hay comandos personalizados definidos." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" -msgstr "Contar Palabras" +msgstr "Contar palabras" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "selección" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "todo el documento" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Rango:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Líneas:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Palabras:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Caracteres:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" -msgstr "No se encontraron tags" +msgstr "No se han encontrado etiquetas" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Mostrar la lista de _símbolos" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" -msgstr "Mostrar la Lista de _Documentos" +msgstr "Mostrar la lista de _documentos" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "_Ocultar barra lateral" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "Mostrar la ruta _completa" +msgstr "Mostrar _rutas" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "linea: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "línea: %d / %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "SL" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "SOB" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "ES" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/E" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "modo: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "codificación: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" -msgstr "Tipo de archivo: %s" +msgstr "tipo de archivo: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" -msgstr "alcance: %s" +msgstr "ámbito: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Fuente actualizada (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" -msgstr "Biblioteca Estandard de C" +msgstr "Biblioteca estándar de C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" -msgstr "C++ (Biblioteca Estandard de C)" +msgstr "C++ (Biblioteca estándar de C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" -msgstr "Biblioteca Estandard de C++" +msgstr "Biblioteca estándar de C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" -msgstr "_Configurar Formato de Fecha Personalizado" +msgstr "_Establecer formato de fecha personalizado" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" -msgstr "Seleccionar Carpeta" +msgstr "Seleccionar carpeta" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" -msgstr "Seleccionar Archivo" - -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Archivos de C_onfiguración" +msgstr "Seleccionar archivo" -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" -msgstr "Guardar _Todo" +msgstr "Guardar _todo" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" -msgstr "C_errar Todo" +msgstr "C_errar todo" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" -msgstr "_Configurar Ruta del Documento" +msgstr "_Establecer ruta desde el documento" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" -msgstr "_Reinicia Terminal" +msgstr "_Reiniciar terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" -msgstr "Métodos de _Entrada" +msgstr "Métodos de _entrada" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" -"No se pudo cambiar el directorio en la terminal virtual (VTE) probablemente " -"porque contiene un comando." +"No se ha podido cambiar el directorio en la terminal virtual (VTE) " +"probablemente porque contiene un comando." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Plugin de Terminal" +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Tipografía:" -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Estas opciones para la emulación de terminal virtual (VTE) sólo se aplican " -"si se pudo cargar la biblioteca de VTE." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Fuente de la terminal:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" -msgstr "Selecciona la fuente para la ventana de terminal" +msgstr "Selecciona la fuente para el componente de terminal" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" -msgstr "Color de primer plano:" +msgstr "Primer plano:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" -msgstr "Color de fondo:" +msgstr "Fondo:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" -msgstr "Selecciona el color de frente del texto en la terminal." +msgstr "Establece el color del texto en la terminal" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" -msgstr "Selecciona el color de fondo del texto en la terminal." +msgstr "Establece el color de fondo del texto en la terminal." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Líneas del historial:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "" -"Especifica el número de líneas de historial que pueden volver a usarse en la " +"Indica el número de líneas de historial que pueden volver a usarse en la " "terminal." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "" "Configura la ruta para la línea de comandos que se iniciará dentro del " -"emulador de teminal" +"emulador de terminal" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" -msgstr "Descender al presionar una tecla" +msgstr "Desplazarse al pulsar una tecla" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "" -"Define si se realiza scroll hacia abajo hasta el final cuando se pulse una " -"tecla" +"Define si se desplaza hacia abajo hasta el final cuando se pulse una tecla" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" -msgstr "Descender al haber salida" +msgstr "Desplazar según salida" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "" -"Define si se realiza scroll hacia abajo hasta el final de manera automática " -"cuando se genere nueva salida" +"Define si se desplaza hacia abajo hasta el final de manera automática cuando " +"se genere nueva salida" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" -msgstr "Hacer que el cursor parpadee" +msgstr "Cursor parpadeante" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Define si el cursor parpadea" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" -msgstr "Sobreescribir atajos de Geany" +msgstr "Sobreescribir combinaciones de tecla de Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" -"Permite que la terminal virtual (VTE) reciba atajos de teclado (exceptuando " -"los comandos de foco)." +"Permite que la terminal virtual (VTE) reciba combinaciones de tecla " +"(exceptuando los comandos de foco)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" -msgstr "Desactivar el atajo de teclado del menu (por omisión F10)" +msgstr "Desactivar la combinación de teclas del menú (predet. F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " "within the VTE." msgstr "" -"Esta opción desactiva el atajo de teclado usado para desplegar la barra de " -"menu (por omisión F10). Desactivarlo puede ser útil si se usa, por ejemplo, " -"Midnight Commander dentro de la VTE." +"Esta opción desactiva la combinación de teclas usada para desplegar la barra " +"de menú (F10 de modo predeterminado). Desactivarlo puede ser útil si se usa, " +"por ejemplo, «Midnight Commander» dentro de la VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Seguir la ruta del archivo actual" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" -"Indica si se ejecutará \"cd $path\" cuando se cambie de archivo abierto." +"Indica si se ejecutará «cd $path» cuando se cambie entre archivos abiertos." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "No usar script de ejecución" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4714,201 +4881,234 @@ "No usar el script de ejecución simple que normalmente se usa para mostrar el " "estado de salida del programa ejecutado." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Ejecutar programas en la VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" msgstr "" "Ejecutar programas en la VTE en lugar de abrir una ventana de emulación de " -"terminal. Por favor, obsérvese que los programas ejecutados en la VTE no " -"pueden ser detenidos." +"terminal. Fíjese en que los programas ejecutados en la VTE no pueden ser " +"detenidos." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Archivos de proyectos Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Ejecutables" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Constructor de clases" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Crea archivos fuente para nuevas clases." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" -msgstr "Crear Clase" +msgstr "Crear clase" + +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Namespace" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Namespace:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Clase" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nombre de clase:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Archivo de encabezado:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Archivo de fuente:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Herencia" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Clase base:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Fuente base:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Encabezado base:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Gtype base:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementa:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Opciones" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Crear constructor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Crear destructor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Es abstracto" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Es singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" -msgstr "Constructor de tipo GTK+ " +msgstr "Constructor de tipo GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" -msgstr "Crear Cla_se" +msgstr "Crear cla_se" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Clase _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Clase _GTK+" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "Clase _PHP" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caracteres HTML" #: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." -msgstr "Insertar entidades HTML para carácteras como '&'." +msgstr "Insertar entidades HTML para carácteras como «&»." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "El equipo de desarrollo de Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Caracteres HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Caracteres ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Caracteres griegos" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Caracteres matemáticos" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Caracteres técnicos" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Caracteres de flechas" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Caracteres de puntuación" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" -msgstr "Caracteres misceláneos" +msgstr "Caracteres variados" + +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "No se ha podido crear el directorio de configuración del complemento." -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Caracteres especiales" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Insertar" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." msgstr "" -"Elija un carácter especial de la lista de abajo y haga doble click en él o " +"Elija un carácter especial de la lista de abajo y haga doble clic en él o " "use el botón para insertarlo en la posición actual del cursor." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Carácter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nombre)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" -msgstr "_Insertar Caracteres Especiales de HTML" +msgstr "_Insertar caracteres especiales de HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Reemplazo HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" -msgstr "Activar / Desactivar HTML" +msgstr "Activar/desactivar _HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Reemplazo masivo de caracteres especiales" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" -msgstr "Insertar Caracteres Especiales HTML" +msgstr "Insertar caracteres especiales HTML" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Reemplazar caracteres especiales" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" -msgstr "Activar/Desactivar estado del complemento" +msgstr "Intercambiar el estado del complemento" #: ../plugins/export.c:37 msgid "Export" @@ -4924,114 +5124,114 @@ #: ../plugins/export.c:183 msgid "_Use current zoom level" -msgstr "_Usar el nivel actual de acercamiento/alejamiento" +msgstr "_Usar el nivel actual de zoom" #: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" "Muestra el tamaño de fuente del documento en conjunto con el nivel actual de " -"acercamiento/alejamiento." +"zoom." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." -msgstr "Documento exportado exitosamente como '%s'." +msgstr "Documento exportado con éxito como «%s»." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." -msgstr "El archivo '%s' no pudo ser escrito (%s)." +msgstr "No se ha podido escribir el archivo «%s» (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" -msgstr "El archivo '%s' ya existe. ¿Quiere sobreescribirlo?" +msgstr "El archivo «%s» ya existe. ¿Quiere sobreescribirlo?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exportar" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Como _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Como _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" -msgstr "Navegador de Archivos:" +msgstr "Navegador de archivos" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." -msgstr "Agrega una pestaña de navegación de archivos al panel lateral." +msgstr "Añade una pestaña de navegación de archivos al panel lateral." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" -msgstr "¡Demasiados items seleccionados!" +msgstr "Demasiados elementos seleccionados" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." -msgstr "No se pudo ejeutar el comando externo configurado '%s' (%s)." +msgstr "No se ha podido ejecutar el comando externo configurado «%s» (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Abrir _externamente" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" -msgstr "_Buscar en Archivos" +msgstr "_Buscar en archivos" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" -msgstr "Mostrar Archivos _Ocultos" +msgstr "Mostrar archivos _ocultos" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Arriba" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Refrescar" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Inicio" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Tomar ruta del documento" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Borrar el filtro" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtre sus archivos mediante el uso de los comodines usuales" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" -msgstr "Enfocar la Lista de Archivos" +msgstr "Enfocar la lista de archivos" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" -msgstr "Enfocar Entrada de Ruta" - -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "El directorio de configuración del complemento no pudo ser creado." +msgstr "Enfocar entrada de ruta" -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" -msgstr "Comando externo de apertura:" +msgstr "Comando de apertura externa:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5040,20 +5240,20 @@ "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" -"El comando a ejecutar cuando se usa \"Abrir con\". Pueden usarse %f y %d " -"como remplazos.\n" -"%f será remplazado con el nombre del archivo con su ruta completa\n" -"%d será remplazado con la ruta del archivo seleccionado sin su nombre" +"El comando que se ejecutaría cuando se usa «Abrir con». Se pueden usar los " +"comodines %f y %d.\n" +"%f será reemplazado por el nombre del archivo con su ruta completa\n" +"%d será reemplazado por la ruta del archivo seleccionado sin su nombre" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" -msgstr "Mostrar archivos _ocultos" +msgstr "Mostrar archivos ocultos" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Ocultar archivos objeto" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5061,12 +5261,11 @@ "No mostrar objetos generados en el navegador de archivos, esto incluye *.o, " "*.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "Establece el directorio base del proyecto" +msgstr "Usar el directorio base del proyecto" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "" @@ -5074,7 +5273,7 @@ #: ../plugins/saveactions.c:39 msgid "Save Actions" -msgstr "Guardar Acciones" +msgstr "Acciones de guardado" #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." @@ -5085,18 +5284,18 @@ #: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." -msgstr "Copia de Seguridad: No se pudo crear el directorio (%s)." +msgstr "Copia de seguridad: No se ha podido crear el directorio (%s)." #. it's unlikely that this happens #: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." -msgstr "Copia de Seguridad: No se pudo leer el archivo (%s)." +msgstr "Copia de seguridad: No se ha podido leer el archivo (%s)." #: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." -msgstr "Copia de Seguridad: No se pudo guardar el archivo (%s)." +msgstr "Copia de seguridad: No se ha podido guardar el archivo (%s)." #: ../plugins/saveactions.c:311 #, c-format @@ -5118,7 +5317,7 @@ #: ../plugins/saveactions.c:543 msgid "Auto Save" -msgstr "Auto Guardar" +msgstr "Autoguardar" #: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 @@ -5127,7 +5326,7 @@ #: ../plugins/saveactions.c:553 msgid "Auto save _interval:" -msgstr "Intervalo de autoguardado:" +msgstr "_Intervalo de autoguardado:" #: ../plugins/saveactions.c:561 msgid "seconds" @@ -5139,11 +5338,11 @@ #: ../plugins/saveactions.c:578 msgid "Save only current open _file" -msgstr "Guardar sólo el archivo abierto actualmente" +msgstr "Guardar sólo el _archivo abierto actualmente" #: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" -msgstr "Guardar todos los archivos abiertos" +msgstr "Guardar todos los archi_vos abiertos" #: ../plugins/saveactions.c:605 msgid "Instant Save" @@ -5151,11 +5350,11 @@ #: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" -msgstr "_Tipo de archivo a emplear para nuevos archivos creados:" +msgstr "_Tipo de archivo para archivos nuevos:" #: ../plugins/saveactions.c:646 msgid "Backup Copy" -msgstr "Copia de Seguridad" +msgstr "Copia de seguridad" #: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" @@ -5164,8 +5363,8 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" -"Formato de Fecha/_Hora para las copias de seguridad (para más detalles, " -"consultar \"man strftime\"):" +"Formato de fecha/_hora para las copias de seguridad (consulte «man " +"strftime», para más información):" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" @@ -5179,619 +5378,31 @@ msgid "Splits the editor view into two windows." msgstr "Divide la vista del editor en dos ventanas" -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "Marcar todas las coincidencias en el documento actual" +msgstr "Mostrar el documento actual" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Unificar" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Dividir ventana" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontalmente" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Verticalmente" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" -msgstr "Dividir Horizontalmente" +msgstr "Dividir horizontalmente" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" -msgstr "Dividir Verticalmente" - -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "_Unificar" - -#~ msgid "Diff file" -#~ msgstr "Archivo diff" - -#~ msgid "reStructuredText file" -#~ msgstr "Archivo de reStructuredText" - -#~ msgid "Select _All" -#~ msgstr "Seleccionar _todo" - -#~ msgid "Automatic symbol completion" -#~ msgstr "Completado automático de simbolos" - -#~ msgid "" -#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -#~ "xml'. Please see the documentation for details." -#~ msgstr "" -#~ "Información: Para personalizar los elementos de la barra de " -#~ "herramientas, modifique el archivo 'ui_toolbar.xml'. Por favor consulte " -#~ "la documentación para más detalles." - -#~ msgid "" -#~ "For all changes you make in this file to take effect, you need to restart " -#~ "Geany." -#~ msgstr "" -#~ "Para que surjan efecto los cambios que se realizan en este archivo, se " -#~ "necesita reiniciar Geany." - -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "Fallo al ver %s (asegurese de que está compilado)" - -#~ msgid "" -#~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" -#~ msgstr "" -#~ "Añadir números de página al final de cada página, ocupa 2 lineas de la " -#~ "página" - -#~ msgid "Jump to the entered line number." -#~ msgstr "Saltar al número de línea ingresado" - -#~ msgid "Version Diff" -#~ msgstr "Diff versionado" - -#~ msgid "Creates a patch of a file against version control." -#~ msgstr "Crea un parche de un archivo contra un control de versiones." - -#~ msgid "" -#~ "%s exited with an error: \n" -#~ "%s." -#~ msgstr "" -#~ "%s salió con un error: \n" -#~ "%s." - -#~ msgid "No changes were made." -#~ msgstr "No se realizó ningún cambio." - -#~ msgid "unknown error while trying to spawn a process for %s" -#~ msgstr "error desconocido tratando de generar un proceso para %s" - -#~ msgid "An error occurred (%s)." -#~ msgstr "Ocurrio un error (%s)." - -#~ msgid "_Version Diff" -#~ msgstr "Diff del _Versionador" - -#~ msgid "From Current _File" -#~ msgstr "Del _Archivo Actual" - -#~ msgid "Make a diff from the current active file" -#~ msgstr "Hacer un diff del archivo actualmente activo" - -#~ msgid "From Current _Directory" -#~ msgstr "Del _Directorio Actual" - -#~ msgid "Make a diff from the directory of the current active file" -#~ msgstr "Hacer un diff del directorio del archivo actualmente activo" - -#~ msgid "From Current _Project" -#~ msgstr "Del _Proyecto Actual" - -#~ msgid "Make a diff from the current project's base path" -#~ msgstr "Hacer un diff del directorio base del proyecti actual" - -#~ msgid "Command stopped because the current file has no extension." -#~ msgstr "Comando detenido porque el archivo actual no tiene extención." - -#~ msgid "Failed to execute \"%s\" (make sure it is already built)" -#~ msgstr "Fallo al ejecutar \"%s\" (asegurese de que está construido)" - -#~ msgid "Compiles the current file" -#~ msgstr "Compila el archivo actual" - -#~ msgid "Builds the current file (generate an executable file)" -#~ msgstr "Construye el archivo actual (genera un archivo ejecutable)" - -#~ msgid "Compiles the current file using the make tool" -#~ msgstr "Compila el archivo actual usando la herramienta make" - -#~ msgid "" -#~ "Sets the includes and library paths for the compiler and the program " -#~ "arguments for execution" -#~ msgstr "" -#~ "Selecciona las rutas de inclusión y librerías para el compilador y los " -#~ "argumentos del programa para su ejecución" - -#~ msgid "Compiles the current file into a DVI file" -#~ msgstr "Compila el archivo actual a un archivo DVI" - -#~ msgid "Compiles the current file into a PDF file" -#~ msgstr "Compila el archivo actual a un archivo PDF" - -#~ msgid "Compile and view the current file" -#~ msgstr "Compilar y muestrar el archivo actual" - -#~ msgid "Sets the program paths and arguments" -#~ msgstr "Selecciona las rutas y argumentos del programa" - -#~ msgid "Saves all open files" -#~ msgstr "Guarda todos los archivos abiertos" - -#~ msgid "Prints the current file" -#~ msgstr "Imprime el archivo actual" - -#~ msgid "Inserts a typical ChangeLog entry in the current file" -#~ msgstr "Inserta una entrada típica de ChangeLog en el archivo actual" - -#~ msgid "Inserts a file header at the beginning of the file" -#~ msgstr "Inserta un encabezado al principio del archivo" - -#~ msgid "Inserts a description before the current function" -#~ msgstr "Inserta una descripción antes de la función actual" - -#~ msgid "Inserts a multiline comment" -#~ msgstr "Inserta un comentario multilínea" - -#~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" -#~ msgstr "" -#~ "Inserta un aviso de licencia GPL (debería agregarse al principio del " -#~ "archivo)" - -#, fuzzy -#~ msgid "" -#~ "Inserts a BSD license notice (should be done at the beginning of the file)" -#~ msgstr "" -#~ "Inserta un aviso de licencia BSD (debería agregarse al principio del " -#~ "archivo)" - -#~ msgid "Change the default font" -#~ msgstr "Cambiar la fuente predeterminada" - -#~ msgid "Toggle the window with status and compiler messages on and off" -#~ msgstr "Ocultar/mostrar la ventana con mensajes de estado y de compilador" - -#~ msgid "Toggle the toolbar on and off" -#~ msgstr "Ocultar/mostrar la barra de herramientas" - -#~ msgid "Treat this file as read-only. No changes can be made." -#~ msgstr "" -#~ "Tratar este archivo como de sólo lectura. No se podrán hacer cambios." - -#, fuzzy -#~ msgid "Replaces all spaces in the document by tab characters." -#~ msgstr "Reemplaza todas las tabulaciones en el documento por espacios" - -#~ msgid "Folds all contractible code blocks" -#~ msgstr "Pliega todos los bloques de código contraibles" - -#~ msgid "Unfolds all contracted code blocks" -#~ msgstr "Depliega todos los bloques de código plegados" - -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Borra todos los indicadores de errores en el documento actual." - -#~ msgid "" -#~ "Counts the words and characters in the current selection or the whole " -#~ "document" -#~ msgstr "" -#~ "Cuenta las palabras y carácteres en la selección actual o en todo el " -#~ "documento" - -#~ msgid "Load global tags file" -#~ msgstr "Carga un archivo de tags global" - -#~ msgid "Shows a list of all keyboard shortcuts for Geany." -#~ msgstr "Muestra una lista de todos los atajos de teclado para Geany" - -#~ msgid "Color" -#~ msgstr "Color" - -#~ msgid "Enter a line number and jump to it." -#~ msgstr "Ingresar un número de línea y saltar allí" - -#~ msgid "Go to the entered line" -#~ msgstr "Ir a la línea ingresada" - -#~ msgid "Show full path name in documents list" -#~ msgstr "Mostrar la ruta completa en la lista de documentos" - -#~ msgid "Show file operation buttons" -#~ msgstr "Mostrar botones de operaciones sobre archivos" - -#~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -#~ msgstr "" -#~ "Mostrar los botones de Nuevo, Abrir, Cerrar, Grabar y Recargar en la " -#~ "barra de herramientas" - -#~ msgid "Show Redo and Undo buttons" -#~ msgstr "Mostrar los botones de Deshacer y Rehacer" - -#~ msgid "Display the Redo and Undo buttons in the toolbar" -#~ msgstr "Mostrar los botones Rehacer y Deshacer en la barra de herramientas" - -#~ msgid "Show Back and Forward buttons" -#~ msgstr "Mostrar los botones de Atras y Adelante" - -#~ msgid "" -#~ "Display the Back and Forward buttons in the toolbar used for code " -#~ "navigation" -#~ msgstr "" -#~ "Mostrar en la barra de herramientas los botones Atras y Adelante usados " -#~ "para navegación de codigo" - -#~ msgid "Show Compile and Run buttons" -#~ msgstr "Mostrar los botones de Compilar y Ejecutar" - -#~ msgid "Display the Compile and Run buttons in the toolbar" -#~ msgstr "" -#~ "Mostrar los botones de Compilar y Ejecutar en la barra de herramientas" - -#~ msgid "Show Color Chooser button" -#~ msgstr "Mostrar botón del Selector de Color" - -#~ msgid "Display the Color Chooser button in the toolbar" -#~ msgstr "Mostrar el botón del Selector de Color en la barra de herramientas" - -#~ msgid "Show Zoom In and Zoom Out buttons" -#~ msgstr "Mostrar botones de Acercar y Alejar texto" - -#~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" -#~ msgstr "" -#~ "Mostrar los botones de Acercar y Alejar el texto en la barra de " -#~ "herramientas" - -#~ msgid "Show Increase and Decrease Indentation buttons" -#~ msgstr "Mostrar los botones de Aumentar y Decrementar sangría" - -#, fuzzy -#~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" -#~ msgstr "Mostrar los botones Rehacer y Deshacer en la barra de herramientas" - -#~ msgid "Show Search field" -#~ msgstr "Mostrar campo de búsqueda" - -#~ msgid "Display the search field and button in the toolbar" -#~ msgstr "Mostrar el campo y botón de búsqueda en la barra de herramientas" - -#~ msgid "Show Go to Line field" -#~ msgstr "Mostrar el campo para saltar a una línea" - -#~ msgid "Display the line number field and button in the toolbar" -#~ msgstr "" -#~ "Mostrar el campo y botón de número de línea en la barra de herramientas" - -#~ msgid "Show Quit button" -#~ msgstr "Mostrar botón de Salir" - -#~ msgid "Display the quit button in the toolbar" -#~ msgstr "Mostrar el botón de Salir en la barra de herramientas" - -#~ msgid "Items" -#~ msgstr "Elementos" - -#~ msgid "Use white text on a black background." -#~ msgstr "Usar texto blanco sobre fondo negro." - -#~ msgid "Runs in debug mode (means being verbose)" -#~ msgstr "Corre en modo de depuración (significa ser verborragico)" - -#~ msgid "Search failed." -#~ msgstr "Búsqueda fallida." - -#~ msgid "Couldn't find pixmap file: %s" -#~ msgstr "No se pudo encontrar la imagen: %s" - -#~ msgid "JavaScript functions" -#~ msgstr "Fuenciones Javascript" - -#~ msgid "Heading (H2)" -#~ msgstr "Encabezado (H2)" - -#~ msgid "Heading (H3)" -#~ msgstr "Encabezado (H3)" - -#~ msgid "Structs / Typedefs" -#~ msgstr "Structs / Typedefs" - -#~ msgid "Terminal emulation:" -#~ msgstr "Emulación de terminal:" - -#~ msgid "" -#~ "Controls how the terminal emulator should behave. Do not change this " -#~ "value unless you know exactly what you are doing." -#~ msgstr "" -#~ "Controla cómo debe comportarse el emulador de terminal. No cambiar esto a " -#~ "menos que se sepa exactamente lo que se esta haciendo. " - -#, fuzzy -#~ msgid "Found %d matches for \"%s\"." -#~ msgid_plural "Found %d matches for \"%s\"." -#~ msgstr[0] "Se encontraron %d coincidencias para \"%s\"." -#~ msgstr[1] "Se encontraron %d coincidencias para \"%s\"." - -#~ msgid "Failed to execute the terminal program" -#~ msgstr "Fallo al ejecutar el programa de terminal" - -#~ msgid "Save automatically all open files in a given time interval." -#~ msgstr "" -#~ "Guarda automátiamente todos los archivos abiertos en un determinado " -#~ "intervalo de tiempo." - -#~ msgid "Whether to use tabs or spaces when indentation is inserted." -#~ msgstr "Si usar tabulaciones o espacios cuando se inserta sangría." - -#~ msgid "Rows of symbol completion list:" -#~ msgstr "Líneas de la lista de completado automático de símbolos:" - -#~ msgid "Could not parse the output of the diff" -#~ msgstr "No se pudo procesar la salida del diff" - -#~ msgid "Something very strange is occurred, could not stat %s (%s)." -#~ msgstr "" -#~ "Algo muy raro ha ocurrido, no se pudo realizar stat() sobre %s (%s)." - -#~ msgid "Insert Comments" -#~ msgstr "Insertar Comentarios" - -#~ msgid "Insert \"include <...>\"" -#~ msgstr "Insertar \"include <...>\"" - -#~ msgid "File menu" -#~ msgstr "Menu Archivo" - -#~ msgid "Edit menu" -#~ msgstr "Menu Editar" - -#~ msgid "Search menu" -#~ msgstr "Menu Buscar" - -#~ msgid "View menu" -#~ msgstr "Menu Ver" - -#~ msgid "Document menu" -#~ msgstr "Menu Documento" - -#~ msgid "Build menu" -#~ msgstr "Menu Construir" - -#~ msgid "Tools menu" -#~ msgstr "Menu Herramientas" - -#~ msgid "Help menu" -#~ msgstr "Menu Ayuda" - -#~ msgid "Focus commands" -#~ msgstr "Comandos de foco" - -#~ msgid "Editing commands" -#~ msgstr "Comandos de edición" - -#~ msgid "Tag commands" -#~ msgstr "Comandos de tags" - -#~ msgid "Other commands" -#~ msgstr "Otros comandos" - -#~ msgid "Mixins" -#~ msgstr "Mixins" - -#~ msgid "C source file" -#~ msgstr "Archivo de fuente C" - -#~ msgid "C++ source file" -#~ msgstr "Archivo de fuente C++" - -#~ msgid "C# source file" -#~ msgstr "Archivo de fuente C#" - -#~ msgid "D source file" -#~ msgstr "Archivo de fuente D" - -#~ msgid "Java source file" -#~ msgstr "Archivo de fuente Java" - -#~ msgid "Pascal source file" -#~ msgstr "Archivo de fuente Pascal" - -#~ msgid "Assembler source file" -#~ msgstr "Archivo de fuente Ensamblador" - -#~ msgid "FreeBasic source file" -#~ msgstr "Archivo de fuente FreeBasic" - -#~ msgid "Fortran source file (F77)" -#~ msgstr "Archivo de fuente Fortran (F77)" - -#~ msgid "(O)Caml source file" -#~ msgstr "Archivo de fuente (O)Caml" - -#~ msgid "Perl source file" -#~ msgstr "Archivo de fuente Perl" - -#~ msgid "PHP source file" -#~ msgstr "Archivo de fuente PHP" - -#~ msgid "Python source file" -#~ msgstr "Archivo de fuente Python" - -#~ msgid "Ruby source file" -#~ msgstr "Archivo de fuente Ruby" - -#~ msgid "Tcl source file" -#~ msgstr "Archivo de fuente Tcl" - -#~ msgid "Lua source file" -#~ msgstr "Archivo de fuente Lua" - -#~ msgid "Ferite source file" -#~ msgstr "Archivo de fuente Ferite" - -#~ msgid "Haskell source file" -#~ msgstr "Archivo de fuente Haskell" - -#~ msgid "Docbook source file" -#~ msgstr "Archivo de fuente Docbook" - -#~ msgid "HTML source file" -#~ msgstr "Archivo de fuente HTML" - -#~ msgid "LaTeX source file" -#~ msgstr "Archivo de fuente LaTeX" - -#~ msgid "O-Matrix source file" -#~ msgstr "Archivo de fuente O-Matrix" - -#~ msgid "VHDL source file" -#~ msgstr "Archivo de fuente VHDL" - -#~ msgid "Haxe source file" -#~ msgstr "Archivo de fuente Haxe" - -#~ msgid "Open files" -#~ msgstr "Archivos" - -#~ msgid "Show open files list" -#~ msgstr "Mostrar la lista de archivos abiertos" - -#~ msgid "" -#~ "Whenever some whitespace is inserted by Geany it will use tabs when " -#~ "enabled otherwise Geany will use just spaces." -#~ msgstr "" -#~ "Usar tabulaciones cuando Geany inserte espacios en blanco, de otra manera " -#~ "se usan simplemente espacios." - -#~ msgid "Unfold all children of a fold point when unfolding it." -#~ msgstr "" -#~ "Desplegar todos los hijos de un punto de plegado cuando se despliega éste." - -#~ msgid "Construct autocompletion" -#~ msgstr "Compleción automática de construcciones" - -#~ msgid "Automatic completion of often used constructs like if and for" -#~ msgstr "" -#~ "Compleción automática de construcciones usadas comunmente como if y for" - -#~ msgid "Symbol autocompletion" -#~ msgstr "Compleción automática de simbolos" - -#~ msgid "Print:" -#~ msgstr "Imprimir:" - -#~ msgid "Find in files" -#~ msgstr "Buscar en archivos" - -#~ msgid "Go to line" -#~ msgstr "Ir a la línea" - -#~ msgid "Complete construct" -#~ msgstr "Completar contrucción" - -#~ msgid "Go to tag definition" -#~ msgstr "Ir a la definición del tag" - -#~ msgid "Go to tag declaration" -#~ msgstr "Ir a la declaración del tag" - -#~ msgid "" -#~ "Directory to run Make All from. Leave blank to use the default command." -#~ msgstr "" -#~ "Directorio desde el cual correr Make All. Dejar en blanco para usar el " -#~ "comando por defecto." - -#~ msgid "Hide" -#~ msgstr "Ocultar" - -#~ msgid "Reload" -#~ msgstr "Recargar" - -#~ msgid "" -#~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " -#~ "%s filetype: %s scope: %s" -#~ msgstr "" -#~ "línea: %d\t columna: %d\t seleccion: %d\t %s %s modo: %s " -#~ "codificación: %s %s tipo de archivo: %s vista: %s" - -#~ msgid "Do you realy want to revert '%s'?" -#~ msgstr "¿Realmente desea revertir '%s'?" - -#~ msgid "Do you want to save all opened files before processing?" -#~ msgstr "¿Quiere guardar todos los archivos abiertos antes de procesar?" - -#~ msgid "From _directory" -#~ msgstr "Desde _directorio" - -#~ msgid "Convert Selection to _Lower-case" -#~ msgstr "Convertir Selección a M_inúsculas" - -#~ msgid "Convert Selection to _Upper-case" -#~ msgstr "Convertir Selección a _Mayúsculas" - -#~ msgid "Convert Selection to lower-case" -#~ msgstr "Convertir Selección a Minúsculas" - -#~ msgid "Convert Selection to upper-case" -#~ msgstr "Convertir Selección a Mayúsculas" - -#~ msgid "Advanced" -#~ msgstr "Avanzado" - -#~ msgid "Editing menu" -#~ msgstr "Menu Editar" - -#~ msgid "Behaviour" -#~ msgstr "Comportamiento" - -#~ msgid "Misc." -#~ msgstr "Misc." - -#~ msgid "language" -#~ msgstr "lenguaje" - -#~ msgid "XML source file" -#~ msgstr "Archivo de fuente XML" - -#~ msgid "Insert BSD license Notice" -#~ msgstr "Insertar aviso de licencia BSD" - -#~ msgid "" -#~ "Selects the indentation mode. Use None to disable auto indentation " -#~ "completely. Basic indents new lines with the same indentation as the " -#~ "previous line. Advanced does the same and indents also curly brackets." -#~ msgstr "" -#~ "Selecciona el modo de formateo de código. Usar Ninguno para deshabilitar " -#~ "el formateo automático del todo. Básico formatea las lineas nuevas con el " -#~ "mismo nivel que la linea anterior. Avanzado hace lo mismo y además " -#~ "formatea las llaves." - -#~ msgid "Print command:" -#~ msgstr "Comando de impresión:" - -#~ msgid "" -#~ "\n" -#~ "Focus commands\n" -#~ msgstr "" -#~ "\n" -#~ "Comandos de foco\n" - -#~ msgid "Keyboard shortcuts" -#~ msgstr "Atajos de teclado" - -#~ msgid " - A fast and lightweight IDE" -#~ msgstr " - Un IDE rápido y liviano" - -#~ msgid "Function" -#~ msgstr "Función" +msgstr "Dividir verticalmente" diff -Nru geany-0.18/po/fi.po geany-0.19/po/fi.po --- geany-0.18/po/fi.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/fi.po 2010-05-23 09:08:49.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-08-13 15:48+0200\n" "Last-Translator: Harri Koskinen \n" "Language-Team: Finnish\n" @@ -24,7 +24,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Nopea ja kevyt GTK2-pohjainen ohjelmointiympäristö" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -32,67 +32,67 @@ msgid "Integrated Development Environment" msgstr "Integroitu ohjelmointiympäristö" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Tietoja Geanystä" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Nopea ja kevyt ohjelmointiympäristö" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(käännetty %s tai sen jälkeen)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Tietoja" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Kehittäjät" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "ylläpitäjä" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "kehittäjä" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "käännösten ylläpitäjä" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Kääntäjät" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Aikaisemmat kääntäjät" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Avustavat kehittäjät" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Eräitä avustavia kehittäjiä (täydellinen lista tiedostossa %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Tekijät" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Lisenssi" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -100,277 +100,291 @@ "Lisenssitekstin sisältävää tiedostoa ei löytynyt. Voit lukea lisenssin " "osoitteessa http://www.gnu.org/licenses/gpl-2.0.txt" -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Pääteohjelmaa \"%s\" ei löytynyt. Tarkista päätteen polku geanyn asetuksista." -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Työkansion vaihto kansioon \"%s\" epäonnistui." + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "" -"Komennon \"%s\" suoritus epäonnistui. Käynnistyskomentotiedostoa ei voitu " -"luoda" +msgid "%s (in directory: %s)" +msgstr "%s (kansiossa %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Prosessi epäonnistui (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (kansiossa %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Työkansion vaihto kansioon \"%s\" epäonnistui." -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "" +"Komennon \"%s\" suoritus epäonnistui. Käynnistyskomentotiedostoa ei voitu " +"luoda" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Tiedoston suoritus VTE:ssä epäonnistui, koska se todennäköisesti sisältää " "komennon." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Pääteohjelmaa \"%s\" ei löytynyt. Tarkista päätteen polku geanyn asetuksista." + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Käännös epäonnistui." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Käännös onnistui." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Käännä" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "K_oosta" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Koosta k_aikki" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Koosta _mukautettu kohde" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Koosta valinnainen kohde" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Koosta o_lio" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Tähän syöttämäsi valitsimet välitetään sellaisenaan make -komennolle." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Seu_raava virhe" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "_Edellinen virhe" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Ase_ta sisällytettävät tiedostot ja valitsimet" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "Näytä _DVI-tiedosto" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Näytä _PDF-tiedosto" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Mukautetut komennot" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Aseta valitsimet" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Käännä nykyinen tiedosto" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Aseta valitsimet" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Koosta nykyinen tiedosto make-komennolla määrittämättä kohdetta" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Aseta (La)Tex-tiedostojen kääntö- ja katseluohjelmat sekä valitsimet." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Koosta nykyinen tiedosto make-komennon määritetyllä kohteella" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI:n luominen:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Käännä nykyinen tiedosto make-komennolla" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF:n luominen:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Prosessin (%s) pysäytys epäonnistui." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI:n esikatselu:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Kääntövirheitä ei ole enempää." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF:n esikatselu:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f korvataan nykyisellä tiedostonimellä, esim. tiedosto.c\n" -"%e korvataan tiedostonimellä ilman päätettä, esim. tiedosto" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Sisällytettävät tiedostot ja valitsimet" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Nimike" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Aseta ohjelmien koostamis- ja suorituskomennot." +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Komento" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (kansiossa %s)" + +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Kääntäjä" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s komennot" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Käännä:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Koosta:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Aseta _tiedostotyyppi" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Suorita:" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "_Grepin säännölliset lausekkeet" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Käännä nykyinen tiedosto" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Koosta valinnainen kohde" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" + +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Mukautetut komennot" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "Tähän syöttämäsi valitsimet välitetään sellaisenaan make -komennolle." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Koosta nykyinen tiedosto make-komennolla määrittämättä kohdetta" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Mukautetut komennot" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Koosta nykyinen tiedosto make-komennon määritetyllä kohteella" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Käännä" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Käännä nykyinen tiedosto make-komennolla" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "K_oosta" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Katseluohjelman suoritus epäonnistui" +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Suorita:" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Prosessin (%s) pysäytys epäonnistui." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Koosta _mukautettu kohde" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Kääntövirheitä ei ole enempää." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Koosta o_lio" + +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Koosta k_aikki" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Mukautetut komennot" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Haluatko varmasti sulkea sovelluksen?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Tiedosto %s tallennettu." +msgstr[1] "Tiedosto %s tallennettu." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Lataa uudelleen" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Tallentamattomat muutokset menetetään." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Haluatko varmasti ladata tiedoston \"%s\" uudelleen?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Siirry riville" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Syötä rivinumero, jolle haluat siirtyä:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Määritä tiedostotyyppi ennen tämän toiminnon käyttämistä." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "pp.kk.vvvv" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "kk.pp.vvvv" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "vvvv/kk/pp" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "pp.kk.vvvv tt:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "kk.pp.vvvv tt:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "vvvv/kk/pp tt:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Mukautettu päivämäärän muoto" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Mukautettu päivämäärän muoto" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -378,26 +392,25 @@ "Syötä haluamasi päivämäärän ja ajan esitysmuoto. Voit käyttää ANSI C -" "standardin strftime-funktion ymmärtämiä merkintöjä." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Päivämäärän muotoilumerkkijonon muunnos epäonnistui. Se saattaa olla liian " "pitkä." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Ei muita viestejä." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Avaa tiedosto" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Näytä" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -405,28 +418,28 @@ "Avaa tiedoston ilman kirjoitusoikeuksia. Jos valitset useita tiedostoja, ne " "kaikki avataan ilman kirjoitusoikeuksia." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Tunnista päätteen perusteella" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Tunnista tiedostosta" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Lisävalinnat" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "_Näytä piilotiedostot" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Aseta merkistö:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -439,11 +452,11 @@ "Jos valitset useita tiedostoja, ne kaikki avataan käyttäen samaa merkistöä." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Aseta tiedostotyyppi:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -462,23 +475,23 @@ msgid "Filename already exists!" msgstr "Tiedoston nimi on jo olemassa!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Tallenna tiedosto" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "_Nimeä uudelleen" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Tallenna tiedosto ja nimeä se uudelleen" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Avaa tiedosto uuteen välilehteen" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -486,41 +499,41 @@ "Pidä nykyinen asiakirja avoinna ja avaa tallennettu tiedosto uuteen " "välilehteen" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Virhe" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Kysymys" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Varoitus" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Tietoa" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Älä tallenna" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Tiedostoa \"%s\" ei ole tallennettu." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Tallennetaanko tiedosto ennen sulkemista?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Valitse kirjasin" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -528,106 +541,110 @@ "Tapahtui virhe tai tiedoston tietoja ei voitu hakea (esim. uudesta " "tiedostosta)" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "tuntematon" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Ominaisuudet" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tyyppi:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Koko:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Sijainti:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Vain luku:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(vain Geanyn sisällä)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Merkistö:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(BOM-merkintä)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(ei BOM-merkintää)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Muokattu:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Muutettu:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Käytetty:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Oikeudet:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Luku:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Kirjoitus:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Suorita:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Omistaja:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Ryhmä:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Muu:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Tiedosto %s suljettu." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Uusi tiedosto \"%s\" avattu." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Tiedoston %s avaaminen epäonnistui (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -641,12 +658,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Tiedoston \"%s\" merkistö ei ole %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -654,30 +671,30 @@ msgstr "" "Tiedosto \"%s\" ei ole tekstitiedosto tai käytettyä merkistöä ei tueta." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Välilyönnit" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Sarkaimet" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Sarkaimet ja välilyönnit" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Asetetaan sisennystila %s tiedostolle %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Tiedostonimi ei kelpaa" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Tiedosto %s ladattu uudelleen." @@ -685,20 +702,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Tiedosto %s avattu (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", kirjoitussuojattu" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Tiedostonimen muutosvirhe." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -707,7 +724,7 @@ "Virhe muunnettaessa tiedostoa merkistöstä UTF-8 (%s). Tiedostoa ei " "tallennettu." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -716,52 +733,52 @@ "Virheilmoitus: %s\n" "Tiedostossa \"%s\" (rivi %d, merkki %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Virheilmoitus: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Tiedoston tallennusvirhe." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Tiedoston tallennusvirhe (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Tiedosto %s tallennettu." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" ei löytynyt." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Jatketaanko etsintää tiedoston alusta?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Osumia ei löytynyt: \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%1$s: \"%3$s\" korvattiin merkkijonolla \"%4$s\" %2$d kerran." msgstr[1] "%1$s: \"%3$s\" korvattiin merkkijonolla \"%4$s\" %2$d kertaa." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Ladataanko uudelleen?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -770,23 +787,28 @@ "Levyllä oleva tiedosto \"%s\" on uudempi kuin\n" "Geanyn muistissa oleva." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Yritetäänkö tallentaa uudelleen?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Tiedostoa \"%s\" ei löytynyt!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Sarkaimen leveys" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Montako peräkkäistä välilyöntiä korvataan sarkaimella." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Kelttiläinen" @@ -897,572 +919,637 @@ msgid "Without encoding" msgstr "Ei merkistöä" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Länsieurooppalainen" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Itäeurooppalainen" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Itä_aasialainen" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_Kaakkois- ja lounaisaasialainen" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Itä_mainen" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s-lähdekoodi" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "%s tiedosto" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Ei mitään" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Komentotiedosto" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML-dokumentti" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "CSS-tyylisivu" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL-vedos" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Asetustiedosto" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext-käännöstiedosto" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s-komentotiedosto" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Ohjelmointikielet" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Tulkattavat kielet" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Kuvauskielet" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "S_ekalaiset kielet" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Aseta _tiedostotyyppi" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Kaikki lähdekoodi" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Kaikki tiedostot" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Lauseke ei kelpaa tiedostotyypille %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "nimetön" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Tiedostoa \"%s\" ei löytynyt" + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "_Värivalitsin" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Tiedosto" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Uusi (_mallineesta)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "näkymätön" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "dummy" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Avaa val_ittu tiedosto" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Viimeisimmät tiedostot" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Tallenna _kaikki" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Lataa uudelleen merkist_öllä" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "näkymätön" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Sivun as_etukset" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Sul_je muut tiedostot" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "S_ulje kaikki" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Muokkaa" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "Mu_otoile" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +#, fuzzy +msgid "_Reflow Lines/Block" +msgstr "Rivitä uudelleen valinta tai nykyinen kappale" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Vai_hda valinnan tekstikokoa" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Vaihda rivin paikkaa" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Rivi(t) kommentiksi" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Poista kommentointi" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "_Aseta/poista kommentointi" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Kah_denna rivi tai valinta" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Kasvata sisennystä" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Vähennä sisennystä" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Lähetä valinta päätteeseen" +#: ../src/interface.c:537 ../src/keybindings.c:361 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Älykäs rivien sisennys" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Lähetä valinta" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Komento" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Leikkaa rivi(t)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Kopioi rivi(t)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Poista rivi(t)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "Kah_denna rivi tai valinta" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Valitse rivi(t)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Valitse kappale" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Lisää vaihtoehtoinen tyhjä tila" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Seuraava merkintä" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Edellinen merkintä" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Lähetä valinta päätteeseen" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Lisää ko_mmentti" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Lisää _ChangeLog-merkintä" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Lisää _ylätunniste" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Lisää _funktion kuvaus" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Lisää usean _rivin kommentti" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Lisää _GPL-lisenssimerkintä" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Lisää _BSD-lisenssimerkintä" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Lisää _päivämäärä" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Lisää \"in_clude <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "_Asetukset" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Asetukset" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Etsi" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Etsi _seuraava" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Etsi e_dellinen" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Etsi tied_ostoista" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Ko_rvaa" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Etsi _valinta" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Etsi edelli_nen valinta" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Seur_aava viesti" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Ede_llinen viesti" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Siirr_y riville" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Vaih_da kirjasin" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Näytä/piilota lisäko_mponentit" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Koko_ruututila" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Näytä _viesti-ikkuna" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Näytä työ_kalupalkki" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Näytä _sivupalkki" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editori" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Näytä _merkintäreunus" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Näytä rivi_numerot" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Näytä ty_hjä tila" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Näytä rivinvaih_dot" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Näytä sis_ennysvihjeet" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Asiakirja" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Rivitys" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Rivi_nvaihdot" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "A_utomaattisisennys" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Sis_ennystyyppi" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Sarkaimet" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Välilyönnit" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "_Sarkaimet ja välilyönnit" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Vain lu_ku" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Lisää Unicode BOM-merkintä" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Aseta _tiedostotyyppi" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Aseta _merkistö" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Aseta ri_vinvaihdot" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Muunna rivinvaihdot muotoon _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Muunna rivinvaihdot muotoon _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Muunna rivinvaihdot muotoon CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Poista tyhjä tila rivien lopusta" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Korvaa _sarkaimet välilyönneillä" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Korvaa vä_lilyönnit sarkaimilla" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Supista kaikki" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Laajenna kaikki" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "P_oista merkinnät" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Poista virh_eilmaisimet" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projekti" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Uus_i" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Avaa" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "_Viimeisimmät projektit" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Sulje" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "Työ_kalut" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Lataa asetukset uudelleen" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Aset_ustiedostot" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Värivalitsin" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Laske _sanat" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Lataa _tunnisteet" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Lataa asetukset uudelleen" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Ohje" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Ve_rkkosivut" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Pika_näppäimet" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Vianetsintäviestit" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symbolit" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Asiakirjat" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Tila" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Kääntäjä" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Viestit" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Muistilappu" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Kuvat j_a teksti" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Vain _kuvat" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Vain _teksti" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Suuret kuvakkeet" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Pienet kuvakkeet" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "_Erittäin pienet kuvakkeet" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Muokkaa työkalupalkkia" +#: ../src/interface.c:1887 +#, fuzzy +msgid "_Toolbar Preferences" +msgstr "Asetukset" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Piilota työkalupalkki" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "_Etsi avoimista" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "_Etsi asiakirjasta" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Näytä t_unnisteen määritys" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Näytä tu_nnisteen esittely" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "_Kontekstitoiminto" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Asetukset" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Lataa edellisen istunnon tiedostot" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Avaa edellisen istunnon tiedostot käynnistäessä" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Lataa virtuaalipäätteen tuki" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1470,39 +1557,39 @@ "Ladataanko virtuaalipääte (VTE) käynnistyksen yhteydessä. Poista valinta, " "jollet sitä tarvitse." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Ota liitännäistuki käyttöön" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Käynnistys" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Muista ikkunan sijainti ja koko" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Tallentaa ikkunan sijainnin ja koon ja palauttaa ne käynnistäessä" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Vahvista ohjelman sulkeminen" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Varmistaa poistuessa, että sovelluksen saa sulkea" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Sulkeminen" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Oletuspolku:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1511,19 +1598,19 @@ "täytyy olla täydellinen. Jätä tyhjäksi, jos haluat käyttää polkuna nykyistä " "työkansiota." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Projektitiedostot:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Oletuskansio, kun avataan projektitiedostoja" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Lisäpolku liitännäisille:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1532,19 +1619,19 @@ "Geany etsii liitännäisiä yleisestä asennuspolusta ja asetuskansiostaan sekä " "tähän syöttämästäsi polusta. Jätä halutessasi tyhjäksi." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Polut" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Käynnistys" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Äänimerkki käännöksen valmistuessa ja virhetilanteissa" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1552,11 +1639,11 @@ "Jos valitset tämän, sovellus ilmoittaa käännöksen valmistumisesta ja " "virhetilanteista äänimerkillä." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Tuo tilaviestit näkyviin uuden viestin tullessa" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1564,11 +1651,11 @@ "Näytä tilaviestivälilehti (ikkunan alareunan välilehtinäkymässä) uuden " "tilaviestin saapuessa" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Älä näytä tilaviestejä tilapalkissa" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1576,11 +1663,11 @@ "Piilottaa kaikki viestit tilapalkista. Viestit näytetään kuitenkin " "tilaviestiruudussa." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Kohdista widgetit automaattisesti (kohdistus seuraa hiirtä)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1590,15 +1677,25 @@ "muokkausruudussa, muistilapulla, työkalupalkin haku- ja siirry riville -" "kentissä sekä virtuaalipäätteessä." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Muut" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Jatka aina etsintää tiedoston alusta ja piilota hakuikkuna" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1606,11 +1703,11 @@ "Jatka etsintää aina tiedoston alusta ja piilota hakuikkuna, kun käyttäjä " "napsauttaa \"Etsi seuraava/edellinen\"" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Siirrä kohdistimen alla oleva sana hakukenttään" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1618,19 +1715,19 @@ "Esitäytä kohdistimen alla oleva sana Etsi-, Korvaa- tai Etsi tiedostoista -" "ikkunan hakukenttään kun valintaa ei ole." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "\"Etsi tiedostoista\" etsii nykyisen tiedoston kansiosta." -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Haku" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Käytä projektikohtaisia istuntotiedostoja" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1638,11 +1735,11 @@ "Määrittää, tallennetaanko projekteille istuntotiedostot, ja avataanko ne " "projektin mukana." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Tallenna projektitiedosto projektin pääkansioon" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1654,75 +1751,99 @@ "projektin pääkansio sijaitsee. Tiedostopolun voi tästä asetuksesta " "riippumatta vaihtaa Uusi projekti -ikkunassa." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projektit" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Muut" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Yleiset" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Näytä symboliluettelo" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Määrittää, näytetäänkö symboluettelo" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Näytä asiakirjaluettelo" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Määrittää, näytetäänkö asiakirjaluettelo" -#: ../src/interface.c:2993 -msgid "Sidebar" -msgstr "Sivupalkki" - #: ../src/interface.c:3014 -msgid "Symbol list:" -msgstr "Symboluettelo:" +#, fuzzy +msgid "Show sidebar" +msgstr "Näytä _sivupalkki" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Kuvaus:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Vasen" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Oikea" + +#: ../src/interface.c:3039 +msgid "Sidebar" +msgstr "Sivupalkki" + +#: ../src/interface.c:3060 +msgid "Symbol list:" +msgstr "Symboluettelo:" + +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Viesti-ikkuna:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editori:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Asettaa viesti-ikkunan kirjasimen" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Asettaa symbolilistan kirjasimen" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Asettaa editorin kirjasimen" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Kirjasimet" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Näytä editorin välilehdet" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Näytä sulkemispainikkeet" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1730,109 +1851,140 @@ "Näyttää tiedostovälilehdissä pienen rastipainikkeen, joka sulkee tiedoston. " "Vaatii uudelleenkäynnistyksen." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Uusien välilehtien sijainti:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Vasen" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Uudet tiedostovälilehdet lisätään vasempaan reunaan" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Oikea" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Uudet tiedostovälilehdet lisätään oikeaan reunaan" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Tallenna tiedosto" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Kaksoisnapsautus piilottaa käyttöliittymän lisäkomponentit" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Suorittaa Näytä->Näytä/Piilota lisäkomponentit -valinnan" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Editorin välilehdet" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Ylhäällä" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Alhaalla" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Sivupalkki:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Välilehtien sijainnit" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Näytä tilapalkki" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Määrittää, näytetäänkö pääikkunan alareunassa tilapalkki" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Käyttöliittymä" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Näytä työ_kalupalkki" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Työkalupalkki valikon vierellä" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "Siirrä työkalupalkki päävalikon viereen säästääksesi pystytilaa" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Työkalupalkki" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Kuvaketyyli:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Kuvakekoko:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Ulkoasu" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Muokkaa työkalupalkkia" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Kuvat j_a teksti" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Vain _kuvat" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Vain _teksti" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Kirjasimet" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Pienet kuvakkeet" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Erittäin pienet kuvakkeet" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Suuret kuvakkeet" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Koko:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Työkalupalkki" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Työkalupalkki" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Rivitys" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1841,11 +1993,11 @@ "Katkaise rivi, kun se saavuttaa ikkunan reunan ja jatka sitä seuraavalla " "rivillä. Huomaa että suuren tiedoston rivitys vaatii koneelta paljon tehoa." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Home-näppäin on \"älykäs\"" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1858,11 +2010,11 @@ "alkuun. Muussa tapauksessa kohdistin siirretään aina rivin alkuun " "riippumatta sen sijainnista." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Estä valintojen raahaaminen" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1870,19 +2022,19 @@ "Poista käytöstä tekstin raahaaminen ja pudottaminen editori-ikkunaan tai " "siitä pois" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Salli supistaminen" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Määrittää, voiko ohjelmakoodin osia supistaa" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Supista/Laajenna rekursiivisesti" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1890,11 +2042,11 @@ "Supista tai laajenna myös kaikki alueen sisältämät kohteet. Shift-näppäin " "muuttaa käytöksen päinvastaiseksi." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Merkitse käännösvirheet editorissa" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1902,23 +2054,23 @@ "Määrittää, merkitäänkö (aaltoviivalla) rivit, joista kääntäjä antaa " "varoituksen tai virheilmoituksen" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Rivinvaihto siistii rivin lopun" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Rivinvaihto karsii tyhjän tilan edellisen rivin lopusta" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Rivityssarake:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Kommentoinnin ilmaisin:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1926,95 +2078,87 @@ "Merkkijono, joka ilmaisee, että rivi on merkitty kommentiksi tai sen " "kommentointi poistettiin." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Ominaisuudet" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Ominaisuudet" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Automaattisisennys:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Perus" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Säilytä sisennys" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Seuraa sulkeita" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Tapa:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Leveys:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Yhden sisennyksen leveys merkkeinä" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Lisää sisennys välilyönteinä" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Sisennys on yhtä kuin sarkain" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Lisää sisennys välilyönteinä, jos se on sarkainta kapeampi, muuten käytä " "molempia" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Kiinteä sarkainleveys:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Sarkaimen leveys, kun käytössä \"Sarkaimet ja välilyönnit\"" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Määrittää, tunnistetaanko sisennystapa tiedoston sisällöstä avattaessa" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Sarkain sisentää" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Sarkainnäppäin kasvattaa (shift-näppäimen kanssa vähentää) sisennystä sen " "sijaan että lisäisi sarkainmerkin" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Sisennys" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Sisennys" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Katkelman täydennys" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2022,19 +2166,19 @@ "Täydennä määritetty lyhyt merkkiyhdistelmä pidemmäksi merkkijonoksi yhdellä " "näppäimenpainalluksella" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XML-tunnisteiden automaattinen täydennys" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "XML-tunnisteiden (myös HTML) automaattinen täydennys ja sulkeminen" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Usean rivin kommenttien jatkaminen" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2042,11 +2186,11 @@ "Jatka automaattisesti usean rivin kommentteja, kun sellaisen sisään lisätään " "uusi rivi (kielissä kuten C, C++ ja Java)" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Symbolien automaattitäydennys" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2054,141 +2198,137 @@ "Täydennä automaattisesti avoimissa tiedostoissa olevat tunnetut symbolit " "(kuten funktiot, globaalit muuttujat, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Täydennä automaattisesti kaikki sanat asiakirjassa" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Poista loppuosa sanasta täydennettäessä" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Symboliehdotuksia enintään:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Ehdotusluettelon korkeus:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Automaattisen täydennyksen vaatima merkkimäärä:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Täydennysehdotuksia ei näytetä tätä lyhyemmille merkkijonoille" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Täydennysehdotusluettelon korkeus riveinä" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Täydennysehdotusluettelossa näytettävien kohteiden enimmäismäärä" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Täydennykset" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Kaarisulkeet ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Sulje kaarisulkeet heti avaavan heti sulkeen syöttämisen jälkeen" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Heittomerkit ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Sulje heittomerkit heti avaavan heittomerkin syöttämisen jälkeen" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Aaltosulkeet { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Sulje aaltosulkeet heti avaavan sulkeen kirjoittamisen jälkeen" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Hakasulkeet [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Sulje hakasulkeet heti avaavan sulkeen syöttämisen jälkeen" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Lainausmerkit \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Sulje lainausmerkit heti avaavan lainausmerkin syöttämisen jälkeen" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Sulje lainausmerkit ja sulkeet" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Täydennykset" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Käänteiset syntaksivärit" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Käytä valkoista tekstiä mustalla taustalla ja muuta värit käänteisiksi. " -"Vaatii Geanyn uudelleenkäynnistyksen." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Näytä sisennysvihjeet" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Näyttää pienet katkoviivat, jotta sisennys olisi helpompaa" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Näytä tyhjä tila" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Näytä välilyönnit pisteinä ja sarkaimet nuolina" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Näytä rivinvaihdot" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Näytä rivinvaihtomerkit rivien lopussa" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Näytä rivinumerot" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Näytä tai piilota rivinumeroreunus" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Näytä merkintäreunus" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2196,38 +2336,39 @@ "Näytä tai piilota rivinumeroiden oikealla puolella pieni reunus, jota " "käytetään rivien merkitsemiseen" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Pysäytä viimeiselle riville" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Määrittää, lopetetaanko vieritys yhden sivun verran asiakirjan viimeisen " "rivin jälkeen" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Näyttö" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Pitkän rivin ilmaisin:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Pitkän rivin ilmaisimen väri:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Yritys:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Määrittää liian pitkän rivin ilmaisimen värin" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Värin valitsin" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2237,11 +2378,11 @@ "katkaisemaan liian pitkät rivit. Viiva piirretään kentän arvon määrittämään " "sarakkeesen, jos se on enemmän kuin 0." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Rivi" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2249,11 +2390,11 @@ "Piirtää editoriin pystysuoran viivan syöttämääsi kohdistimen sijaintiin (ks. " "alla)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Tausta" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2263,111 +2404,148 @@ "asetetaan valintasi mukaan. (Suositeltavaa, jos käytät suhteutettua " "kirjasinta.)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Ei käytössä" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Käytä" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Pitkän rivin ilmaisin" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Ei käytössä" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Poistaa ylimääräiset välilyönnit ja sarkaimet rivien lopusta" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Työkalujen polut" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Näyttö" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Luo uusi asiakirja komentoriviltä" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Luo uusi asiakirja sellaisille komentorivillä annetuille tiedostolle, joita " "ei ole olemassa" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Oletusarvoinen rivinvaihtomerkki:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Uudet tiedostot" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Asettaa oletusmerkistön uusille tiedostoille" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Oletusmerkistö (uusi tiedosto):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Oletusmerkistö (tiedosto olemassa):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Asettaa oletusmerkistön avattaville tiedostoille" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Asettaa oletusmerkistön uusille tiedostoille" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Kiinteä merkistö tiedostoja avattaessa" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Määrittää, että tiedostojen merkistöä ei tunnisteta automaattisesti, vaan " "tiedostot avataan aina käyttäen määritettyä merkistöä (yleensä ei tarpeen)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Oletusmerkistö (tiedosto olemassa):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Asettaa oletusmerkistön avattaville tiedostoille" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Merkistöt" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Tiedoston lopussa aina tyhjä rivi" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Varmistaa, että tiedosto loppuu aina tyhjään riviin" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Karsi tyhjä tila rivien lopusta" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Poistaa ylimääräiset välilyönnit ja sarkaimet rivien lopusta" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Korvaa sarkaimet välilyönneillä" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Korvaa kaikki asiakirjan sarkaimet välilyönneillä" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Tiedostojen tallennus" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Viimeaikaisten tiedostojen määrä:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Määrittää, montako tiedostoa viimeisimpien tiedostojen luettelo sisältää" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Levyn tarkistusviive:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2375,27 +2553,20 @@ "Asiakirjatiedostojen muutosten tarkistusväli sekunteina. Nolla poistaa " "tarkkailun käytöstä." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Tiedostot" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Pääte:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Selain:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Make-työkalun polku ja valitsimet" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2403,23 +2574,23 @@ "Pääteohjelma kuten xterm, gnome-terminal tai konsole (täytyy hyväksyä " "valitsin \"-e\")" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Suosikkiselaimesi tiedostopolku (ja mahdolliset valitsimet)" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Työkalujen polut" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Kontekstitoiminto:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2429,67 +2600,67 @@ "Kontekstitoiminnon komento. Merkintä %s korvataan editorin valinnalla ennen " "komennon suorittamista." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Komennot" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Työkalut" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "kehittäjän sähköpostiosoite" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Kehittäjän nimikirjaimet" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Oletusversio:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Versionumero, joka uudella tiedostolla on luotaessa" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Yrityksen nimi" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Kehittäjä:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Yritys:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Sähköposti:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Nimikirjaimet:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Kehittäjän nimi" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Vuosi:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Päiväys:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Päiväys ja aika" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2497,7 +2668,7 @@ "Syötä merkkijonon {datetime} korvaavan päivämäärän ja ajan esitysmuoto. Voit " "käyttää ANSI C -standardin strftime-funktion ymmärtämiä merkintöjä." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2505,7 +2676,7 @@ "Syötä merkkijonon {year} korvaavan vuosiluvun esitysmuoto. Voit käyttää ANSI " "C -standardin strftime-funktion ymmärtämiä merkintöjä." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2513,61 +2684,61 @@ "Syötä merkkijonon {date} korvaavan päivämäärän esitysmuoto. Voit käyttää " "ANSI C -standardin strftime-funktion ymmärtämiä merkintöjä." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Mallinetiedot" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Mallineet" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Vaihda" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Pikanäppäimet" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Pikanäppäimet" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Komento:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Tulostuskomennon polku (%f korvataan tiedostonimellä)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Käytä ulkoista tulostuskomentoa" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Tulosta rivinumerot" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Lisää rivinumerot tulostetulle sivulle" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Tulosta sivunumerot" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Lisää sivunumerot jokaisen sivun alareunaan. Vie kaksi riviä tilaa." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Tulosta ylätunniste" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2575,19 +2746,19 @@ "Lisää jokaiselle sivulle ylätunnisteen, joka sisältää sivunumeron, " "tiedostonimen sekä päiväyksen (ks. alla). Vie kolme riviä tilaa." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Tulosta tiedostonimen perusosa" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Tulosta vain tulostettavan tiedoston nimi ilman polkua" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Päiväyksen muoto:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2597,547 +2768,575 @@ "esitysmuoto. Voit käyttää ANSI C -standardin strftime-funktion ymmärtämiä " "merkintöjä." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Käytä GTK:n tulostusta" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Merkistö:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Tulostus" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Projektin ominaisuudet" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Näyttö" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Leikkaa" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Tiedosto" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Uusi" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Avaa" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Avaa valittu tiedosto" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Tallenna" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Tallenna nimellä" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Tallenna kaikki" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Tulosta" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Sulje" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Sulje kaikki" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Lataa tiedosto uudelleen" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Projekti" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Projektin ominaisuudet" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Peru" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Tee uudelleen" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Kahdenna rivi tai valinta" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Poista rivi(t)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Poista rivin loppuun" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Vaihda rivin paikkaa" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Vieritä nykyiselle riville" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Vieritä ylös yhden rivin verran" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Vieritä alas yhden rivin verran" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Täydennä katkelma" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Siirrä kohdistin katkelmaan" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Estä katkelman täydennys" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Kontekstitoiminto" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Täydennä sana" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Näytä kutsuvihje" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Näytä makroluettelo" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Katkelman täydennys" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Kommentoi rivi(t)" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Kommentoi rivi(t)" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Leikepöytä" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Leikkaa" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopioi" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Liitä" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Kopioi rivi(t)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Leikkaa rivi(t)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Valitse" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Valitse Kaikki" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Valitse sana" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Valitse rivi(t)" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Edellinen sana" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Valitse kappale" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Seuraava sana" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Muotoile" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Vaihda kirjainkoko" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Lisää/Poista kommentointi" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Kommentoi rivi(t)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Poista kommentointi" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Kasvata sisennystä" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Vähennä sisennystä" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Kasvata sisennystä merkin verran" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Vähennä sisennystä merkin verran" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Älykäs rivien sisennys" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Suorita mukautettu komento 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Suorita mukautettu komento 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Suorita mukautettu komento 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Lähetä valinta päätteeseen" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "Rivitä uudelleen valinta tai nykyinen kappale" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Lisää" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Lisää päiväys" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Lisää vaihtoehtoinen tyhjä tila" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Asetukset" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Etsi" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Etsi" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Etsi seuraava" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Etsi edellinen" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Etsi seuraava valinta" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Etsi edellinen valinta" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Korvaa" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Etsi tiedostoista" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Seuraava viesti" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Edellinen viesti" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Etsi avoimista" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Etsi asiakirjasta" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Merkitse kaikki" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Siirry" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Edelliseen sijaintiin" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Seuraavaan sijaintiin" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Sulkeen pari" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Lisää/poista merkintä" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Seuraava merkintä" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Edellinen merkintä" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Tunnisteen kuvaus" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Tunnisteen määritys" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Rivin alkuun" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Rivin loppuun" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Näytöllä rivin loppuun" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Edellinen sana" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Seuraava sana" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Näytä" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Näytä/Piilota lisäkomponentit" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Kokoruututila" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Näytä/Piilota viesti-ikkuna" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Näytä/Piilota sivupalkki" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Suurenna" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Pienennä" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Pienennä" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Kohdistus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Editoriin" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Muistilappuun" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Päätteeseen" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Hakupalkkiin" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Sivupalkkiin" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Kääntäjään" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Sivupalkkiin" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Näytä _viesti-ikkuna" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Siirry asiakirjaan" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Sivupalkkiin" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Välilehdet" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Vasemmanpuoleinen asiakirja" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Oikeanpuoleinen asiakirja" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Viimeksi käytetty asiakirja" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Siirrä asiakirja vasemmalle" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Siirrä asiakirja oikealle" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Siirrä asiakirja ensimmäiseksi" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Siirrä asiakirja viimeiseksi" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Asiakirja" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Rivitys päälle/pois" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Rivien katkaisu päälle/pois" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Korvaa sarkaimet välilyönneillä" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Supista/laajenna" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Supista kaikki" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Laajenna kaikki" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Virkistä symbolilista" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "P_oista merkinnät" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Poista virh_eilmaisimet" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Koosta" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Käännä" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Koosta kaikki" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Koosta valinnainen kohde" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Koosta olio" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Seuraava virhe" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Edellinen virhe" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Suorita" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Suorita (vaihtoehtoinen)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Koostajan valitsimet" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Näytä värivalitsin" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Ohje" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Pikanäppäimet" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Voit muokata seuraavia pikanäppäimiä:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Siirry asiakirjaan" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Tähän tilaan voit kirjoittaa vaikkapa muistiinpanoja" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Yhden tai useamman istuntotiedoston lataus epäonnistui." @@ -3145,7 +3344,12 @@ msgid "Debug Messages" msgstr "Vianetsintäviestit" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Etsi" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3153,84 +3357,93 @@ "Aseta kohdistimen sarake ensimmäisessä avatussa tiedostossa (hyödyllinen " "valitsimen \"--line\" kanssa)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Käytä vaihtoehtoista asetuskansiota" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Tulosta enemmän tilaviestejä" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Tulosta sisäiset tiedostotyyppien nimet" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Luo globaali tunnistetiedosto (ks. käyttöohje)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Älä esikäsittele C/C++ -tiedostoja tunnisteita luodessa" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Älä avaa tiedostoja avoimessa istunnossa, vaan avaa aina uusi istunto" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Aseta kohdistimen rivinumero ensimmäisessä avatussa tiedostossa" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Älä näytä viesti-ikkunaa käynnistäessä" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Älä lataa täydennystietoja (ks. käyttöohje)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Älä lataa liitännäisiä" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Tulosta Geanyn asennuspolku" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Älä lataa edellisen istunnon tiedostoja" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Älä lataa päätetukea" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Tiedoston libvte.so nimi/polku" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Tulosta enemmän tilaviestejä" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Tulosta versiotiedot" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[TIEDOSTOT...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(käännetty %s kirjastoversioilla GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Siirretäänkö se heti?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Vanha asetuskansiosi täytyy siirtää ennen Geanyn käynnistystä" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3239,7 +3452,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3248,7 +3461,7 @@ "Asetuskansiosi siirto ei onnistunut kohteesta \"%s\" kohteeseen \"%s\" (%s). " "Ole hyvä ja siirrä kansio käsin uuteen sijaintiin." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3259,38 +3472,43 @@ "Geany ei välttämättä toimi oikein ilman asetuskansiota.\n" "Käynnistetäänkö Geany tästä huolimatta?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Tiedostoa \"%s\" ei löytynyt" - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Tämä on Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Asetuskansion luominen epäonnistui (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Asetustiedostot ladattiin uudelleen." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Tilaviestit" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Kopioi" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "_Kopioi kaikki" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Piilota viesti-ikkuna" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3299,11 +3517,11 @@ "Liitännäinen \"%s\" täytyy kääntää uudelleen, jotta se toimisi tämän Geany-" "version kanssa" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Liit_ännäisten hallinta" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3314,88 +3532,96 @@ "Kuvaus: %s\n" "Tekijä(t): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Aktiivinen" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Liitännäinen" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Ei liitännäisiä" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Liitännäiset" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Alla on luettelo käytettävissä olevista liitännäisistä. Valitse Geanyn " -"käynnistyessä ladattavat liitännäiset." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Liitännäisen tiedot:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Kaappaa näppäin" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Paina näppäinyhdistelmää, jonka haluat liittää toimintoon \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Laajenna kaikki" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "S_upista kaikki" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Toiminto" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Pikanäppäin" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "K_orvaa" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Korvataanko pikanäppäin?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Näppäinyhdistelmä \"%s\" on jo liitetty toimintoon \"%s\"" +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Pääte" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Syötä alle ohjelmien polut. Voit jättää tyhjiksi ne, joita et tarvitse." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" "Aseta mallineissa käytettävät tiedot. Lisätietoja löydät käyttöohjeesta." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3405,7 +3631,7 @@ "Geanyn uudelleen tai valitset Työkalut->Lataa asetukset uudelleen." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3416,7 +3642,7 @@ "kaksoisnapsauta näppäinyhdistelmää muokataksesi pikanäppäimen merkkijonoa." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3425,7 +3651,7 @@ "käännöksen aikainen että käytössä oleva GTK:n versio on vähintään 2.10." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3441,44 +3667,44 @@ msgid "Text will be wrongly spaced." msgstr "Tekstin sanavälit menevät väärin." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Sivu %d/%d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Asiakirjan asetukset" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Tulosta vain tulostettavan tiedoston nimi ilman polkua" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Sivu %d/%d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Tiedoston \"%s\" tulostus peruttiin." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Tiedosto %s tulostettu." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Tiedoston \"%s\" tulostus epäonnistui (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Aseta ensin tulostuskomento asetusikkunassa" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3489,38 +3715,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Tiedoston \"%s\" tulostus epäonnistui (paluuarvo: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Tiedosto %s tulostettu." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projektit" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Uusi projekti" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "_Luo" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Nimi:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Tiedostonimi:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Pääkansio:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3529,123 +3760,117 @@ "Polku projektin kaikkien tiedostojen pääkansioon. Kansio voi olla uusi tai " "olemassaoleva. Voit merkitä polun suhteessa projektitiedostoon." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Valitse projektin pääkansio" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektitiedostoa \"%s\" ei voitu ladata." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Avaa projekti" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Projektitiedostot" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projekti \"%s\" suljettu." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Kuvaus:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Koosta pääkansiossa" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Suorituskomento:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Kpl1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Projektin pääkansiossa suoritettava komentorivi. Komennolle voi määrittää " -"myös valitsimia. Jätä tyhjäksi, jos haluat käyttää oletuskomentoa." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Tiedostokaavat:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Tallennetaanko tiedosto ennen jatkamista?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Projekti \"%s\" on jo auki." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Projektin nimi on liian lyhyt." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Projektin nimi on liian pitkä (enintään %d merkkiä)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Projektitiedoston nimi ei kelpaa." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Luodaanko projektin pääkansio?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Polkua \"%s\" ei löydy." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektin pääkansion luominen epäonnistui (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektitiedoston tallennus epäonnistui (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projekti \"%s\" luotu." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projekti \"%s\" tallennettu." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Valitse projektitiedoston nimi" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Valitse projektin suorituskomento" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projekti \"%s\" avattu." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Käytä sää_nnöllisiä lausekkeita" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3653,15 +3878,15 @@ "Käytä POSIX-standardin mukaisia säännöllisiä lausekkeita (regular " "expressions). Lisätietoja käyttöohjeessa." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Etsi takape_rin" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Käytä o_hjausmerkkejä" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3669,402 +3894,425 @@ "Korvaa \\\\, \\t, \\n, \\r ja \\uXXXX (Unicode-merkit) vastaavilla " "ohjausmerkeillä" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Huo_mioi kirjainkoko" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Etsi k_okonaisia sanoja" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Etsi sanan al_usta" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "E_dellinen" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Seuraava" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "E_tsittävä:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Etsi k_aikki" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Merkitse" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Merkitse kaikki asiakirjasta löydetyt esiintymät." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "_Istunnosta" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "Asiakirjas_ta" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Sulj_e ikkuna" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Jos tätä ei ole valittu, ikkuna pysyy avoinna" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Etsi ja kor_vaa" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "K_orvaava:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Korvaa _kaikki" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Va_linnasta" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Korvaa kaikki valitusta tekstistä löydetyt esiintymät" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Ka_nsio:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Merkist_ö:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Merkki_jonot" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grepin säännölliset lausekkeet" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Lisätietoja grepin käyttöohjeessa (man grep)" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Laajat s_äännölliset lausekkeet" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Etsi m_yös alikansioista" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Kää_nteiset tulokset" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Valitse rivit, jotka eivät vastaa hakua" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Lisä_valitsimet:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Grep-komennon lisävalitsimet" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d osuma haulla \"%s\"." msgstr[1] "%d osumaa haulla \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Tekstiä korvattu %u tiedostossa." -msgstr[1] "Tekstiä korvattu %u tiedostossa." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Korvaa tekstiä nykyisestä asiakirjasta" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "\"Etsi tiedostoista\" ei onnistu määritetyssä kansiossa." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Ei haettavaa tekstiä." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Grep-komentoa \"%s\" ei voi suorittaa. Tarkista polku asetuksista." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Etsitään..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (kansiossa: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Kansion avaaminen epäonnistui (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Haku epäonnistui (Ks. Ohje->Vianetsintäviestit)" +#: ../src/search.c:1601 +#, fuzzy +msgid "Search failed." +msgstr "E_tsittävä:" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Haku suoritettu. Löytyi %d osuma." msgstr[1] "Haku suoritettu. Löytyi %d osumaa." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Haku ei tuottanut tulosta." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Lauseke ei kelpaa tiedostotyypille %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Luku" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Kappale" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Kpl1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Kpl2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Kpl3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Liite" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Muu" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Moduuli" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Tyypit" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Tyyppien muodostimet" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funktiot" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Osat" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Avaimet" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Muuttujat" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Komento" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Ympäristö" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Aliosa" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Alialiosa" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Nimike" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Tietueet" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Paketti" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Minun" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Paikallinen" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Meidän" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Nimikkeet" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Vakiot" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Rajapinnat" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Luokat" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Vakiot" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Ankkurit" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1-otsikot" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2-otsikot" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3-otsikot" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID-valitsimet" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Tyyppivalitsimet" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Moduulit" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Ainokaiset" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Metodit" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Nimiavaruudet" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Proseduurit" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Viennit" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "nimetön" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Tietueet" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Proseduurit" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Muuttujat" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Funktiot" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Jäsenet" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Nimikkeet" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Alirutiinit" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blokit" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Makrot" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Määrittelyt" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Kohteet" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Tietueet" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Tyyppimäärittelyt / Luetellut tyypit" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Tuntematon tiedostopääte \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Tunnistetiedoston luominen epäonnistui; ehkä tunnisteita ei löytynyt.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4073,7 +4321,7 @@ "Käyttö: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4084,163 +4332,181 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Lataa tunnisteet" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geanyn tunnisteet (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Ladattu tunnisteet tyypille %s \"%s\"." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Tunnistetiedoston \"%s\" lataaminen epäonnistui." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "\"%s\" esittelyä ei löydy." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" määritystä ei löydy." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Järjestä _nimen mukaan" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Järjestä _esiintymisen mukaan" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Tallenna tiedosto" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Tallenna kaikki avoimet tiedostot" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Lataa nykyinen tiedosto uudelleen" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Sulje tiedosto" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Sulje avoimet tiedostot" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Leikkaa valinta" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Kopioi valinta" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Liitä leikepöydän sisältö" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Poista valinta" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Peru viimeisin muutos" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Tee uudelleen viimeisin muutos" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Käännä tiedosto" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Suorita tai näytä tiedosto" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Avaa värivalintaikkuna, jossa voit poimia väriarvoja paletista." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Suurenna tekstiä" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Pienennä tekstiä" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Vähennä sisennystä" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Kasvata sisennystä" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Etsi kentän teksti nykyisestä tiedostosta" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Siirry kenttään syötetylle riville" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Näytä asetusikkuna" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Sulje Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Tulosta tiedosto" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Korvaa tekstiä nykyisestä asiakirjasta" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Luo uusi tiedosto" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Luo uusi tiedosto" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Avaa tiedosto" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Avaa valittu tiedosto" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Kääntövirheitä ei ole enempää." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Siirry" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Erotin" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Erotin ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4248,11 +4514,11 @@ "Valitse työkalupalkissa näytettävät kohteet. Niitä voi järjestellä " "raahaamalla ja pudottamalla." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Saatavilla olevat kohteet" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Näytetyt kohteet" @@ -4279,7 +4545,7 @@ msgid "Custom command failed: %s" msgstr "Mukautettu komento epäonnistui: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Mukautetut komennot" @@ -4291,192 +4557,184 @@ "Voit lähettää valitun tekstin jollekin näistä komennoista. Komennon " "tulostama teksti korvaa tällöin valinnan." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Mukautettuja komentoja ei määritetty." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Laske sanat" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "valinta" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "koko asiakirja" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Alue:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Rivejä:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Sanoja:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Merkkejä:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Tunnisteita ei löytynyt" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Näytä _symbolilista" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Näytä _asiakirjalista" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "_Piilota sivupalkki" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Näytä _Polut" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "rivi: %d\t mrk: %d\t val: %d\t" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "SAR" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "VL" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "S/V" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "tila: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "merkistö: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "tyyppi: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "näkyvyys: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Kirjasin päivitetty (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C:n vakiokirjasto" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C:n vakiokirjasto)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++:n vakiokirjasto" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Päivämäärän muotoilu" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Valitse kansio" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Valitse tiedosto" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Aset_ustiedostot" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Tallenna _kaikki" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Sulje kaikki" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Pääte" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "P_olku asiakirjasta" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Käynnistä pääte uudelleen" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Syöttötavat" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4484,101 +4742,89 @@ "Kansion muutos virtuaalipäätteessä epäonnistui, koska se todennäköisesti " "sisältää komennon." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Pääteliitännäinen" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Näitä virtuaalipäätteen (VTE) asetuksia käytetään ainoastaan, jos VTE-" -"kirjaston lataus onnistui." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Päätteen kirjasin:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Määrittää pääteruudun kirjasimen" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Edustaväri" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Taustaväri" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Asettaa päätteen tekstin edustavärin" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Asettaa päätteen tekstin taustavärin" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Rivipuskurin koko:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Määrittää, monenko rivin verran voit vierittää päätettä takaisin päin." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Komentotulkki:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Määrittää päätteessä käynnistettävän komentotulkkin polun" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Näppäily vierittää" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Vieritä syöteriville aina kun näppäintä painetaan" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Tulostus vierittää" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Vieritä syöteriville aina kun päätteeseen tulostetaan" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Vilkkuva kohdistin" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Määrittää, vilkkuuko kohdistin" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Ohita Geanyn pikanäppäimet" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Pääte vastaanottaa näppäinyhdistelmät (kohdistuskomentoja lukuunottamatta)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Poista päävalikon pikanäppäin käytöstä (oletus F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4588,11 +4834,11 @@ "Tee näin jos tarvitset kyseisiä näppäimiä päätteessä suorittamassasi " "sovelluksessa" -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Osoita aina valitun tiedoston kansioon" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Suoritetaanko komento \"cd $path\" siirryttäessä avattujen tiedostojen " @@ -4600,11 +4846,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Ohita suorituskomentosarja" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4612,11 +4858,11 @@ "Ohita suorituskomentosarja, jota käytetään tavallisesti suoritetun ohjelman " "paluuarvon näyttämiseen" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Suorita virtuaalipäätteessä" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4624,90 +4870,123 @@ "Suorita ohjelmat sisäisessä virtuaalipäätteessä erillisen pääteikkunan " "sijaan. Huomaa, että näin suoritettuja ohjelmia ei voi pysäyttää." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geanyn projektitiedostot" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Käynnistystiedostot" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Luokan rakentaja" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Luo lähdetiedostot uusille luokkatyypeille." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Luo luokka" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Nimiavaruudet" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Nimiavaruudet" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Luokka" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Luokan nimi:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Otsaketiedosto:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Lähdetiedosto:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Perintä" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Kantaluokka:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "%s-lähdekoodi" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Kantaotsake:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Globaali" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Kanta-GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Valinnat" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Luo muodostin" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Luo hajotin" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Ainokaiset" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+-muodostintyyppi" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "_Luo luokka" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++-luokka" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+-luokka" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "_C++-luokka" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML-erityismerkit" @@ -4717,52 +4996,57 @@ msgstr "Lisää HTML-erityismerkkejä kuten \"&\"." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geanyn kehittäjät" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML-erikoismerkit" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 -merkit" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Kreikkalaiset merkit" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Matemaattiset merkit" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Tekniset merkit" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Nuolimerkit" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Välimerkit" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Muut merkit" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Liitännäiskansion luominen epäonnistui." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Erikoismerkit" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Lisää" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4770,40 +5054,40 @@ "Valitse luettelosta erikoismerkki ja lisää se kohdistimen sijaintiin " "kaksoisnapsauttamalla tai Lisää-painikkeen avulla." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Merkki" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nimi)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Lisää _HTML-erikoismerkkejä" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML-korvaus" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTML-vaihto" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Erikoismerkkien massamuutos" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Lisää HTML:n erikoismerkkejä" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Korvaa erikoismerkit" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Vaihda liitännäisen tilaa" @@ -4828,105 +5112,105 @@ "Renders the font size of the document together with the current zoom level" msgstr "Piirrä käyttäen nykyistä tekstin kokoa ja suurennostasoa" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Tiedosto viety nimellä \"%s\"" -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Tiedoston \"%s\" kirjoitus epäonnistui (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Tiedosto \"%s\" on jo olemassa. Korvataanko se?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Vie" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "_HTML-muotoon" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "_LaTeX-muotoon" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Tiedostoselain" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Lisää tiedostoselainvälilehden sivupalkkiin." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Liikaa valittuja kohteita!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Ulkoisen komennon \"%s\" suoritus epäonnistui (%s)" -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Avaa _ulkoisesti" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Etsi tiedostoista" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Näytä _piilotiedostot" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Ylös" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Virkistä" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Koti" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Avaa asiakirjan polku" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Tyhjennä suodatin" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Suodatin:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Kohdista tiedostoluetteloon" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Kohdista polkukenttään" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Liitännäiskansion luominen epäonnistui." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Ulkoinen avauskomento:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4940,15 +5224,15 @@ "%f korvataan tiedostonimellä ja sen täydellisellä polulla\n" "%d korvataan tiedoston polulla ilman tiedostonimeä" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Näytä piilotiedostot" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Piilota objektitiedostot" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4956,11 +5240,11 @@ "Älä näytä kääntäjän luomia objektitiedostoja tiedostoselaimessa. (*.o, *." "obj, *.so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Käytä projektin pääkansiota" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Avaa avoinna olevan projektin pääkansio" @@ -5067,37 +5351,201 @@ msgid "Splits the editor view into two windows." msgstr "Jakaa editorin kahteen näkymään" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Näytä nykyinen asiakirja" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Yhdistä" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Jaa" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Vaakasuunnassa" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Pystysuunnassa" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Jaa vaakasuunnassa" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Jaa pystysuunnassa" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Yhdistä" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Ase_ta sisällytettävät tiedostot ja valitsimet" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "Näytä _DVI-tiedosto" + +#~ msgid "V_iew PDF File" +#~ msgstr "Näytä _PDF-tiedosto" + +#~ msgid "_Set Arguments" +#~ msgstr "_Aseta valitsimet" + +#~ msgid "Set Arguments" +#~ msgstr "Aseta valitsimet" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Aseta (La)Tex-tiedostojen kääntö- ja katseluohjelmat sekä valitsimet." + +#~ msgid "DVI creation:" +#~ msgstr "DVI:n luominen:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF:n luominen:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI:n esikatselu:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF:n esikatselu:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f korvataan nykyisellä tiedostonimellä, esim. tiedosto.c\n" +#~ "%e korvataan tiedostonimellä ilman päätettä, esim. tiedosto" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Sisällytettävät tiedostot ja valitsimet" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Aseta ohjelmien koostamis- ja suorituskomennot." + +#~ msgid "Compile:" +#~ msgstr "Käännä:" + +#~ msgid "Build:" +#~ msgstr "Koosta:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Katseluohjelman suoritus epäonnistui" + +#~ msgid "Try to resave the file?" +#~ msgstr "Yritetäänkö tallentaa uudelleen?" + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr "dummy" + +#~ msgid "_Customize Toolbar" +#~ msgstr "_Muokkaa työkalupalkkia" + +#~ msgid "Icon style:" +#~ msgstr "Kuvaketyyli:" + +#~ msgid "Icon size:" +#~ msgstr "Kuvakekoko:" + +#~ msgid "Appearance" +#~ msgstr "Ulkoasu" + +#~ msgid "Hard tab width:" +#~ msgstr "Kiinteä sarkainleveys:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "Sarkaimen leveys, kun käytössä \"Sarkaimet ja välilyönnit\"" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Käytä valkoista tekstiä mustalla taustalla ja muuta värit käänteisiksi. " +#~ "Vaatii Geanyn uudelleenkäynnistyksen." + +#~ msgid "Long line marker:" +#~ msgstr "Pitkän rivin ilmaisin:" + +#~ msgid "Long line marker color:" +#~ msgstr "Pitkän rivin ilmaisimen väri:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Make-työkalun polku ja valitsimet" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Kahdenna rivi tai valinta" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Lähetä valinta päätteeseen" + +#~ msgid "Run (alternative command)" +#~ msgstr "Suorita (vaihtoehtoinen)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Alla on luettelo käytettävissä olevista liitännäisistä. Valitse Geanyn " +#~ "käynnistyessä ladattavat liitännäiset." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Tiedoston \"%s\" tulostus peruttiin." + +#~ msgid "Make in base path" +#~ msgstr "Koosta pääkansiossa" + +#~ msgid "Run command:" +#~ msgstr "Suorituskomento:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Projektin pääkansiossa suoritettava komentorivi. Komennolle voi määrittää " +#~ "myös valitsimia. Jätä tyhjäksi, jos haluat käyttää oletuskomentoa." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Valitse projektin suorituskomento" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Tekstiä korvattu %u tiedostossa." +#~ msgstr[1] "Tekstiä korvattu %u tiedostossa." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Haku epäonnistui (Ks. Ohje->Vianetsintäviestit)" + +#~ msgid "My" +#~ msgstr "Minun" + +#~ msgid "Local" +#~ msgstr "Paikallinen" + +#~ msgid "Our" +#~ msgstr "Meidän" + +#~ msgid "Terminal plugin" +#~ msgstr "Pääteliitännäinen" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Näitä virtuaalipäätteen (VTE) asetuksia käytetään ainoastaan, jos VTE-" +#~ "kirjaston lataus onnistui." + +#~ msgid "Terminal font:" +#~ msgstr "Päätteen kirjasin:" + +#~ msgid "Unsplit" +#~ msgstr "Yhdistä" #~ msgid "Diff file" #~ msgstr "Diff-tiedosto" diff -Nru geany-0.18/po/fr.po geany-0.19/po/fr.po --- geany-0.18/po/fr.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/fr.po 2010-06-02 22:42:48.000000000 +0100 @@ -1,15 +1,15 @@ # French translations for geany package. # Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. -# Jean-Philippe Moal , 2006 - 2009. +# Jean-Philippe Moal , 2006 - 2010 # Roland Baudin , 2008 # Lionel Fuentes , 2009 msgid "" msgstr "" "Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-11 00:46+0100\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-06-01 15:10+0100\n" "Last-Translator: Jean-Philippe Moal \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -21,7 +21,9 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un EDI rapide et léger utilisant GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:281 +#: ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,437 +31,426 @@ msgid "Integrated Development Environment" msgstr "Environnement de Développement Intégré" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "À propos de Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Un EDI rapide et léger" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(construit le %s ou ultérieurement)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Infos" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Développeurs" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "mainteneur" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "développeur" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "mainteneur des traductions" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Traducteurs" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Traducteurs précédents" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Contributeurs" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Quelques uns des principaux contributeurs (pour une liste plus détaillé, " -"voir le fichier %s) :" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Quelques uns des principaux contributeurs (pour une liste plus détaillé, voir le fichier %s) :" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Crédits" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licence" -#: ../src/about.c:391 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"Le texte de la licence n'a pu être trouvé, veuillez visiter http://www.gnu." -"org/licenses/gpl-2.0.txt pour le consulter en ligne." +#: ../src/about.c:397 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Le texte de la licence n'a pu être trouvé, veuillez visiter http://www.gnu.org/licenses/gpl-2.0.txt pour le consulter en ligne." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Impossible de trouver le terminal \"%s\" (vérifiez le chemin vers l'outil " -"Terminal dans les préférences)" +msgid "failed to substitute %%p, no project active" +msgstr "impossible de substituer %%p, aucun projet actif" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Échec du processus, pas de dossier de travail" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "" -"Impossible d'exécuter \"%s\" (le script de lancement n'a pas pu être créé)" +msgid "%s (in directory: %s)" +msgstr "%s (dans le dossier : %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 +#: ../src/build.c:944 +#: ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Processus échoué (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (dans le dossier : %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Impossible de changer le dossier de travail pour \"%s\"" -#: ../src/build.c:707 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Impossible d'exécuter le fichier dans le VTE car il contient probablement " -"une commande." +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Impossible d'exécuter \"%s\" (le script de lancement n'a pas pu être créé)" + +#: ../src/build.c:873 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Impossible d'exécuter le fichier dans le VTE car il contient probablement une commande." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Impossible de trouver le terminal \"%s\" (vérifiez le chemin vers l'outil Terminal dans les préférences)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Compilation échouée." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Compilation terminée avec succès." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compiler" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "Const_ruire" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make All" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make Custom _Target" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _Object" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Texte personnalisé" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Entrez votre texte personnalisé ici, tout texte entré ici ajouté à la commande." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Erreur suiva_nte" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "_Erreur précédente" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Définir les include_s et les options" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Voir le fichier DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Vo_ir le fichier PDF" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "Définir les commande_s de construction" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Définir les option_s" - -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Définir les options" +#: ../src/build.c:1623 +#: ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Construit le fichier courant" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Définir les programmes et options utilisées pour compiler et visionner les " -"fichiers (La)Tex." +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Construit le fichier courant avec l'outil make et la cible par défaut" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Construit le fichier courant avec l'outil make et la cible spécifiée" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Création de DVI :" - -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Création de PDF :" - -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Prévisualisation de DVI :" - -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Prévisualisation de PDF :" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Compile le fichier courant avec make" -#: ../src/build.c:1401 ../src/build.c:1583 +#: ../src/build.c:1668 #, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f sera remplacé par le fichier courant, ex. fichier_test.c\n" -"%e sera remplacé par le nom du fichier sans extension, ex. fichier_test" +msgid "Process could not be stopped (%s)." +msgstr "Le processus n'a pas pu être stoppé (%s)." -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Définir les includes et les options" +#: ../src/build.c:1685 +#: ../src/build.c:1697 +msgid "No more build errors." +msgstr "Plus d'erreurs de construction." -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "" -"Définir les commandes utilisées pour construire et lancer les programmes." +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Définir l'étiquette de l'élément du menu" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Élément" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1789 +#: ../src/symbols.c:650 +msgid "Label" +msgstr "Étiquette" + +#: ../src/build.c:1790 +#: ../src/symbols.c:645 +msgid "Command" +msgstr "Commande" + +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Dossier de travail" + +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Effacer" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Cliquez pour définir l'étiquette de l'élément du menu" + +#: ../src/build.c:1904 +#: ../src/build.c:1906 +msgid "%s Commands" msgstr "Commandes pour %s" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compiler :" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Construire :" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Pas de type de fichier" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Exécuter :" +#: ../src/build.c:1914 +#: ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Expression régulière pour les erreurs :" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Construit le fichier courant" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Commandes sans type de fichier" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make Custom Target" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Note : le deuxième élément ouvre une boite de dialogue et ajoute la réponse à la commande." -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Entrez vos options personnalisées ici, tout texte entré ici est passé à la " -"commande make." +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Commandes d'exécution" -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Construit le fichier courant avec l'outil make et la cible par défaut" +#: ../src/build.c:1992 +#, c-format +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p sont remplacés par les répertoires et nom de commandes, voir le manuel pour plus de détails." -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Construit le fichier courant avec l'outil make et la cible spécifiée" +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Définir les commandes de construction" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compile le fichier courant avec make" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compiler" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Impossible d'exécuter le programme de visualisation" +#. build the code +#: ../src/build.c:2406 +#: ../src/build.c:2669 +#: ../src/interface.c:1075 +msgid "_Build" +msgstr "Const_ruire" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Le processus n'a pas pu être stoppé (%s)." +#: ../src/build.c:2413 +#: ../src/build.c:2443 +#: ../src/build.c:2636 +msgid "_Execute" +msgstr "_Exécuter" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Plus d'erreurs de construction." +#. build the code with make custom +#: ../src/build.c:2458 +#: ../src/build.c:2634 +#: ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make Custom _Target" + +#. build the code with make object +#: ../src/build.c:2460 +#: ../src/build.c:2635 +#: ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make _Object" + +#: ../src/build.c:2462 +#: ../src/build.c:2633 +msgid "_Make" +msgstr "_Make" -#: ../src/callbacks.c:152 +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make All" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "Définir les commande_s de construction" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d fichier enregistré." +msgstr[1] "%d fichiers enregistrés." + +#: ../src/callbacks.c:488 +#: ../src/document.c:2895 +#: ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Recharger" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Tout changement non enregistré sera perdu." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Êtes-vous sur de vouloir recharger '%s' ?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 +#: ../src/keybindings.c:428 msgid "Go to Line" msgstr "Aller à la ligne" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Entrez le numéro de la ligne à laquelle vous voulez vous rendre :" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Veuillez définir le type du fichier courant avant d'utiliser cette fonction." +#: ../src/callbacks.c:1296 +#: ../src/callbacks.c:1321 +msgid "Please set the filetype for the current file before using this function." +msgstr "Veuillez définir le type du fichier courant avant d'utiliser cette fonction." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 +#: ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "jj.mm.aaaa" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 +#: ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.jj.aaaa" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 +#: ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/mm/jj" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 +#: ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "jj.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 +#: ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.jj.aaaa hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 +#: ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/jj hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 +#: ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Utiliser le format de date personnalisé" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Format de date personnalisé" -#: ../src/callbacks.c:1498 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Entrez ici un format de date et d'heure personnalisé. Vous pouvez utiliser " -"tous les spécificateurs de conversion qui peuvent être utilisés avec la " -"fonction C ANSI strftime." +#: ../src/callbacks.c:1447 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Entrez ici un format de date et d'heure personnalisé. Vous pouvez utiliser tous les spécificateurs de conversion qui peuvent être utilisés avec la fonction C ANSI strftime." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Le format de date n'a pas pu être converti (peut-être trop long)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 +#: ../src/callbacks.c:1699 msgid "No more message items." msgstr "Plus d'éléments de messages." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 +#: ../src/dialogs.c:229 msgid "Open File" msgstr "Ouvrir un fichier" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 +#: ../src/interface.c:790 msgid "_View" msgstr "_Affichage" -#: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Ouvre le fichier en mode lecture seule. Si vous choisissez plus d'un fichier " -"à ouvrir, tous ces fichiers seront ouverts en lecture seule." +#: ../src/dialogs.c:151 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Ouvre le fichier en mode lecture seule. Si vous choisissez plus d'un fichier à ouvrir, tous ces fichiers seront ouverts en lecture seule." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Détecter depuis l'extension du fichier" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 +#: ../src/interface.c:3651 +#: ../src/interface.c:5263 msgid "Detect from file" msgstr "Détecter depuis le fichier" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Plus d'options" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Afficher les fichiers cac_hés" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Définir l'encodage :" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Définit explicitement un encodage pour le fichier, si celui-ci ne serait pas " -"détecté. Cela est utile lorsque vous savez que l'encodage d'un fichier ne " -"peut pas être détecté correctement par Geany.\n" -"Notez que si vous choisissez plusieurs fichiers, ils seront tous ouverts " -"avec l'encodage choisi." +"Définit explicitement un encodage pour le fichier, si celui-ci ne serait pas détecté. Cela est utile lorsque vous savez que l'encodage d'un fichier ne peut pas être détecté correctement par Geany.\n" +"Notez que si vous choisissez plusieurs fichiers, ils seront tous ouverts avec l'encodage choisi." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Définir le type de fichier :" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Définit explicitement un type de fichier pour ce fichier, s'il n'est pas " -"détecté par l'extension du nom de fichier.\n" -"Notez que si vous choisissez plusieurs fichier, ils seront tous ouverts avec " -"le type de fichier choisi." +"Définit explicitement un type de fichier pour ce fichier, s'il n'est pas détecté par l'extension du nom de fichier.\n" +"Notez que si vous choisissez plusieurs fichier, ils seront tous ouverts avec le type de fichier choisi." #: ../src/dialogs.c:389 msgid "Overwrite?" @@ -469,224 +460,227 @@ msgid "Filename already exists!" msgstr "Le nom de fichier existe déjà !" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 +#: ../src/dialogs.c:552 msgid "Save File" msgstr "Enregistrer le fichier" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "R_enommer" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Enregistre le fichier et le renomme" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Ouvrir le fichier dans un nouvel onglet" -#: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Conserve le document en cours non enregistré et ouvre le nouveau fichier " -"enregistré dans un nouvel onglet." +#: ../src/dialogs.c:442 +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Conserve le document en cours non enregistré et ouvre le nouveau fichier enregistré dans un nouvel onglet." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 +#: ../src/win32.c:681 msgid "Error" msgstr "Erreur" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 +#: ../src/dialogs.c:1443 +#: ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Question" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 +#: ../src/win32.c:693 msgid "Warning" msgstr "Avertissement" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 +#: ../src/win32.c:699 msgid "Information" msgstr "Information" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "Ne pas enre_gistrer" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Le fichier '%s' n'est pas enregistré." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Voulez-vous l'enregistrer avant la fermeture ?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Choisir la police" -#: ../src/dialogs.c:1005 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Une erreur s'est produite ou une information sur un fichier n'a pas pu être " -"récupérée (ex. depuis un nouveau fichier)." - -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1057 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Une erreur s'est produite ou une information sur un fichier n'a pas pu être récupérée (ex. depuis un nouveau fichier)." + +#: ../src/dialogs.c:1076 +#: ../src/dialogs.c:1077 +#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1745 +#: ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "inconnu" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 +#: ../src/symbols.c:800 msgid "Properties" msgstr "Propriétés" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Type :" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Taille :" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Emplacement :" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Lecture seule :" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(seulement pour Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Encodage :" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 +#: ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(avec BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(sans BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modifié :" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Changé :" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Accédé :" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Permissions :" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Lecture :" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Écriture :" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Exécuter :" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Propriétaire :" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Groupe :" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Autres :" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Fichier %s fermé." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Nouveau fichier \"%s\" ouvert." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 +#: ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Impossible d'ouvrir le fichier %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Le fichier \"%s\" n'a pas pu être ouvert correctement et a été tronqué. Cela " -"peut se produire si le fichier contient un bit NULL. Soyez averti que son " -"enregistrement peut causer une perte de données.\n" +"Le fichier \"%s\" n'a pas pu être ouvert correctement et a été tronqué. Cela peut se produire si le fichier contient un bit NULL. Soyez averti que son enregistrement peut causer une perte de données.\n" "Le fichier a été défini en lecture seule." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Le fichier \"%s\" n'est pas valide %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Le fichier \"%s\" ne ressemble pas à un fichier texte ou son encodage n'est " -"pas supporté." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Le fichier \"%s\" ne ressemble pas à un fichier texte ou son encodage n'est pas supporté." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Espaces" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulations" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabulations et espaces" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Définir le mode d'indentation %s pour %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Nom de fichier invalide" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Fichier %s rechargé." @@ -694,29 +688,25 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Fichier %s ouvert (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", lecture seule" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Erreur lors du renommage du fichier." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Une erreur s'est produite lors de la conversion du fichier depuis l'UTF-8 " -"vers \"%s\". Le fichier reste non sauvegardé." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Une erreur s'est produite lors de la conversion du fichier depuis l'UTF-8 vers \"%s\". Le fichier reste non sauvegardé." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -725,52 +715,59 @@ "Message d'erreur : %s\n" "L'erreur s'est produite à \"%s\" (ligne : %d, colonne : %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Message d'erreur : %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 +#: ../src/document.c:1833 msgid "Error saving file." msgstr "Erreur lors de l'enregistrement du fichier." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Erreur lors de l'enregistrement du fichier (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Fichier %s enregistré." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 +#: ../src/document.c:1982 +#: ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" n'a pu être trouvé." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Recommencer la recherche ?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 +#: ../src/search.c:1127 +#: ../src/search.c:1171 +#: ../src/search.c:1875 +#: ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Aucune correspondance trouvée pour \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 +#: ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s : Remplacement de %d occurrence de \"%s\" par \"%s\"." msgstr[1] "%s : Remplacement de %d occurrences de \"%s\" par \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Voulez-vous le recharger ?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -779,28 +776,33 @@ "Le fichier '%s' sur le disque est plus récent que\n" "le tampon actuel." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Essayer de sauvegarder à nouveau le fichier ?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "_Fermer sans sauvegarder" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "Le fichier \"%s\" n'a pu être trouvé!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "Le fichier \"%s\" n'a pu être trouvé sur le disque ! Essayer d'enregistrer le fichier à nouveau ?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Largeur des tabulations" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Entrer le nombre d'espaces à remplacer par une tabulation." +#: ../src/editor.c:4577 +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Avertissement : largeur de tabulation non standard : %d != 8 !" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celtique" -#: ../src/encodings.c:77 ../src/encodings.c:78 +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 msgid "Greek" msgstr "Grec" @@ -812,22 +814,31 @@ msgid "South European" msgstr "Européen du sud " -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 #: ../src/encodings.c:84 msgid "Western" msgstr "Occidental" -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Baltic" msgstr "Baltique" -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 msgid "Central European" msgstr "Européen central" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 msgid "Cyrillic" msgstr "Cyrillique" @@ -843,12 +854,16 @@ msgid "Romanian" msgstr "Roumain" -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 msgid "Arabic" msgstr "Arabe" #. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 msgid "Hebrew" msgstr "Hébreu" @@ -868,36 +883,53 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Turkish" msgstr "Turc" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 msgid "Vietnamese" msgstr "Vietnamien" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 msgid "Unicode" msgstr "Unicode" #. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" msgstr "Chinois simplifié" -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 msgid "Chinese Traditional" msgstr "Chinois traditionnel" -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 #: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonais" -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 #: ../src/encodings.c:145 msgid "Korean" msgstr "Coréen" @@ -906,2311 +938,2327 @@ msgid "Without encoding" msgstr "Sans encodage" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Européen de l'_ouest" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "Européen de l'_est" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "_Asiatique de l'est" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Asiatique du _SE & SO" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Moyen-Oriental" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Fichier source %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "fichier %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Aucun" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Script Shell" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Feuille de style en cascade" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Dump SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Fichier de Config" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Fichier de traduction Gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "fichier de script %sl" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Langages de _Programmation" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Langages de _Script" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Langages de _Balisage" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Langages D_ivers" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "_Types de fichier personnalisés" + +#: ../src/filetypes.c:1403 +#: ../src/win32.c:105 msgid "All Source" msgstr "Tout fichier source" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 +#: ../src/project.c:285 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Tous les fichiers" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Mauvaise expression régulière pour le type de fichier %s : %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "sans titre" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 +#: ../src/main.c:802 +#: ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Impossible de trouver le fichier '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Jeux de _couleurs" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "Par _défaut" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Fichier" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nou_veau (selon un modèle)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisible" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 +#: ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Ou_vrir le fichier sélectionné" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Fichiers récents" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Tout enre_gistrer" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "R_echarger en tant que" -#: ../src/interface.c:376 +#: ../src/interface.c:371 +#: ../src/interface.c:553 +#: ../src/interface.c:682 +#: ../src/interface.c:696 +#: ../src/interface.c:950 +#: ../src/interface.c:960 +#: ../src/interface.c:2090 +#: ../src/interface.c:2104 +msgid "invisible" +msgstr "invisible" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "_Mise en page" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 +#: ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Fermer les _autres fichiers" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 +#: ../src/notebook.c:219 msgid "C_lose All" msgstr "_Tout fermer" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "Édit_er" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 +#: ../src/interface.c:2031 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 +#: ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Reformater les lignes/blocs" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" -msgstr "M_odifier la casse de la séléction" +msgstr "M_odifier la casse de la sélection" + +#: ../src/interface.c:495 +#: ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "In_tervertir la ligne courante" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Commenter la(les) ligne(s)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Décomme_nter la(les) ligne(s)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Commen_ter/Décommenter la ligne" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_pliquer la ligne ou la sélection" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Augmenter l'_indentation" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Diminuer l'indentation" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "Envoyer la _sélection vers le terminal" +#: ../src/interface.c:537 +#: ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "Indentation intelli_gente de la ligne" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Envoyer la _sélection vers" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 +#: ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Commandes" + +#: ../src/interface.c:563 +#: ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Couper le(s) ligne(s) courante(s)" + +#: ../src/interface.c:571 +#: ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copier le(s) ligne(s) courante(s)" + +#: ../src/interface.c:579 +#: ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Effacer le(s) ligne(s) courante(s)" + +#: ../src/interface.c:583 +#: ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Dupliquer la ligne ou la sélection" + +#: ../src/interface.c:592 +#: ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Sélectionner la(les) ligne(s) courante(s)" + +#: ../src/interface.c:596 +#: ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Sélectionner le paragraphe courant" + +#: ../src/interface.c:605 +#: ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Insérer un espacement alternatif" + +#: ../src/interface.c:614 +#: ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Se _rendre au marqueur suivant" + +#: ../src/interface.c:618 +#: ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Se _rendre au marqueur précédent" + +#: ../src/interface.c:627 +#: ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Envoyer la _sélection vers le terminal" + +#: ../src/interface.c:636 +#: ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Insérer des co_mmentaires" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 +#: ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Insérer une entrée de _changelog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 +#: ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Insérer un en-tête de fic_hier" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 +#: ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Insérer une description de _fonction" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 +#: ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Insérer un commentaire _multilignes" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 +#: ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Insérer une note _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 +#: ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Insérer une note _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 +#: ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Insérer la dat_e" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 +#: ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Insérer \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Préférence_s" -#: ../src/interface.c:621 +#: ../src/interface.c:712 +#: ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Préférences des _plugins" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Rechercher" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Rechercher le suiva_nt" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Re_chercher le précédent" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Rechercher dans les f_ichiers" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 +#: ../src/search.c:551 msgid "_Replace" msgstr "R_emplacer" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Rechercher la _sélection" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Rechercher la sélection _vers l'arrière" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Message suivant" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Message _précédent" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 +#: ../src/interface.c:2145 msgid "_Go to Line" msgstr "Aller à la li_gne" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Changer la _police" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Afficher/Cacher toutes les fenêtres _supplémentaires" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Plein é_cran" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Afficher la _fenêtre de messages" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Afficher la barre d'ou_tils" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Afficher la _barre latérale" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 +#: ../src/interface.c:4025 +#: ../src/interface.c:5347 +#: ../src/keybindings.c:260 +#: ../src/prefs.c:1531 msgid "Editor" msgstr "Éditeur" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Afficher la marge des _marqueurs" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Afficher les numéros de _ligne" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Afficher les e_spaces" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Afficher les fins d_e lignes" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Afficher les guides d'_indentation" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Ren_voi à la ligne automatique" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "_Renvoi à la ligne" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Indentation _automatique" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "T_ype d'indentation" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 +#: ../src/interface.c:3633 +#: ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabulations" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 +#: ../src/interface.c:3624 +#: ../src/interface.c:5236 msgid "_Spaces" msgstr "E_spaces" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 +#: ../src/interface.c:3642 +#: ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "Tabulations et _espaces" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "_Lecture seule" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Écrire le _BOM Unicode" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Définir le _type de fichier" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Définir l'_encodage" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Définir les fi_ns de lignes" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convertir en _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Convertir en _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Convertir en CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Enlever les e_spaces de fin" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Remplacer les tabulati_ons par des espaces" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Rempla_cer les espaces par des tabulations" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Tout _plier" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Tout _déplier" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Effacer les _marqueurs" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Supprimer les _indicateurs d'erreurs" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projet" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nouveau" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Ouvrir" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Projets _récents" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Fermer" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Outils" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Mettre à jour la configuration" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Fichiers de c_onfiguration" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Sélecteur de couleur" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Compteur de mots" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Charger les Ta_gs" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Mettre à jour la configuration" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 +#: ../src/interface.c:1130 msgid "_Help" msgstr "A_ide" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Site _Web" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Raccourcis clavier" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Messages de débogage" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 +#: ../src/sidebar.c:130 msgid "Symbols" msgstr "Symboles" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documents" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Statut" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compilateur" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Messages" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Notes" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Im_ages et texte" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "_Images seulement" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "_Texte seulement" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Grosses icônes" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Petite_s icônes" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "T_rès petites icônes" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Personnaliser la barre d'outils" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Préférences de la barre d'ou_tils" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "Cac_her la barre d'outils" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "_Rechercher dans tous les documents" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Rechercher dans le _document" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Aller à la définition du s_ymbole" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Aller à la déclaration du _symbole" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Action conte_xtuelle" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 +#: ../src/keybindings.c:387 msgid "Preferences" msgstr "Préférences" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Charger les fichiers depuis la session précédente" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Ouvre les fichiers de la dernière session au démarrage" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Charger le support du terminal virtuel" -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Charger ou non l'émulateur virtuel de terminal (VTE) au lancement, " -"désactivez le si vous n'en avez pas besoin" - #: ../src/interface.c:2712 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Charger ou non l'émulateur virtuel de terminal (VTE) au lancement, désactivez le si vous n'en avez pas besoin" + +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Activer le support des plugins" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Démarrage" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Enregistrer la position et la géométrie de la fenêtre" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" -msgstr "" -"Enregistre la position et la géométrie de la fenêtre et la restaure au " -"démarrage" +msgstr "Enregistre la position et la géométrie de la fenêtre et la restaure au démarrage" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Confirmer la fermeture" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Affiche une boite de dialogue de confirmation lors de la fermeture" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Fermeture" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Dossier de démarrage :" -#: ../src/interface.c:2778 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Le dossier où commencer lors de l'ouverture ou de l'enregistrement des " -"fichiers. Entrez un chemin absolu. Laissez vide pour utiliser le dossier de " -"travail courant." +#: ../src/interface.c:2780 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Le dossier où commencer lors de l'ouverture ou de l'enregistrement des fichiers. Entrez un chemin absolu. Laissez vide pour utiliser le dossier de travail courant." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Fichiers de projet :" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Chemin de départ lors de l'ouverture des fichiers de projet" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Répertoire de plugin supplémentaire :" -#: ../src/interface.c:2828 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Geany cherche par défaut des plugins dans le répertoire d'installation " -"global et dans le dossier de configuration. Le chemin entré ici est " -"également utilisé pour la recherche. Laissez le champ vide pour désactiver " -"cette fonction." +#: ../src/interface.c:2830 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Geany cherche par défaut des plugins dans le répertoire d'installation global et dans le dossier de configuration. Le chemin entré ici est également utilisé pour la recherche. Laissez le champ vide pour désactiver cette fonction." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Chemins" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Démarrage" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Émettre un bip sur les erreurs ou lorsque la compilation est terminée" -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Émettre ou non un bip si une erreur s'est produite ou lorsque le processus " -"de compilation est fini" +#: ../src/interface.c:2874 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Émettre ou non un bip si une erreur s'est produite ou lorsque le processus de compilation est fini" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Se rendre à la liste des messages de statut aux nouveaux messages" -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Se rendre à l'onglet des messages de statut (au bas de la fenêtre des " -"messages) lorsqu'un nouveau message de statut arrive" +#: ../src/interface.c:2879 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Se rendre à l'onglet des messages de statut (au bas de la fenêtre des messages) lorsqu'un nouveau message de statut arrive" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Supprimer les messages de statut de la barre de statut" -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Supprime tous les messages de la barre de statut. Les messages sont toujours " -"affichés dans la fenêtre des messages de statut." +#: ../src/interface.c:2884 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Supprime tous les messages de la barre de statut. Les messages sont toujours affichés dans la fenêtre des messages de statut." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Auto focus des fenêtres (le focus suit la souris)" -#: ../src/interface.c:2886 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Donne le focus automatiquement aux fenêtres sous le curseur de la souris. " -"Fonctionne pour la fenêtre de l'éditeur, les notes, la barre de recherche, " -"les champs aller à la ligne et le VTE." - -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2889 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Donne le focus automatiquement aux fenêtres sous le curseur de la souris. Fonctionne pour la fenêtre de l'éditeur, les notes, la barre de recherche, les champs aller à la ligne et le VTE." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Utiliser la boite de dialogue Windows d'ouverture/sauvegarde des fichiers" + +#: ../src/interface.c:2894 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Utiliser ou non la boite de dialogue Windows d'ouverture/sauvegarde des fichiers ou la boite de dialogue GTK" + +#: ../src/interface.c:2896 +#: ../src/interface.c:3275 +#: ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Divers" # Adaptation de wrap -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" -msgstr "" -"Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche" +msgstr "Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche" # Adaptation de wrap -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche " -"après un clic sur Suivant/Précédent" +#: ../src/interface.c:2918 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche après un clic sur Suivant/Précédent" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Utiliser le mot courant sous le curseur pour la recherche." -#: ../src/interface.c:2916 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Utilise le mot courant sous le curseur lors de l'ouverture de la boite de " -"dialogue de recherche, recherche dans les fichiers, ou remplacement si aucun " -"texte n'est sélectionné" +#: ../src/interface.c:2923 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Utilise le mot courant sous le curseur lors de l'ouverture de la boite de dialogue de recherche, recherche dans les fichiers, ou remplacement si aucun texte n'est sélectionné" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" -msgstr "" -"Utiliser le dossier du fichier courant pour la recherche dans les fichiers" +msgstr "Utiliser le dossier du fichier courant pour la recherche dans les fichiers" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Recherche" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Utiliser des fichiers de session basés sur les projets" -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"Conserver ou non des fichiers de session d'un projet et les ouvrir lors de " -"la réouverture du projet" +#: ../src/interface.c:2951 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Conserver ou non des fichiers de session d'un projet et les ouvrir lors de la réouverture du projet" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Enregistrer le fichier projet dans le dossier de base du projet" -#: ../src/interface.c:2949 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Quand cette case est cochée, un fichier de projet est créé par défaut dans " -"le dossier de base du projet à chaque création d'un nouveau projet, plutôt " -"qu'à un niveau au dessus du dossier de projet. Vous pouvez toujours changer " -"le chemin du projet dans la boite de dialogue Nouveau projet." +#: ../src/interface.c:2956 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Quand cette case est cochée, un fichier de projet est créé par défaut dans le dossier de base du projet à chaque création d'un nouveau projet, plutôt qu'à un niveau au dessus du dossier de projet. Vous pouvez toujours changer le chemin du projet dans la boite de dialogue Nouveau projet." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projets" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Divers" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 +#: ../src/prefs.c:1525 msgid "General" msgstr "Général" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Afficher la liste des symboles" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Affiche/Cache la liste des symboles" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Afficher la liste des documents" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Affiche/Cache la liste des documents" -#: ../src/interface.c:2993 -msgid "Sidebar" +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Afficher la barre latérale" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Position :" + +#: ../src/interface.c:3026 +#: ../src/interface.c:3149 +#: ../src/interface.c:3210 +#: ../src/interface.c:3228 +#: ../src/interface.c:3246 +msgid "Left" +msgstr "Gauche" + +#: ../src/interface.c:3033 +#: ../src/interface.c:3157 +#: ../src/interface.c:3211 +#: ../src/interface.c:3229 +#: ../src/interface.c:3247 +msgid "Right" +msgstr "Droite" + +#: ../src/interface.c:3039 +msgid "Sidebar" msgstr "Barre latérale" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Liste des symboles :" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 +#: ../src/interface.c:3197 msgid "Message window:" msgstr "Fenêtre de message :" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 +#: ../src/interface.c:3233 msgid "Editor:" msgstr "Éditeur :" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Définit la police utilisée pour la fenêtre de message" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Définit la police utilisée pour la liste des symboles" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Définit la police de l'éditeur" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Polices" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Afficher les onglets de l'éditeur" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Afficher les boutons de fermeture" -#: ../src/interface.c:3084 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Affiche un petit bouton croix sur les onglets des fichiers pour les fermer " -"facilement en cliquant dessus (nécessite un redémarrage de Geany)" +#: ../src/interface.c:3130 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Affiche un petit bouton croix sur les onglets des fichiers pour les fermer facilement en cliquant dessus (nécessite un redémarrage de Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Placement des nouveaux onglets de fichier :" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Gauche" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" -msgstr "" -"Les nouveaux onglets de fichier seront placés à droite de la liste des " -"onglets" - -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Droite" +msgstr "Les nouveaux onglets de fichier seront placés à droite de la liste des onglets" -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" -msgstr "" -"Les nouveaux onglets de fichier seront placés à gauche de la liste des " -"onglets" +msgstr "Les nouveaux onglets de fichier seront placés à gauche de la liste des onglets" + +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "À côté de l'onglet courant" -#: ../src/interface.c:3110 +#: ../src/interface.c:3169 +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Placer l'onglet du fichier à côté de l'onglet actuel plutôt qu'à l'extrémité de la liste des onglets" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Un double-clic cache les fenêtres supplémentaires" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "" -"Appelle la commande Affichage->Afficher/Cacher toutes les fenêtres " -"supplémentaires" +msgstr "Appelle la commande Affichage->Afficher/Cacher toutes les fenêtres supplémentaires" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Onglets de l'éditeur" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 +#: ../src/interface.c:3230 +#: ../src/interface.c:3248 msgid "Top" msgstr "Haut" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 +#: ../src/interface.c:3231 +#: ../src/interface.c:3249 msgid "Bottom" msgstr "Bas" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Barre latérale :" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Position des onglets" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Afficher la barre d'état" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Montrer ou cacher la barre d'état au bas de la fenêtre principale" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 +#: ../src/prefs.c:1527 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Afficher la barre d'ou_tils" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Ajouter la barre d'outils au menu" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" -"Regroupe la barre d'outils avec le menu principal pour gagner de l'espace en " -"hauteur" - -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Barre d'outils" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Style des icônes :" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Taille des icônes :" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Apparence" +msgstr "Regroupe la barre d'outils avec le menu principal pour gagner de l'espace en hauteur" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 +#: ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Pa_ramètres système" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Im_ages et texte" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "_Images seulement" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "_Texte seulement" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Style des icônes" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Para_mètres système" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Petite_s icônes" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "T_rès petites icônes" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Grosses icônes" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Taille des icônes :" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barre d'outils" + +#: ../src/interface.c:3455 +#: ../src/prefs.c:1529 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Renvoi à la ligne" -#: ../src/interface.c:3393 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Coupe la ligne au bord de la fenêtre et la continue sur la ligne suivante. " -"Note : le renvoi automatique à la ligne a un coût élevé en performances pour " -"les gros documents et devrait donc être désactivé sur les machines lentes." +#: ../src/interface.c:3485 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Coupe la ligne au bord de la fenêtre et la continue sur la ligne suivante. Note : le renvoi automatique à la ligne a un coût élevé en performances pour les gros documents et devrait donc être désactivé sur les machines lentes." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Activer la touche home \"intelligente\"" -#: ../src/interface.c:3398 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Quand la touche home \"intelligente\" est activée, la touche HOME déplacera " -"le curseur au premier caractère significatif de la ligne, à moins qu'il y " -"soit déjà, auquel cas il sera déplacé au début de la ligne. Lorsque cette " -"fonctionnalité est désactivée, la touche HOME déplace toujours le curseur au " -"début de la ligne courante, peu importe sa position actuelle." +#: ../src/interface.c:3490 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Quand la touche home \"intelligente\" est activée, la touche HOME déplacera le curseur au premier caractère significatif de la ligne, à moins qu'il y soit déjà, auquel cas il sera déplacé au début de la ligne. Lorsque cette fonctionnalité est désactivée, la touche HOME déplace toujours le curseur au début de la ligne courante, peu importe sa position actuelle." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Désactiver le glisser-déposer" -#: ../src/interface.c:3403 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Désactiver complètement le glisser-déposer dans la fenêtre d'édition pour " -"éviter de pouvoir glisser-déposer toute sélection à l'intérieur ou " -"l'extérieur de la fenêtre d'édition" +#: ../src/interface.c:3495 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Désactiver complètement le glisser-déposer dans la fenêtre d'édition pour éviter de pouvoir glisser-déposer toute sélection à l'intérieur ou l'extérieur de la fenêtre d'édition" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Activer le pliage" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Active ou non le pliage du code" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Déplier/Replier tous les éléments fils d'un point de pliage" -#: ../src/interface.c:3413 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Plier ou déplier tous les éléments fils d'un point de pliage. En appuyant " -"sur la touche Shift lors d'un clic sur un symbole de repli le comportement " -"inverse se produit." +#: ../src/interface.c:3505 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Plier ou déplier tous les éléments fils d'un point de pliage. En appuyant sur la touche Shift lors d'un clic sur un symbole de repli le comportement inverse se produit." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Utiliser les indicateurs d'erreurs de compilation" # squiggly fait reference au style du soulignage (une ligne brisée) -#: ../src/interface.c:3418 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Utilise ou non les indicateurs (un soulignage) pour mettre en avant les " -"lignes ou le compilateur a trouvé un avertissement ou une erreur" +#: ../src/interface.c:3510 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Utilise ou non les indicateurs (un soulignage) pour mettre en avant les lignes ou le compilateur a trouvé un avertissement ou une erreur" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Un passage à la ligne enlève les espaces de fin de ligne" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "" -"Autoriser le retour à la ligne à supprimer les espaces de fin de la ligne " -"précédente" +msgstr "Autoriser le retour à la ligne à supprimer les espaces de fin de la ligne précédente" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Colonne de retour à la ligne :" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Marqueur de commentaire :" -#: ../src/interface.c:3450 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Une chaîne de caractères qui est ajoutée quand on utilise la commande " -"\"Commenter/Décommenter la ligne\", elle sert à marquer le commentaire." +#: ../src/interface.c:3542 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Une chaîne de caractères qui est ajoutée quand on utilise la commande \"Commenter/Décommenter la ligne\", elle sert à marquer le commentaire." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 +#: ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Mode d'indentation automatique :" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 +#: ../src/interface.c:5207 msgid "Basic" msgstr "Basique" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 +#: ../src/interface.c:5208 msgid "Current chars" msgstr "Caractères courants" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 +#: ../src/interface.c:5209 msgid "Match braces" msgstr "Accolades correspondantes" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 +#: ../src/interface.c:3925 +#: ../src/interface.c:5211 msgid "Type:" msgstr "Type :" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 +#: ../src/interface.c:5218 msgid "Width:" msgstr "Largeur :" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 +#: ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "La largeur, en caractères, d'une indentation simple" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 +#: ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Utiliser des espaces pour l'indentation" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 +#: ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Utiliser une tabulation par indentation" -#: ../src/interface.c:3554 ../src/interface.c:5122 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Utiliser des espaces si l'indentation totale est inférieure à la taille de " -"la tabulation, sinon utiliser les deux" - -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Largeur des tabulations :" +#: ../src/interface.c:3647 +#: ../src/interface.c:5259 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Utiliser des espaces si l'indentation totale est inférieure à la taille de la tabulation, sinon utiliser les deux" -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"La largeur d'une tabulation, quand tabulations et espaces sont définis pour " -"un document" - -#: ../src/interface.c:3587 ../src/interface.c:5155 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Détecter ou non le type d'indentation depuis le contenu d'un fichier lors de " -"son ouverture" +#: ../src/interface.c:3656 +#: ../src/interface.c:5268 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Détecter ou non le type d'indentation depuis le contenu d'un fichier lors de son ouverture" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Indentation par la touche Tab " -#: ../src/interface.c:3592 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Appuyer sur Tab/Shift-Tab augmente/diminue l'indentation au lieu d'insérer " -"une tabulation" +#: ../src/interface.c:3661 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Appuyer sur Tab/Shift-Tab augmente/diminue l'indentation au lieu d'insérer une tabulation" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 +#: ../src/interface.c:5270 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Complétion des snippets" -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Entrez une courte séquence de caractères prédéfinie et complétez la pour " -"obtenir une chaîne plus complexe en utilisant une seule touche" +#: ../src/interface.c:3694 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Entrez une courte séquence de caractères prédéfinie et complétez la pour obtenir une chaîne plus complexe en utilisant une seule touche" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Complétion automatique des balises XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" -msgstr "" -"Complétion et fermeture automatique des balises XML ouvertes (cela inclut " -"les balises HTML)" +msgstr "Complétion et fermeture automatique des balises XML ouvertes (cela inclut les balises HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Continuation automatique des commentaires multi-lignes" -#: ../src/interface.c:3635 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Continue automatiquement les commentaires multi-lignes dans des langages " -"tels que C, C++ et Java, quand une nouvelle ligne est entrée dans un tel " -"commentaire" +#: ../src/interface.c:3704 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Continue automatiquement les commentaires multi-lignes dans des langages tels que C, C++ et Java, quand une nouvelle ligne est entrée dans un tel commentaire" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Compléter automatiquement les symboles" -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Complétion automatique des symboles connus dans les fichiers ouverts (noms " -"des fonctions, variables globales...)" +#: ../src/interface.c:3709 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Complétion automatique des symboles connus dans les fichiers ouverts (noms des fonctions, variables globales...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Compléter automatiquement tous les mots du document" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Supprimer le reste du mot lors de la complétion" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Nombre maximum de suggestions de nom de symbole :" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Hauteur de la liste de complétion :" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Caractères à taper pour la complétion automatique :" -#: ../src/interface.c:3683 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" -msgstr "" -"Le nombre de caractères nécessaires pour afficher la liste de complétion " -"automatique des symboles" +#: ../src/interface.c:3752 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" +msgstr "Le nombre de caractères nécessaires pour afficher la liste de complétion automatique des symboles" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Nombre de lignes à afficher dans la liste de complétion automatique" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "" -"Nombre maximum d'entrées à afficher dans la liste de complétion automatique" +msgstr "Nombre maximum d'entrées à afficher dans la liste de complétion automatique" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Parenthèses ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" -msgstr "" -"Ferme automatiquement les parenthèses lors de l'écriture d'une parenthèse " -"ouvrante" +msgstr "Ferme automatiquement les parenthèses lors de l'écriture d'une parenthèse ouvrante" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Guillemets simples ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" -msgstr "" -"Ferme automatiquement les guillemets simples lors de l'écriture d'un " -"guillemet ouvrant" +msgstr "Ferme automatiquement les guillemets simples lors de l'écriture d'un guillemet ouvrant" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Accolades { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" -msgstr "" -"Ferme automatiquement les accolades lors de l'écriture d'une accolade " -"ouvrante" +msgstr "Ferme automatiquement les accolades lors de l'écriture d'une accolade ouvrante" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Crochets [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" -"Ferme automatiquement les crochets lors de l'écriture d'un crochet ouvrant" +msgstr "Ferme automatiquement les crochets lors de l'écriture d'un crochet ouvrant" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Guillemets doubles \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" -msgstr "" -"Ferme automatiquement les guillemets doubles lors de l'écriture d'un " -"guillemet ouvrant" +msgstr "Ferme automatiquement les guillemets doubles lors de l'écriture d'un guillemet ouvrant" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Fermeture automatique des guillemets, accolades et crochets" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Inverser les couleurs de la coloration syntaxique" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Utilise un texte blanc sur fond noir et inverse toutes les couleurs; cette " -"option nécessite un redémarrage de Geany." +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Inverser toutes les couleurs, par défaut en utilisant un texte blanc sur fond noir" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Afficher les guides d'indentation" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Affiche de petites lignes pointillées pour aider à utiliser la bonne " -"indentation" +msgstr "Affiche de petites lignes pointillées pour aider à utiliser la bonne indentation" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Afficher les espaces" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marque les espaces avec des points et les tabulations avec des flèches" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Afficher les fins de lignes" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Affiche le caractère de fin de ligne" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Affiche ou masque la marge des numéros de ligne" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Afficher la marge des marqueurs" -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Affiche ou masque la petite marge à droite des numéros des lignes, qui est " -"utilisée pour marquer les lignes" +#: ../src/interface.c:3883 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Affiche ou masque la petite marge à droite des numéros des lignes, qui est utilisée pour marquer les lignes" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Arrêter le défilement à la dernière ligne" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "" -"Permet d'arrêter le défilement une page après la dernière ligne d'un document" +msgstr "Permet d'arrêter le défilement une page après la dernière ligne d'un document" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Marqueur des longues lignes :" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Couleur du marqueur des longues lignes :" +#: ../src/interface.c:3911 +#: ../src/interface.c:5302 +msgid "Column:" +msgstr "Colonne :" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Couleur :" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Définit la couleur du marqueur des longues lignes" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 +#: ../src/toolbar.c:71 +#: ../src/tools.c:717 +#: ../src/vte.c:765 +#: ../src/vte.c:772 msgid "Color Chooser" msgstr "Sélecteur de couleur" -#: ../src/interface.c:3878 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"Le marqueur des longues lignes est une fine ligne verticale dans l'éditeur. " -"Il aide à marquer les longues lignes, ou sert d'indice pour revenir à la " -"ligne. Définissez une valeur supérieure à 0 pour spécifier la colonne où il " -"devrait apparaître." +#: ../src/interface.c:3946 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Le marqueur des longues lignes est une fine ligne verticale dans l'éditeur. Il aide à marquer les longues lignes, ou sert d'indice pour revenir à la ligne. Définissez une valeur supérieure à 0 pour spécifier la colonne où il devrait apparaître." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Ligne" -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Affiche une ligne verticale dans la fenêtre de l'éditeur à la position " -"donnée (voir plus bas)" +#: ../src/interface.c:3959 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Affiche une ligne verticale dans la fenêtre de l'éditeur à la position donnée (voir plus bas)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Fond" -#: ../src/interface.c:3898 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"La couleur de fond des caractères après la position donnée (voir plus bas) " -"est changée pour la couleur définie plus bas. (Ceci est recommandé si vous " -"utilisez des polices proportionnelles)" +#: ../src/interface.c:3966 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "La couleur de fond des caractères après la position donnée (voir plus bas) est changée pour la couleur définie plus bas. (Ceci est recommandé si vous utilisez des polices proportionnelles)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Activé" -#: ../src/interface.c:3902 +#: ../src/interface.c:3976 +#: ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Marqueur des longues lignes" + +#: ../src/interface.c:3995 +#: ../src/interface.c:5309 msgid "Disabled" msgstr "Désactivé" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Marqueur des longues lignes" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Ne pas afficher les espaces virtuels" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Seulement pour les sélections rectangulaires" + +#: ../src/interface.c:4005 +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Affiche les espaces virtuels après les fins de lignes seulement lors d'une sélection rectangulaire" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Toujours" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Toujours afficher les espaces virtuels après les fins de lignes" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Espaces virtuels" -#: ../src/interface.c:3913 +#: ../src/interface.c:4021 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Ouvrir les nouveaux documents depuis la ligne de commande" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "" -"Ouvrir un nouveau fichier pour chaque nom de fichier inexistant spécifié en " -"ligne de commande" +msgstr "Ouvrir un nouveau fichier pour chaque nom de fichier inexistant spécifié en ligne de commande" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Caractères de fin de ligne par défaut :" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nouveaux fichiers" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "" -"Définit le jeu de caractères utilisés par défaut lors de la création de " -"nouveaux fichiers" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Encodage par défaut (nouveaux fichiers) :" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Encodage par défaut (fichiers existants) :" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Définit le jeu de caractères utilisés par défaut lors de la création de nouveaux fichiers" -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "" -"Définit le jeu de caractères utilisé par défaut lors de l'ouverture de " -"fichiers existants" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Utiliser un encodage fixe lors de l'ouverture des fichiers non-Unicode" + +#: ../src/interface.c:4116 +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Cette option désactive la détection automatique de l'encodage lors de l'ouverture des fichiers non-Unicode et ouvre le fichier avec l'encodage spécifié (non requis habituellement)" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Utiliser un encodage fixe lors de l'ouverture des fichiers" +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Encodage par défaut (fichiers existants non-Unicode) :" -#: ../src/interface.c:4030 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" -msgstr "" -"Cette option désactive la détection automatique de l'encodage lors de " -"l'ouverture des fichiers et ouvre le fichier avec l'encodage spécifié (non " -"requis habituellement)" +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Définit le jeu de caractères utilisé par défaut lors de l'ouverture de fichiers existants non-Unicode" -#: ../src/interface.c:4032 +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Encodage" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Nouvelle ligne à la fin du fichier" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Garantit que la dernière ligne du fichier est une nouvelle ligne" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Enlever les espaces et tabulations de fin" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Enlève les espaces et tabulations restants à la fin des lignes" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 +#: ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Remplacer les tabulations par des espaces" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Remplace toutes les tabulations du document par des espaces" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Enregistrement des fichiers" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Longueur de la liste des fichiers récents :" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "" -"Spécifie le nombre de fichiers conservés dans la liste des fichiers récents" +msgstr "Spécifie le nombre de fichiers conservés dans la liste des fichiers récents" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Intervalle de vérification du disque :" -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Intervalle de vérification périodique des modifications des fichiers sur le " -"disque, en secondes. Zéro signifie qu'aucune vérification péridoque n'est " -"faite." - -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4226 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Intervalle de vérification périodique des modifications des fichiers sur le disque, en secondes. Zéro signifie qu'aucune vérification péridoque n'est faite." + +#: ../src/interface.c:4235 +#: ../src/prefs.c:1533 +#: ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Fichiers" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make :" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal :" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Navigateur :" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Chemin et options pour l'outil make" - -#: ../src/interface.c:4197 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Un émulateur de terminal comme xterm, gnome-terminal ou konsole (doit " -"accepter l'option -e )" +#: ../src/interface.c:4287 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Un émulateur de terminal comme xterm, gnome-terminal ou konsole (doit accepter l'option -e )" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" -msgstr "" -"Chemin (et options supplémentaires si nécessaire) vers votre navigateur " -"favori" +msgstr "Chemin (et options supplémentaires si nécessaire) vers votre navigateur favori" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep :" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Chemins des outils" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Action contextuelle :" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Commande d'action contextuelle. Le mot sélectionné peut être utilisé avec %" -"s. Il peut être placé n'importe où dans la commande donnée et sera remplacé " -"avant exécution." +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Commande d'action contextuelle. Le mot sélectionné peut être utilisé avec %s. Il peut être placé n'importe où dans la commande donnée et sera remplacé avant exécution." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Commandes" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 +#: ../src/keybindings.c:560 +#: ../src/prefs.c:1535 msgid "Tools" msgstr "Outils" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "adresse e-mail du développeur" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Initiales du nom du développeur" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Version initiale :" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Numéro de version, qu'un nouveau fichier contient initialement" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Nom de l'entreprise" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Développeur :" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Entreprise :" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Adresse e-mail :" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Initiales :" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Le nom du développeur" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Année :" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Date :" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Date et heure :" -#: ../src/interface.c:4434 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Entrez ici un format de date et d'heure personnalisé. Vous pouvez utiliser " -"tous les spécificateurs de conversion qui peuvent être utilisés avec la " -"fonction C ANSI strftime." +#: ../src/interface.c:4518 +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Entrez ici un format de date et d'heure personnalisé. Vous pouvez utiliser tous les spécificateurs de conversion qui peuvent être utilisés avec la fonction C ANSI strftime." -#: ../src/interface.c:4441 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Entrez ici un format d'année personnalisé. Vous pouvez utiliser tous les " -"spécificateurs de conversion qui peuvent être utilisés avec la fonction C " -"ANSI strftime." +#: ../src/interface.c:4525 +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Entrez ici un format d'année personnalisé. Vous pouvez utiliser tous les spécificateurs de conversion qui peuvent être utilisés avec la fonction C ANSI strftime." -#: ../src/interface.c:4448 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Entrez ici un format de date personnalisé. Vous pouvez utiliser tous les " -"spécificateurs de conversion qui peuvent être utilisés avec la fonction C " -"ANSI strftime." +#: ../src/interface.c:4532 +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Entrez ici un format de date personnalisé. Vous pouvez utiliser tous les spécificateurs de conversion qui peuvent être utilisés avec la fonction C ANSI strftime." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Données des modèles" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 +#: ../src/prefs.c:1537 msgid "Templates" msgstr "Modèles" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "C_hanger" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 +#: ../src/prefs.c:1539 msgid "Keybindings" msgstr "Raccourcis" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Commande :" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" -msgstr "" -"Chemin vers la commande à utiliser pour imprimer les fichiers (utiliser %f " -"pour le nom du fichier)" +msgstr "Chemin vers la commande à utiliser pour imprimer les fichiers (utiliser %f pour le nom du fichier)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Utiliser une commande externe pour imprimer" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 +#: ../src/printing.c:381 msgid "Print line numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 +#: ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Ajouter les numéros de lignes à la page imprimée" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 +#: ../src/printing.c:386 msgid "Print page numbers" msgstr "Afficher les numéros de page" -#: ../src/interface.c:4570 ../src/printing.c:387 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Ajouter la numérotation des pages en bas de chaque page. Cela prend 2 lignes " -"par page." +#: ../src/interface.c:4665 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Ajouter la numérotation des pages en bas de chaque page. Cela prend 2 lignes par page." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 +#: ../src/printing.c:391 msgid "Print page header" msgstr "Afficher les en-têtes des pages" -#: ../src/interface.c:4575 ../src/printing.c:392 -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Ajoute un court en-tête à chaque page contenant le numéro de page, le nom du " -"fichier et la date (voir ci-après). Cela prend 3 lignes par page." +#: ../src/interface.c:4670 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Ajoute un court en-tête à chaque page contenant le numéro de page, le nom du fichier et la date (voir ci-après). Cela prend 3 lignes par page." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 +#: ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Utiliser le nom court du fichier à imprimer" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimer seulement le nom (sans le chemin) du fichier à imprimer" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 +#: ../src/printing.c:417 msgid "Date format:" msgstr "Format de date :" -#: ../src/interface.c:4608 ../src/printing.c:422 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Entrez ici un format de date et d'heure personnalisé qui sera ajouté à l'en-" -"tête de chaque page. Vous pouvez utiliser tous les spécificateurs de " -"conversion qui peuvent être utilisés avec la fonction C ANSI strftime." +#: ../src/interface.c:4703 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Entrez ici un format de date et d'heure personnalisé qui sera ajouté à l'en-tête de chaque page. Vous pouvez utiliser tous les spécificateurs de conversion qui peuvent être utilisés avec la fonction C ANSI strftime." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Utiliser l'impression GTK native" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Impression" + +#: ../src/interface.c:4717 +#: ../src/prefs.c:1541 msgid "Printing" msgstr "Imprimer" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Propriétés du projet" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Affichage :" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Personnalisé" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Utiliser les préférences globales" + +#: ../src/keybindings.c:227 +#: ../src/plugins.c:1171 msgid "File" msgstr "Fichier" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nouveau" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Ouvrir" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Ouvrir le fichier sélectionné" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Enregistrer" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Enregistrer sous" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Tout enregistrer" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Imprimer" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Fermer" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Tout fermer" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Recharger le fichier" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Rouvrir le dernier onglet fermé" + +#: ../src/keybindings.c:255 +#: ../src/project.c:519 msgid "Project" msgstr "Projet" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Propriétés du projet" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Annuler" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Refaire" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Dupliquer la ligne ou la sélection" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Effacer le(s) ligne(s) courante(s)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Effacer jusqu'à la fin de la ligne" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Intervertir la ligne courante" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Défiler vers la ligne courante" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Faire défiler la vue d'une ligne vers le haut" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Faire défiler la vue d'une ligne vers le bas" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Compléter le snippet" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Déplacer le curseur dans le snippet" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Supprimer la complétion du snippet" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Action contextuelle" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Compléter le mot" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Afficher la bulle d'aide" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Afficher la liste des macros" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Complétion des parties de mots" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Déplacer la(les) ligne(s) vers le haut" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Déplacer la(les) ligne(s) vers le bas" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Presse-papiers" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Couper" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copier" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Coller" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copier le(s) ligne(s) courante(s)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Couper le(s) ligne(s) courante(s)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Sélection" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Tout sélectionner" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Selectionner le mot courant" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Sélectionner la(les) ligne(s) courante(s)" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Sélectionner le paragraphe courant" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Sélectionner la section de mot précédente" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Sélectionner la section de mot suivante" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Modifier la casse de la sélection" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Commenter/Décommenter la ligne" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Commenter la(les) ligne(s)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Décommenter la(les) ligne(s)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Augmenter l'indentation" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Diminuer l'indentation" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Augmenter l'indentation d'une espace" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Diminuer l'indentation d'une espace" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Indentation intelligente des lignes " - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Envoyer vers la commande personnalisée 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Envoyer vers la commande personnalisée 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Envoyer vers la commande personnalisée 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Envoyer la sélection vers le terminal" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "Reformater les lignes/blocs" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Insérer" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Insérer la date" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Insérer un espacement alternatif" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Préférences" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 +#: ../src/toolbar.c:381 msgid "Search" msgstr "Recherche" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 +#: ../src/search.c:396 msgid "Find" msgstr "Rechercher" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Rechercher le suivant" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Rechercher le précédent" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Rechercher la sélection" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Rechercher la sélection vers l'arrière" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 +#: ../src/search.c:541 msgid "Replace" msgstr "Remplacer" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 +#: ../src/search.c:715 msgid "Find in Files" msgstr "Rechercher dans les fichiers" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Message suivant" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Message précédent" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Utiliser la recherche" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Rechercher dans le document" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Tout marquer" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Déplacements" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 +#: ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Naviguer en arrière vers une position" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 +#: ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Naviguer en avant vers une position" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Se rendre à l'accolade correspondante" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Ajouter/Supprimer un marqueur" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Se rendre au marqueur suivant" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Se rendre au marqueur précédent" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Aller à la définition du symbole" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Aller à la déclaration du symbole" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Aller au début de la ligne" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Aller à la fin de la ligne" # fin de la ligne virtuelle si word wrapping -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Aller à la fin de la ligne affichée" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Aller à la section de mot précédente" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Aller à la section de mot suivante" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Affichage" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Afficher/Cacher toutes les fenêtres supplémentaires" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Plein écran" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Afficher/Cacher la fenêtre de messages" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Afficher/Cacher la barre latérale" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Zoom avant" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Zoom arrière" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Zoom normal" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Basculer vers l'éditeur" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Basculer vers les notes" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Basculer vers le VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Basculer vers la barre de recherche" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Basculer vers la barre latérale" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Basculer vers le compilateur" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Basculer vers les messages" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Basculer vers la fenêtre de messages" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Basculer vers la liste des documents de la barre latérale" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Basculer vers la liste des symboles de la barre latérale" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Onglets" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Basculer vers le document de gauche" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Basculer vers le document de droite" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Basculer vers le dernier document utilisé" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Déplacer le document vers la gauche" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Déplacer le document vers la droite" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Déplacer le document en première position" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Déplacer le document en dernière position" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Basculer le renvoi à la ligne" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Basculer le retour à la ligne" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Remplacer les espaces par des tabulations" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Basculer le pliage courant" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Tout plier" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Tout déplier" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Recharger la liste des symboles" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Supprimer les marqueurs" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Supprimer les indicateurs d'erreurs" + +#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 +#: ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Construire" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 +#: ../src/toolbar.c:69 msgid "Compile" msgstr "Compiler" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make custom target" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Erreur suivante" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Erreur précédente" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Exécuter" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Exécuter (commande alternative)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Options de construction" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Afficher le sélecteur de couleurs" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Help" msgstr "Aide" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Raccourcis clavier" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Les raccourcis clavier suivants peuvent être configurés :" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Basculer vers le document" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" -"Écrivez ici ce que vous souhaitez, utilisez cela comme comme un tableau de " -"notes" +msgstr "Écrivez ici ce que vous souhaitez, utilisez cela comme comme un tableau de notes" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Impossible de charger un ou plusieurs fichiers de session." @@ -3218,119 +3266,112 @@ msgid "Debug Messages" msgstr "Messages de débogage" -#: ../src/main.c:124 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"Définit la colonne initiale pour le premier fichier ouvert (utile en " -"association avec --line)" +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "_Effacer" + +#: ../src/main.c:122 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Définit la colonne initiale pour le premier fichier ouvert (utile en association avec --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Utiliser un dossier de configuration alternatif" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Mode verbeux" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Afficher les types de fichier internes" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Générer un fichier de tags global (voir la documentation)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" -msgstr "" -"Ne pas utiliser le préprocesseur lors de la génération de tags pour les " -"fichiers C/C++" +msgstr "Ne pas utiliser le préprocesseur lors de la génération de tags pour les fichiers C/C++" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" -"Ne pas ouvrir les fichiers dans l'instance courante, forcer l'ouverture dans " -"une nouvelle instance" +msgstr "Ne pas ouvrir les fichiers dans l'instance courante, forcer l'ouverture dans une nouvelle instance" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Utiliser ce nom de fichier comme socket pour communiquer avec une instance de Geany en cours d'exécution" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Renvoie une liste de tous les documents ouverts dans une instance de Geany en cours d'exécution" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Définit la ligne initiale pour le premier fichier ouvert" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Ne pas afficher la fenêtre de message au démarrage" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" -msgstr "" -"Ne pas charger les données de complétion automatique (voir la documentation)" +msgstr "Ne pas charger les données de complétion automatique (voir la documentation)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Ne pas charger les plugins" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Imprime le préfixe de l'installation de Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Ne pas charger les fichiers des sessions précédentes" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Ne pas charger le support du terminal" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Nom du fichier libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Mode verbeux" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Afficher la version et quitter" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FICHIERS...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(construit le %s avec GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Le déplacer maintenant ?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." -msgstr "" -"Geany doit déplacer votre ancien dossier de configuration avant de démarrer." +msgstr "Geany doit déplacer votre ancien dossier de configuration avant de démarrer." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." -msgstr "" -"Votre dossier de configuration a été déplacé avec succès de \"%s\" vers \"%s" -"\"." +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." +msgstr "Votre dossier de configuration a été déplacé avec succès de \"%s\" vers \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"Votre ancien dossier de configuration \"%s\" n'a pu être déplacé vers \"%s" -"\" (%s). Veuillez déplacer manuellement le dossier vers le nouvel " -"emplacement." +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "Votre ancien dossier de configuration \"%s\" n'a pu être déplacé vers \"%s\" (%s). Veuillez déplacer manuellement le dossier vers le nouvel emplacement." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3338,55 +3379,53 @@ "Start Geany anyway?" msgstr "" "Le dossier de configuration n'a pas pu être créé (%s).\n" -"Il peut y avoir des problèmes à l'utilisation de Geany sans dossier de " -"configuration.\n" +"Il peut y avoir des problèmes à l'utilisation de Geany sans dossier de configuration.\n" "Lancer Geany quand même ?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Impossible de trouver le fichier '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Voici Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Le dossier de configuration n'a pas pu être créé (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Fichiers de configuration rechargés." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Messages de statut" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "C_opier" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "To_ut copier" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Cac_her la fenêtre de message" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +msgid "Could not find file '%s' - trying the current document path." +msgstr "Impossible de trouver le fichier '%s' - essayez le chemin du document courant." + +#: ../src/plugins.c:464 #, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"Le plugin \"%s\" n'est pas compatible au niveau binaire avec cette version " -"de Geany - Veuillez le recompiler." +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "Le plugin \"%s\" n'est pas compatible au niveau binaire avec cette version de Geany - Veuillez le recompiler." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Gestionnaire de _plugin" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3397,181 +3436,161 @@ "Description : %s\n" "Auteur(s) : %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Actif" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Aucun plugin disponible." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Ci-dessous se trouve la liste des modules disponibles. Sélectionnez les " -"modules qui pourraient être chargés quand Geany est démarré." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Choisissez les plugins à charger au démarrage :" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Détails du plugin :" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configurer les plugins" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Entrer une touche" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." -msgstr "" -"Tapez la combinaison de touches que vous souhaitez utiliser pour \"%s\"" +msgstr "Tapez la combinaison de touches que vous souhaitez utiliser pour \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 +#: ../src/symbols.c:1866 msgid "_Expand All" msgstr "Tout dépli_er" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 +#: ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Tout _replier" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Action" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Raccourci" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Autoriser les deux" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "Écras_er" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Écraser ce raccourci ?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinaison '%s' est déjà utilisée pour \"%s\"." +#: ../src/prefs.c:1543 +#: ../src/vte.c:269 +#: ../src/vte.c:723 +#: ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Entrer les chemins vers les outils ici. Les chemins vers les outils dont " -"vous n'avez pas besoin peuvent être laissés vides." +msgstr "Entrer les chemins vers les outils ici. Les chemins vers les outils dont vous n'avez pas besoin peuvent être laissés vides." #. page Templates -#: ../src/prefs.c:1519 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" -"Spécifier ici les informations à utiliser dans les modèles. Voir la " -"documentation pour plus de détails." - -#: ../src/prefs.c:1523 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany or force the reload of the settings using Tools->Reload Configuration." -"" -msgstr "" -"Note : vous devrez relancer Geany pour que tous les changements effectués " -"ici prennent effet, ou bien vous pouvez forcer Geany à recharger les " -"paramètres en utilisant le menu Outils -> Recharger la configuration." +#: ../src/prefs.c:1624 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Spécifier ici les informations à utiliser dans les modèles. Voir la documentation pour plus de détails." + +#: ../src/prefs.c:1628 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." +msgstr "Note : vous devrez relancer Geany pour que tous les changements effectués ici prennent effet, ou bien vous pouvez forcer Geany à recharger les paramètres en utilisant le menu Outils -> Recharger la configuration." #. page Keybindings -#: ../src/prefs.c:1529 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Vous pouvez ici changer les raccourcis clavier pour diverses actions. " -"Choisissez une action et appuyez sur le bouton Changer pour entrer un " -"nouveau raccourci, Ou double-cliquez sur une action pour éditer la chaîne de " -"caractères représentant le raccourci." +#: ../src/prefs.c:1634 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Vous pouvez ici changer les raccourcis clavier pour diverses actions. Choisissez une action et appuyez sur le bouton Changer pour entrer un nouveau raccourci, Ou double-cliquez sur une action pour éditer la chaîne de caractères représentant le raccourci." #. page Printing -#: ../src/prefs.c:1534 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" -"Note : l'impression GTK native est uniquement disponible si Geany a été " -"compilé avec GTK 2.10 (ou supérieur) et Geany fonctionne avec GTK " -"2.10 (ou supérieur)." +#: ../src/prefs.c:1639 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Note : l'impression GTK native est uniquement disponible si Geany a été compilé avec GTK 2.10 (ou supérieur) et Geany fonctionne avec GTK 2.10 (ou supérieur)." #. page Editor->Indentation -#: ../src/prefs.c:1540 -msgid "" -"Warning: these settings are overridden by the current project. See " -"Project->Properties." -msgstr "" -"Avertissement : ces préférences sont remplacées par celles du projet " -"courant. Voir Projet->Propriétés." +#: ../src/prefs.c:1645 +msgid "Warning: these settings are overridden by the current project. See Project->Properties." +msgstr "Avertissement : ces préférences sont remplacées par celles du projet courant. Voir Projet->Propriétés." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" -"La police de caractères de l'éditeur n'est pas une police à chasse fixe !" +msgstr "La police de caractères de l'éditeur n'est pas une police à chasse fixe !" #: ../src/printing.c:189 msgid "Text will be wrongly spaced." msgstr "Le texte sera espacé de façon incorrecte." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Page %d sur %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Mise en forme du document" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" -msgstr "" -"Imprimer seulement le nom de base (sans le chemin) du fichier à imprimer" +msgstr "Imprimer seulement le nom de base (sans le chemin) du fichier à imprimer" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Page %d sur %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "L'impression du fichier %s a été annulée." +msgid "Did not send document %s to the printing subsystem." +msgstr "Le document %s n'a pas été envoyé au sous-système d'impression." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Le fichier %s a été imprimé." +msgid "Document %s was sent to the printing subsystem." +msgstr "Le document %s a été envoyé au sous-système d'impression." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "L'impression de %s a échoué (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." -msgstr "" -"Veuillez d'abord définir une commande d'impression dans la fenêtre des " -"préférences." +msgstr "Veuillez d'abord définir une commande d'impression dans la fenêtre des préférences." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3582,593 +3601,664 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "L'impression de \"%s\" a échoué (code de retour : %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Le fichier %s a été imprimé." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projets" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Nouveau projet" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "C_réer" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 +#: ../src/project.c:413 msgid "Name:" msgstr "Nom :" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 +#: ../src/project.c:426 msgid "Filename:" msgstr "Nom de fichier :" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 +#: ../src/project.c:456 msgid "Base path:" msgstr "Dossier de base :" -#: ../src/project.c:171 ../src/project.c:438 -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 "" -"Dossier de base pour tous les fichiers du projet. Cela peut être un nouveau " -"chemin, ou un dossier existant. Vous pouvez utiliser des chemins relatifs au " -"nom du projet." +#: ../src/project.c:170 +#: ../src/project.c:465 +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 "Dossier de base pour tous les fichiers du projet. Cela peut être un nouveau chemin, ou un dossier existant. Vous pouvez utiliser des chemins relatifs au nom du projet." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 +#: ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Choisir le dossier de base du projet" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 +#: ../src/project.c:263 +#: ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Le fichier de projet \"%s\" n'a pu être chargé." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 +#: ../src/project.c:269 msgid "Open Project" msgstr "Ouvrir un projet" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Fichiers de projet" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projet \"%s\" fermé." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Description :" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Lancer Make dans le dossier de base" - -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Commande à lancer :" - -#: ../src/project.c:461 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" -"Ligne de commande à exécuter dans le dossier de base du projet. Des " -"paramètres peuvent être ajoutés à la commande. Laissez vide pour utiliser la " -"commande à exécuter par défaut." +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Utiliser le dossier de base pour les commandes de construction sans type de fichier :" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Définir" + +#: ../src/project.c:486 +msgid "Set the working directories (on the Build tab) for the non-filetype build commands to use the base path" +msgstr "Définit le dossier de base comme le dossier de travail (du menu Construction) pour les commandes de construction sans type de fichier" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Modèles de fichier :" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Voulez-vous le fermer avant de continuer ?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Le projet '%s' est déjà ouvert." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Le nom de projet spécifié est trop court." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Le nom de projet spécifié est trop long (maximum %d caractères)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Vous avez spécifié un nom de fichier de projet invalide." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Créer le dossier de base du projet ?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Le chemin \"%s\" est inexistant." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Le dossier de base du projet n'a pu être créé (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Le fichier de projet n'a pas pu être écrit (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projet \"%s\" créé." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projet \"%s\" enregistré." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 +#: ../src/project.c:872 msgid "Choose Project Filename" msgstr "Choix du nom du fichier du projet" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Choix de la commande d'exécution du projet" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projet \"%s\" ouvert." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Utiliser des expressions régulières" -#: ../src/search.c:220 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" -"Utiliser les expressions régulières de type POSIX. Pour des informations " -"détaillées à propos de l'utilisation des expressions régulières, veuillez " -"lire la documentation." +#: ../src/search.c:237 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Utiliser les expressions régulières de type POSIX. Pour des informations détaillées à propos de l'utilisation des expressions régulières, veuillez lire la documentation." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Rechercher vers _l'arrière" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Utiliser les séquences d'échapp_ement" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" msgstr "" -"Remplacer \\\\, \\t, \\n, \\r et \\uXXXX (caractères Unicode) par les " -"caractères de contrôle correspondants" +"Remplacer \\\\, \\t, \\n" +", \\r et \\uXXXX (caractères Unicode) par les caractères de contrôle correspondants" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 +#: ../src/search.c:810 msgid "C_ase sensitive" msgstr "Sensible à la c_asse" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 +#: ../src/search.c:816 msgid "Match only a _whole word" msgstr "Correspondre _seulement avec un mot entier" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Co_rrespondre avec le début du mot" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Précédent" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "Suiva_nt" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 +#: ../src/search.c:562 +#: ../src/search.c:740 msgid "_Search for:" msgstr "Re_chercher :" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Tout _trouver" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Marquer" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Marque toutes les correspondances dans le document courant" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 +#: ../src/search.c:622 msgid "In Sessi_on" msgstr "Dans la sessi_on" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 +#: ../src/search.c:627 msgid "_In Document" msgstr "Dans le _document" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 +#: ../src/search.c:640 msgid "Close _dialog" msgstr "Fermer la _fenêtre" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 +#: ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Désactivez cette option pour laisser la fenêtre ouverte" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Remplacer et Rec_hercher" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Rem_placer par :" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Rempl_acer tout" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Dans la sé_lection" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" -msgstr "" -"Remplacer toutes les correspondances trouvées dans le texte actuellement " -"sélectionné" +msgstr "Remplacer toutes les correspondances trouvées dans le texte actuellement sélectionné" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Dossier :" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "E_ncodage :" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Chaînes _fixes" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Expressions régulières de _Grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 +#: ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Voir la page de manuel de grep pour plus d'informations" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Expressions régulières ét_endues" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Recherche _récursive dans les sous-dossiers" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Inverser les résultats des recherches" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" -msgstr "" -"Inverse le sens des correspondances, pour sélectionner les lignes non " -"correspondantes" +msgstr "Inverse le sens des correspondances, pour sélectionner les lignes non correspondantes" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "_Options supplémentaires :" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Autres options à passer à grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 +#: ../src/search.c:1881 +#: ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d correspondances trouvées pour \"%s\"." msgstr[1] "%d correspondance trouvée pour \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Texte remplacé dans %u fichier." -msgstr[1] "Texte remplacé dans %u fichiers." +msgid "Replaced %u matches in %u documents." +msgstr "%u correspondances remplacées dans %u documents." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Dossier invalide pour la recherche dans les fichiers." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Pas de texte à rechercher." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" -"Impossible d'exécuter l'outil grep '%s'; vérifiez la configuration du chemin " -"dans les Préférences." +msgstr "Impossible d'exécuter l'outil grep '%s'; vérifiez la configuration du chemin dans les Préférences." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Recherche en cours..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (dans le dossier : %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Impossible d'ouvrir le dossier (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"La recherche a échoué (voir Aide->Messages de débogage pour plus de détails)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Recherche échouée." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Recherche terminée avec %d correspondance." msgstr[1] "Recherche terminée avec %d correspondances." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Pas de correspondances trouvées." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Mauvaise expression régulière : %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany a essayé d'accéder au socket de domaine Unix d'une autre instance d'un autre utilisateur.\n" +"Ceci est une erreur fatale et Geany va maintenant fermer." + +#: ../src/symbols.c:611 +#: ../src/symbols.c:651 +#: ../src/symbols.c:718 msgid "Chapter" msgstr "Chapitre" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 +#: ../src/symbols.c:647 +#: ../src/symbols.c:719 msgid "Section" msgstr "Section" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Annexe" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 +#: ../src/symbols.c:652 +#: ../src/symbols.c:668 +#: ../src/symbols.c:679 +#: ../src/symbols.c:766 +#: ../src/symbols.c:777 +#: ../src/symbols.c:789 +#: ../src/symbols.c:803 +#: ../src/symbols.c:815 +#: ../src/symbols.c:827 +#: ../src/symbols.c:842 +#: ../src/symbols.c:887 msgid "Other" msgstr "Autre" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 +#: ../src/symbols.c:835 +#: ../src/symbols.c:867 msgid "Module" msgstr "Module" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 +#: ../src/symbols.c:762 +#: ../src/symbols.c:813 +#: ../src/symbols.c:825 +#: ../src/symbols.c:840 +#: ../src/symbols.c:852 msgid "Types" msgstr "Types" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Constructeurs de type" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 +#: ../src/symbols.c:638 +#: ../src/symbols.c:659 +#: ../src/symbols.c:667 +#: ../src/symbols.c:676 +#: ../src/symbols.c:688 +#: ../src/symbols.c:697 +#: ../src/symbols.c:750 +#: ../src/symbols.c:799 +#: ../src/symbols.c:822 +#: ../src/symbols.c:837 +#: ../src/symbols.c:874 msgid "Functions" msgstr "Fonctions" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 +#: ../src/symbols.c:637 msgid "Sections" msgstr "Sections" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Clés" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 +#: ../src/symbols.c:690 +#: ../src/symbols.c:751 +#: ../src/symbols.c:776 +#: ../src/symbols.c:801 +#: ../src/symbols.c:814 +#: ../src/symbols.c:823 +#: ../src/symbols.c:839 +#: ../src/symbols.c:886 msgid "Variables" msgstr "Variables" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Commande" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Environment" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 +#: ../src/symbols.c:720 msgid "Subsection" msgstr "Sous-section" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 +#: ../src/symbols.c:721 msgid "Subsubsection" msgstr "Sous-sous-section" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Label" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Structures" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 +#: ../src/symbols.c:759 +#: ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Package" -#: ../src/symbols.c:655 -msgid "My" -msgstr "My" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +#: ../src/symbols.c:677 +#: ../src/symbols.c:826 +#: ../src/symbols.c:849 +msgid "Labels" +msgstr "Étiquettes" + +#: ../src/symbols.c:678 +#: ../src/symbols.c:689 +#: ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constantes" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 +#: ../src/symbols.c:785 +#: ../src/symbols.c:797 +#: ../src/symbols.c:810 +#: ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 +#: ../src/symbols.c:708 +#: ../src/symbols.c:729 +#: ../src/symbols.c:739 +#: ../src/symbols.c:748 +#: ../src/symbols.c:786 +#: ../src/symbols.c:798 +#: ../src/symbols.c:811 +#: ../src/symbols.c:873 msgid "Classes" msgstr "Classes" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Constantes" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Ancres" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Titres H1" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Titres H2" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Titres H3" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Sélecteurs d'ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Sélecteurs de type" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 +#: ../src/symbols.c:774 msgid "Modules" msgstr "Modules" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 +#: ../src/symbols.c:740 +#: ../src/symbols.c:749 +#: ../src/symbols.c:787 +#: ../src/symbols.c:812 msgid "Methods" msgstr "Méthodes" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 +#: ../src/symbols.c:870 msgid "Namespaces" msgstr "Espaces de nommage" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Procédures" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Imports" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entités" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Architectures" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Fonctions / Procédures" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variables / Signaux" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Processus / Composants" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Évènements" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Fonctions / Tâches" + +#: ../src/symbols.c:788 +#: ../src/symbols.c:875 msgid "Members" msgstr "Membres" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Labels" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Sous-routines" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blocs" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 +#: ../src/symbols.c:859 +#: ../src/symbols.c:883 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Définitions" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Cibles" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extension de fichier inconnue pour \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "" -"Échec à la création du fichier de tags, probablement à cause de tags " -"introuvables.\n" +msgstr "Échec à la création du fichier de tags, probablement à cause de tags introuvables.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4177,205 +4267,208 @@ "Utilisation : %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" msgstr "" "Exemple : \n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Charger des tags" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Fichiers de tags Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Chargement de %s fichiers de tags '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Impossible de charger le fichier de tags '%s'." # Prochaine déclaration (recherche vers l'avant) -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Déclaration suivante de \"%s\" non trouvée." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Définition de \"%s\" non trouvée." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Trier par _nom" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Trier par ordre d'_apparition" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Ancien" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Enregistrer le fichier courant" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Enregistrer tous les fichiers ouverts" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Recharger le fichier courant depuis le disque" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Fermer le fichier courant" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Ferme tous les fichiers ouverts" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Couper la sélection courante" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Copier la sélection courante" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Colle le contenu du presse-papiers" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Supprimer la sélection courante" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compiler le fichier courant" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Exécuter ou voir le fichier courant" -#: ../src/toolbar.c:70 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette" -msgstr "" -"Ouvre une fenêtre de choix de couleur, pour sélectionner de manière " -"interactive des couleurs depuis une palette" - #: ../src/toolbar.c:71 +msgid "Open a color chooser dialog, to interactively pick colors from a palette" +msgstr "Ouvre une fenêtre de choix de couleur, pour sélectionner de manière interactive des couleurs depuis une palette" + +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Zoomer en avant sur le texte" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Zoomer en arrière" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Diminuer l'indentation" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Augmenter l'indentation" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 +#: ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Rechercher le texte entré dans le fichier courant" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 +#: ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Se rendre à la ligne choisie" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Affiche la fenêtre des préférences" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Quitter Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Imprimer le document" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Remplacer le texte dans le document courant" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Créer un nouveau fichier" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Créer un nouveau fichier depuis un modèle" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Ouvrir un fichier existant" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Ouvrir un fichier récent" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Choisir plus d'actions de construction" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Aller à" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Séparateur" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Séparateur ---" -#: ../src/toolbar.c:897 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"Sélectionnez les éléments à afficher sur la barre d'outils. Les éléments " -"peuvent être réordonnés par glisser-déposer." +#: ../src/toolbar.c:946 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Sélectionnez les éléments à afficher sur la barre d'outils. Les éléments peuvent être réordonnés par glisser-déposer." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Outils disponibles" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Outils affichés" #: ../src/tools.c:153 #, c-format -msgid "" -"The executed custom command returned an error. Your selection was not " -"changed. Error message: %s" -msgstr "" -"La commande personnalisée a retournée une erreur. Votre sélection n'a pas " -"été modifiée. Message d'erreur : %s" +msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" +msgstr "La commande personnalisée a retournée une erreur. Votre sélection n'a pas été modifiée. Message d'erreur : %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." -msgstr "" -"La commande personnalisée s'est terminée avec un code de retour d'erreur." +msgstr "La commande personnalisée s'est terminée avec un code de retour d'erreur." #: ../src/tools.c:246 #, c-format @@ -4387,441 +4480,417 @@ msgid "Custom command failed: %s" msgstr "La commande personnalisée a échoué : %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 +#: ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Définir les commandes personnalisées" #: ../src/tools.c:311 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" -"Vous pouvez envoyer la sélection courante vers une de ces commandes et la " -"sortie de la commande remplacera la sélection." +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "Vous pouvez envoyer la sélection courante vers une de ces commandes et la sortie de la commande remplacera la sélection." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Aucune commande personnalisée définie." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Compteur de mots" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "sélection" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "document entier" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Étendue :" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Lignes :" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Mots :" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Caractères :" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Aucun symbole trouvé" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Afficher la liste des s_ymboles" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Afficher la liste des _documents" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 +#: ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Cacher la barre _latérale" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Afficher les _chemins" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "ligne: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "ligne: %d / %d\t col: %d\t sel: %d\t " # Lecture seule (barre d'état) #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "mode : %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "encodage : %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "type de fichier : %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "portée : %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Police mise à jour (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Bibliothèque C standard" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Bibliothèque C standard)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Bibliothèque C++ standard" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "STL C++" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Définir le format de date per_sonnalisé" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Choisir un dossier" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Choisir un fichier" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Fichiers de c_onfiguration" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Tout enregistrer" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Tout fermer" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Définir le chemin depui_s le document" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Relancer le terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Méthodes d'entrée" -#: ../src/vte.c:670 -msgid "" -"Could not change the directory in the VTE because it probably contains a " -"command." -msgstr "" -"Impossible de changer de dossier dans le VTE car il contient probablement " -"une commande." - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Plugin Terminal" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Ces paramètres de configuration pour l'émulateur virtuel de terminal (VTE) " -"s'appliquent seulement si la bibliothèque VTE peut être chargée." +#: ../src/vte.c:638 +msgid "Could not change the directory in the VTE because it probably contains a command." +msgstr "Impossible de changer de dossier dans le VTE car il contient probablement une commande." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Police de caractères :" -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Police du terminal :" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Définit la police du terminal" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Couleur de premier plan :" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Couleur de fond :" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Définit la couleur de premier plan pour le texte du terminal" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Définit la couleur de fond pour le texte du terminal" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Lignes d'historique :" -#: ../src/vte.c:790 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget" -msgstr "" -"Spécifie le nombre de lignes d'historique que vous pouvez faire défiler en " -"arrière dans le terminal" +#: ../src/vte.c:786 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget" +msgstr "Spécifie le nombre de lignes d'historique que vous pouvez faire défiler en arrière dans le terminal" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell :" -#: ../src/vte.c:802 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation" -msgstr "" -"Définit le chemin vers le shell qui doit être lancé dans l'émulateur de " -"terminal" +#: ../src/vte.c:798 +msgid "Sets the path to the shell which should be started inside the terminal emulation" +msgstr "Définit le chemin vers le shell qui doit être lancé dans l'émulateur de terminal" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Défilement au clavier" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Définit si l'on doit défiler en bas lorsqu'une touche a été pressée" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Faire défiler lors d'une sortie" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Définit si l'on doit défiler en bas lorsqu'une sortie est générée." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Faire clignoter le curseur" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Faire clignoter ou non le curseur" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Écraser les raccourcis clavier de Geany" -#: ../src/vte.c:833 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" -"Autorise le VTE à utiliser des raccourcis clavier (mis à part ceux de focus)" +#: ../src/vte.c:829 +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "Autorise le VTE à utiliser des raccourcis clavier (mis à part ceux de focus)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Désactiver le raccourci clavier du menu (F10 par défaut)" -#: ../src/vte.c:837 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" -"Cette option désactive le raccourci clavier utilisé pour afficher le menu " -"(par défaut F10). Le désactiver peut être utile si vous utilisez, par " -"exemple, Midnight Commander à l'intérieur du VTE." +#: ../src/vte.c:833 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Cette option désactive le raccourci clavier utilisé pour afficher le menu (par défaut F10). Le désactiver peut être utile si vous utilisez, par exemple, Midnight Commander à l'intérieur du VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 +#: ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Suivre le chemin du fichier courant" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" -msgstr "" -"Définit si l'on doit exécuter \"cd $path\" lorsque vous basculez entre les " -"fichiers ouverts" +msgstr "Définit si l'on doit exécuter \"cd $path\" lorsque vous basculez entre les fichiers ouverts" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Ne pas utiliser le script de lancement" -#: ../src/vte.c:847 -msgid "" -"Don't use the simple run script which is usually used to display the exit " -"status of the executed program" -msgstr "" -"Ne pas utiliser le script de lancement utilisé habituellement pour afficher " -"le statut de sortie du programme exécuté" +#: ../src/vte.c:843 +msgid "Don't use the simple run script which is usually used to display the exit status of the executed program" +msgstr "Ne pas utiliser le script de lancement utilisé habituellement pour afficher le statut de sortie du programme exécuté" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Exécuter les programmes dans le VTE" -#: ../src/vte.c:851 -msgid "" -"Run programs in VTE instead of opening a terminal emulation window. Please " -"note, programs executed in VTE cannot be stopped" -msgstr "" -"Lance les programmes dans l'émulateur de terminal virtuel (VTE) au lieu " -"d'ouvrir une fenêtre d'émulation de terminal. Veuillez noter que les " -"programmes exécutés dans le VTE ne peuvent pas être stoppés" +#: ../src/vte.c:847 +msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped" +msgstr "Lance les programmes dans l'émulateur de terminal virtuel (VTE) au lieu d'ouvrir une fenêtre d'émulation de terminal. Veuillez noter que les programmes exécutés dans le VTE ne peuvent pas être stoppés" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Fichiers de projet Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Exécutables" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Créateur de Classe" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Crée des fichiers sources pour une nouvelle classe." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Créer une classe" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Espace de nommage" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Espace de nommage :" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nom de la classe :" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Fichier header :" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Fichier source :" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Héritage" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Classe de base :" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Source de base :" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Header de base :" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "GType de base :" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implémente :" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Options" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Créer un constructeur" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Créer un destructeur" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "abstraite" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Type de constructeur GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Créer une cla_sse" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Classe _GTK+" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "Classe _PHP" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caractères HTML" @@ -4830,95 +4899,98 @@ msgid "Inserts HTML character entities like '&'." msgstr "Insérer des entités HTML telles que '&'." -#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/htmlchars.c:39 +#: ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 +#: ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "L'équipe de développement de Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Caractères HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Caractères ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Caractères grecs" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Caractères mathématiques" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Caractères techniques" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Caractères fléchés" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Caractères de ponctuation" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Caractères divers" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 +#: ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Le dossier de configuration du plugin n'a pas pu être créé." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Caractères spéciaux" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Insérer" -#: ../plugins/htmlchars.c:458 -msgid "" -"Choose a special character from the list below and double click on it or use " -"the button to insert it at the current cursor position." -msgstr "" -"Choisissez un caractère spécial depuis la liste ici-bas et double-cliquez " -"dessus ou utilisez le bouton pour l'insérer à la position actuelle du " -"curseur." +#: ../plugins/htmlchars.c:493 +msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." +msgstr "Choisissez un caractère spécial depuis la liste ici-bas et double-cliquez dessus ou utilisez le bouton pour l'insérer à la position actuelle du curseur." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Caractère" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nom)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Insérer un caractère HTML spécial" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Remplacement HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "Basculement _HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Remplacement en masse des caractères spéciaux" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Insérer des caractères HTML spéciaux" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Remplacer les caractères spéciaux" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Activer/Désactiver le plugin" @@ -4939,151 +5011,137 @@ msgstr "_Utiliser le niveau de zoom courant" #: ../plugins/export.c:185 -msgid "" -"Renders the font size of the document together with the current zoom level" -msgstr "" -"Restitue la taille de police du document en adéquation avec le niveau de " -"zoom courant" +msgid "Renders the font size of the document together with the current zoom level" +msgstr "Restitue la taille de police du document en adéquation avec le niveau de zoom courant" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Document exporté avec succès vers '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Le fichier '%s' n'a pu être écrit (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Le fichier '%s' existe déjà. Voulez-vous l'écraser ?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exporter" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "En _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "En _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Navigateur de fichier" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Ajoute un onglet navigateur de fichiers à la barre latérale." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Trop d'éléments sélectionnés !" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Impossible d'exécuter la commande extérieure configurée '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Ouvrir à l'_extérieur" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "Rechercher dans les _fichiers" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Afficher les fichiers cac_hés" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Dossier parent" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Actualiser" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Dossier personnel" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Définir le chemin depuis le document" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Effacer le filtre" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtre :" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtre vos fichiers avec vos wildcards habituelles" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Focus sur la liste des fichiers" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Focus sur le chemin" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Le dossier de configuration du plugin n'a pas pu être créé." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Commande d'ouverture extérieure :" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, 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 "" -"La commande à lancer en utilisant \"Ouvrir à l'extérieur\". Vous pouvez " -"utiliser les caractères de substitution %f et %d.\n" +"La commande à lancer en utilisant \"Ouvrir à l'extérieur\". Vous pouvez utiliser les caractères de substitution %f et %d.\n" "%f sera remplacé par le nom du fichier en incluant son chemin complet\n" -"%d sera remplacé par le nom du chemin vers le fichier sélectionné sans le " -"nom du fichier" +"%d sera remplacé par le nom du chemin vers le fichier sélectionné sans le nom du fichier" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Afficher les fichiers cachés" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Cacher les fichiers objets" -#: ../plugins/filebrowser.c:1117 -msgid "" -"Don't show generated object files in the file browser, this includes *.o, *." -"obj. *.so, *.dll, *.a, *.lib" -msgstr "" -"Ne pas afficher les fichiers objets générés dans le gestionnaire de fichier, " -"ceci incluant *.o, *.obj. *.so, *.dll, *.a, *.lib" +#: ../plugins/filebrowser.c:1212 +msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +msgstr "Ne pas afficher les fichiers objets générés dans le gestionnaire de fichier, ceci incluant *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Utiliser le répertoire de base du projet" -#: ../plugins/filebrowser.c:1132 -msgid "" -"Change the directory to the base directory of the currently opened project" -msgstr "" -"Changer le répertoire pour le répertoire de base du projet actuellement " -"ouvert" +#: ../plugins/filebrowser.c:1227 +msgid "Change the directory to the base directory of the currently opened project" +msgstr "Changer le répertoire pour le répertoire de base du projet actuellement ouvert" #: ../plugins/saveactions.c:39 msgid "Save Actions" @@ -5091,9 +5149,7 @@ #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." -msgstr "" -"Ce plugin fournit différentes actions relatives à l'enregistrement des " -"fichiers." +msgstr "Ce plugin fournit différentes actions relatives à l'enregistrement des fichiers." #: ../plugins/saveactions.c:169 #, c-format @@ -5125,14 +5181,14 @@ #: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." -msgstr "" -"Le dossier de sauvegarde n'existe pas ou n'a pas de permission d'écriture." +msgstr "Le dossier de sauvegarde n'existe pas ou n'a pas de permission d'écriture." #: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Enregistrement automatique" -#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:545 +#: ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Valider" @@ -5147,9 +5203,7 @@ #: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" -msgstr "" -"_Afficher un message de statut si les fichiers ont été automatiquement " -"sauvegardés" +msgstr "_Afficher un message de statut si les fichiers ont été automatiquement sauvegardés" #: ../plugins/saveactions.c:578 msgid "Save only current open _file" @@ -5165,8 +5219,7 @@ #: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" -msgstr "" -"_Type de fichiers à utiliser lors de la création de nouveaux fichiers :" +msgstr "_Type de fichiers à utiliser lors de la création de nouveaux fichiers :" #: ../plugins/saveactions.c:646 msgid "Backup Copy" @@ -5178,9 +5231,7 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "" -"_Format de date / heure pour les fichiers sauvegardés (faire \"man strftime" -"\" pour plus de détails) :" +msgstr "_Format de date / heure pour les fichiers sauvegardés (faire \"man strftime\" pour plus de détails) :" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" @@ -5194,60 +5245,176 @@ msgid "Splits the editor view into two windows." msgstr "Diviser en deux la fenêtre d'édition" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Afficher le document courant" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 +#: ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Annuler la division" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Diviser la fenêtre" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontalement" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Verticalement" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Diviser horizontalement" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Diviser verticalement" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Annuler la division" - +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Définir les include_s et les options" +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" +#~ msgid "_View DVI File" +#~ msgstr "_Voir le fichier DVI" +#~ msgid "V_iew PDF File" +#~ msgstr "Vo_ir le fichier PDF" +#~ msgid "_Set Arguments" +#~ msgstr "Définir les option_s" +#~ msgid "Set Arguments" +#~ msgstr "Définir les options" +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Définir les programmes et options utilisées pour compiler et visionner " +#~ "les fichiers (La)Tex." +#~ msgid "DVI creation:" +#~ msgstr "Création de DVI :" +#~ msgid "PDF creation:" +#~ msgstr "Création de PDF :" +#~ msgid "DVI preview:" +#~ msgstr "Prévisualisation de DVI :" +#~ msgid "PDF preview:" +#~ msgstr "Prévisualisation de PDF :" +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f sera remplacé par le fichier courant, ex. fichier_test.c\n" +#~ "%e sera remplacé par le nom du fichier sans extension, ex. fichier_test" +#~ msgid "Set Includes and Arguments" +#~ msgstr "Définir les includes et les options" +#~ msgid "Set the commands for building and running programs." +#~ msgstr "" +#~ "Définir les commandes utilisées pour construire et lancer les programmes." +#~ msgid "Compile:" +#~ msgstr "Compiler :" +#~ msgid "Build:" +#~ msgstr "Construire :" +#~ msgid "Failed to execute the view program" +#~ msgstr "Impossible d'exécuter le programme de visualisation" +#~ msgid "Try to resave the file?" +#~ msgstr "Essayer de sauvegarder à nouveau le fichier ?" +#~ msgid "_Customize Toolbar" +#~ msgstr "_Personnaliser la barre d'outils" +#~ msgid "Icon style:" +#~ msgstr "Style des icônes :" +#~ msgid "Icon size:" +#~ msgstr "Taille des icônes :" +#~ msgid "Appearance" +#~ msgstr "Apparence" +#~ msgid "Hard tab width:" +#~ msgstr "Largeur des tabulations :" +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "La largeur d'une tabulation, quand tabulations et espaces sont définis " +#~ "pour un document" +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Utilise un texte blanc sur fond noir et inverse toutes les couleurs; " +#~ "cette option nécessite un redémarrage de Geany." +#~ msgid "Long line marker:" +#~ msgstr "Marqueur des longues lignes :" +#~ msgid "Long line marker color:" +#~ msgstr "Couleur du marqueur des longues lignes :" +#~ msgid "Path and options for the make tool" +#~ msgstr "Chemin et options pour l'outil make" +#~ msgid "Duplicate line or selection" +#~ msgstr "Dupliquer la ligne ou la sélection" +#~ msgid "Send Selection to Terminal" +#~ msgstr "Envoyer la sélection vers le terminal" +#~ msgid "Run (alternative command)" +#~ msgstr "Exécuter (commande alternative)" +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Ci-dessous se trouve la liste des modules disponibles. Sélectionnez les " +#~ "modules qui pourraient être chargés quand Geany est démarré." +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "L'impression du fichier %s a été annulée." +#~ msgid "Make in base path" +#~ msgstr "Lancer Make dans le dossier de base" +#~ msgid "Run command:" +#~ msgstr "Commande à lancer :" +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Ligne de commande à exécuter dans le dossier de base du projet. Des " +#~ "paramètres peuvent être ajoutés à la commande. Laissez vide pour utiliser " +#~ "la commande à exécuter par défaut." +#~ msgid "Choose Project Run Command" +#~ msgstr "Choix de la commande d'exécution du projet" +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Texte remplacé dans %u fichier." +#~ msgstr[1] "Texte remplacé dans %u fichiers." +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "La recherche a échoué (voir Aide->Messages de débogage pour plus de " +#~ "détails)." +#~ msgid "My" +#~ msgstr "My" +#~ msgid "Local" +#~ msgstr "Local" +#~ msgid "Our" +#~ msgstr "Our" +#~ msgid "Terminal plugin" +#~ msgstr "Plugin Terminal" +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Ces paramètres de configuration pour l'émulateur virtuel de terminal " +#~ "(VTE) s'appliquent seulement si la bibliothèque VTE peut être chargée." +#~ msgid "Terminal font:" +#~ msgstr "Police du terminal :" +#~ msgid "Unsplit" +#~ msgstr "Annuler la division" #~ msgid "Diff file" #~ msgstr "Fichier Diff" - #~ msgid "reStructuredText file" #~ msgstr "Fichier reStructuredText" - #~ msgid "" #~ "For all changes you make in this file to take effect, you need to restart " #~ "Geany." #~ msgstr "" #~ "Pour que les changements que vous effectuez dans ce fichier prennent " #~ "effet, vous devrez redémarrer Geany." - #~ msgid "Select _All" #~ msgstr "Sélectionner _tout" - #~ msgid "Automatic symbol completion" #~ msgstr "Complétion automatique des symboles" - #~ msgid "Customize toolbar" #~ msgstr "Personnaliser la barre d'outils" - #~ msgid "" #~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." #~ "xml'. Please see the documentation for details." @@ -5255,195 +5422,138 @@ #~ "Note : Pour personnaliser les éléments de la barre d'outils, éditez le " #~ "fichier 'ui_toolbar.xml'. Reportez-vous à la documentation pour plus de " #~ "détails." - #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Impossible de voir %s (assurez-vous qu'il soit déjà compilé)" - #~ msgid "" #~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" #~ msgstr "" #~ "Ajouter la numérotation des pages en bas de chaque page; cela prend 2 " #~ "lignes par page" - #~ msgid "Jump to the entered line number." #~ msgstr "Se rendre à la ligne choisie" - #~ msgid "Version Diff" #~ msgstr "Version Diff" - #~ msgid "Creates a patch of a file against version control." #~ msgstr "" #~ "Créer un patch pour le fichier en fonction de son système de contrôle de " #~ "version" - #~ msgid "Input conversion of the diff output failed." #~ msgstr "La conversion·de·la sorte de diff a·échoué." - #~ msgid "" #~ "%s exited with an error: \n" #~ "%s." #~ msgstr "" #~ "%s s'est terminé avec une erreur : \n" #~ "%s." - #~ msgid "No changes were made." #~ msgstr "Aucun changement n'a été effectué." - #~ msgid "unknown error while trying to spawn a process for %s" #~ msgstr "erreur inconnue en essayant de lancer un processus pour %s" - #~ msgid "An error occurred (%s)." #~ msgstr "Une erreur s'est produite (%s)." - #~ msgid "_Version Diff" #~ msgstr "_Version Diff" - #~ msgid "From Current _File" #~ msgstr "Depuis le _Fichier courant" - #~ msgid "Make a diff from the current active file" #~ msgstr "Créer un fichier diff depuis le fichier actif courant" - #~ msgid "From Current _Directory" #~ msgstr "_Depuis le dossier courant" - #~ msgid "Make a diff from the directory of the current active file" #~ msgstr "Créer un fichier diff depuis le dossier du fichier actif courant" - #~ msgid "From Current _Project" #~ msgstr "Depuis le _projet courant" - #~ msgid "Make a diff from the current project's base path" #~ msgstr "Créer un fichier diff depuis le dossier de base du projet courant" - #~ msgid "Command stopped because the current file has no extension." #~ msgstr "Commande stoppée, le fichier courant n'ayant pas d'extension." - #~ msgid "Failed to execute \"%s\" (make sure it is already built)" #~ msgstr "" #~ "Impossible d'exécuter \"%s\" (assurez vous qu'il soit déjà construit)" - #~ msgid "Compiles the current file" #~ msgstr "Compile le fichier courant" - #~ msgid "Builds the current file (generate an executable file)" #~ msgstr "Construit le fichier courant (génère un fichier exécutable)" - #~ msgid "Compiles the current file using the make tool" #~ msgstr "Compile le fichier courant en utilisant l'outil make" - #~ msgid "" #~ "Sets the includes and library paths for the compiler and the program " #~ "arguments for execution" #~ msgstr "" #~ "Définit les includes et les chemins des librairies pour le compilateur et " #~ "les options du programme pour l'exécution" - #~ msgid "Compiles the current file into a DVI file" #~ msgstr "Compile le fichier courant vers un fichier DVI" - #~ msgid "Compiles the current file into a PDF file" #~ msgstr "Compile le fichier courant vers un fichier PDF" - #~ msgid "Compile and view the current file" #~ msgstr "Compiler et afficher le fichier courant" - #~ msgid "Sets the program paths and arguments" #~ msgstr "Définit les options et chemin du programme" - #~ msgid "Saves all open files" #~ msgstr "Enregistrer tous les fichiers ouverts" - #~ msgid "Prints the current file" #~ msgstr "Imprime le fichier courant" - #~ msgid "Convert the case of the current selection" #~ msgstr "Convertir la casse de la sélection courante" - #~ msgid "Inserts a typical ChangeLog entry in the current file" #~ msgstr "Insère une entrée de changelog classique dans le fichier courant" - #~ msgid "Inserts a file header at the beginning of the file" #~ msgstr "Insère un en-tête au début du fichier courant" - #~ msgid "Inserts a description before the current function" #~ msgstr "Insère une description avant la fonction courante" - #~ msgid "Inserts a multiline comment" #~ msgstr "Insère un commentaire sur plusieurs lignes" - #~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" #~ msgstr "" #~ "Insère une partie de la GPL (ceci devrait être fait au début du fichier)" - #~ msgid "" #~ "Inserts a BSD license notice (should be done at the beginning of the file)" #~ msgstr "" #~ "Insère une note de licence BSD (ceci devrait être fait au début du " #~ "fichier)" - #~ msgid "Change the default font" #~ msgstr "Changer la police par défaut" - #~ msgid "Toggle the window with status and compiler messages on and off" #~ msgstr "Affiche/Masque la fenêtre de statut et des messages du compilateur" - #~ msgid "Toggle the toolbar on and off" #~ msgstr "Affiche/Masque la barre d'outils" - #~ msgid "Treat this file as read-only. No changes can be made." #~ msgstr "" #~ "Traiter ce fichier en lecture seule. Aucun changement ne peut être " #~ "effectué." - #~ msgid "Replaces all spaces in the document by tab characters." #~ msgstr "Remplace tous les espaces du document par des tabulations." - #~ msgid "Folds all contractible code blocks" #~ msgstr "Plie tous les blocs de code pliables." - #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Déplie tous les blocs de code pliés" - -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Enlève toutes les indications d'erreur dans le document courant." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" #~ msgstr "" #~ "Compte les mots et les caractères de la sélection courante ou du document " #~ "entier" - #~ msgid "Load global tags file" #~ msgstr "Charger un fichier de tags global" - #~ msgid "" #~ "Reload configuration data like snippets, templates and filetype " #~ "extensions." #~ msgstr "" #~ "Mettre à jour les données de configuration, telles que snippets, " #~ "templates et types de fichiers. " - #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Affiche une liste de tous les raccourcis claviers pour Geany." - -#~ msgid "Color" -#~ msgstr "Couleur" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Entrer un numéro de ligne et s'y rendre" - #~ msgid "Go to the entered line" #~ msgstr "Se rendre à la ligne choisie" - #~ msgid "Show full path name in documents list" #~ msgstr "Afficher le chemin complet dans la liste des documents" #, fuzzy #~ msgid "Show File Operation buttons" #~ msgstr "Afficher les boutons d'opération sur les fichiers" - #~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" #~ msgstr "" #~ "Afficher les boutons Nouveau, Ouvrir, Fermer, Enregistrer et Recharger " @@ -5468,272 +5578,189 @@ #~ msgstr "" #~ "Afficher les boutons Compiler et Lancer un programme dans la barre " #~ "d'outils" - #~ msgid "Show Redo and Undo buttons" #~ msgstr "Afficher les boutons d'annulation et de répétition" - #~ msgid "Display the Redo and Undo buttons in the toolbar" #~ msgstr "" #~ "Afficher les boutons d'annulation et de répétition dans la barre d'outils" - #~ msgid "Show Back and Forward buttons" #~ msgstr "Afficher les boutons suivant et précédent" - #~ msgid "" #~ "Display the Back and Forward buttons in the toolbar used for code " #~ "navigation" #~ msgstr "" #~ "Afficher les boutons suivant et précédent utilisés pour la navigation " #~ "dans le code dans la barre d'outils" - #~ msgid "Show Compile and Run buttons" #~ msgstr "Afficher les boutons Compiler et Lancer" - #~ msgid "Display the Compile and Run buttons in the toolbar" #~ msgstr "" #~ "Afficher les boutons Compiler et Lancer un programme dans la barre " #~ "d'outils" - #~ msgid "Show Color Chooser button" #~ msgstr "Afficher le bouton du sélecteur de couleurs" - #~ msgid "Display the Color Chooser button in the toolbar" #~ msgstr "Affiche le bouton du sélecteur de couleur dans la barre d'outils" - #~ msgid "Show Zoom In and Zoom Out buttons" #~ msgstr "Afficher les boutons de zoom avant et arrière" - #~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" #~ msgstr "" #~ "Afficher les boutons de zoom avant et arrière dans la barre d'outils" - #~ msgid "Show Increase and Decrease Indentation buttons" #~ msgstr "Afficher les boutons d'indentation" - #~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" #~ msgstr "" #~ "Afficher les boutons d'augmentation et de diminution d'indentation dans " #~ "la barre d'outils" - #~ msgid "Show Search field" #~ msgstr "Afficher le champ de recherche" - #~ msgid "Display the search field and button in the toolbar" #~ msgstr "" #~ "Afficher le champ de recherche et le bouton associé dans la barre d'outils" - #~ msgid "Show Go to Line field" #~ msgstr "Afficher le champ Aller à la ligne" - #~ msgid "Display the line number field and button in the toolbar" #~ msgstr "" #~ "Afficher le champ de numéro de ligne et son bouton dans la barre d'outils" - #~ msgid "Show Quit button" #~ msgstr "Afficher le bouton Quitter" - #~ msgid "Display the quit button in the toolbar" #~ msgstr "Afficher le bouton Quitter dans la barre d'outils" - #~ msgid "Items" #~ msgstr "Éléments" -#~ msgid "Use white text on a black background." -#~ msgstr "Utiliser un texte blanc sur fond noir." - # on laisse debug. #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Exécution en mode de debug (mode verbeux)" - -#~ msgid "Search failed." -#~ msgstr "Recherche échouée." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Impossible de trouver le fichier pixmap : %s" - #~ msgid "JavaScript functions" #~ msgstr "Fonctions JavaScript" - #~ msgid "Heading (H2)" #~ msgstr "Titre (H2)" - #~ msgid "Heading (H3)" #~ msgstr "Titre (H3)" - #~ msgid "Structs / Typedefs" #~ msgstr "Structs / Typedefs" - #~ msgid "Terminal emulation:" #~ msgstr "Émulation du terminal :" - #~ msgid "" #~ "Controls how the terminal emulator should behave. Do not change this " #~ "value unless you know exactly what you are doing." #~ msgstr "" #~ "Contrôle le comportement de l'émulateur de terminal. Ne changez pas cette " #~ "valeur à moins de savoir exactement ce que vous faites." - #, fuzzy #~ msgid "Found %d matches for \"%s\"." #~ msgid_plural "Found %d matches for \"%s\"." #~ msgstr[0] "%d correspondances trouvées pour \"%s\"." #~ msgstr[1] "%d correspondances trouvées pour \"%s\"." - #~ msgid "Failed to execute the terminal program" #~ msgstr "Impossible d'exécuter le programme du terminal" - #~ msgid "Save automatically all open files in a given time interval." #~ msgstr "" #~ "Sauvegarder automatiquement tous les fichiers ouverts selon une " #~ "intervalle de temps donnée." - #~ msgid "Whether to use tabs or spaces when indentation is inserted." #~ msgstr "" #~ "Définit si l'on doit utiliser des espaces ou des tabulations lors d'une " #~ "indentation." - #~ msgid "Rows of symbol completion list:" #~ msgstr "Lignes de la liste de complétion automatique :" - #~ msgid "Could not parse the output of the diff" #~ msgstr "Impossible d'analyser la sortie du diff" - #~ msgid "Something very strange is occurred, could not stat %s (%s)." #~ msgstr "" #~ "Quelque chose de vraiment étrange s'est produit, impossible de statuer " #~ "sur %s (%s)." - #~ msgid "Insert Comments" #~ msgstr "Insérer des commentaires" - #~ msgid "Insert \"include <...>\"" #~ msgstr "_Insérer \"include <...>\"" - #~ msgid "File menu" #~ msgstr "Menu Fichier" - #~ msgid "Edit menu" #~ msgstr "Menu Éditer" - #~ msgid "Search menu" #~ msgstr "Menu Rechercher" - #~ msgid "View menu" #~ msgstr "Menu Affichage" - #~ msgid "Document menu" #~ msgstr "Menu Document" - #~ msgid "Build menu" #~ msgstr "Menu Construire" - #~ msgid "Tools menu" #~ msgstr "Menu Outils" - #~ msgid "Help menu" #~ msgstr "Menu aide" - #~ msgid "Focus commands" #~ msgstr "Commandes de focus" - #~ msgid "Editing commands" #~ msgstr "Commandes d'édition" - #~ msgid "Tag commands" #~ msgstr "Commandes de tag" - #~ msgid "Other commands" #~ msgstr "Autres commandes" - #~ msgid "Something went really wrong." #~ msgstr "Quelque chose s'est très très mal passé." - #~ msgid "_VCdiff" #~ msgstr "_VCdiff" - #~ msgid "Mixins" #~ msgstr "Mixins" #, fuzzy #~ msgid "C source file" #~ msgstr "Fichier source C#" - #~ msgid "C++ source file" #~ msgstr "Fichier source C++" - #~ msgid "C# source file" #~ msgstr "Fichier source C#" - #~ msgid "D source file" #~ msgstr "Fichier source D" - #~ msgid "Java source file" #~ msgstr "Fichier source Java" - #~ msgid "Pascal source file" #~ msgstr "Fichier source Pascal" - #~ msgid "Assembler source file" #~ msgstr "Fichier source assembleur" - #~ msgid "FreeBasic source file" #~ msgstr "Fichier source FreeBasic" - #~ msgid "Fortran source file (F77)" #~ msgstr "Fichier source Fortran (F77)" - #~ msgid "(O)Caml source file" #~ msgstr "Fichier source (O)Caml" - #~ msgid "Perl source file" #~ msgstr "Fichier source Perl" - #~ msgid "PHP source file" #~ msgstr "Fichier source PHP" - #~ msgid "Python source file" #~ msgstr "Fichier source Python" - #~ msgid "Ruby source file" #~ msgstr "Fichier source Ruby" - #~ msgid "Tcl source file" #~ msgstr "Fichier source Tcl" - #~ msgid "Lua source file" #~ msgstr "Fichier source Lua" - #~ msgid "Ferite source file" #~ msgstr "Fichier source Ferite" - -#~ msgid "Haskell source file" -#~ msgstr "Fichier source Haskell" - #~ msgid "Docbook source file" #~ msgstr "Fichier source Docbook" - #~ msgid "HTML source file" #~ msgstr "Fichier source HTML" - #~ msgid "LaTeX source file" #~ msgstr "Fichier source Latex" - #~ msgid "O-Matrix source file" #~ msgstr "Fichier source O-Matrix" - #~ msgid "VHDL source file" #~ msgstr "Fichier source VHDL" - #~ msgid "Haxe source file" #~ msgstr "Fichier source Haxe" - #~ msgid "Open files" #~ msgstr "Fichiers ouverts" #, fuzzy #~ msgid "Show open files list" #~ msgstr "Afficher la liste des fichiers ouverts" - #~ msgid "" #~ "Whenever some whitespace is inserted by Geany it will use tabs when " #~ "enabled otherwise Geany will use just spaces." @@ -5741,14 +5768,11 @@ #~ "Quand des espaces vides sont insérés par Geany, il utilisera des " #~ "tabulations si cela est activé, autrement Geany utilisera simplement des " #~ "espaces." - #~ msgid "Unfold all children of a fold point when unfolding it." #~ msgstr "" #~ "Déplier tous les éléments fils d'un point de pliage lors de son dépliage." - #~ msgid "Construct autocompletion" #~ msgstr "Complétion automatique des constructions" - #~ msgid "Automatic completion of often used constructs like if and for" #~ msgstr "" #~ "Complétion automatique des constructions souvent utilisées comme if et for" @@ -5756,26 +5780,20 @@ #, fuzzy #~ msgid "Symbol autocompletion" #~ msgstr "Complétion automatique des constructions" - #~ msgid "Print:" #~ msgstr "Impression :" - #~ msgid "Find in files" #~ msgstr "Rechercher dans les fichiers" - #~ msgid "Go to line" #~ msgstr "Aller à la ligne" #, fuzzy #~ msgid "Complete construct" #~ msgstr "Créer un constructeur" - #~ msgid "Go to tag definition" #~ msgstr "Aller à la définition du symbole" - #~ msgid "Go to tag declaration" #~ msgstr "Aller à la déclaration du symbole" - #~ msgid "" #~ "Directory to run Make All from. Leave blank to use the default command." #~ msgstr "" @@ -5785,10 +5803,8 @@ #, fuzzy #~ msgid "Hide" #~ msgstr "Cacher" - #~ msgid "Reload" #~ msgstr "Recharger" - #~ msgid "" #~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " #~ "%s filetype: %s scope: %s" @@ -5803,23 +5819,14 @@ #, fuzzy #~ msgid "Do you want to save all opened files before processing?" #~ msgstr "Voulez-vous l'enregistrer avant la fermeture ?" - -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "_Dossier :" - #~ msgid "Convert Selection to _Lower-case" #~ msgstr "Convertir la sélection en minuscu_les" - #~ msgid "Convert Selection to _Upper-case" #~ msgstr "Convertir la sélection en maj_uscules" - #~ msgid "Convert Selection to lower-case" #~ msgstr "Convertir la sélection en minuscules" - #~ msgid "Convert Selection to upper-case" #~ msgstr "Convertir la sélection en majuscules" - #~ msgid "Advanced" #~ msgstr "Avancé" @@ -5828,22 +5835,16 @@ #~ msgstr "" #~ "\n" #~ "Menu Éditer\n" - #~ msgid "Behaviour" #~ msgstr "Comportement" - #~ msgid "Misc." #~ msgstr "Divers" - #~ msgid "language" #~ msgstr "langue" - #~ msgid "XML source file" #~ msgstr "Fichier source XML" - #~ msgid "Insert BSD license Notice" #~ msgstr "Insérer une note BSD" - #~ msgid "" #~ "Selects the indentation mode. Use None to disable auto indentation " #~ "completely. Basic indents new lines with the same indentation as the " @@ -5853,45 +5854,36 @@ #~ "l'indentation automatique complètement. Le mode Basique indente les " #~ "nouvelles lignes avec la même indentation que la ligne précédente. Le " #~ "mode Avancé fait la même chose et indente également les accolades." - #~ msgid "Print command:" #~ msgstr "Commande d'impression :" - #~ msgid "" #~ "\n" #~ "Focus commands\n" #~ msgstr "" #~ "\n" #~ "Commandes de Focus\n" - #~ msgid "Keyboard shortcuts" #~ msgstr "Raccourcis clavier" - #~ msgid " - A fast and lightweight IDE" #~ msgstr " - Un EDI rapide et léger" - #~ msgid "Function" #~ msgstr "Fonction" - #~ msgid "Add the same indentation as the previous line after pressing enter" #~ msgstr "" #~ "Ajoute la même indentation que la ligne précédente après avoir appuyé sur " #~ "entrée" - #~ msgid "" #~ "There is already an open project \"%s\". Do you want to close it before " #~ "proceed?" #~ msgstr "" #~ "Il y a déjà un projet ouvert, \"%s\". Voulez-vous le fermer avant de " #~ "continuer ?" - #~ msgid "You have specified an invalid project base path." #~ msgstr "Vous avez spécifié un dossier de base du projet invalide." - #~ msgid "" #~ "The specified project base path does not exist. Should it be created?" #~ msgstr "" #~ "Le dossier de base du projet spécifié n'existe pas. Doit-il être créé ?" - #~ msgid "(Unsaved)" #~ msgstr "(Non enregistré)" + diff -Nru geany-0.18/po/gl.po geany-0.19/po/gl.po --- geany-0.18/po/gl.po 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/po/gl.po 2010-06-03 22:11:57.000000000 +0100 @@ -0,0 +1,5398 @@ +# Galician messages for the Geany IDE +# Copyright (C) 2009-2010 by Geany's copyright holders +# This file is distributed under the same license as the Geany package. +# José Manuel Castroagudín Silva , 2009-2010 +# +msgid "" +msgstr "" +"Project-Id-Version: Geany 0.19\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-28 22:52+0200\n" +"PO-Revision-Date: 2010-06-03 04:13+0100\n" +"Last-Translator: José Manuel Castroagudín Silva \n" +"Language-Team: Galician \n" +"Language: gl\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" + +#: ../geany.desktop.in.h:1 +msgid "A fast and lightweight IDE using GTK2" +msgstr "Un IDE rápido e lixeiro empregando GTK2" + +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:281 +#: ../src/interface.c:1624 +msgid "Geany" +msgstr "Geany" + +#: ../geany.desktop.in.h:3 +msgid "Integrated Development Environment" +msgstr "Contorno integrado de desenvolvemento" + +#: ../src/about.c:146 +msgid "About Geany" +msgstr "Acerca de Geany" + +#: ../src/about.c:196 +msgid "A fast and lightweight IDE" +msgstr "Un IDE rápido e lixeiro " + +#: ../src/about.c:217 +#, c-format +msgid "(built on or after %s)" +msgstr "(compilado no ou despois do %s)" + +#. gtk_container_add(GTK_CONTAINER(info_box), cop_label); +#: ../src/about.c:248 +msgid "Info" +msgstr "Información" + +#: ../src/about.c:264 +msgid "Developers" +msgstr "Desenvolvedores" + +#: ../src/about.c:273 +msgid "maintainer" +msgstr "mantedor" + +#: ../src/about.c:281 +msgid "developer" +msgstr "desenvolvedor" + +#: ../src/about.c:289 +msgid "translation maintainer" +msgstr "mantedor da tradución" + +#: ../src/about.c:298 +msgid "Translators" +msgstr "Tradutores" + +#: ../src/about.c:318 +msgid "Previous Translators" +msgstr "Tradutores anteriores" + +#: ../src/about.c:339 +msgid "Contributors" +msgstr "Contribuíntes" + +#: ../src/about.c:349 +#, c-format +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Algúns dos moitos contribuíntes (para ver unha lista máis detallada, vexa o ficheiro %s):" + +#: ../src/about.c:375 +msgid "Credits" +msgstr "Créditos" + +#: ../src/about.c:389 +msgid "License" +msgstr "Licenza" + +#: ../src/about.c:398 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Non se puido atopar o texto da licenza, visite http://www.gnu.org/licenses/gpl-2.0.txt para velo en liña." + +#. fall back to %d +#: ../src/build.c:635 +#, c-format +msgid "failed to substitute %%p, no project active" +msgstr "Produciuse un erro ao substituír %%p, non hai ningún proxecto activo" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Producíuse un erro, non hai ningún directorio de traballo" + +#: ../src/build.c:699 +#, c-format +msgid "%s (in directory: %s)" +msgstr "%s (no directorio: %s)" + +#: ../src/build.c:719 +#: ../src/build.c:944 +#: ../src/search.c:1475 +#, c-format +msgid "Process failed (%s)" +msgstr "O proceso fallou (%s)" + +#: ../src/build.c:790 +#, c-format +msgid "Failed to change the working directory to \"%s\"" +msgstr "Producíuse un erro ao cambiar o directorio de traballo a \"%s\"" + +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Produciuse un erro ao executar \"%s\" (non se puido crear un script de inicio)" + +#: ../src/build.c:873 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Non se puido executar o ficheiro no ETV, probablemente porque conteña unha orde." + +#: ../src/build.c:911 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Non se puido atopar o terminal \"%s\" (comprobe a configuración do camiño para a ferramenta de terminal nas preferencias)" + +#: ../src/build.c:1083 +msgid "Compilation failed." +msgstr "Fallou a compilación." + +#: ../src/build.c:1097 +msgid "Compilation finished successfully." +msgstr "A compilación rematou correctamente." + +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "Texto personalizado" + +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Introduza texto personalizado aquí. Todo o texto introducido engadiráselle á orde." + +#: ../src/build.c:1333 +msgid "_Next Error" +msgstr "Segui_nte erro" + +#: ../src/build.c:1335 +msgid "_Previous Error" +msgstr "Erro _anterior" + +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "Definir as orde_s de compilación" + +#: ../src/build.c:1625 +#: ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Compilar o ficheiro actual" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the default target" +msgstr "Construír o ficheiro actual con Make e o obxectivo predeterminado" + +#: ../src/build.c:1641 +msgid "Build the current file with Make and the specified target" +msgstr "Construír o ficheiro actual con Make e o obxectivo especificado" + +#: ../src/build.c:1643 +msgid "Compile the current file with Make" +msgstr "Compilar o ficheiro actual con Make" + +#: ../src/build.c:1670 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "O proceso non se puido deter (%s)." + +#: ../src/build.c:1687 +#: ../src/build.c:1699 +msgid "No more build errors." +msgstr "Non hai máis erros de compilación." + +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "Estabelecer etiqueta de elemento de menú" + +#: ../src/build.c:1790 +msgid "Item" +msgstr "Elemento" + +#: ../src/build.c:1791 +#: ../src/symbols.c:650 +msgid "Label" +msgstr "Etiqueta" + +#: ../src/build.c:1792 +#: ../src/symbols.c:645 +msgid "Command" +msgstr "Orde" + +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "Directorio de traballo" + +#: ../src/build.c:1794 +msgid "Clear" +msgstr "Limpar" + +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "Prema para estabelecer etiqueta de elemento de menú" + +#: ../src/build.c:1906 +#: ../src/build.c:1908 +#, c-format +msgid "%s Commands" +msgstr "Ordes para ficheiros %s" + +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "sen tipo de ficheiro" + +#: ../src/build.c:1916 +#: ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "Expresión regular para os erros:" + +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "Ordes para os ficheiros sen tipo de ficheiro" + +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Nota: o elemento 2 abre un diálogo e engade a resposta á orde." + +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "Ordes para executar" + +#: ../src/build.c:1994 +#, c-format +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p substitúense nos campos de orde e directorio. Vexa o manual para coñecer os detalles." + +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "Definir as ordes de compilación" + +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "_Compilar" + +#. build the code +#: ../src/build.c:2408 +#: ../src/build.c:2671 +#: ../src/interface.c:1075 +msgid "_Build" +msgstr "Constr_uír" + +#: ../src/build.c:2415 +#: ../src/build.c:2445 +#: ../src/build.c:2638 +msgid "_Execute" +msgstr "_Executar" + +#. build the code with make custom +#: ../src/build.c:2460 +#: ../src/build.c:2636 +#: ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "Make cun obxec_tivo personalizado" + +#. build the code with make object +#: ../src/build.c:2462 +#: ../src/build.c:2637 +#: ../src/build.c:2699 +msgid "Make _Object" +msgstr "Make (_obxecto)" + +#: ../src/build.c:2464 +#: ../src/build.c:2635 +msgid "_Make" +msgstr "_Make" + +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "Lanzar un _make all" + +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "Configurar a_s ordes do menú Construír" + +#: ../src/callbacks.c:150 +msgid "Do you really want to quit?" +msgstr "Está seguro de que desexa saír?" + +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d ficheiro gardado." +msgstr[1] "%d ficheiros gardados." + +#: ../src/callbacks.c:488 +#: ../src/document.c:2895 +#: ../src/interface.c:352 +#: ../src/sidebar.c:618 +msgid "_Reload" +msgstr "_Recargar" + +#: ../src/callbacks.c:489 +msgid "Any unsaved changes will be lost." +msgstr "Perderase calquera cambio non gardado." + +#: ../src/callbacks.c:490 +#, c-format +msgid "Are you sure you want to reload '%s'?" +msgstr "Está seguro de que recargar '%s'?" + +#: ../src/callbacks.c:1202 +#: ../src/keybindings.c:428 +msgid "Go to Line" +msgstr "Ir á liña" + +#: ../src/callbacks.c:1202 +msgid "Enter the line you want to go to:" +msgstr "Introduza a liña á que quere ir:" + +#: ../src/callbacks.c:1296 +#: ../src/callbacks.c:1321 +msgid "Please set the filetype for the current file before using this function." +msgstr "Por favor configure o tipo de ficheiro do ficheiro actual antes de usar esta función." + +#: ../src/callbacks.c:1429 +#: ../src/ui_utils.c:548 +msgid "dd.mm.yyyy" +msgstr "dd.mm.aaaa" + +#: ../src/callbacks.c:1431 +#: ../src/ui_utils.c:549 +msgid "mm.dd.yyyy" +msgstr "mm.dd.aaaa" + +#: ../src/callbacks.c:1433 +#: ../src/ui_utils.c:550 +msgid "yyyy/mm/dd" +msgstr "aaaa/mm/dd" + +#: ../src/callbacks.c:1435 +#: ../src/ui_utils.c:559 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.aaaa hh:mm:ss" + +#: ../src/callbacks.c:1437 +#: ../src/ui_utils.c:560 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.aaaa hh:mm:ss" + +#: ../src/callbacks.c:1439 +#: ../src/ui_utils.c:561 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "aaaa/mm/dd hh:mm:ss" + +#: ../src/callbacks.c:1441 +#: ../src/ui_utils.c:570 +msgid "_Use Custom Date Format" +msgstr "_Usar un formato de data personalizado" + +#: ../src/callbacks.c:1446 +msgid "Custom Date Format" +msgstr "Formato de data personalizado" + +#: ../src/callbacks.c:1447 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Introduza aquí un formato de data e hora personalizado. Pode usar calquera modificador de conversión que se poida usar coa función strftime de ANSI C." + +#: ../src/callbacks.c:1466 +msgid "Date format string could not be converted (possibly too long)." +msgstr "A cadea de formato de data non se puido converter (posiblemente sexa moi longa)." + +#: ../src/callbacks.c:1689 +#: ../src/callbacks.c:1699 +msgid "No more message items." +msgstr "Non hai máis elementos de mensaxe." + +#: ../src/dialogs.c:144 +#: ../src/dialogs.c:229 +msgid "Open File" +msgstr "Abrir ficheiro" + +#: ../src/dialogs.c:148 +#: ../src/interface.c:790 +msgid "_View" +msgstr "_Ver" + +#: ../src/dialogs.c:151 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Abre o ficheiro en modo só lectura. Se escolle máis dun ficheiro, todos se abriránen modo só lectura." + +#: ../src/dialogs.c:173 +msgid "Detect by file extension" +msgstr "Detectar pola extensión do ficheiro" + +#: ../src/dialogs.c:200 +#: ../src/interface.c:3651 +#: ../src/interface.c:5263 +msgid "Detect from file" +msgstr "Detectar dende ficheiro" + +#: ../src/dialogs.c:262 +msgid "_More Options" +msgstr "_Máis opcións" + +#. line 1 with checkbox and encoding combo +#: ../src/dialogs.c:269 +msgid "Show _hidden files" +msgstr "Mostrar os fic_heiros ocultos" + +#: ../src/dialogs.c:280 +msgid "Set encoding:" +msgstr "Definir a codificación de caracteres:" + +#: ../src/dialogs.c:290 +msgid "" +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." +msgstr "" +"Define explicitamente unha codificación para o ficheiro, se non se detectase. Isto é útil cando sabe que Geany non pode detectar a codificación dun ficheiro correctamente.\n" +"Teña en conta que se escolle múltiples ficheiros abriranse todos coa codificación escollida." + +#. line 2 with filetype combo +#: ../src/dialogs.c:297 +msgid "Set filetype:" +msgstr "Definir o tipo de ficheiro:" + +#: ../src/dialogs.c:307 +msgid "" +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." +msgstr "" +"Define explicitamente un tipo de ficheiro para o ficheiro, se non se detectase pola extensión do nome do ficheiro.\n" +"Teña en conta que se escolle múltiples ficheiros abriranse todos co tipo de ficheiro escollido." + +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Sobrescribir?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Ese nome de ficheiro xa existe!" + +#: ../src/dialogs.c:422 +#: ../src/dialogs.c:552 +msgid "Save File" +msgstr "Gardar o ficheiro" + +#: ../src/dialogs.c:430 +msgid "R_ename" +msgstr "R_enomear" + +#: ../src/dialogs.c:432 +msgid "Save the file and rename it" +msgstr "Gardar o ficheiro e renomealo" + +#: ../src/dialogs.c:440 +msgid "_Open file in a new tab" +msgstr "Abrir _o ficheiro nun separador novo" + +#: ../src/dialogs.c:442 +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Manter aberto o documento sen gardar actual e abrir o ficheiro gardado agora nun novo separador" + +#: ../src/dialogs.c:570 +#: ../src/win32.c:681 +msgid "Error" +msgstr "Erro" + +#: ../src/dialogs.c:573 +#: ../src/dialogs.c:1443 +#: ../src/win32.c:687 +#: ../src/win32.c:746 +msgid "Question" +msgstr "Pregunta" + +#: ../src/dialogs.c:576 +#: ../src/win32.c:693 +msgid "Warning" +msgstr "Aviso" + +#: ../src/dialogs.c:579 +#: ../src/win32.c:699 +msgid "Information" +msgstr "Información" + +#: ../src/dialogs.c:660 +msgid "_Don't save" +msgstr "_Non gardar" + +#: ../src/dialogs.c:691 +#, c-format +msgid "The file '%s' is not saved." +msgstr "O ficheiro '%s' non se gardou." + +#: ../src/dialogs.c:693 +msgid "Do you want to save it before closing?" +msgstr "Quere gardalo antes de pechar?" + +#: ../src/dialogs.c:768 +msgid "Choose font" +msgstr "Escoller tipo de letra" + +#: ../src/dialogs.c:1057 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Produciuse un erro, ou a información do ficheiro non se pode obter (p. ex., cun ficheiro novo)" + +#: ../src/dialogs.c:1076 +#: ../src/dialogs.c:1077 +#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1745 +#: ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 +msgid "unknown" +msgstr "descoñecido" + +#: ../src/dialogs.c:1091 +#: ../src/symbols.c:800 +msgid "Properties" +msgstr "Propiedades" + +#: ../src/dialogs.c:1120 +msgid "Type:" +msgstr "Tipo:" + +#: ../src/dialogs.c:1134 +msgid "Size:" +msgstr "Tamaño:" + +#: ../src/dialogs.c:1150 +msgid "Location:" +msgstr "Localización:" + +#: ../src/dialogs.c:1164 +msgid "Read-only:" +msgstr "Só lectura:" + +#: ../src/dialogs.c:1171 +msgid "(only inside Geany)" +msgstr "(só dentro de Geany)" + +#: ../src/dialogs.c:1180 +msgid "Encoding:" +msgstr "Codificación:" + +#. BOM = byte order mark +#: ../src/dialogs.c:1190 +#: ../src/ui_utils.c:225 +msgid "(with BOM)" +msgstr "(con marca de orde de bytes)" + +#: ../src/dialogs.c:1190 +msgid "(without BOM)" +msgstr "(sen marca de orde de bytes)" + +#: ../src/dialogs.c:1201 +msgid "Modified:" +msgstr "Modificado:" + +#: ../src/dialogs.c:1215 +msgid "Changed:" +msgstr "Modificado:" + +#: ../src/dialogs.c:1229 +msgid "Accessed:" +msgstr "Accedido:" + +#: ../src/dialogs.c:1251 +msgid "Permissions:" +msgstr "Permisos:" + +#. Header +#: ../src/dialogs.c:1259 +msgid "Read:" +msgstr "Ler:" + +#: ../src/dialogs.c:1266 +msgid "Write:" +msgstr "Escribir:" + +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Executar:" + +#. Owner +#: ../src/dialogs.c:1281 +msgid "Owner:" +msgstr "Propietario:" + +#. Group +#: ../src/dialogs.c:1317 +msgid "Group:" +msgstr "Grupo:" + +#. Other +#: ../src/dialogs.c:1353 +msgid "Other:" +msgstr "Outro:" + +#: ../src/document.c:648 +#, c-format +msgid "File %s closed." +msgstr "Pechouse o ficheiro %s" + +#: ../src/document.c:775 +#, c-format +msgid "New file \"%s\" opened." +msgstr "Abriuse o novo ficheiro \"%s\"." + +#: ../src/document.c:948 +#: ../src/document.c:1464 +#, c-format +msgid "Could not open file %s (%s)" +msgstr "Non se puido abrir o ficheiro %s (%s)" + +#: ../src/document.c:978 +#, c-format +msgid "" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" +"The file was set to read-only." +msgstr "" +"Non se puido abrir correctamente o ficheiro \"%s\" e truncouse. Isto pode ocorrer se o ficheiro contén un byte NULL. Teña en conta que gardalo pode producir perda de datos.\n" +"Estabeleceuse o ficheiro a só lectura." + +#. For translators: the second wildcard is an encoding name, e.g. +#. * The file \"test.txt\" is not valid UTF-8. +#: ../src/document.c:1004 +#, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "O ficheiro \"%s\" non é %s válido " + +#: ../src/document.c:1014 +#, c-format +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "O ficheiro \"%s\" non parece un ficheiro de texto, ou ben a codificación do ficheiro non é compatíbel." + +#: ../src/document.c:1163 +msgid "Spaces" +msgstr "Espazos" + +#: ../src/document.c:1166 +msgid "Tabs" +msgstr "Tabulacións" + +#: ../src/document.c:1169 +msgid "Tabs and Spaces" +msgstr "Tabulacións e espazos" + +#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs +#. * and Spaces), the second one is the filename +#: ../src/document.c:1174 +#, c-format +msgid "Setting %s indentation mode for %s." +msgstr "Estabelecendo o modo de indentación %s para %s" + +#: ../src/document.c:1227 +msgid "Invalid filename" +msgstr "O nome do ficheiro non é válido" + +#: ../src/document.c:1342 +#, c-format +msgid "File %s reloaded." +msgstr "Recargouse o ficheiro %s." + +#. For translators: this is the status window message for opening a file. %d is the number +#. * of the newly opened file, %s indicates whether the file is opened read-only +#. * (it is replaced with the string ", read-only"). +#: ../src/document.c:1347 +#, c-format +msgid "File %s opened(%d%s)." +msgstr "Abriuse o ficheiro %s (%d%s)." + +#: ../src/document.c:1349 +msgid ", read-only" +msgstr ", só lectura" + +#: ../src/document.c:1558 +msgid "Error renaming file." +msgstr "Erro ao renomear o ficheiro." + +#: ../src/document.c:1643 +#, c-format +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Produciuse un erro mentres se convirtía o ficheiro de UTF-8 a \"%s\". O ficheiro queda sen gardar." + +#: ../src/document.c:1665 +#, c-format +msgid "" +"Error message: %s\n" +"The error occurred at \"%s\" (line: %d, column: %d)." +msgstr "" +"Mensaxe de erro: %s\n" +"O erro produciuse en \"%s\" (liña: %d, columna: %d)." + +#: ../src/document.c:1670 +#, c-format +msgid "Error message: %s." +msgstr "Mensaxe de erro: %s" + +#: ../src/document.c:1770 +#: ../src/document.c:1833 +msgid "Error saving file." +msgstr "Produciuse un erro ao gardar o ficheiro." + +#: ../src/document.c:1832 +#, c-format +msgid "Error saving file (%s)." +msgstr "Produciuse un erro ao gardar o ficheiro (%s)." + +#: ../src/document.c:1857 +#, c-format +msgid "File %s saved." +msgstr "Gardouse o ficheiro %s." + +#: ../src/document.c:1925 +#: ../src/document.c:1982 +#: ../src/document.c:1990 +#, c-format +msgid "\"%s\" was not found." +msgstr "Non se atopou \"%s\"." + +#: ../src/document.c:1990 +msgid "Wrap search and find again?" +msgstr "Buscar ciclicamente e buscar de novo?" + +#: ../src/document.c:2069 +#: ../src/search.c:1127 +#: ../src/search.c:1171 +#: ../src/search.c:1875 +#: ../src/search.c:1876 +#, c-format +msgid "No matches found for \"%s\"." +msgstr "Non se atoparon coincidencias para \"%s\"." + +#: ../src/document.c:2080 +#: ../src/document.c:2089 +#, c-format +msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." +msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." +msgstr[0] "%s: substituiuse %d ocorrencia de \"%s\" por \"%s\"." +msgstr[1] "%s: substituiuse %d ocorrencias de \"%s\" por \"%s\"." + +#: ../src/document.c:2896 +msgid "Do you want to reload it?" +msgstr "Quere recargalo?" + +#: ../src/document.c:2897 +#, c-format +msgid "" +"The file '%s' on the disk is more recent than\n" +"the current buffer." +msgstr "" +"O ficheiro '%s' no disco é máis recente que\n" +"o búfer actual." + +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Pechar _sen gardar" + +#: ../src/document.c:2919 +#, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "O ficheiro \"%s\" non se atopou no disco! Quere intentar gardar de novo o ficheiro?" + +#: ../src/editor.c:4425 +msgid "Enter Tab Width" +msgstr "Introduza o largo da tabulación" + +#: ../src/editor.c:4426 +msgid "Enter the amount of spaces which should be replaced by a tab character." +msgstr "Introduza a cantidade de espazos que deberían substituírse por un caracter de tabulador." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Atención: o largo da tabulación fixado non é estándar: %d != 8!" + +#: ../src/encodings.c:76 +msgid "Celtic" +msgstr "Celta" + +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 +msgid "Greek" +msgstr "Grego" + +#: ../src/encodings.c:79 +msgid "Nordic" +msgstr "Nórdico" + +#: ../src/encodings.c:80 +msgid "South European" +msgstr "Europa do Sur" + +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 +#: ../src/encodings.c:84 +msgid "Western" +msgstr "Occidental" + +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 +msgid "Baltic" +msgstr "Báltico" + +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 +msgid "Central European" +msgstr "Europa Central" + +#. ISO-IR-111 not available on Windows +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 +msgid "Cyrillic" +msgstr "Cirílico" + +#: ../src/encodings.c:98 +msgid "Cyrillic/Russian" +msgstr "Cirílico/Ruso" + +#: ../src/encodings.c:99 +msgid "Cyrillic/Ukrainian" +msgstr "Cirílico/Ucraíno" + +#: ../src/encodings.c:100 +msgid "Romanian" +msgstr "Romanés" + +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 +msgid "Arabic" +msgstr "Árabe" + +#. not available at all, ? +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 +msgid "Hebrew" +msgstr "Hebreo" + +#: ../src/encodings.c:109 +msgid "Hebrew Visual" +msgstr "Hebreo visual" + +#: ../src/encodings.c:111 +msgid "Armenian" +msgstr "Armenio" + +#: ../src/encodings.c:112 +msgid "Georgian" +msgstr "Xeorxiano" + +#: ../src/encodings.c:113 +msgid "Thai" +msgstr "Thai" + +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 +msgid "Turkish" +msgstr "Turco" + +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 +msgid "Vietnamese" +msgstr "Vietnamita" + +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 +msgid "Unicode" +msgstr "Unicode" + +#. maybe not available on Linux +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 +#: ../src/encodings.c:134 +msgid "Chinese Simplified" +msgstr "Chinés simplificado" + +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 +msgid "Chinese Traditional" +msgstr "Chinés tradicional" + +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 +#: ../src/encodings.c:141 +msgid "Japanese" +msgstr "Xaponés" + +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 +#: ../src/encodings.c:145 +msgid "Korean" +msgstr "Coreano" + +#: ../src/encodings.c:147 +msgid "Without encoding" +msgstr "Sen codificación" + +#: ../src/encodings.c:375 +msgid "_West European" +msgstr "Europeo _occidental" + +#: ../src/encodings.c:381 +msgid "_East European" +msgstr "_Europeo oriental" + +#: ../src/encodings.c:387 +msgid "East _Asian" +msgstr "_Asiático oriental" + +#: ../src/encodings.c:393 +msgid "_SE & SW Asian" +msgstr "Asiático do _sudeste e sudoeste" + +#: ../src/encodings.c:399 +msgid "_Middle Eastern" +msgstr "_Medio oriente" + +#: ../src/encodings.c:405 +msgid "_Unicode" +msgstr "_Unicode" + +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 +#, c-format +msgid "%s source file" +msgstr "Ficheiro fonte de %s" + +#: ../src/filetypes.c:102 +#, c-format +msgid "%s file" +msgstr "Ficheiro %s" + +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3594 +#: ../src/interface.c:5206 +msgid "None" +msgstr "Ningún" + +#: ../src/filetypes.c:409 +msgid "Shell script file" +msgstr "Script de shell" + +#: ../src/filetypes.c:421 +msgid "Makefile" +msgstr "Makefile" + +#: ../src/filetypes.c:433 +msgid "XML document" +msgstr "Documento XML" + +#: ../src/filetypes.c:468 +msgid "Cascading StyleSheet" +msgstr "Folla de estilo en cascada" + +#: ../src/filetypes.c:479 +msgid "SQL Dump file" +msgstr "Ficheiro de volcado SQL" + +#: ../src/filetypes.c:534 +msgid "Config file" +msgstr "Ficheiro de configuración" + +#: ../src/filetypes.c:546 +msgid "Gettext translation file" +msgstr "Ficheiro de tradución Gettext" + +#: ../src/filetypes.c:579 +#, c-format +msgid "%s script file" +msgstr "Ficheiros de Script de %s" + +#: ../src/filetypes.c:826 +msgid "_Programming Languages" +msgstr "Linguaxes de _programación" + +#: ../src/filetypes.c:827 +msgid "_Scripting Languages" +msgstr "Linguaxes de _script" + +#: ../src/filetypes.c:828 +msgid "_Markup Languages" +msgstr "Linguaxes de _marcado" + +#: ../src/filetypes.c:829 +msgid "M_iscellaneous Languages" +msgstr "Linguaxes var_iados" + +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Tipos de fi_cheiro personalizados" + +#: ../src/filetypes.c:1403 +#: ../src/win32.c:105 +msgid "All Source" +msgstr "Todos os ficheiros de código fonte" + +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 +#: ../src/project.c:285 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 +msgid "All files" +msgstr "Todos os ficheiros" + +#: ../src/filetypes.c:1487 +#, c-format +msgid "Bad regex for filetype %s: %s" +msgstr "Expresión regular errónea para o tipo de ficheiro %s: %s" + +#: ../src/geany.h:52 +msgid "untitled" +msgstr "Sen título" + +#: ../src/highlighting.c:3349 +#: ../src/main.c:802 +#: ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Non foi posíbel encontrar o ficheiro '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Esquemas de _cor" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "Pre_definido" + +#: ../src/interface.c:295 +msgid "_File" +msgstr "_Ficheiro" + +#: ../src/interface.c:306 +msgid "New (with _Template)" +msgstr "Novo (con _modelo)" + +#: ../src/interface.c:323 +#: ../src/interface.c:2022 +msgid "Open Selected F_ile" +msgstr "Abrir o f_icheiro seleccionado" + +#: ../src/interface.c:327 +msgid "Recent _Files" +msgstr "_Ficheiros recentes" + +#: ../src/interface.c:344 +msgid "Save A_ll" +msgstr "Gardar _todos" + +#: ../src/interface.c:360 +msgid "R_eload As" +msgstr "R_ecargar como" + +#: ../src/interface.c:371 +#: ../src/interface.c:553 +#: ../src/interface.c:682 +#: ../src/interface.c:696 +#: ../src/interface.c:950 +#: ../src/interface.c:960 +#: ../src/interface.c:2090 +#: ../src/interface.c:2104 +msgid "invisible" +msgstr "invisible" + +#: ../src/interface.c:388 +msgid "Page Set_up" +msgstr "Config_uración da páxina" + +#: ../src/interface.c:405 +#: ../src/notebook.c:214 +msgid "Close Ot_her Documents" +msgstr "Pec_har os outros documentos" + +#: ../src/interface.c:413 +#: ../src/notebook.c:219 +msgid "C_lose All" +msgstr "P_echar todos" + +#: ../src/interface.c:430 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/interface.c:480 +#: ../src/interface.c:2031 +msgid "_Format" +msgstr "_Formato" + +#: ../src/interface.c:487 +#: ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Refacer o fluxo de liñas/bloque" + +#: ../src/interface.c:491 +msgid "T_oggle Case of Selection" +msgstr "Intercambiar a capitalizaci_ón da selección" + +#: ../src/interface.c:495 +#: ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Traspor a liña actual" + +#: ../src/interface.c:504 +msgid "_Comment Line(s)" +msgstr "_Comentar liña(s)" + +#: ../src/interface.c:508 +msgid "U_ncomment Line(s)" +msgstr "Descome_ntar liña(s)" + +#: ../src/interface.c:512 +msgid "_Toggle Line Commentation" +msgstr "In_tercambiar o comentado de liña" + +#: ../src/interface.c:521 +msgid "_Increase Indent" +msgstr "Aumentar a sangr_ía" + +#: ../src/interface.c:529 +msgid "_Decrease Indent" +msgstr "_Diminuír a sangría" + +#: ../src/interface.c:537 +#: ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Sangría intelixente de liñas" + +#: ../src/interface.c:546 +msgid "_Send Selection to" +msgstr "Enviar a _selección a" + +#: ../src/interface.c:556 +#: ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Ordes" + +#: ../src/interface.c:563 +#: ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Cortar a(s) liña(s) actual(is)" + +#: ../src/interface.c:571 +#: ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copiar a(s) liña(s) actual(is)" + +#: ../src/interface.c:579 +#: ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Borrar a(s) liña(s) actual(is)" + +#: ../src/interface.c:583 +#: ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Duplicar liña ou selección" + +#: ../src/interface.c:592 +#: ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Seleccionar a(s) liña(s) actual(is)" + +#: ../src/interface.c:596 +#: ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Seleccionar o parágrafo actual" + +#: ../src/interface.c:605 +#: ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Inserir espazo en branco alternativo" + +#: ../src/interface.c:614 +#: ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "_Ir ao seguinte marcador" + +#: ../src/interface.c:618 +#: ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "_Ir ao anterior marcador" + +#: ../src/interface.c:627 +#: ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Enviar a _selección á terminal" + +#: ../src/interface.c:636 +#: ../src/interface.c:2044 +msgid "I_nsert Comments" +msgstr "I_nserir comentarios" + +#: ../src/interface.c:647 +#: ../src/interface.c:2055 +msgid "Insert _ChangeLog Entry" +msgstr "Inserir entrada de rexistro de _cambios" + +#: ../src/interface.c:651 +#: ../src/interface.c:2059 +msgid "Insert File _Header" +msgstr "Inserir _cabeceira de ficheiro" + +#: ../src/interface.c:655 +#: ../src/interface.c:2063 +msgid "Insert _Function Description" +msgstr "Inserir descrición de _función" + +#: ../src/interface.c:659 +#: ../src/interface.c:2067 +msgid "Insert _Multiline Comment" +msgstr "Inserir comentario _multiliña" + +#: ../src/interface.c:663 +#: ../src/interface.c:2071 +msgid "Insert _GPL Notice" +msgstr "Inserir texto da _GPL" + +#: ../src/interface.c:667 +#: ../src/interface.c:2075 +msgid "Insert _BSD License Notice" +msgstr "Insertar texto da licenza _BSD" + +#: ../src/interface.c:671 +#: ../src/interface.c:2079 +msgid "Insert Dat_e" +msgstr "Inserir D_ata" + +#: ../src/interface.c:685 +#: ../src/interface.c:2093 +msgid "_Insert \"include <...>\"" +msgstr "_Inserir \"include <...>\"" + +#: ../src/interface.c:704 +msgid "Preference_s" +msgstr "Preferencia_s" + +#: ../src/interface.c:712 +#: ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Preferencias dos p_lugins" + +#: ../src/interface.c:720 +msgid "_Search" +msgstr "Bu_scar" + +#: ../src/interface.c:731 +msgid "Find _Next" +msgstr "Buscar _seguinte" + +#: ../src/interface.c:735 +msgid "Find _Previous" +msgstr "Buscar _anterior" + +#: ../src/interface.c:739 +msgid "Find in F_iles" +msgstr "Buscar en f_icheiros" + +#: ../src/interface.c:743 +#: ../src/search.c:551 +msgid "_Replace" +msgstr "Substituí_r" + +#: ../src/interface.c:756 +msgid "Find _Selected" +msgstr "Buscar a _selección" + +#: ../src/interface.c:760 +msgid "Find Pre_vious Selected" +msgstr "Buscar a selección pre_via" + +#: ../src/interface.c:769 +msgid "Next _Message" +msgstr "Seguinte _mensaxe" + +#: ../src/interface.c:773 +msgid "Pr_evious Message" +msgstr "Ant_erior mensaxe" + +#: ../src/interface.c:782 +#: ../src/interface.c:2145 +msgid "_Go to Line" +msgstr "_Ir á liña" + +#: ../src/interface.c:797 +msgid "Change _Font" +msgstr "Cambiar tipo de _letra" + +#: ../src/interface.c:810 +msgid "To_ggle All Additional Widgets" +msgstr "Intercambiar todos os wid_gets adicionais" + +#: ../src/interface.c:814 +msgid "Full_screen" +msgstr "_Pantalla completa" + +#: ../src/interface.c:818 +msgid "Show Message _Window" +msgstr "Mostrar a _xanela de mensaxes" + +#: ../src/interface.c:823 +msgid "Show _Toolbar" +msgstr "Mostrar barra de ferramen_tas" + +#: ../src/interface.c:828 +msgid "Show Side_bar" +msgstr "Mostrar _barra lateral" + +#: ../src/interface.c:833 +#: ../src/interface.c:4025 +#: ../src/interface.c:5347 +#: ../src/keybindings.c:260 +#: ../src/prefs.c:1531 +msgid "Editor" +msgstr "Editor" + +#: ../src/interface.c:840 +msgid "Show _Markers Margin" +msgstr "Mostrar a marxe de _marcadores" + +#: ../src/interface.c:845 +msgid "Show _Line Numbers" +msgstr "Mostrar números de _liña" + +#: ../src/interface.c:850 +msgid "Show _White Space" +msgstr "Mostrar espazos en _branco" + +#: ../src/interface.c:854 +msgid "Show Line _Endings" +msgstr "Mostrar finais d_e liña" + +#: ../src/interface.c:858 +msgid "Show _Indentation Guides" +msgstr "Mostrar as gu_ías de sangría" + +#: ../src/interface.c:879 +msgid "_Document" +msgstr "_Documento" + +#: ../src/interface.c:886 +msgid "_Line Wrapping" +msgstr "Axuste de _liñas longas" + +#: ../src/interface.c:891 +msgid "Line _Breaking" +msgstr "_Salto de liña" + +#: ../src/interface.c:895 +msgid "_Auto-indentation" +msgstr "Sangría _automática" + +#: ../src/interface.c:900 +msgid "In_dent Type" +msgstr "T_ipo de sangría" + +#: ../src/interface.c:907 +#: ../src/interface.c:3633 +#: ../src/interface.c:5245 +msgid "_Tabs" +msgstr "_Tabulacións" + +#: ../src/interface.c:913 +#: ../src/interface.c:3624 +#: ../src/interface.c:5236 +msgid "_Spaces" +msgstr "E_spazos" + +#: ../src/interface.c:919 +#: ../src/interface.c:3642 +#: ../src/interface.c:5254 +msgid "T_abs and Spaces" +msgstr "T_abulacións e espazos" + +#: ../src/interface.c:930 +msgid "Read _Only" +msgstr "S_ó lectura" + +#: ../src/interface.c:934 +msgid "_Write Unicode BOM" +msgstr "_Escribir o BOM (marca de orde de bytes) unicode" + +#: ../src/interface.c:943 +msgid "Set File_type" +msgstr "Configurar o _tipo de ficheiro" + +#: ../src/interface.c:953 +msgid "Set _Encoding" +msgstr "Configurar a codificación de caract_eres" + +#: ../src/interface.c:963 +msgid "Set Line E_ndings" +msgstr "Configurar os finais d_e liña" + +#: ../src/interface.c:970 +msgid "Convert and Set to _CR/LF (Win)" +msgstr "Converter e configurar a _CR/LF (Win)" + +#: ../src/interface.c:976 +msgid "Convert and Set to _LF (Unix)" +msgstr "Converter e configurar a _LF (Unix)" + +#: ../src/interface.c:982 +msgid "Convert and Set to CR (_Mac)" +msgstr "Converter e configurar a CR (_Mac)" + +#: ../src/interface.c:993 +msgid "_Strip Trailing Spaces" +msgstr "Quitar e_spazos do final" + +#: ../src/interface.c:997 +msgid "_Replace Tabs by Spaces" +msgstr "Substituí_r tabulacións por espazos" + +#: ../src/interface.c:1001 +msgid "Replace Spaces b_y Tabs" +msgstr "Substituír espazos por _tabulacións" + +#: ../src/interface.c:1010 +msgid "_Fold All" +msgstr "_Contraer todo" + +#: ../src/interface.c:1014 +msgid "_Unfold All" +msgstr "_Expandir todo" + +#: ../src/interface.c:1023 +msgid "Remove _Markers" +msgstr "Eliminar _marcadores" + +#: ../src/interface.c:1027 +msgid "Remove Error _Indicators" +msgstr "Eliminar _indicadores de erro" + +#: ../src/interface.c:1031 +msgid "_Project" +msgstr "_Proxecto" + +#: ../src/interface.c:1038 +msgid "_New" +msgstr "_Novo" + +#: ../src/interface.c:1046 +msgid "_Open" +msgstr "_Abrir" + +#: ../src/interface.c:1054 +msgid "_Recent Projects" +msgstr "Proxectos _recentes" + +#: ../src/interface.c:1058 +msgid "_Close" +msgstr "Pe_char" + +#: ../src/interface.c:1079 +msgid "_Tools" +msgstr "Ferramen_tas" + +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Recargar a configuración" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Ficheiros de c_onfiguración" + +#: ../src/interface.c:1107 +msgid "_Color Chooser" +msgstr "Selector de _cor" + +#: ../src/interface.c:1115 +msgid "_Word Count" +msgstr "Contar pala_bras" + +#: ../src/interface.c:1119 +msgid "Load Ta_gs" +msgstr "Car_gar etiquetas" + +#: ../src/interface.c:1123 +#: ../src/interface.c:1130 +msgid "_Help" +msgstr "A_xuda" + +#: ../src/interface.c:1138 +msgid "_Website" +msgstr "Sitio _web" + +#: ../src/interface.c:1142 +msgid "_Keyboard Shortcuts" +msgstr "Atallos de t_eclado" + +#: ../src/interface.c:1146 +msgid "_Debug Messages" +msgstr "Mensaxes de _depuración" + +#: ../src/interface.c:1185 +#: ../src/sidebar.c:130 +msgid "Symbols" +msgstr "Símbolos" + +#: ../src/interface.c:1199 +msgid "Documents" +msgstr "Documentos" + +#: ../src/interface.c:1235 +msgid "Status" +msgstr "Estado" + +#: ../src/interface.c:1249 +msgid "Compiler" +msgstr "Compilador" + +#: ../src/interface.c:1264 +msgid "Messages" +msgstr "Mensaxes" + +#: ../src/interface.c:1277 +msgid "Scribble" +msgstr "Anotacións" + +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Preferencias da barra de ferramen_tas" + +#: ../src/interface.c:1900 +msgid "_Hide Toolbar" +msgstr "O_cultar a barra de ferramentas" + +#: ../src/interface.c:2112 +msgid "Find _Usage" +msgstr "_Uso da busca" + +#: ../src/interface.c:2120 +msgid "Find _Document Usage" +msgstr "Uso da busca en _documentos" + +#: ../src/interface.c:2128 +msgid "Go to _Tag Definition" +msgstr "Ir á definición da e_tiqueta" + +#: ../src/interface.c:2132 +msgid "Go to T_ag Declaration" +msgstr "Ir á declaración da etiquet_a" + +#: ../src/interface.c:2136 +msgid "Conte_xt Action" +msgstr "Acción do conte_xto" + +#: ../src/interface.c:2669 +#: ../src/keybindings.c:387 +msgid "Preferences" +msgstr "Preferencias" + +#: ../src/interface.c:2705 +msgid "Load files from the last session" +msgstr "Cargar os ficheiros da última sesión" + +#: ../src/interface.c:2708 +msgid "Opens at startup the files from the last session" +msgstr "Abre os ficheiros da última sesión ao iniciar" + +#: ../src/interface.c:2710 +msgid "Load virtual terminal support" +msgstr "Cargar a compatibilidade co terminal virtual" + +#: ../src/interface.c:2712 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Debe o emulador de terminal virtual (ETV) cargarse ao inicio? Desactíveo se non o precisa" + +#: ../src/interface.c:2714 +msgid "Enable plugin support" +msgstr "Activar compatibilidade con plugins" + +#: ../src/interface.c:2718 +msgid "Startup" +msgstr "Inicio" + +#: ../src/interface.c:2737 +msgid "Save window position and geometry" +msgstr "Gardar a posición e tamaño da xanela" + +#: ../src/interface.c:2740 +msgid "Saves the window position and geometry and restores it at the start" +msgstr "Garda a posición e xeometría da xanela e restáuraas ao inicio" + +#: ../src/interface.c:2742 +msgid "Confirm exit" +msgstr "Confirmar a saída" + +#: ../src/interface.c:2745 +msgid "Shows a confirmation dialog on exit" +msgstr "Mostra un diálogo de confirmación ao saír" + +#: ../src/interface.c:2747 +msgid "Shutdown" +msgstr "Apagar" + +#: ../src/interface.c:2768 +msgid "Startup path:" +msgstr "Camiño de inicio:" + +#: ../src/interface.c:2780 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Camiño no que comezar ao abrir ou gardar ficheiros. Debe ser un camiño absoluta. Déixeo en branco para usar o directorio de traballo actual." + +#: ../src/interface.c:2793 +msgid "Project files:" +msgstr "Ficheiros de proxecto:" + +#: ../src/interface.c:2805 +msgid "Path to start in when opening project files" +msgstr "Camiño no que comezar ao abrir ficheiros de proxecto" + +#: ../src/interface.c:2818 +msgid "Extra plugin path:" +msgstr "Camiño adicional para plugins:" + +#: ../src/interface.c:2830 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "De xeito predeterminado Geany busca no camiño de instalación global e no directorio de configuración. Adicionalmente buscaranse plugins no camiño introducido aquí. Déixeo en branco para deshabilitar." + +#: ../src/interface.c:2843 +msgid "Paths" +msgstr "Camiños" + +#: ../src/interface.c:2848 +msgid "Startup" +msgstr "Inicio" + +#: ../src/interface.c:2871 +msgid "Beep on errors or when compilation has finished" +msgstr "Emitir un ton nos erros ou cando remate a compilación" + +#: ../src/interface.c:2874 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Débese emitir un ton se ocorre un erro ou cando remate o proceso de compilación?" + +#: ../src/interface.c:2876 +msgid "Switch to status message list at new message" +msgstr "Cambiar á lista de mensaxes de estado en cada nova mensaxe" + +#: ../src/interface.c:2879 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Cambiar ao separador de mensaxes de estado (na xanela do caderno de abaixo) se chega unha nova mensaxe de estado" + +#: ../src/interface.c:2881 +msgid "Suppress status messages in the status bar" +msgstr "Eliminar as mensaxes do inicio da barra de estado" + +#: ../src/interface.c:2884 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Elimina todas as mensaxes da barra de estado. As mensaxes aínda se mostrarán na xanela de mensaxes de estado." + +#: ../src/interface.c:2886 +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "Enfocar automaticamente os widgets (o foco segue ao rato)" + +#: ../src/interface.c:2889 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Pon o foco automaticamente nos widgets debaixo do cursor do rato. Funciona co widget proncipal do editor, as anotacións, a busca na barra de ferramentas e o ETV." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Usar os diálogos de abrir ou gardar ficheiros de Windows" + +#: ../src/interface.c:2894 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "DEfine se se debe usar os diálogos de abrir ou gardar ficheiros nativos de Windows ou os diálogos predefinidos de GTK" + +#: ../src/interface.c:2896 +#: ../src/interface.c:3275 +#: ../src/interface.c:4230 +msgid "Miscellaneous" +msgstr "Miscelánea" + +#: ../src/interface.c:2915 +msgid "Always wrap search and hide the Find dialog" +msgstr "Procurar sempre ciclicamente e ocultar o diálogo de procura" + +#: ../src/interface.c:2918 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Procurar sempre ciclicamente no documento e ocultar o diálogo de procura despois de premer en procurar seguinte ou anterior" + +#: ../src/interface.c:2920 +msgid "Use the current word under the cursor for Find dialogs" +msgstr "Usar a palabra actual baixo o cursor para os diálogos de busca" + +#: ../src/interface.c:2923 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Usar a palabra baixo o cursor cando se abren os diálogos de buscar, buscar en ficheiros ou Substiruír e non hai nada seleccionado" + +#: ../src/interface.c:2925 +msgid "Use the current file's directory for Find in Files" +msgstr "Usar o directorio do ficheiro actual para buscar en ficheiros" + +#: ../src/interface.c:2929 +msgid "Search" +msgstr "Busca" + +#: ../src/interface.c:2948 +msgid "Use project-based session files" +msgstr "Usar ficheiros de sesión baseados no proxecto" + +#: ../src/interface.c:2951 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Débense gardar os ficheiros de sesión dun proxecto e abrilos cando se reabra o proxecto?" + +#: ../src/interface.c:2953 +msgid "Store project file inside the project base directory" +msgstr "Gardar o ficheiro de proxecto dentro do directorio base do proxecto" + +#: ../src/interface.c:2956 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Cando está activado, o ficheiro dun proxecto gárdase de xeito predeterminado dentro do directorio base do proxecto ao crear proxectos novos, no canto de nun directorio por riba do directorio base. Aínda así pode cambiar o camiño do ficheiro de proxecto no diálogo de novo proxecto." + +#: ../src/interface.c:2958 +msgid "Projects" +msgstr "Proxectos" + +#: ../src/interface.c:2963 +msgid "Miscellaneous" +msgstr "Miscelánea" + +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 +#: ../src/prefs.c:1525 +msgid "General" +msgstr "Xeral" + +#: ../src/interface.c:3004 +msgid "Show symbol list" +msgstr "Mostrar a lista de símbolos" + +#: ../src/interface.c:3007 +msgid "Toggle the symbol list on and off" +msgstr "Activar ou desactivar a lista de símbolos" + +#: ../src/interface.c:3009 +msgid "Show documents list" +msgstr "Mostrar a lista de documentos" + +#: ../src/interface.c:3012 +msgid "Toggle the documents list on and off" +msgstr "Activar ou desactivar a lista de documentos" + +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Mostrar a barra lateral" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Posición:" + +#: ../src/interface.c:3026 +#: ../src/interface.c:3149 +#: ../src/interface.c:3210 +#: ../src/interface.c:3228 +#: ../src/interface.c:3246 +msgid "Left" +msgstr "Left" + +#: ../src/interface.c:3033 +#: ../src/interface.c:3157 +#: ../src/interface.c:3211 +#: ../src/interface.c:3229 +#: ../src/interface.c:3247 +msgid "Right" +msgstr "Right" + +#: ../src/interface.c:3039 +msgid "Sidebar" +msgstr "Barra lateral" + +#: ../src/interface.c:3060 +msgid "Symbol list:" +msgstr "Lista de símbolos:" + +#: ../src/interface.c:3067 +#: ../src/interface.c:3197 +msgid "Message window:" +msgstr "Xanela de mensaxes." + +#: ../src/interface.c:3074 +#: ../src/interface.c:3233 +msgid "Editor:" +msgstr "Editor:" + +#: ../src/interface.c:3086 +msgid "Sets the font for the message window" +msgstr "Configura o tipo de letra para a xanela de mensaxes" + +#: ../src/interface.c:3094 +msgid "Sets the font for the symbol list" +msgstr "Configura o tipo de letra para a lista de símbolos" + +#: ../src/interface.c:3102 +msgid "Sets the editor font" +msgstr "Configura o tipo de letra do editor" + +#: ../src/interface.c:3104 +msgid "Fonts" +msgstr "Tipos de letra" + +#: ../src/interface.c:3123 +msgid "Show editor tabs" +msgstr "Mostrar os separadores do editor" + +#: ../src/interface.c:3127 +msgid "Show close buttons" +msgstr "Mostrar botóns de pechar" + +#: ../src/interface.c:3130 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Amosa un pequeno botón cunha cruz no separador do ficheiro para pechar ficheiros facilmente premendo nel (require reiniciar Geany)" + +#: ../src/interface.c:3136 +msgid "Placement of new file tabs:" +msgstr "Situación de novos separadores de ficheiro:" + +#: ../src/interface.c:3152 +msgid "File tabs will be placed on the left of the notebook" +msgstr "Os separadores de ficheiros colocaranse á esquerda do caderno" + +#: ../src/interface.c:3160 +msgid "File tabs will be placed on the right of the notebook" +msgstr "Os separadores de ficheiros colocaranse á dereita do caderno" + +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Pegado ao actual" + +#: ../src/interface.c:3169 +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Colocar os separadores de ficheiro pegados ao actual no canto de nos bordos do caderno" + +#: ../src/interface.c:3171 +msgid "Double-clicking hides all additional widgets" +msgstr "Premer dúas veces oculta todos os widgets adicionais" + +#: ../src/interface.c:3174 +msgid "Calls the View->Toggle All Additional Widgets command" +msgstr "Chama á orde de Ver -> Intercambiar todos os widgets adicionais" + +#: ../src/interface.c:3176 +msgid "Editor tabs" +msgstr "Separadores do editor" + +#: ../src/interface.c:3212 +#: ../src/interface.c:3230 +#: ../src/interface.c:3248 +msgid "Top" +msgstr "Arriba" + +#: ../src/interface.c:3213 +#: ../src/interface.c:3231 +#: ../src/interface.c:3249 +msgid "Bottom" +msgstr "Abaixo" + +#: ../src/interface.c:3215 +msgid "Sidebar:" +msgstr "Barra lateral:" + +#: ../src/interface.c:3251 +msgid "Tab positions" +msgstr "Posicións dos separadores" + +#: ../src/interface.c:3270 +msgid "Show status bar" +msgstr "Mostrar a barra de estado" + +#: ../src/interface.c:3273 +msgid "Whether to show the status bar at the bottom of the main window" +msgstr "Indica se a barra de estado na parte inferior da xanela principal debería ser visíbel." + +#: ../src/interface.c:3280 +#: ../src/prefs.c:1527 +msgid "Interface" +msgstr "Interface" + +#: ../src/interface.c:3311 +msgid "Show T_oolbar" +msgstr "M_ostrar a barra de ferramentas" + +#: ../src/interface.c:3315 +msgid "_Append Toolbar to the Menu" +msgstr "Engadir _a barra de ferramentas ao menú" + +#: ../src/interface.c:3318 +msgid "Pack the toolbar to the main menu to save vertical space" +msgstr "Empaquetar a barra de ferramentas ao menú principal para aforrar espazo vertical" + +#: ../src/interface.c:3340 +#: ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Personalizar a barra de ferramentas" + +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Pre_definido do sistema" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Im_axes e texto" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Só _imaxes" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Só _texto" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Estilo das iconas" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Predefinido do s_istema" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Iconas _pequenas" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Iconas _moi pequenas" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Iconas _grandes" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Tamaño das iconas" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra de ferramentas" + +#: ../src/interface.c:3455 +#: ../src/prefs.c:1529 +msgid "Toolbar" +msgstr "Barra de ferramentas" + +#: ../src/interface.c:3482 +msgid "Line wrapping" +msgstr "Axuste de liñas longas" + +#: ../src/interface.c:3485 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Axustar a liña ao borde da xanela e continuala na seguinte liña. Nota: o axuste de liñas ten un custe alto de rendemento para documentos grandes así que debería desactivarse en equipos lentos." + +#: ../src/interface.c:3487 +msgid "Enable \"smart\" home key" +msgstr "Activar a tecla de inicio \"intelixente\"" + +#: ../src/interface.c:3490 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Cando estea activado o inicio \"intelixente\", a tecla de inicio moverá o cursor ao primeiro caracter non branco da liña, a non ser que xa estea alí, que o moverá ao verdadeiro inicio da liña. Cando esta característica está deshabilitada, a tecla de inicio levará o cursor ao inicio da liña actual, da igual a súa posición actual." + +#: ../src/interface.c:3492 +msgid "Disable Drag and Drop" +msgstr "Desactivar arrastrar e soltar" + +#: ../src/interface.c:3495 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Desactivar completamente arrastrar e soltar na xanela do editor de xeito que non se poida arrastrar e soltar ningunha selección dentro ou fora da xanela do editor" + +#: ../src/interface.c:3497 +msgid "Enable folding" +msgstr "Activar o pregado" + +#: ../src/interface.c:3500 +msgid "Whether to enable folding the code" +msgstr "Indica se se activa o pregado de código" + +#: ../src/interface.c:3502 +msgid "Fold/unfold all children of a fold point" +msgstr "Pregar ou despregar todos os fillos dun punto de pregado" + +#: ../src/interface.c:3505 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Pregar ou despregar todos os fillos dun punto de pregado. Premendo a tecla de maiúsculas ao premer nun símbolo de encoller fará que se use o comportamento contrario." + +#: ../src/interface.c:3507 +msgid "Use indicators to show compile errors" +msgstr "Usar indicadores para mostrar erros ao compilar" + +#: ../src/interface.c:3510 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Débense usar indicadores (un subliñado ondeante) para resaltar as liñas nas que o compilador atopou un aviso ou un erro?" + +#: ../src/interface.c:3512 +msgid "Newline strips trailing spaces" +msgstr "As novas liñas eliminan os caracteres sobrantes " + +#: ../src/interface.c:3515 +msgid "Enable newline to strip the trailing spaces on the previous line" +msgstr "Permitir ás novas liñas eliminar os caracteres sobrantes da liña anterior" + +#: ../src/interface.c:3521 +msgid "Line breaking column:" +msgstr "Columna de rotura de liña:" + +#: ../src/interface.c:3535 +msgid "Comment toggle marker:" +msgstr "Marca de intercambio de comentarios:" + +#: ../src/interface.c:3542 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Unha cadea que se engade ao intercambiar un comentario de liña nun ficheiro fonte. Úsase para marcar o comentario como intercambiado." + +#: ../src/interface.c:3544 +msgid "Features" +msgstr "Características" + +#: ../src/interface.c:3549 +msgid "Features" +msgstr "Características" + +#: ../src/interface.c:3582 +#: ../src/interface.c:5194 +msgid "Auto-indent mode:" +msgstr "Modo de sangría automática:" + +#: ../src/interface.c:3595 +#: ../src/interface.c:5207 +msgid "Basic" +msgstr "Basic" + +#: ../src/interface.c:3596 +#: ../src/interface.c:5208 +msgid "Current chars" +msgstr "Caracteres actuais" + +#: ../src/interface.c:3597 +#: ../src/interface.c:5209 +msgid "Match braces" +msgstr "Parénteses correspondentes" + +#: ../src/interface.c:3599 +#: ../src/interface.c:3925 +#: ../src/interface.c:5211 +msgid "Type:" +msgstr "Tipo:" + +#: ../src/interface.c:3606 +#: ../src/interface.c:5218 +msgid "Width:" +msgstr "Largura:" + +#: ../src/interface.c:3619 +#: ../src/interface.c:5231 +msgid "The width in chars of a single indent" +msgstr "A largura en caracteres dun sangrado simple" + +#: ../src/interface.c:3629 +#: ../src/interface.c:5241 +msgid "Use spaces when inserting indentation" +msgstr "Usar espazos ao inserir sangrados" + +#: ../src/interface.c:3638 +#: ../src/interface.c:5250 +msgid "Use one tab per indent" +msgstr "Usar unha tabulación por sangrado" + +#: ../src/interface.c:3647 +#: ../src/interface.c:5259 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Usar espazos se o sangrado total é menor que a largura da tabulación. Se non, usar ambos." + +#: ../src/interface.c:3656 +#: ../src/interface.c:5268 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Débese detectar o tipo de sangrado a partir do contido do ficheiro cando se abre?" + +#: ../src/interface.c:3658 +msgid "Tab key indents" +msgstr "Sangría da tecla de tabulación" + +#: ../src/interface.c:3661 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Premendo tabulador ou maiúsculas+tabulador aumenta un reduce o sangrado no canto de inserir un carácter de tabulación" + +#: ../src/interface.c:3663 +msgid "Indentation" +msgstr "Sangría" + +#: ../src/interface.c:3668 +#: ../src/interface.c:5270 +msgid "Indentation" +msgstr "Sangría" + +#: ../src/interface.c:3691 +msgid "Snippet completion" +msgstr "Completado de recortes de código" + +#: ../src/interface.c:3694 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Teclear unha secuencia corta de caracteres definida e completala para formar unha cadea máis complexa premendo só unha tecla" + +#: ../src/interface.c:3696 +msgid "XML tag autocompletion" +msgstr "Completado automático de etiquetas XML" + +#: ../src/interface.c:3699 +msgid "Automatic completion and closing of XML tags (includes HTML tags)" +msgstr "Completado e cerrado automático de etiquetas XML (inclúe as etiquetas HTML)" + +#: ../src/interface.c:3701 +msgid "Automatic continuation of multi-line comments" +msgstr "Continuación automática de comentarios de varias liñas" + +#: ../src/interface.c:3704 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Continuar automaticamente comentarios de varias liñas en linguaxes como C, C++ e Java cando se introduce unha liña nova dentro dun deses comentarios" + +#: ../src/interface.c:3706 +msgid "Autocomplete symbols" +msgstr "Completado automático de símbolos" + +#: ../src/interface.c:3709 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Completado automático de símbolos coñecidos en ficheiros abertos (nomes de funcións, variables globais, ...)" + +#: ../src/interface.c:3711 +msgid "Autocomplete all words in document" +msgstr "Completar automaticamente todas as palabras do documento" + +#: ../src/interface.c:3715 +msgid "Drop rest of word on completion" +msgstr "Eliminar o resto da palabra cando se complete" + +#: ../src/interface.c:3725 +msgid "Max. symbol name suggestions:" +msgstr "Número máximo de suxestións de nomes de símbolos:" + +#: ../src/interface.c:3732 +msgid "Completion list height:" +msgstr "Altura da lista de completado:" + +#: ../src/interface.c:3739 +msgid "Characters to type for autocompletion:" +msgstr "Caracteres a teclear para o completado automático:" + +#: ../src/interface.c:3752 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" +msgstr "A cantidade de caracteres necesarios para mostrar a lista de autocompletado de símbolos" + +#: ../src/interface.c:3761 +msgid "Display height in rows for the autocompletion list" +msgstr "Altura en filas do visor para a lista de autocompletado" + +#: ../src/interface.c:3770 +msgid "Maximum number of entries to display in the autocompletion list" +msgstr "Número máximo de entradas a mostrar na lista de autocompletado" + +#: ../src/interface.c:3773 +msgid "Completions" +msgstr "Completados" + +#: ../src/interface.c:3792 +msgid "Parenthesis ( )" +msgstr "Parénteses ()" + +#: ../src/interface.c:3797 +msgid "Auto-close parenthesis when typing an opening one" +msgstr "Cerrar automaticamente os parénteses cando se teclea un de apertura" + +#: ../src/interface.c:3799 +msgid "Single quotes ' '" +msgstr "Comiñas simples ' '" + +#: ../src/interface.c:3804 +msgid "Auto-close simple quote when typing an opening one" +msgstr "Cerrar automaticamente as comiñas simples cando se teclea unha de apertura" + +#: ../src/interface.c:3806 +msgid "Curly brackets { }" +msgstr "Chaves { }" + +#: ../src/interface.c:3811 +msgid "Auto-close curly bracket when typing an opening one" +msgstr "Cerrar automaticamente as chaves cando se teclea unha de apertura" + +#: ../src/interface.c:3813 +msgid "Square brackets [ ]" +msgstr "Corchetes [ ]" + +#: ../src/interface.c:3818 +msgid "Auto-close square-bracket when typing an opening one" +msgstr "Cerrar automaticamente os corchetes cando se teclea un de apertura" + +#: ../src/interface.c:3820 +msgid "Double quotes \" \"" +msgstr "Comiñas dobres \" \"" + +#: ../src/interface.c:3825 +msgid "Auto-close double quote when typing an opening one" +msgstr "Cerrar automaticamente as comiñas dobres cando se teclea unha de apertura" + +#: ../src/interface.c:3827 +msgid "Auto-close quotes and brackets" +msgstr "Cerrar automaticamente comiñas e parénteses" + +#: ../src/interface.c:3832 +msgid "Completions" +msgstr "Completados" + +#: ../src/interface.c:3855 +msgid "Invert syntax highlighting colors" +msgstr "Inverter as cores do resaltado de sintaxe" + +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Inverter todas as cores, usando texto branco sobre fondo negro de xeito predeterminado" + +#: ../src/interface.c:3860 +msgid "Show indentation guides" +msgstr "Mostrar guías de sangría" + +#: ../src/interface.c:3863 +msgid "Shows small dotted lines to help you to use the right indentation" +msgstr "Mostrar unhas pequenas liñas de puntos para axudalo a usar o sangrado correcto" + +#: ../src/interface.c:3865 +msgid "Show white space" +msgstr "Mostrar espazos en branco" + +#: ../src/interface.c:3868 +msgid "Marks spaces with dots and tabs with arrows" +msgstr "Marcar os espazos con puntos e as tabulacións con frechas" + +#: ../src/interface.c:3870 +msgid "Show line endings" +msgstr "Mostrar remates de liña" + +#: ../src/interface.c:3873 +msgid "Shows the line ending character" +msgstr "Mostra o carácter de fin de liña" + +#: ../src/interface.c:3875 +msgid "Show line numbers" +msgstr "Mostrar números de liña" + +#: ../src/interface.c:3878 +msgid "Shows or hides the Line Number margin" +msgstr "Mostra ou oculta a marxe cos números de liña" + +#: ../src/interface.c:3880 +msgid "Show markers margin" +msgstr "Mostrar a marxe de marcadores" + +#: ../src/interface.c:3883 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Mostra ou oculta a pequena marxe á dereita dos números de liña, que se usa para marcar liñas" + +#: ../src/interface.c:3885 +msgid "Stop scrolling at last line" +msgstr "Parar o desprazamento na última liña" + +#: ../src/interface.c:3888 +msgid "Whether to stop scrolling one page past the last line of a document" +msgstr "Débese parar o desprazamento da páxina pasada a última liña dun documento?" + +#: ../src/interface.c:3890 +msgid "Display" +msgstr "Mostrar" + +#: ../src/interface.c:3911 +#: ../src/interface.c:5302 +msgid "Column:" +msgstr "Columna:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Cor:" + +#: ../src/interface.c:3937 +msgid "Sets the color of the long line marker" +msgstr "Configura a cor da marca de liña longa" + +#: ../src/interface.c:3938 +#: ../src/toolbar.c:71 +#: ../src/tools.c:717 +#: ../src/vte.c:765 +#: ../src/vte.c:772 +msgid "Color Chooser" +msgstr "Selector de cores" + +#: ../src/interface.c:3946 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "A marca de liña longa é unha fina liña vertical no editor, que axuda a marcar as liñas longas, ou actúa como un consello para saltar de liña. Configure este valor a maior que 0 para especificar onde debería aparecer." + +#: ../src/interface.c:3956 +msgid "Line" +msgstr "Liña" + +#: ../src/interface.c:3959 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Imprime unha liña vertical na xanela do editor na posición do cursor (vexa abaixo)" + +#: ../src/interface.c:3963 +msgid "Background" +msgstr "Fondo" + +#: ../src/interface.c:3966 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "A cor de fondo dos caracteres detrás da posición dada do cursor (ver embaixo) cambiada á cor configurada embaixo, (recomendado se usa fontes proporcionais)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Activado" + +#: ../src/interface.c:3976 +#: ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Marcador de liña longa" + +#: ../src/interface.c:3995 +#: ../src/interface.c:5309 +msgid "Disabled" +msgstr "Desactivado" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Non mostrar espazos virtuais" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Só para seleccións rectangulares" + +#: ../src/interface.c:4005 +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Mostrar espazos virtuais ao final das liñas só cando se faga unha selección rectangular" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Sempre" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Mostrar sempre espazos virtuais ao final das liñas" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Espazos virtuais" + +#: ../src/interface.c:4021 +msgid "Display" +msgstr "Mostrar" + +#: ../src/interface.c:4052 +msgid "Open new documents from the command-line" +msgstr "Abrir documentos novos dende a liña de ordes" + +#: ../src/interface.c:4055 +msgid "Start a new file for each command-line filename that doesn't exist" +msgstr "Comezar un ficheiro novo para cada nome de ficheiro da liña de ordes que non exista" + +#: ../src/interface.c:4069 +msgid "Default end of line characters:" +msgstr "Caracteres predeterminados de fin de liña:" + +#: ../src/interface.c:4076 +msgid "New files" +msgstr "Ficheiros novos" + +#: ../src/interface.c:4099 +msgid "Default encoding (new files):" +msgstr "Codificación predeterminada (ficheiros novos):" + +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Configura a codificación predeterminada para os novos ficheiros creados" + +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Usar unha codificación fixada ao abrir ficheiros que non estean en Unicode" + +#: ../src/interface.c:4116 +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Esta opción desactiva a detección automática da codificación do ficheiro ao abrir ficheiros que non estean en Unicode e abre o ficheiro coa codificación especificada (normalmente non se necesita)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codificación predeterminada (ficheiros existentes que non estean en Unicode):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Configura a codificación predeterminada para abrir ficheiros existentes que non estean en Unicode" + +#: ../src/interface.c:4136 +msgid "Encodings" +msgstr "Codificacións" + +#: ../src/interface.c:4155 +msgid "Ensure new line at file end" +msgstr "Asegurar unha nova liña ao final do ficheiro" + +#: ../src/interface.c:4158 +msgid "Ensures that at the end of the file is a new line" +msgstr "Asegura que ao final do ficheiro haberá unha liña nova" + +#: ../src/interface.c:4160 +msgid "Strip trailing spaces and tabs" +msgstr "Eliminar espazos e tabulacións sobrantes" + +#: ../src/interface.c:4163 +msgid "Removes trailing spaces and tabs and the end of lines" +msgstr "Elimina espazos e tabulacións ao final dos ficheiros" + +#: ../src/interface.c:4165 +#: ../src/keybindings.c:522 +msgid "Replace tabs by space" +msgstr "Substituír tabulacións por espazos" + +#: ../src/interface.c:4168 +msgid "Replaces all tabs in document by spaces" +msgstr "Substitúe todas as tabulacións no documento por espazos" + +#: ../src/interface.c:4170 +msgid "Saving files" +msgstr "Gardando ficheiros" + +#: ../src/interface.c:4195 +msgid "Recent files list length:" +msgstr "Lonxitude da lista de ficheiros recentes:" + +#: ../src/interface.c:4209 +msgid "Specifies the number of files which are stored in the Recent files list" +msgstr "Especifica o número de ficheiros que se gardan na lista de ficheiros recentes" + +#: ../src/interface.c:4213 +msgid "Disk check timeout:" +msgstr "Límite de tempo para a comprobación de disco:" + +#: ../src/interface.c:4226 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Cada canto tempo se debe comprobar se houbo cambios nos ficheiros dos documentos no disco, en segundos. Un cero desactiva a comprobación." + +#: ../src/interface.c:4235 +#: ../src/prefs.c:1533 +#: ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 +msgid "Files" +msgstr "Ficheiros" + +#: ../src/interface.c:4268 +msgid "Terminal:" +msgstr "Terminal:" + +#: ../src/interface.c:4275 +msgid "Browser:" +msgstr "Navegador:" + +#: ../src/interface.c:4287 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Un emulador de terminal como xterm, gnome-terminal ou konsole (debe aceptar o argumento \"-e\")" + +#: ../src/interface.c:4294 +msgid "Path (and possibly additional arguments) to your favorite browser" +msgstr "Camiño (e posibelmente argumentos adicionais) ao seu navegador favorito" + +#: ../src/interface.c:4316 +msgid "Grep:" +msgstr "Grep:" + +#: ../src/interface.c:4339 +msgid "Tool paths" +msgstr "Camiño para ferramentas" + +#: ../src/interface.c:4360 +msgid "Context action:" +msgstr "Acción de contexto:" + +#: ../src/interface.c:4371 +#, c-format +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Orde de acción de contexto. Pódese usar a palabra seleccionada nese momento con %s. Pode aparecer en calquera lugar na orde especificada e substituirase despois da execución." + +#: ../src/interface.c:4384 +msgid "Commands" +msgstr "Ordes" + +#: ../src/interface.c:4389 +#: ../src/keybindings.c:560 +#: ../src/prefs.c:1535 +msgid "Tools" +msgstr "Ferramentas" + +#: ../src/interface.c:4427 +msgid "email address of the developer" +msgstr "Enderezo de correo do desenvolvedor" + +#: ../src/interface.c:4434 +msgid "Initials of the developer name" +msgstr "Iniciais do nome do desenvolvedor" + +#: ../src/interface.c:4436 +msgid "Initial version:" +msgstr "Versión inicial:" + +#: ../src/interface.c:4448 +msgid "Version number, which a new file initially has" +msgstr "O número de versión que un ficheiro ten inicialmente" + +#: ../src/interface.c:4455 +msgid "Company name" +msgstr "Nome da empresa" + +#: ../src/interface.c:4457 +msgid "Developer:" +msgstr "Desenvolvedor:" + +#: ../src/interface.c:4464 +msgid "Company:" +msgstr "Empresa:" + +#: ../src/interface.c:4471 +msgid "Mail address:" +msgstr "Enderezo de correo:" + +#: ../src/interface.c:4478 +msgid "Initials:" +msgstr "Iniciais:" + +#: ../src/interface.c:4490 +msgid "The name of the developer" +msgstr "O nome do desenvolvedor" + +#: ../src/interface.c:4492 +msgid "Year:" +msgstr "Ano:" + +#: ../src/interface.c:4499 +msgid "Date:" +msgstr "Data:" + +#: ../src/interface.c:4506 +msgid "Date & Time:" +msgstr "Data e Hora:" + +#: ../src/interface.c:4518 +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique un formato para o comodín {datetime}. Pode usar calquera especificador de conversión que poida ser usado coa función strftime de ANSI C." + +#: ../src/interface.c:4525 +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique un formato para o comodín {year}. Pode usar calquera especificador de conversión que poida ser usado coa función strftime de ANSI C." + +#: ../src/interface.c:4532 +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique un formato para o comodín {date}. Pode usar calquera especificador de conversión que poida ser usado coa función strftime de ANSI C." + +#: ../src/interface.c:4534 +msgid "Template data" +msgstr "Datos do modelo" + +#: ../src/interface.c:4539 +#: ../src/prefs.c:1537 +msgid "Templates" +msgstr "Modelos" + +#: ../src/interface.c:4577 +msgid "C_hange" +msgstr "_Cambiar" + +#: ../src/interface.c:4581 +msgid "Keyboard shortcuts" +msgstr "Atallos de teclado" + +#: ../src/interface.c:4586 +#: ../src/prefs.c:1539 +msgid "Keybindings" +msgstr "Asignacións de teclas" + +#: ../src/interface.c:4620 +msgid "Command:" +msgstr "Orde:" + +#: ../src/interface.c:4627 +#, c-format +msgid "Path to the command for printing files (use %f for the filename)" +msgstr "CAmiño á orde para imprimir ficheiros (use %f para referirse ao nome do ficheiro)" + +#: ../src/interface.c:4637 +msgid "Use an external command for printing" +msgstr "Usar unha orde externa para imprimir" + +#: ../src/interface.c:4657 +#: ../src/printing.c:381 +msgid "Print line numbers" +msgstr "Imprimir números de liña" + +#: ../src/interface.c:4660 +#: ../src/printing.c:383 +msgid "Add line numbers to the printed page" +msgstr "Engadir números de liña á páxina impresa" + +#: ../src/interface.c:4662 +#: ../src/printing.c:386 +msgid "Print page numbers" +msgstr "Imprimir números de páxina" + +#: ../src/interface.c:4665 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Engadir números de páxina ao final de cada páxina. Ocupa 2 liñas da páxina." + +#: ../src/interface.c:4667 +#: ../src/printing.c:391 +msgid "Print page header" +msgstr "Imprimir a cabeceira da páxina" + +#: ../src/interface.c:4670 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Engadir unha pequena cabeceira a cada páxina co número de páxina, o nome do ficheiro e a data actual (vexa abaixo). Ocupa 3 liñas da páxina." + +#: ../src/interface.c:4687 +#: ../src/printing.c:409 +msgid "Use the basename of the printed file" +msgstr "Usar o nome base do ficheiro impreso" + +#: ../src/interface.c:4690 +msgid "Print only the basename (without the path) of the printed file" +msgstr "Imprimir só o nome base (sen o camiño) do ficheiro impreso" + +#: ../src/interface.c:4696 +#: ../src/printing.c:417 +msgid "Date format:" +msgstr "Formato da data:" + +#: ../src/interface.c:4703 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique un formato para a data e hora que se engadirá á cabeceira de cada páxina. Pode usar calquera especificador de conversión que poida ser usado coa función strftime de ANSI C." + +#: ../src/interface.c:4706 +msgid "Use native GTK printing" +msgstr "Usar o sistema de impresión nativo de GTK" + +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Impresión:" + +#: ../src/interface.c:4717 +#: ../src/prefs.c:1541 +msgid "Printing" +msgstr "Impresión" + +#: ../src/interface.c:5177 +msgid "Project Properties" +msgstr "Propiedades do proxecto" + +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Pantalla:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Personalizado" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Usar as propiedades globais" + +#: ../src/keybindings.c:227 +#: ../src/plugins.c:1171 +msgid "File" +msgstr "Ficheiro" + +#: ../src/keybindings.c:230 +msgid "New" +msgstr "Novo" + +#: ../src/keybindings.c:232 +msgid "Open" +msgstr "Abrir" + +#: ../src/keybindings.c:235 +msgid "Open selected file" +msgstr "Abrir o ficheiro seleccionado" + +#: ../src/keybindings.c:237 +msgid "Save" +msgstr "Gardar" + +#: ../src/keybindings.c:239 +msgid "Save as" +msgstr "Gardar como" + +#: ../src/keybindings.c:241 +msgid "Save all" +msgstr "Gardar todos" + +#: ../src/keybindings.c:244 +msgid "Print" +msgstr "Imprimir" + +#: ../src/keybindings.c:246 +msgid "Close" +msgstr "Pechar" + +#: ../src/keybindings.c:248 +msgid "Close all" +msgstr "Pechar todo" + +#: ../src/keybindings.c:251 +msgid "Reload file" +msgstr "Recargar o ficheiro" + +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Abrir de novo o último separador pechado" + +#: ../src/keybindings.c:255 +#: ../src/project.c:519 +msgid "Project" +msgstr "Proxecto" + +#: ../src/keybindings.c:258 +msgid "Project properties" +msgstr "Propiedades do proxecto" + +#: ../src/keybindings.c:263 +msgid "Undo" +msgstr "Desfacer" + +#: ../src/keybindings.c:265 +msgid "Redo" +msgstr "Refacer" + +#: ../src/keybindings.c:274 +msgid "Delete to line end" +msgstr "Borrar ata o final da liña" + +#: ../src/keybindings.c:280 +msgid "Scroll to current line" +msgstr "Ir á liña actual" + +#: ../src/keybindings.c:282 +msgid "Scroll up the view by one line" +msgstr "Desprazar a vista arriba unha liña" + +#: ../src/keybindings.c:284 +msgid "Scroll down the view by one line" +msgstr "Desprazar a vista abaixo unha liña" + +#: ../src/keybindings.c:286 +msgid "Complete snippet" +msgstr "Completar fragmentos" + +#: ../src/keybindings.c:288 +msgid "Move cursor in snippet" +msgstr "Mover o cursor no fragmento" + +#: ../src/keybindings.c:290 +msgid "Suppress snippet completion" +msgstr "Suprimir o completado de fragmento" + +#: ../src/keybindings.c:292 +msgid "Context Action" +msgstr "Acción de contexto" + +#: ../src/keybindings.c:294 +msgid "Complete word" +msgstr "Completar palabra" + +#: ../src/keybindings.c:296 +msgid "Show calltip" +msgstr "Mostrar suxestións da función" + +#: ../src/keybindings.c:298 +msgid "Show macro list" +msgstr "Mostrar a lista de macros" + +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Completado de partes de palabras" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Mover liña(s) cara arriba" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Mover liña(s) cara abaixo" + +#: ../src/keybindings.c:306 +msgid "Clipboard" +msgstr "Portaretallos" + +#: ../src/keybindings.c:309 +msgid "Cut" +msgstr "Cortar" + +#: ../src/keybindings.c:311 +msgid "Copy" +msgstr "Copiar" + +#: ../src/keybindings.c:313 +msgid "Paste" +msgstr "Pegar" + +#: ../src/keybindings.c:321 +msgid "Select" +msgstr "Seleccionar" + +#: ../src/keybindings.c:324 +msgid "Select All" +msgstr "Seleccionar todo" + +#: ../src/keybindings.c:326 +msgid "Select current word" +msgstr "Seleccionar a palabra actual" + +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Seleccionar ata a anterior parte de palabra" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Seleccionar ata a seguinte parte de palabra" + +#: ../src/keybindings.c:338 +msgid "Format" +msgstr "Formato" + +#: ../src/keybindings.c:342 +msgid "Toggle Case of Selection" +msgstr "Alternar a capitalización da selección" + +#: ../src/keybindings.c:344 +msgid "Toggle line commentation" +msgstr "Intercambiar o comentado da liña" + +#: ../src/keybindings.c:347 +msgid "Comment line(s)" +msgstr "Comentar liña(s)" + +#: ../src/keybindings.c:349 +msgid "Uncomment line(s)" +msgstr "Descomentar liña(s)" + +#: ../src/keybindings.c:351 +msgid "Increase indent" +msgstr "Aumentar a sangría" + +#: ../src/keybindings.c:354 +msgid "Decrease indent" +msgstr "Diminuír a sangría" + +#: ../src/keybindings.c:357 +msgid "Increase indent by one space" +msgstr "Aumentar o sangrado nun espazo" + +#: ../src/keybindings.c:359 +msgid "Decrease indent by one space" +msgstr "Reducir o sangrado nun espazo" + +#: ../src/keybindings.c:363 +msgid "Send to Custom Command 1" +msgstr "Enviar á orde personalizada 1" + +#: ../src/keybindings.c:365 +msgid "Send to Custom Command 2" +msgstr "Enviar á orde personalizada 2" + +#: ../src/keybindings.c:367 +msgid "Send to Custom Command 3" +msgstr "Enviar á orde personalizada 3" + +#: ../src/keybindings.c:375 +msgid "Insert" +msgstr "Inserir" + +#: ../src/keybindings.c:378 +msgid "Insert date" +msgstr "Inserir data" + +#: ../src/keybindings.c:384 +msgid "Settings" +msgstr "Configuración" + +#: ../src/keybindings.c:392 +#: ../src/toolbar.c:381 +msgid "Search" +msgstr "Buscar" + +#: ../src/keybindings.c:395 +#: ../src/search.c:396 +msgid "Find" +msgstr "Buscar" + +#: ../src/keybindings.c:397 +msgid "Find Next" +msgstr "Buscar seguinte" + +#: ../src/keybindings.c:399 +msgid "Find Previous" +msgstr "Buscar anterior" + +#: ../src/keybindings.c:402 +msgid "Find Next Selection" +msgstr "Buscar a seguinte selección" + +#: ../src/keybindings.c:404 +msgid "Find Previous Selection" +msgstr "Buscar a anterior selección" + +#: ../src/keybindings.c:406 +#: ../src/search.c:541 +msgid "Replace" +msgstr "Substituír" + +#: ../src/keybindings.c:408 +#: ../src/search.c:715 +msgid "Find in Files" +msgstr "Buscar en ficheiros" + +#: ../src/keybindings.c:411 +msgid "Next Message" +msgstr "Seguinte mensaxe" + +#: ../src/keybindings.c:413 +msgid "Previous Message" +msgstr "Mensaxe anterior" + +#: ../src/keybindings.c:415 +msgid "Find Usage" +msgstr "Uso da busca" + +#: ../src/keybindings.c:417 +msgid "Find Document Usage" +msgstr "Uso da busca en documentos" + +#: ../src/keybindings.c:419 +msgid "Mark All" +msgstr "Marcar todo" + +#: ../src/keybindings.c:421 +msgid "Go to" +msgstr "Ir a" + +#: ../src/keybindings.c:424 +#: ../src/toolbar.c:67 +msgid "Navigate back a location" +msgstr "Navegar cara atrás unha localización" + +#: ../src/keybindings.c:426 +#: ../src/toolbar.c:68 +msgid "Navigate forward a location" +msgstr "Navegar cara adiante unha localización" + +#: ../src/keybindings.c:431 +msgid "Go to matching brace" +msgstr "Ir ao paréntese correspondente" + +#: ../src/keybindings.c:434 +msgid "Toggle marker" +msgstr "Intercambiar marcador" + +#: ../src/keybindings.c:442 +msgid "Go to Tag Definition" +msgstr "Ir á definición da etiqueta" + +#: ../src/keybindings.c:444 +msgid "Go to Tag Declaration" +msgstr "Ir á declaración da etiqueta" + +#: ../src/keybindings.c:446 +msgid "Go to Start of Line" +msgstr "Ir ao comezo de liña" + +#: ../src/keybindings.c:448 +msgid "Go to End of Line" +msgstr "Ir ao final de liña" + +#: ../src/keybindings.c:450 +msgid "Go to End of Display Line" +msgstr "Ir ao final da liña en pantalla" + +#: ../src/keybindings.c:452 +msgid "Go to Previous Word Part" +msgstr "Ir á anterior parte de palabra" + +#: ../src/keybindings.c:454 +msgid "Go to Next Word Part" +msgstr "Ir á seguinte parte de palabra" + +#: ../src/keybindings.c:456 +msgid "View" +msgstr "Ver" + +#: ../src/keybindings.c:459 +msgid "Toggle All Additional Widgets" +msgstr "Intercambiar todos os widgets adicionais" + +#: ../src/keybindings.c:462 +msgid "Fullscreen" +msgstr "Pantalla completa" + +#: ../src/keybindings.c:464 +msgid "Toggle Messages Window" +msgstr "Des/Activar a xanela de mensaxes" + +#: ../src/keybindings.c:467 +msgid "Toggle Sidebar" +msgstr "Des/Activar a barra lateral" + +#: ../src/keybindings.c:469 +msgid "Zoom In" +msgstr "Achegar" + +#: ../src/keybindings.c:471 +msgid "Zoom Out" +msgstr "Alonxar" + +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Reiniciar o zoom" + +#: ../src/keybindings.c:475 +msgid "Focus" +msgstr "Foco" + +#: ../src/keybindings.c:478 +msgid "Switch to Editor" +msgstr "Cambiar ao editor" + +#: ../src/keybindings.c:480 +msgid "Switch to Scribble" +msgstr "Cambiar ás anotacións" + +#: ../src/keybindings.c:482 +msgid "Switch to VTE" +msgstr "Cambiar ao ETV" + +#: ../src/keybindings.c:484 +msgid "Switch to Search Bar" +msgstr "Cambiar á barra de busca" + +#: ../src/keybindings.c:486 +msgid "Switch to Sidebar" +msgstr "Cambiar á barra lateral" + +#: ../src/keybindings.c:488 +msgid "Switch to Compiler" +msgstr "Cambiar ao compilador" + +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Cambiar ás mensaxes" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Cambiar á xanela de mensaxes" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Cambiar a lista de documentos na barra lateral" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Cambiar a lista de símbolos na barra lateral" + +#: ../src/keybindings.c:498 +msgid "Notebook tab" +msgstr "Separador do caderno" + +#: ../src/keybindings.c:501 +msgid "Switch to left document" +msgstr "Cambiar ao documento á esquerda" + +#: ../src/keybindings.c:503 +msgid "Switch to right document" +msgstr "Cambiar ao documento á dereita" + +#: ../src/keybindings.c:505 +msgid "Switch to last used document" +msgstr "Cambiar ao último documento usado" + +#: ../src/keybindings.c:507 +msgid "Move document left" +msgstr "Mover o documento á esquerda" + +#: ../src/keybindings.c:509 +msgid "Move document right" +msgstr "Mover o documento á dereita" + +#: ../src/keybindings.c:511 +msgid "Move document first" +msgstr "Mover o documento ao inicio" + +#: ../src/keybindings.c:513 +msgid "Move document last" +msgstr "Mover o documento ao final" + +#: ../src/keybindings.c:515 +msgid "Document" +msgstr "Documento" + +#: ../src/keybindings.c:518 +msgid "Toggle Line wrapping" +msgstr "Des/Activar o axuste de liñas" + +#: ../src/keybindings.c:520 +msgid "Toggle Line breaking" +msgstr "Des/Activar a rotura de liñas" + +#: ../src/keybindings.c:524 +msgid "Replace spaces by tabs" +msgstr "Substituír espazos por tabulacións" + +#: ../src/keybindings.c:526 +msgid "Toggle current fold" +msgstr "Des/Activar o pregado actual" + +#: ../src/keybindings.c:528 +msgid "Fold all" +msgstr "Pregar todo" + +#: ../src/keybindings.c:530 +msgid "Unfold all" +msgstr "Despregar todo" + +#: ../src/keybindings.c:532 +msgid "Reload symbol list" +msgstr "Recargar a lista de símbolos" + +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Eliminar marcadores" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Eliminar indicadores de erro" + +#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 +#: ../src/project.c:477 +#: ../src/ui_utils.c:1815 +msgid "Build" +msgstr "Construír" + +#: ../src/keybindings.c:541 +#: ../src/toolbar.c:69 +msgid "Compile" +msgstr "Compilar" + +#: ../src/keybindings.c:545 +msgid "Make all" +msgstr "Make all" + +#: ../src/keybindings.c:548 +msgid "Make custom target" +msgstr "Make (destino personalizado)" + +#: ../src/keybindings.c:550 +msgid "Make object" +msgstr "Make object" + +#: ../src/keybindings.c:552 +msgid "Next error" +msgstr "Seguinte erro" + +#: ../src/keybindings.c:554 +msgid "Previous error" +msgstr "Erro anterior" + +#: ../src/keybindings.c:556 +msgid "Run" +msgstr "Executar" + +#: ../src/keybindings.c:558 +msgid "Build options" +msgstr "Opcións para construír" + +#: ../src/keybindings.c:563 +msgid "Show Color Chooser" +msgstr "Mostrar o selector de cores" + +#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 +msgid "Help" +msgstr "Axuda" + +#: ../src/keybindings.c:856 +msgid "Keyboard Shortcuts" +msgstr "Atallos de teclado" + +#: ../src/keybindings.c:868 +msgid "The following keyboard shortcuts are configurable:" +msgstr "Os seguintes atallos de teclado son configurábeis :" + +#: ../src/keybindings.c:1791 +msgid "Switch to Document" +msgstr "Cambiar ao documento" + +#: ../src/keyfile.c:852 +msgid "Type here what you want, use it as a notice/scratch board" +msgstr "Escriba aquí o que queira, úseo como un taboleiro de avisos ou apuntes" + +#: ../src/keyfile.c:1056 +msgid "Failed to load one or more session files." +msgstr "Produciuse un erro ao cargar un ou máis ficheiros de sesión." + +#: ../src/log.c:181 +msgid "Debug Messages" +msgstr "Mensaxes de depuración" + +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "L_impar" + +#: ../src/main.c:122 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Configurar o número de liña inicial para o primeiro ficheiro aberto (útil cando se usa xunto con --line)" + +#: ../src/main.c:123 +msgid "Use an alternate configuration directory" +msgstr "Usar un directorio de configuración diferente" + +#: ../src/main.c:124 +msgid "Print internal filetype names" +msgstr "Imprimir os nomes de tipos de ficheiros internos" + +#: ../src/main.c:125 +msgid "Generate global tags file (see documentation)" +msgstr "Xerar o ficheiro global de etiquetas (vexa a documentación)" + +#: ../src/main.c:126 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "Non preprocesar ficheiros C/C++ ao xerar as etiquetas" + +#: ../src/main.c:128 +msgid "Don't open files in a running instance, force opening a new instance" +msgstr "Non abrir ficheiros nunha instancia existente, forzar a apertura dunha nova instancia" + +#: ../src/main.c:129 +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Usar este ficheiro de socket para a comunicación cunha instancia existente de Geany" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Devolve unha lista de documentos abertos nunha instancia existente de Geany" + +#: ../src/main.c:132 +msgid "Set initial line number for the first opened file" +msgstr "Configurar o número de liña inicial para o primeiro ficheiro aberto" + +#: ../src/main.c:133 +msgid "Don't show message window at startup" +msgstr "Non mostrar a xanela de mensaxes ao inicio" + +#: ../src/main.c:134 +msgid "Don't load auto completion data (see documentation)" +msgstr "Non cargar datos de completado automático (vexa a documentación)" + +#: ../src/main.c:136 +msgid "Don't load plugins" +msgstr "Non cargar os plugins" + +#: ../src/main.c:138 +msgid "Print Geany's installation prefix" +msgstr "Imprime o prefixo de instalación de Geany" + +#: ../src/main.c:139 +msgid "Don't load the previous session's files" +msgstr "Non cargar os ficheiros da sesión previa" + +#: ../src/main.c:141 +msgid "Don't load terminal support" +msgstr "Non cargar a compatibilidade coa terminal" + +#: ../src/main.c:142 +msgid "Filename of libvte.so" +msgstr "Nome de ficheiro de libvte.so" + +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Ser detallado" + +#: ../src/main.c:145 +msgid "Show version and exit" +msgstr "Mostrar a versión e saír" + +#: ../src/main.c:498 +msgid "[FILES...]" +msgstr "[Ficheiros...]" + +#: ../src/main.c:515 +#, c-format +msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" +msgstr "(compiladoen %s con GTK %d.%d.%d, GLib %d.%d.%d)" + +#: ../src/main.c:614 +msgid "Move it now?" +msgstr "Movelo agora?" + +#: ../src/main.c:616 +msgid "Geany needs to move your old configuration directory before starting." +msgstr "Geany precisa mover o seu directorio de configuración vello antes de comezar." + +#: ../src/main.c:625 +#, c-format +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." +msgstr "O seu directorio de configuración moveuse correctamente de \"%s\" a \"%s\"." + +#. for translators: the third %s in brackets is the error message which +#. * describes why moving the dir didn't work +#: ../src/main.c:635 +#, c-format +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "Non foi posíbel mover o seu vello directorio de configuración \"%s\" a \"%s\" (%s). Por favor, mova de xeito manual o directorio á nova localización." + +#: ../src/main.c:716 +#, c-format +msgid "" +"Configuration directory could not be created (%s).\n" +"There could be some problems using Geany without a configuration directory.\n" +"Start Geany anyway?" +msgstr "" +"Non foi posíbel crear o directorio de configuración (%s).\n" +"Podería haber algúns problemas ao usar Geany sen directorio de configuración.\n" +"Iniciar Geany de todos xeitos?" + +#: ../src/main.c:1031 +#, c-format +msgid "This is Geany %s." +msgstr "Isto é Geany %s" + +#: ../src/main.c:1033 +#, c-format +msgid "Configuration directory could not be created (%s)." +msgstr "Non foi posíbel crear o directorio de configuración (%s)." + +#: ../src/main.c:1244 +msgid "Configuration files reloaded." +msgstr "Recargáronse os ficheiros de configuración." + +#: ../src/msgwindow.c:147 +msgid "Status messages" +msgstr "Mensaxes de estado" + +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "C_opiar" + +#: ../src/msgwindow.c:533 +msgid "Copy _All" +msgstr "Copi_ar todo" + +#: ../src/msgwindow.c:563 +msgid "_Hide Message Window" +msgstr "_Ocultar a xanela de mensaxes" + +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Non foi posíbel atopar o ficheiro '%s' - intentarase no camiño do documento actual" + +#: ../src/plugins.c:464 +#, c-format +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "O plugin \"%s\" non é compatíbel a nivel binario con esta versión de Geany - por favor, recompíleo. " + +#: ../src/plugins.c:906 +msgid "_Plugin Manager" +msgstr "Xestor de _plugins" + +#: ../src/plugins.c:1083 +#, c-format +msgid "" +"Plugin: %s %s\n" +"Description: %s\n" +"Author(s): %s" +msgstr "" +"Plugin: %s %s\n" +"Descrición: %s\n" +"Autor(es): %s" + +#: ../src/plugins.c:1159 +msgid "Active" +msgstr "Activo" + +#: ../src/plugins.c:1165 +msgid "Plugin" +msgstr "Plugin" + +#: ../src/plugins.c:1189 +msgid "No plugins available." +msgstr "Non hai plugins dispoñíbeis." + +#: ../src/plugins.c:1269 +msgid "Plugins" +msgstr "Plugins" + +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Escolla que plugins se deben cargar ao iniciar:" + +#: ../src/plugins.c:1301 +msgid "Plugin details:" +msgstr "Detalles do plugin:" + +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configurar plugins" + +#: ../src/prefs.c:165 +msgid "Grab Key" +msgstr "Captura de teclas" + +#: ../src/prefs.c:171 +#, c-format +msgid "Press the combination of the keys you want to use for \"%s\"." +msgstr "Prema a combinación de teclas que quere usar para \"%s\"." + +#: ../src/prefs.c:214 +#: ../src/symbols.c:1866 +msgid "_Expand All" +msgstr "_Expandir todo" + +#: ../src/prefs.c:219 +#: ../src/symbols.c:1871 +msgid "_Collapse All" +msgstr "_Contraer todo" + +#: ../src/prefs.c:278 +msgid "Action" +msgstr "Acción" + +#: ../src/prefs.c:283 +msgid "Shortcut" +msgstr "Atallo" + +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Permitir" + +#: ../src/prefs.c:1410 +msgid "_Override" +msgstr "S_obrescribir" + +#: ../src/prefs.c:1411 +msgid "Override that keybinding?" +msgstr "Sobrescribir ese atallo de teclado?" + +#: ../src/prefs.c:1412 +#, c-format +msgid "The combination '%s' is already used for \"%s\"." +msgstr "A combinación '%s' xa se usa para \"%s\"." + +#: ../src/prefs.c:1543 +#: ../src/vte.c:269 +#: ../src/vte.c:723 +#: ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + +#. add manually GeanyWrapLabels because they can't be added with Glade +#. page Tools +#: ../src/prefs.c:1619 +msgid "Enter tool paths below. Tools you do not need can be left blank." +msgstr "Introduza os camiños ás ferramentas embaixo. Pode deixar en branco as ferramentas que non necesite." + +#. page Templates +#: ../src/prefs.c:1624 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Configurar a información que se usará nos modelos. Vexa a documentación se quere máis detalles." + +#: ../src/prefs.c:1628 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." +msgstr "Aviso: Para que os cambios que faga aquí teñan efecto ten que reiniciar Geany ou forzar a recarga da configuración usando Ferramentas->Recargar a configuración." + +#. page Keybindings +#: ../src/prefs.c:1634 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Aquí pode cambiar atallos de teclado para varias accións. Seleccione unha e prema no botón de Cambiar para introducir un novo atallo, ou prema dúas veces nunha acción para editar directamente a representación textual do atallo." + +#. page Printing +#: ../src/prefs.c:1639 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Aviso: o sistema de impresión nativo de GTK só está dispoñíbel se Geany se compilou contra GTK 2.10 (ou superior) e se esta a executar con GTK 2.10 (ou superior)." + +#. page Editor->Indentation +#: ../src/prefs.c:1645 +msgid "Warning: these settings are overridden by the current project. See Project->Properties." +msgstr "Atención: o proxecto actual sobrescribe estas configuracións. Vexa Proxecto->Propiedades." + +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "O tipo de letra do editor non é un tipo de letra de largura fixa!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "O texto espaciarase incorrectamente." + +#: ../src/printing.c:306 +#, c-format +msgid "Page %d of %d" +msgstr "Páxina %d de %d" + +#: ../src/printing.c:376 +msgid "Document Setup" +msgstr "Configuración do documento" + +#: ../src/printing.c:411 +msgid "Print only the basename(without the path) of the printed file" +msgstr "Imprimir só o nome base (sen o camiño) do ficheiro impreso" + +#: ../src/printing.c:527 +#, c-format +msgid "Page %d of %d" +msgstr "Páxina %d de %d" + +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "Non se enviou o documento %s ao subsistema de impresión." + +#: ../src/printing.c:783 +#, c-format +msgid "Document %s was sent to the printing subsystem." +msgstr "Enviouse o documento %s ao subsistema de impresión." + +#: ../src/printing.c:835 +#, c-format +msgid "Printing of %s failed (%s)." +msgstr "Produciuse un erro na impresión de %s (%s)." + +#: ../src/printing.c:875 +msgid "Please set a print command in the preferences dialog first." +msgstr "Por favor, configure antes unha orde para imprimir no diálogo de preferencias." + +#: ../src/printing.c:883 +#, c-format +msgid "" +"The file \"%s\" will be printed with the following command:\n" +"\n" +"%s" +msgstr "" +"Imprimirase o ficheiro \"%s\" coa seguinte orde:\n" +"\n" +"%s" + +#: ../src/printing.c:899 +#, c-format +msgid "Printing of \"%s\" failed (return code: %s)." +msgstr "A impresión de \"%s\" fallou (código devolto: %s)." + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Imprimiuse o ficheiro %s." + +#. "projects" is part of the default project base path so be careful when translating +#. * please avoid special characters and spaces, look at the source for details or ask Frank +#: ../src/project.c:98 +msgid "projects" +msgstr "proxectos" + +#: ../src/project.c:117 +msgid "New Project" +msgstr "Proxecto novo" + +#: ../src/project.c:125 +msgid "C_reate" +msgstr "C_rear" + +#: ../src/project.c:139 +#: ../src/project.c:413 +msgid "Name:" +msgstr "Nome:" + +#: ../src/project.c:148 +#: ../src/project.c:426 +msgid "Filename:" +msgstr "Nome do ficheiro:" + +#: ../src/project.c:164 +#: ../src/project.c:456 +msgid "Base path:" +msgstr "Camiño base:" + +#: ../src/project.c:170 +#: ../src/project.c:465 +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 "Directorio base de todos os ficheiros que constitúen o proxecto. Pode ser un camiño novo, ou unha árbore de directorios existente. Pode usar camiños relativos ó nome de ficheiro do proxecto." + +#: ../src/project.c:173 +#: ../src/project.c:468 +msgid "Choose Project Base Path" +msgstr "Seleccionar o camiño base do proxecto" + +#: ../src/project.c:231 +#: ../src/project.c:263 +#: ../src/project.c:957 +#, c-format +msgid "Project file \"%s\" could not be loaded." +msgstr "Non foi posíbel cargar o ficheiro de proxecto \"%s\"." + +#: ../src/project.c:257 +#: ../src/project.c:269 +msgid "Open Project" +msgstr "Abrir un proxecto" + +#: ../src/project.c:289 +msgid "Project files" +msgstr "Ficheiros do proxecto" + +#: ../src/project.c:339 +#, c-format +msgid "Project \"%s\" closed." +msgstr "Pechouse o proxecto \"%s\"." + +#: ../src/project.c:439 +msgid "Description:" +msgstr "Descrición:" + +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Configurar que os directorios de traballo para construír os ficheiros sen tipo de ficheiro definido usen o camiño base:" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Configurar" + +#: ../src/project.c:486 +msgid "Set the working directories (on the Build tab) for the non-filetype build commands to use the base path" +msgstr "Configurar que os directorios de traballo (no separador de 'construír') para as ordes de construír sen tipo de ficheiro definido usen o camiño base" + +#: ../src/project.c:501 +msgid "File patterns:" +msgstr "Patróns de ficheiro:" + +#: ../src/project.c:610 +msgid "Do you want to close it before proceeding?" +msgstr "Quere pechalo antes de continuar?" + +#: ../src/project.c:611 +#, c-format +msgid "The '%s' project is already open." +msgstr "O proxecto '%s' xa está aberto." + +#: ../src/project.c:658 +msgid "The specified project name is too short." +msgstr "O nome de proxecto especificado é demasiado curto." + +#: ../src/project.c:664 +#, c-format +msgid "The specified project name is too long (max. %d characters)." +msgstr "O nome de proxecto especificado é demasiado longo (o máximo son %d caracteres)." + +#: ../src/project.c:672 +msgid "You have specified an invalid project filename." +msgstr "Especificou un nome de ficheiro para o proxecto non válido." + +#: ../src/project.c:695 +msgid "Create the project's base path directory?" +msgstr "Crear o directorio base do proxecto?" + +#: ../src/project.c:696 +#, c-format +msgid "The path \"%s\" does not exist." +msgstr "O camiño \"%s\" non existe." + +#: ../src/project.c:705 +#, c-format +msgid "Project base directory could not be created (%s)." +msgstr "Non foi posíbel crear o directorio base do proxecto (%s)." + +#: ../src/project.c:717 +#, c-format +msgid "Project file could not be written (%s)." +msgstr "Non foi posíbel escribir o ficheiro do proxecto (%s)." + +#: ../src/project.c:794 +#, c-format +msgid "Project \"%s\" created." +msgstr "Creouse o proxecto \"%s\"." + +#: ../src/project.c:796 +#, c-format +msgid "Project \"%s\" saved." +msgstr "Gardouse o proxecto \"%s\"." + +#. initialise the dialog +#: ../src/project.c:861 +#: ../src/project.c:872 +msgid "Choose Project Filename" +msgstr "Seleccione o nome de ficheiro do proxecto" + +#: ../src/project.c:947 +#, c-format +msgid "Project \"%s\" opened." +msgstr "Abriuse o proxecto \"%s\"." + +#: ../src/search.c:233 +msgid "_Use regular expressions" +msgstr "_Usar expresións regulares" + +#: ../src/search.c:237 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Use expresións regulares tipo POSIX. Para obter información detallada sobre como usar expresións regulares, lea a documentación." + +#: ../src/search.c:244 +msgid "Search _backwards" +msgstr "_Buscar cara atrás" + +#: ../src/search.c:258 +msgid "Use _escape sequences" +msgstr "Usar secuencias de _escape" + +#: ../src/search.c:263 +msgid "" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" +msgstr "" +"Substituír \\\\, \\t, \\n" +", \\r e \\uXXXX (caracteres unicode) polos correspondentes caracteres de control" + +#: ../src/search.c:272 +#: ../src/search.c:810 +msgid "C_ase sensitive" +msgstr "Diferen_ciar entre maiúsculas e minúsculas" + +#: ../src/search.c:277 +#: ../src/search.c:816 +msgid "Match only a _whole word" +msgstr "Coincidencias só con palabras _enteiras" + +#: ../src/search.c:282 +msgid "Match from s_tart of word" +msgstr "Coincidir dende o _comezo da palabra" + +#: ../src/search.c:403 +msgid "_Previous" +msgstr "_Anterior" + +#: ../src/search.c:409 +msgid "_Next" +msgstr "_Seguinte" + +#: ../src/search.c:413 +#: ../src/search.c:562 +#: ../src/search.c:740 +msgid "_Search for:" +msgstr "_Buscar:" + +#. Now add the multiple match options +#: ../src/search.c:441 +msgid "_Find All" +msgstr "_Buscar todo" + +#: ../src/search.c:448 +msgid "_Mark" +msgstr "_Marcar" + +#: ../src/search.c:450 +msgid "Mark all matches in the current document" +msgstr "Marcar todas as coincidencias do documento actual" + +#: ../src/search.c:455 +#: ../src/search.c:622 +msgid "In Sessi_on" +msgstr "Na sesi_ón" + +#: ../src/search.c:460 +#: ../src/search.c:627 +msgid "_In Document" +msgstr "_No documento" + +#. close window checkbox +#: ../src/search.c:466 +#: ../src/search.c:640 +msgid "Close _dialog" +msgstr "Pechar o _diálogo" + +#: ../src/search.c:471 +#: ../src/search.c:645 +msgid "Disable this option to keep the dialog open" +msgstr "Desactive esta opción para manter o diálogo aberto" + +#: ../src/search.c:556 +msgid "Replace & Fi_nd" +msgstr "Substituír e _buscar" + +#: ../src/search.c:565 +msgid "Replace wit_h:" +msgstr "Substituír _por:" + +#. Now add the multiple replace options +#: ../src/search.c:615 +msgid "Re_place All" +msgstr "Su_bstituír todo" + +#: ../src/search.c:632 +msgid "In Se_lection" +msgstr "Na se_lección" + +#: ../src/search.c:634 +msgid "Replace all matches found in the currently selected text" +msgstr "Substituír todas as coincidencias no texto seleccionado actualmente" + +#: ../src/search.c:725 +msgid "_Directory:" +msgstr "_directorio:" + +#: ../src/search.c:756 +msgid "E_ncoding:" +msgstr "Codificació_n:" + +#: ../src/search.c:781 +msgid "Fixed s_trings" +msgstr "Ca_deas fixadas" + +#: ../src/search.c:790 +msgid "_Grep regular expressions" +msgstr "Expresións regulares de _Grep" + +#: ../src/search.c:793 +#: ../src/search.c:801 +msgid "See grep's manual page for more information" +msgstr "Vexa a paxina de manual de grep para obter máis información" + +#: ../src/search.c:798 +msgid "_Extended regular expressions" +msgstr "Expresións regulares _estendidas" + +#: ../src/search.c:805 +msgid "_Recurse in subfolders" +msgstr "Buscar de xeito _recursivo en subcartafoles" + +#: ../src/search.c:821 +msgid "_Invert search results" +msgstr "_Inverter os resultados da busca" + +#: ../src/search.c:826 +msgid "Invert the sense of matching, to select non-matching lines" +msgstr "Inverter o sentido da coincidencia, para seleccionar liñas que non coincidan" + +#: ../src/search.c:843 +msgid "E_xtra options:" +msgstr "Opcións e_xtra:" + +#: ../src/search.c:851 +msgid "Other options to pass to Grep" +msgstr "Outras opcións que se lle pasarán a Grep" + +#: ../src/search.c:1130 +#: ../src/search.c:1881 +#: ../src/search.c:1884 +#, c-format +msgid "Found %d match for \"%s\"." +msgid_plural "Found %d matches for \"%s\"." +msgstr[0] "Encontrada %d coincidencia para \"%s\"." +msgstr[1] "Encontradas %d coincidencias para \"%s\"." + +#: ../src/search.c:1177 +#, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Substituíronse %u coincidencias en %u documentos." + +#: ../src/search.c:1368 +msgid "Invalid directory for find in files." +msgstr "O directorio para buscar en ficheiros non é válido." + +#: ../src/search.c:1388 +msgid "No text to find." +msgstr "Non hai texto que buscar." + +#: ../src/search.c:1415 +#, c-format +msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." +msgstr "Non foi posíbel executar a ferramenta de grep '%s'. Comprobe a configuración do camiño en Preferencias." + +#: ../src/search.c:1483 +msgid "Searching..." +msgstr "Buscando..." + +#: ../src/search.c:1495 +#, c-format +msgid "%s %s -- %s (in directory: %s)" +msgstr "%s %s -- %s (no directorio: %s)" + +#: ../src/search.c:1523 +#, c-format +msgid "Could not open directory (%s)" +msgstr "Non foi posíbel abrir o directorio (%s)" + +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Produciuse un erro durante a busca." + +#: ../src/search.c:1621 +#, c-format +msgid "Search completed with %d match." +msgid_plural "Search completed with %d matches." +msgstr[0] "Completouse a busca con %d coincidencia." +msgstr[1] "Completouse a busca con %d coincidencias." + +#: ../src/search.c:1629 +msgid "No matches found." +msgstr "Non se atoparon coincidencias" + +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Expresión regular errónea: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany tratou de acceder ao socket de dominio Unix doutra instancia executándose baixo outro usuario.\n" +"Isto é un erro fatal, e Geany pecharase agora." + +#: ../src/symbols.c:611 +#: ../src/symbols.c:651 +#: ../src/symbols.c:718 +msgid "Chapter" +msgstr "Capítulo" + +#: ../src/symbols.c:612 +#: ../src/symbols.c:647 +#: ../src/symbols.c:719 +msgid "Section" +msgstr "Sección" + +#: ../src/symbols.c:613 +msgid "Sect1" +msgstr "Secc1" + +#: ../src/symbols.c:614 +msgid "Sect2" +msgstr "Secc2" + +#: ../src/symbols.c:615 +msgid "Sect3" +msgstr "Secc3" + +#: ../src/symbols.c:616 +msgid "Appendix" +msgstr "Apéndice" + +#: ../src/symbols.c:617 +#: ../src/symbols.c:652 +#: ../src/symbols.c:668 +#: ../src/symbols.c:679 +#: ../src/symbols.c:766 +#: ../src/symbols.c:777 +#: ../src/symbols.c:789 +#: ../src/symbols.c:803 +#: ../src/symbols.c:815 +#: ../src/symbols.c:827 +#: ../src/symbols.c:842 +#: ../src/symbols.c:887 +msgid "Other" +msgstr "Outro" + +#: ../src/symbols.c:623 +#: ../src/symbols.c:835 +#: ../src/symbols.c:867 +msgid "Module" +msgstr "Módulo" + +#: ../src/symbols.c:624 +#: ../src/symbols.c:762 +#: ../src/symbols.c:813 +#: ../src/symbols.c:825 +#: ../src/symbols.c:840 +#: ../src/symbols.c:852 +msgid "Types" +msgstr "Tipos" + +#: ../src/symbols.c:625 +msgid "Type constructors" +msgstr "Construtores de tipo" + +#: ../src/symbols.c:626 +#: ../src/symbols.c:638 +#: ../src/symbols.c:659 +#: ../src/symbols.c:667 +#: ../src/symbols.c:676 +#: ../src/symbols.c:688 +#: ../src/symbols.c:697 +#: ../src/symbols.c:750 +#: ../src/symbols.c:799 +#: ../src/symbols.c:822 +#: ../src/symbols.c:837 +#: ../src/symbols.c:874 +msgid "Functions" +msgstr "Funcións" + +#: ../src/symbols.c:631 +#: ../src/symbols.c:637 +msgid "Sections" +msgstr "Seccións" + +#: ../src/symbols.c:632 +msgid "Keys" +msgstr "Teclas" + +#: ../src/symbols.c:639 +#: ../src/symbols.c:690 +#: ../src/symbols.c:751 +#: ../src/symbols.c:776 +#: ../src/symbols.c:801 +#: ../src/symbols.c:814 +#: ../src/symbols.c:823 +#: ../src/symbols.c:839 +#: ../src/symbols.c:886 +msgid "Variables" +msgstr "Variábeis" + +#: ../src/symbols.c:646 +msgid "Environment" +msgstr "Contorno" + +#: ../src/symbols.c:648 +#: ../src/symbols.c:720 +msgid "Subsection" +msgstr "Subsección" + +#: ../src/symbols.c:649 +#: ../src/symbols.c:721 +msgid "Subsubsection" +msgstr "Sub-subsección" + +#: ../src/symbols.c:660 +msgid "Structures" +msgstr "Estruturas" + +#: ../src/symbols.c:675 +#: ../src/symbols.c:759 +#: ../src/symbols.c:784 +#: ../src/symbols.c:796 +msgid "Package" +msgstr "Paquete" + +#: ../src/symbols.c:677 +#: ../src/symbols.c:826 +#: ../src/symbols.c:849 +msgid "Labels" +msgstr "Etiquetas" + +#: ../src/symbols.c:678 +#: ../src/symbols.c:689 +#: ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constantes" + +#: ../src/symbols.c:686 +#: ../src/symbols.c:785 +#: ../src/symbols.c:797 +#: ../src/symbols.c:810 +#: ../src/symbols.c:836 +msgid "Interfaces" +msgstr "Interfaces" + +#: ../src/symbols.c:687 +#: ../src/symbols.c:708 +#: ../src/symbols.c:729 +#: ../src/symbols.c:739 +#: ../src/symbols.c:748 +#: ../src/symbols.c:786 +#: ../src/symbols.c:798 +#: ../src/symbols.c:811 +#: ../src/symbols.c:873 +msgid "Classes" +msgstr "Clases" + +#: ../src/symbols.c:698 +msgid "Anchors" +msgstr "Áncoras" + +#: ../src/symbols.c:699 +msgid "H1 Headings" +msgstr "Encabezamentos H1" + +#: ../src/symbols.c:700 +msgid "H2 Headings" +msgstr "Encabezamentos H2" + +#: ../src/symbols.c:701 +msgid "H3 Headings" +msgstr "Encabezamentos H3" + +#: ../src/symbols.c:709 +msgid "ID Selectors" +msgstr "Selectores de ID" + +#: ../src/symbols.c:710 +msgid "Type Selectors" +msgstr "Selectores de tipo" + +#: ../src/symbols.c:728 +#: ../src/symbols.c:774 +msgid "Modules" +msgstr "Módulos" + +#: ../src/symbols.c:730 +msgid "Singletons" +msgstr "Singletons" + +#: ../src/symbols.c:731 +#: ../src/symbols.c:740 +#: ../src/symbols.c:749 +#: ../src/symbols.c:787 +#: ../src/symbols.c:812 +msgid "Methods" +msgstr "Métodos" + +#: ../src/symbols.c:738 +#: ../src/symbols.c:870 +msgid "Namespaces" +msgstr "Espazos de nomes" + +#: ../src/symbols.c:741 +msgid "Procedures" +msgstr "Procedementos" + +#: ../src/symbols.c:752 +msgid "Imports" +msgstr "Importacións" + +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entidades" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Arquitecturas" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funcións / procedementos" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variábeis / sinais" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Procesos / componentes" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Eventos" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funcións / tarefas" + +#: ../src/symbols.c:788 +#: ../src/symbols.c:875 +msgid "Members" +msgstr "Membros " + +#: ../src/symbols.c:838 +msgid "Subroutines" +msgstr "Subrutinas" + +#: ../src/symbols.c:841 +msgid "Blocks" +msgstr "Bloques" + +#: ../src/symbols.c:850 +#: ../src/symbols.c:859 +#: ../src/symbols.c:883 +msgid "Macros" +msgstr "Macros" + +#: ../src/symbols.c:851 +msgid "Defines" +msgstr "Definicións" + +#: ../src/symbols.c:858 +msgid "Targets" +msgstr "Obxectivos" + +#: ../src/symbols.c:876 +msgid "Structs" +msgstr "Estruturas" + +#: ../src/symbols.c:877 +msgid "Typedefs / Enums" +msgstr "Definicións de tipo / enumeracións " + +#: ../src/symbols.c:1365 +#, c-format +msgid "Unknown filetype extension for \"%s\".\n" +msgstr "Tipo de ficheiro descoñecido para a extensión \"%s\".\n" + +#: ../src/symbols.c:1389 +#, c-format +msgid "Failed to create tags file, perhaps because no tags were found.\n" +msgstr "Non foi posíbel crear o ficheiro de etiquetas, se cadra porque non se atoparon etiquetas.\n" + +#: ../src/symbols.c:1396 +#, c-format +msgid "" +"Usage: %s -g \n" +"\n" +msgstr "" +"Uso: %s -g \n" +"\n" + +#: ../src/symbols.c:1397 +#, c-format +msgid "" +"Example:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" +msgstr "" +"Exemplo:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" + +#: ../src/symbols.c:1411 +msgid "Load Tags" +msgstr "Cargar etiquetas" + +#: ../src/symbols.c:1418 +msgid "Geany tag files (*.tags)" +msgstr "Ficheiros de etiquetas de Geany (*.tags)" + +#. For translators: the first wildcard is the filetype, the second the filename +#: ../src/symbols.c:1438 +#, c-format +msgid "Loaded %s tags file '%s'." +msgstr "Cargáronse as etiquetas para %s do ficheiro '%s'." + +#: ../src/symbols.c:1440 +#, c-format +msgid "Could not load tags file '%s'." +msgstr "Non foi posíbel cargar o ficheiro de etiquetas '%s'." + +#: ../src/symbols.c:1573 +#, c-format +msgid "Forward declaration \"%s\" not found." +msgstr "Non se atopou a definición diferida \"%s\"." + +#: ../src/symbols.c:1575 +#, c-format +msgid "Definition of \"%s\" not found." +msgstr "Non se atopou a definición de \"%s\"." + +#: ../src/symbols.c:1881 +msgid "Sort by _Name" +msgstr "Ordenar por _nome" + +#: ../src/symbols.c:1888 +msgid "Sort by _Appearance" +msgstr "Ordenar por _aparición" + +#: ../src/templates.c:278 +msgid "Old" +msgstr "Antigo " + +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:56 +msgid "Save the current file" +msgstr "Gardar o ficheiro actual" + +#: ../src/toolbar.c:57 +msgid "Save all open files" +msgstr "Gardar todos os ficheiros abertos" + +#: ../src/toolbar.c:58 +msgid "Reload the current file from disk" +msgstr "Recargar o ficheiro actual dende o disco" + +#: ../src/toolbar.c:59 +msgid "Close the current file" +msgstr "Pechar o ficheiro actual" + +#: ../src/toolbar.c:60 +msgid "Close all open files" +msgstr "Pechar todos os ficheiros abertos" + +#: ../src/toolbar.c:61 +msgid "Cut the current selection" +msgstr "Cortar a selección actual" + +#: ../src/toolbar.c:62 +msgid "Copy the current selection" +msgstr "Copiar a selección actual" + +#: ../src/toolbar.c:63 +msgid "Paste the contents of the clipboard" +msgstr "Pegar o contido do portaretallos" + +#: ../src/toolbar.c:64 +msgid "Delete the current selection" +msgstr "Borrar a selección actual" + +#: ../src/toolbar.c:65 +msgid "Undo the last modification" +msgstr "Desfacer a última modificación" + +#: ../src/toolbar.c:66 +msgid "Redo the last modification" +msgstr "Refacer a última modificación" + +#: ../src/toolbar.c:69 +msgid "Compile the current file" +msgstr "Compilar o ficheiro actual" + +#: ../src/toolbar.c:70 +msgid "Run or view the current file" +msgstr "Executar ou ver o ficheiro actual" + +#: ../src/toolbar.c:71 +msgid "Open a color chooser dialog, to interactively pick colors from a palette" +msgstr "Abre un diálogo de elección de cores, para escoller cores dunha paleta de xeito interactivo" + +#: ../src/toolbar.c:72 +msgid "Zoom in the text" +msgstr "Achegar o texto" + +#: ../src/toolbar.c:73 +msgid "Zoom out the text" +msgstr "Alonxar o texto" + +#: ../src/toolbar.c:74 +msgid "Decrease indentation" +msgstr "Diminuír a sangría" + +#: ../src/toolbar.c:75 +msgid "Increase indentation" +msgstr "Aumentar a sangría" + +#: ../src/toolbar.c:76 +#: ../src/toolbar.c:381 +msgid "Find the entered text in the current file" +msgstr "Buscar o texto introducido no ficheiro actual" + +#: ../src/toolbar.c:77 +#: ../src/toolbar.c:389 +msgid "Jump to the entered line number" +msgstr "Ir ao número de liña introducido" + +#: ../src/toolbar.c:78 +msgid "Show the preferences dialog" +msgstr "Mostrar o diálogo de preferencias" + +#: ../src/toolbar.c:79 +msgid "Quit Geany" +msgstr "Saír de Geany" + +#: ../src/toolbar.c:80 +msgid "Print document" +msgstr "Imprimir o documento" + +#: ../src/toolbar.c:81 +msgid "Replace text in the current document" +msgstr "Substituír texto no documento actual" + +#: ../src/toolbar.c:357 +msgid "Create a new file" +msgstr "Crear un ficheiro novo" + +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Crear un ficheiro novo dende un modelo" + +#: ../src/toolbar.c:365 +msgid "Open an existing file" +msgstr "Abrir un ficheiro existente" + +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Abrir un ficheiro recente" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Escolla outras accións de construcion" + +#: ../src/toolbar.c:389 +msgid "Goto" +msgstr "Ir a" + +#: ../src/toolbar.c:578 +msgid "Separator" +msgstr "Separador" + +#: ../src/toolbar.c:579 +msgid "--- Separator ---" +msgstr "--- Separador ---" + +#: ../src/toolbar.c:946 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Seleccione os elementos que se mostrarán na barra de ferramentas. Pode reordear os elementos arrastrando e soltando." + +#: ../src/toolbar.c:962 +msgid "Available Items" +msgstr "Elementos dispoñibles" + +#: ../src/toolbar.c:983 +msgid "Displayed Items" +msgstr "Elementos mostrados" + +#: ../src/tools.c:153 +#, c-format +msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" +msgstr "A orde personalizada executada devolveu un erro. Non se cambiou a súa selección. Mensaxe de erro: %s" + +#: ../src/tools.c:219 +msgid "The executed custom command exited with an unsuccessful exit code." +msgstr "A orde personalizada executada rematou cun código de saída de erro." + +#: ../src/tools.c:246 +#, c-format +msgid "Passing data and executing custom command: %s" +msgstr "Pasando os datos e executando a orde personalizada: %s" + +#: ../src/tools.c:290 +#, c-format +msgid "Custom command failed: %s" +msgstr "Fallou a orde personalizada: %s" + +#: ../src/tools.c:304 +#: ../src/tools.c:511 +msgid "Set Custom Commands" +msgstr "Definir ordes personalizadas" + +#: ../src/tools.c:311 +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "Pode enviar a selección actual a calquera destas ordes e a saída da orde substituirá á selección actual." + +#: ../src/tools.c:486 +msgid "No custom commands defined." +msgstr "Non se definiron ordes personalizadas." + +#: ../src/tools.c:586 +msgid "Word Count" +msgstr "Conta de palabras" + +#: ../src/tools.c:596 +msgid "selection" +msgstr "selección" + +#: ../src/tools.c:602 +msgid "whole document" +msgstr "todo o documento" + +#: ../src/tools.c:611 +msgid "Range:" +msgstr "Intervalo:" + +#: ../src/tools.c:623 +msgid "Lines:" +msgstr "Liñas:" + +#: ../src/tools.c:637 +msgid "Words:" +msgstr "Palabras:" + +#: ../src/tools.c:651 +msgid "Characters:" +msgstr "Caracteres:" + +#: ../src/sidebar.c:186 +msgid "No tags found" +msgstr "Non se atoparon etiquetas" + +#: ../src/sidebar.c:546 +msgid "Show S_ymbol List" +msgstr "Mostrar a lista de sím_bolos" + +#: ../src/sidebar.c:554 +msgid "Show _Document List" +msgstr "Mostrar a lista de _documentos" + +#: ../src/sidebar.c:562 +#: ../plugins/filebrowser.c:647 +msgid "H_ide Sidebar" +msgstr "_Ocultar a barra lateral" + +#: ../src/sidebar.c:631 +msgid "Show _Paths" +msgstr "Mostrar _camiños" + +#. Status bar statistics: col = column, sel = selection. +#: ../src/ui_utils.c:194 +#, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "liña: %d / %d\t col: %d\t sel: %d\t " + +# SL=so lectura +#. RO = read-only +#: ../src/ui_utils.c:200 +msgid "RO " +msgstr "SL" + +#. OVR = overwrite/overtype, INS = insert +#: ../src/ui_utils.c:202 +msgid "OVR" +msgstr "SOB" + +#: ../src/ui_utils.c:202 +msgid "INS" +msgstr "INS" + +#: ../src/ui_utils.c:208 +msgid "TAB" +msgstr "TAB" + +# ES ven de espazos. No código fonte vin que SP era por Spaces +#: ../src/ui_utils.c:211 +msgid "SP" +msgstr "ES" + +# T/E ven de "tabulacións e espazos". No código fonte vin que esta cadea significaba iso. +#: ../src/ui_utils.c:214 +msgid "T/S" +msgstr "T/E" + +#: ../src/ui_utils.c:218 +#, c-format +msgid "mode: %s" +msgstr "Modo: %s" + +#: ../src/ui_utils.c:221 +#, c-format +msgid "encoding: %s %s" +msgstr "Codificación: %s %s" + +#: ../src/ui_utils.c:227 +#, c-format +msgid "filetype: %s" +msgstr "Tipo de ficheiro: %s" + +#: ../src/ui_utils.c:231 +msgid "MOD" +msgstr "MOD" + +#: ../src/ui_utils.c:236 +#, c-format +msgid "scope: %s" +msgstr "ámbito: %s" + +#: ../src/ui_utils.c:321 +#, c-format +msgid "Font updated (%s)." +msgstr "Fonte actualizada (%s)." + +#: ../src/ui_utils.c:517 +msgid "C Standard Library" +msgstr "Biblioteca estándar de C" + +#: ../src/ui_utils.c:518 +msgid "ISO C99" +msgstr "ISO C99" + +#: ../src/ui_utils.c:519 +msgid "C++ (C Standard Library)" +msgstr "C++ (Biblioteca estándar de C)" + +#: ../src/ui_utils.c:520 +msgid "C++ Standard Library" +msgstr "Biblioteca estándar de C++" + +#: ../src/ui_utils.c:521 +msgid "C++ STL" +msgstr "STL de C++" + +#: ../src/ui_utils.c:585 +msgid "_Set Custom Date Format" +msgstr "Configurar o formato da data per_sonalizado" + +#: ../src/ui_utils.c:1659 +msgid "Select Folder" +msgstr "Seleccionar cartafol" + +#: ../src/ui_utils.c:1659 +msgid "Select File" +msgstr "Seleccionar ficheiro" + +#: ../src/ui_utils.c:1813 +msgid "Save All" +msgstr "Gardar todo" + +#: ../src/ui_utils.c:1814 +msgid "Close All" +msgstr "Pechar todo" + +#: ../src/utils.c:338 +msgid "Win (CRLF)" +msgstr "Win (CRLF)" + +#: ../src/utils.c:339 +msgid "Mac (CR)" +msgstr "Mac (CR)" + +#: ../src/utils.c:340 +msgid "Unix (LF)" +msgstr "Unix (LF)" + +#: ../src/vte.c:516 +msgid "_Set Path From Document" +msgstr "_Configurar o camiño a partir do documento" + +#: ../src/vte.c:521 +msgid "_Restart Terminal" +msgstr "_Reiniciar o terminal" + +#: ../src/vte.c:544 +msgid "_Input Methods" +msgstr "Métodos de _entrada" + +#: ../src/vte.c:638 +msgid "Could not change the directory in the VTE because it probably contains a command." +msgstr "Non foi posíbel cambiar o directorio do ETV porque probabelmente contén unha orde." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Tipo de letra:" + +#: ../src/vte.c:746 +msgid "Sets the font for the terminal widget" +msgstr "Configura o tipo de letra para o widget de terminal" + +#: ../src/vte.c:748 +msgid "Foreground color:" +msgstr "Cor de primeiro plano:" + +#: ../src/vte.c:754 +msgid "Background color:" +msgstr "Cor de fondo:" + +#: ../src/vte.c:764 +msgid "Sets the foreground color of the text in the terminal widget" +msgstr "Configura a cor de primeiro plano do texto no widget de terminal" + +#: ../src/vte.c:771 +msgid "Sets the background color of the text in the terminal widget" +msgstr "Configura a cor de fondo do texto no widget de terminal" + +#: ../src/vte.c:774 +msgid "Scrollback lines:" +msgstr "Liñas de desprazamento:" + +#: ../src/vte.c:786 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget" +msgstr "Especifica o historial en liñas que se pode retroceder no widget de terminal" + +#: ../src/vte.c:790 +msgid "Shell:" +msgstr "Intérprete de ordes:" + +#: ../src/vte.c:798 +msgid "Sets the path to the shell which should be started inside the terminal emulation" +msgstr "Configura o camiño ó intérprete de ordes que se debe iniciar dentro do emulador de terminal" + +#: ../src/vte.c:815 +msgid "Scroll on keystroke" +msgstr "Desprazar cunha pulsación de tecla" + +#: ../src/vte.c:816 +msgid "Whether to scroll to the bottom if a key was pressed" +msgstr "Indica se se despraza ao final ao premer unha tecla" + +#: ../src/vte.c:819 +msgid "Scroll on output" +msgstr "Desprazar con saída" + +#: ../src/vte.c:820 +msgid "Whether to scroll to the bottom when output is generated" +msgstr "Indica se se despraza ao final cando se xera algunha saída" + +#: ../src/vte.c:823 +msgid "Cursor blinks" +msgstr "O cursor pestanexa" + +#: ../src/vte.c:824 +msgid "Whether to blink the cursor" +msgstr "Indica se o cursor pestanexa" + +#: ../src/vte.c:827 +msgid "Override Geany keybindings" +msgstr "Ignorar os atallos de teclado de Geany" + +#: ../src/vte.c:829 +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "Permite que o ETV reciba os atallos de teclado (á parte de ordes de foco)" + +#: ../src/vte.c:832 +msgid "Disable menu shortcut key (F10 by default)" +msgstr "Desactivar a tecla de atallo de menú (F10, de xeito predeterminado)" + +#: ../src/vte.c:833 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Esta opción desactiva o atallo de teclado para mostrar a barra de menú (o predeterminado é F10). Desactivalo pode ser útil se usa, por exemplo, Midnight Commander dentro do ETV." + +#: ../src/vte.c:836 +#: ../plugins/filebrowser.c:1217 +msgid "Follow the path of the current file" +msgstr "Seguir o camiño do ficheiro actual" + +#: ../src/vte.c:837 +msgid "Whether to execute \"cd $path\" when you switch between opened files" +msgstr "Débese executar \"cd $path\" cando pase dun ficheiro aberto a outro?" + +#. create check_skip_script checkbox before the check_skip_script checkbox to be able to +#. * use the object for the toggled handler of check_skip_script checkbox +#: ../src/vte.c:842 +msgid "Don't use run script" +msgstr "Non usar o script de executar" + +#: ../src/vte.c:843 +msgid "Don't use the simple run script which is usually used to display the exit status of the executed program" +msgstr "Non usar o script simple de \"executar\" que se usa normalmente para mostrar o estado de saída do programa executado" + +#: ../src/vte.c:846 +msgid "Execute programs in VTE" +msgstr "Executar os programas no ETV" + +#: ../src/vte.c:847 +msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped" +msgstr "Executar programas no ETV no canto de abrir unha xanela cun emulador de terminal. Teña en conta que os programas executados no ETV non se poden parar" + +#: ../src/win32.c:161 +msgid "Geany project files" +msgstr "Ficheiros de proxecto de Geany" + +#: ../src/win32.c:167 +msgid "Executables" +msgstr "Executables" + +#: ../plugins/classbuilder.c:36 +msgid "Class Builder" +msgstr "Construtor de clase" + +#: ../plugins/classbuilder.c:36 +msgid "Creates source files for new class types." +msgstr "Crea ficheiros fonte para os novos tipos de clase." + +#: ../plugins/classbuilder.c:372 +msgid "Create Class" +msgstr "Crear unha clase" + +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Espazo de nomes" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Espazo de nomes:" + +#: ../plugins/classbuilder.c:402 +msgid "Class" +msgstr "Clase" + +#: ../plugins/classbuilder.c:411 +msgid "Class name:" +msgstr "Nome da clase:" + +#: ../plugins/classbuilder.c:424 +msgid "Header file:" +msgstr "Ficheiro de cabeceira:" + +#: ../plugins/classbuilder.c:434 +msgid "Source file:" +msgstr "Ficheiro fonte:" + +#: ../plugins/classbuilder.c:440 +msgid "Inheritance" +msgstr "Herdanza" + +#: ../plugins/classbuilder.c:449 +msgid "Base class:" +msgstr "Clase base:" + +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Fonte base:" + +#: ../plugins/classbuilder.c:465 +msgid "Base header:" +msgstr "Cabeceira base:" + +#: ../plugins/classbuilder.c:475 +msgid "Global" +msgstr "Global" + +#: ../plugins/classbuilder.c:485 +msgid "Base GType:" +msgstr "GType base:" + +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementa:" + +#: ../plugins/classbuilder.c:505 +msgid "Options" +msgstr "Opcións" + +#: ../plugins/classbuilder.c:514 +msgid "Create constructor" +msgstr "Crear construtor" + +#: ../plugins/classbuilder.c:518 +msgid "Create destructor" +msgstr "Crear destrutor" + +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "É abstracto" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "É singleton" + +#: ../plugins/classbuilder.c:540 +msgid "GTK+ constructor type" +msgstr "Tipo de constructor GTK+" + +#: ../plugins/classbuilder.c:1040 +msgid "Create Cla_ss" +msgstr "Crear cla_se" + +#: ../plugins/classbuilder.c:1046 +msgid "_C++ Class" +msgstr "Clase _C++" + +#: ../plugins/classbuilder.c:1049 +msgid "_GTK+ Class" +msgstr "Clase _GTK+" + +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "Clase _PHP" + +#: ../plugins/htmlchars.c:38 +msgid "HTML Characters" +msgstr "Caracteres HTML" + +#: ../plugins/htmlchars.c:38 +msgid "Inserts HTML character entities like '&'." +msgstr "Insire entidades HTML como '&'." + +#: ../plugins/htmlchars.c:39 +#: ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 +#: ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 +msgid "The Geany developer team" +msgstr "O equipo de desenvolvemento de Geany" + +#: ../plugins/htmlchars.c:75 +msgid "HTML characters" +msgstr "Caracteres HTML" + +#: ../plugins/htmlchars.c:81 +msgid "ISO 8859-1 characters" +msgstr "Caracteres ISO 8859-1" + +#: ../plugins/htmlchars.c:179 +msgid "Greek characters" +msgstr "Caracteres gregos" + +#: ../plugins/htmlchars.c:234 +msgid "Mathematical characters" +msgstr "Caracteres matemáticos" + +#: ../plugins/htmlchars.c:275 +msgid "Technical characters" +msgstr "Caracteres técnicos" + +#: ../plugins/htmlchars.c:283 +msgid "Arrow characters" +msgstr "Caracteres de frecha" + +#: ../plugins/htmlchars.c:296 +msgid "Punctuation characters" +msgstr "Caracteres de puntuación" + +#: ../plugins/htmlchars.c:312 +msgid "Miscellaneous characters" +msgstr "Caracteres variados" + +#: ../plugins/htmlchars.c:367 +#: ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Non foi posíbel crear o directorio de configuración do plugin." + +#: ../plugins/htmlchars.c:482 +msgid "Special Characters" +msgstr "Caracteres especiais" + +#: ../plugins/htmlchars.c:484 +msgid "_Insert" +msgstr "_Inserir" + +#: ../plugins/htmlchars.c:493 +msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." +msgstr "Escolla un caracter especial da lista e prema dúas veces nel, ou use o botón para inserilo na posición actual do cursor." + +#: ../plugins/htmlchars.c:507 +msgid "Character" +msgstr "Carácter" + +#: ../plugins/htmlchars.c:513 +msgid "HTML (name)" +msgstr "HTML (nome)" + +#: ../plugins/htmlchars.c:731 +msgid "_Insert Special HTML Characters" +msgstr "_Inserir caracteres especiais HTML" + +#. Add menuitem for html replacement functions +#: ../plugins/htmlchars.c:746 +msgid "HTML Replacement" +msgstr "Substitución HTML" + +#: ../plugins/htmlchars.c:753 +msgid "_HTMLToggle" +msgstr "Intercambiar _HTML" + +#: ../plugins/htmlchars.c:762 +msgid "Bulk replacement of special chars" +msgstr "Substitución en masa de caracteres especiais" + +#: ../plugins/htmlchars.c:777 +msgid "Insert Special HTML Characters" +msgstr "Inserir caracteres especiais HTML" + +#: ../plugins/htmlchars.c:780 +msgid "Replace special characters" +msgstr "Substituír caracteres especiais" + +#: ../plugins/htmlchars.c:783 +msgid "Toggle plugin status" +msgstr "Intercambiar o estado do plugin" + +#: ../plugins/export.c:37 +msgid "Export" +msgstr "Exportar" + +#: ../plugins/export.c:37 +msgid "Exports the current file into different formats." +msgstr "Exporta o ficheiro actual a diferentes formatos." + +#: ../plugins/export.c:166 +msgid "Export File" +msgstr "Exportar ficheiro" + +#: ../plugins/export.c:183 +msgid "_Use current zoom level" +msgstr "_Usar o nivel de zoom actual" + +#: ../plugins/export.c:185 +msgid "Renders the font size of the document together with the current zoom level" +msgstr "Mostra o tamaño de texto do documento conxuntamente co nivel de zoom actual" + +#: ../plugins/export.c:268 +#, c-format +msgid "Document successfully exported as '%s'." +msgstr "Exportouse o documento correctamente como '%s'." + +#: ../plugins/export.c:270 +#, c-format +msgid "File '%s' could not be written (%s)." +msgstr "Non se pode escribir no ficheiro '%s' (%s)." + +#: ../plugins/export.c:317 +#, c-format +msgid "The file '%s' already exists. Do you want to overwrite it?" +msgstr "O ficheiro '%s' xa existe. Desexa sobrescribilo?" + +#: ../plugins/export.c:704 +msgid "_Export" +msgstr "_Exportar" + +#. HTML +#: ../plugins/export.c:711 +msgid "As _HTML" +msgstr "Como _HTML" + +#. LaTeX +#: ../plugins/export.c:717 +msgid "As _LaTeX" +msgstr "Como _LaTeX" + +#: ../plugins/filebrowser.c:43 +msgid "File Browser" +msgstr "Navegador de ficheiros" + +#: ../plugins/filebrowser.c:43 +msgid "Adds a file browser tab to the sidebar." +msgstr "Engade un separador de navegador de ficheiros á barra lateral." + +#: ../plugins/filebrowser.c:360 +msgid "Too many items selected!" +msgstr "Seleccionáronse demasiados elementos!" + +#: ../plugins/filebrowser.c:436 +#, c-format +msgid "Could not execute configured external command '%s' (%s)." +msgstr "Non foi posíbel executar a orde externa configurada '%s' (%s)." + +#: ../plugins/filebrowser.c:603 +msgid "Open _externally" +msgstr "Abrir _externamente" + +#: ../plugins/filebrowser.c:618 +msgid "_Find in Files" +msgstr "Buscar en _ficheiros" + +#: ../plugins/filebrowser.c:628 +msgid "Show _Hidden Files" +msgstr "Mostrar os fic_heiros ocultos" + +#: ../plugins/filebrowser.c:841 +msgid "Up" +msgstr "Arriba" + +#: ../plugins/filebrowser.c:846 +msgid "Refresh" +msgstr "Refrescar" + +#: ../plugins/filebrowser.c:851 +msgid "Home" +msgstr "Inicio" + +#: ../plugins/filebrowser.c:856 +msgid "Set path from document" +msgstr "Definir camiño a partir de documento" + +#: ../plugins/filebrowser.c:866 +msgid "Clear the filter" +msgstr "Limpar o filtro" + +#: ../plugins/filebrowser.c:880 +msgid "Filter:" +msgstr "Filtro: " + +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtrar os seus ficheiros cos comodíns habituais" + +#: ../plugins/filebrowser.c:1107 +msgid "Focus File List" +msgstr "Enfocar na lista de ficheiros" + +#: ../plugins/filebrowser.c:1109 +msgid "Focus Path Entry" +msgstr "Enfocar na entrada do camiño" + +#: ../plugins/filebrowser.c:1185 +msgid "External open command:" +msgstr "Orde externa para abrir:" + +#: ../plugins/filebrowser.c:1194 +#, 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 "" +"A orde a executar cando se use \"Abrir con\".Pode usar os comodíns %f e %d.\n" +"%f substituirase polo nome do ficheiro incluíndo o camiño absoluto\n" +"%d substituirase polo camiño ao ficheiro seleccionado sen o nome do ficheiro" + +#: ../plugins/filebrowser.c:1202 +msgid "Show hidden files" +msgstr "Mostra os ficheiros ocultos" + +#: ../plugins/filebrowser.c:1208 +msgid "Hide object files" +msgstr "Ocultar ficheiros obxecto" + +#: ../plugins/filebrowser.c:1212 +msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +msgstr "Non mostrar os ficheiros obxecto xerados no navegador de ficheiros. Isto inclúe *.o, *.obj. *.so, *.dll, *.a, *.lib" + +#: ../plugins/filebrowser.c:1223 +msgid "Use the project's base directory" +msgstr "Usar o directorio base do proxecto" + +#: ../plugins/filebrowser.c:1227 +msgid "Change the directory to the base directory of the currently opened project" +msgstr "Cambiar o directorio ao directorio base do proxecto aberto actualmente" + +#: ../plugins/saveactions.c:39 +msgid "Save Actions" +msgstr "Accións de gardar" + +#: ../plugins/saveactions.c:39 +msgid "This plugin provides different actions related to saving of files." +msgstr "Este plugin proporciona diferentes accións relativas ó gardado de ficheiros." + +#: ../plugins/saveactions.c:169 +#, c-format +msgid "Backup Copy: Directory could not be created (%s)." +msgstr "Copia de seguranza: non foi posíbel crear o directorio (%s)." + +#. it's unlikely that this happens +#: ../plugins/saveactions.c:201 +#, c-format +msgid "Backup Copy: File could not be read (%s)." +msgstr "Copia de seguranza: Non foi posíbel ler o ficheiro (%s)." + +#: ../plugins/saveactions.c:219 +#, c-format +msgid "Backup Copy: File could not be saved (%s)." +msgstr "Copia de seguranza: O ficheiro non se puido gardar (%s)." + +#: ../plugins/saveactions.c:311 +#, c-format +msgid "Autosave: Saved %d file automatically." +msgid_plural "Autosave: Saved %d files automatically." +msgstr[0] "Gardado automático: Gardouse %d ficheiro automaticamente." +msgstr[1] "Gardado automático: Gardáronse %d ficheiros automaticamente." + +#. initialize the dialog +#: ../plugins/saveactions.c:380 +msgid "Select Directory" +msgstr "Seleccionar directorio" + +#: ../plugins/saveactions.c:463 +msgid "Backup directory does not exist or is not writable." +msgstr "O directorio para a copia de seguranza non existe ou non se pode escribir nel." + +#: ../plugins/saveactions.c:543 +msgid "Auto Save" +msgstr "Gardado automático" + +#: ../plugins/saveactions.c:545 +#: ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 +msgid "_Enable" +msgstr "_Activar" + +#: ../plugins/saveactions.c:553 +msgid "Auto save _interval:" +msgstr "_Intervalo de gardado automático:" + +#: ../plugins/saveactions.c:561 +msgid "seconds" +msgstr "segundos" + +#: ../plugins/saveactions.c:570 +msgid "_Print status message if files have been automatically saved" +msgstr "Im_primir mensaxes de estado se os ficheiros se gardaron automaticamente" + +#: ../plugins/saveactions.c:578 +msgid "Save only current open _file" +msgstr "Gardar só o _ficheiro aberto actual" + +#: ../plugins/saveactions.c:585 +msgid "Sa_ve all open files" +msgstr "Gardar _todos os ficheiros abertos" + +#: ../plugins/saveactions.c:605 +msgid "Instant Save" +msgstr "Gardado instantáneo" + +#: ../plugins/saveactions.c:615 +msgid "_Filetype to use for newly opened files:" +msgstr "Tipo de _ficheiro a usar para os ficheiros novos abertos:" + +#: ../plugins/saveactions.c:646 +msgid "Backup Copy" +msgstr "Copia de seguranza" + +#: ../plugins/saveactions.c:656 +msgid "_Directory to save backup files in:" +msgstr "_Directorio no que gardar os ficheiros de copia de seguranza:" + +#: ../plugins/saveactions.c:679 +msgid "Date/_Time format for backup files (\"man strftime\" for details):" +msgstr "Forma_to de data e hora para os ficheiros de copia de seguranza (\"man strftime\" para obter detalles):" + +#: ../plugins/saveactions.c:692 +msgid "Directory _levels to include in the backup destination:" +msgstr "Niveles de directorios a inc_luír no destino da copia de seguranza:" + +#: ../plugins/splitwindow.c:36 +msgid "Split Window" +msgstr "Partir a xanela" + +#: ../plugins/splitwindow.c:36 +msgid "Splits the editor view into two windows." +msgstr "Divide a vista de editor en dúas xanelas." + +#: ../plugins/splitwindow.c:244 +msgid "Show the current document" +msgstr "Mostrar o documento actual" + +#: ../plugins/splitwindow.c:261 +#: ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 +msgid "_Unsplit" +msgstr "X_untar" + +#: ../plugins/splitwindow.c:371 +msgid "_Split Window" +msgstr "Dividir a _xanela" + +#: ../plugins/splitwindow.c:379 +msgid "_Horizontally" +msgstr "_Horizontalmente" + +#: ../plugins/splitwindow.c:384 +msgid "_Vertically" +msgstr "_Verticalmente" + +#: ../plugins/splitwindow.c:400 +msgid "Split Horizontally" +msgstr "Dividir horizontalmente" + +#: ../plugins/splitwindow.c:402 +msgid "Split Vertically" +msgstr "Dividir verticalmente" + +#~ msgid "Try to resave the file?" +#~ msgstr "Tentar volver a gardar o ficheiro?" +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplicar a liña ou a selección" +#~ msgid "_Customize Toolbar" +#~ msgstr "Personalizar a _barra de ferramentas" +#~ msgid "Icon style:" +#~ msgstr "Estilo das iconas:" +#~ msgid "Icon size:" +#~ msgstr "Tamaño das iconas:" +#~ msgid "Appearance" +#~ msgstr "Aparencia" +#~ msgid "Hard tab width:" +#~ msgstr "Largura fixada dos separadores:" +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "A largura dunha tabulación cando se configura tabuladores e espazos para " +#~ "un documento" +#~ msgid "Long line marker:" +#~ msgstr "Marcador de liña longa:" +#~ msgid "Long line marker color:" +#~ msgstr "Cor do marcador de liña longa:" +#~ msgid "Send Selection to Terminal" +#~ msgstr "Enviar a selección á Terminal" +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Cancelouse a impresión do ficheiro %s." +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Substituíuse o texto en %u ficheiro." +#~ msgstr[1] "Substituíuse o texto en %u ficheiros." +#~ msgid "Terminal plugin" +#~ msgstr "Plugin de terminal" +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Esta configuración para o widget do emulador de terminal virtual só " +#~ "aplica se se puidera cargar a biblioteca do ETV." +#~ msgid "Terminal font:" +#~ msgstr "Tipo de letra do terminal:" +#~ msgid "Unsplit" +#~ msgstr "Xuntar" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Configurar inclusións e argumento_s" +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" +#~ msgid "_View DVI File" +#~ msgstr "_Ver ficheiro DVI" +#~ msgid "V_iew PDF File" +#~ msgstr "Ver f_icheiro PDF" +#~ msgid "_Set Arguments" +#~ msgstr "Definir o_s argumentos" +#~ msgid "Set Arguments" +#~ msgstr "Definir argumentos" +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "Definir programas e opcións para compilar e ver ficheiros (La)TeX." +#~ msgid "DVI creation:" +#~ msgstr "Creación de DVI:" +#~ msgid "PDF creation:" +#~ msgstr "Creación de PDF:" +#~ msgid "DVI preview:" +#~ msgstr "Vista previa de DVI:" +#~ msgid "PDF preview:" +#~ msgstr "Vista previa de PDF:" +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "Substituirase %f polo nome do ficheiro actual, p.e. ficheiro_proba.c\n" +#~ "Substituirase %e polo nome do ficheiro actual sen extensión, p.e. " +#~ "ficheiro_proba" +#~ msgid "Set Includes and Arguments" +#~ msgstr "Configurar inclusións e argumentos" +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Configurar as ordes para compilar e executar programas." +#~ msgid "Compile:" +#~ msgstr "Compilar:" +#~ msgid "Build:" +#~ msgstr "Construír:" + +#, fuzzy +#~ msgid "Make Custom Target" +#~ msgstr "Lanzar make para un obxectivo personalizado" +#~ msgid "Failed to execute the view program" +#~ msgstr "Produciuse un erro ao executar o programa de vista" +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Usar texto branco sobre fondo negro e inverter todas as cores. Esta " +#~ "opción require reiniciar Geany" +#~ msgid "Path and options for the make tool" +#~ msgstr "Ruta e opcións para a ferramenta make" +#~ msgid "Run (alternative command)" +#~ msgstr "Executar (orde alternativa)" +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Embaixo hai unha lista de plugins dispoñíbeis. Seleccione os plugins que " +#~ "deberían cargarse ao iniciar Geany." +#~ msgid "Run command:" +#~ msgstr "Orde de executar:" +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Liña de ordes que se executará no directorio base do proxecto. Pode " +#~ "engadir opcións á orde. Déixeo en branco para usar a orde de Executar " +#~ "predeterminada." +#~ msgid "Choose Project Run Command" +#~ msgstr "Seleccione un comando de Executar para este proxecto" +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "Produciuse un erro na busca (vexa Axuda->Mensaxes de depuración para " +#~ "obter detalles)." +#~ msgid "Local" +#~ msgstr "Local" + diff -Nru geany-0.18/po/hu.po geany-0.19/po/hu.po --- geany-0.18/po/hu.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/hu.po 2010-05-23 09:08:49.000000000 +0100 @@ -5,9 +5,9 @@ # kilo aka Gabor Kmetyko , 2007, 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-04-30 23:39+0200\n" "Last-Translator: kilo aka Gabor Kmetyko \n" "Language-Team: Hungarian\n" @@ -20,7 +20,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Gyors és pehelykönnyű IDE GTK2 alapokon" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -28,68 +28,68 @@ msgid "Integrated Development Environment" msgstr "Integrált Fejlesztői Felület" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Geany verzió" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Gyors és pehelykönnyű IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(készült %s-on)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Információ" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Fejlesztők" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "karbantartó" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "fejlesztő" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "fordítás karbantartója" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Fordítók" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Előző fordítók" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Hozzájárultak még" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Néhányan a közreműködők közül (a teljes lista megtalálható a(z) %s fájlban):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Közreműködők" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licenc" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -97,285 +97,296 @@ "A licensz szövege nem található, tekintse meg a http://www.gnu.org/licenses/" "gpl-2.0.txt címen." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"\"'%s\"' terminál nem található (ellenőrizze az elérési útvonalat a Terminál " -"beállításoknál a Tulajdonságok között)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Nem sikerült a munkakönyvtárat átállítani erre: \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "" -"\"%s\" végrehajtása nem sikerült (az indító szkriptet nem lehetett " -"létrehozni)" +msgid "%s (in directory: %s)" +msgstr "%s (%s könyvtárban)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Folyamat sikertelen (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (%s könyvtárban)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Nem sikerült a munkakönyvtárat átállítani erre: \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "" +"\"%s\" végrehajtása nem sikerült (az indító szkriptet nem lehetett " +"létrehozni)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Nem sikerült a fájlt végrehajtani a VTE-n belül, mert feltehetően egy " "parancsot tartalmaz." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"\"'%s\"' terminál nem található (ellenőrizze az elérési útvonalat a Terminál " +"beállításoknál a Tulajdonságok között)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Fordítás sikertelen." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Fordítás sikerrel lezárult." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Fordítás" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "Ö_sszeállítás" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make mindet" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Egyedi cél készí_tése" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Egyedi cél készítése" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Cél _készítése" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Adja meg itt az egyedi opciókat, minden bevitt szöveg átadásra kerül a make " +"parancs számára." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Kö_vetkező hiba" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Elő_ző hiba" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Include állományok és argumentumok megadása" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "D_VI fájl megtekintése" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "PD_F fájl megtekintése" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Egyedi parancsok megadása" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Argumentumok megadása" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Jelenlegi fájl fordítása" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Argumentumok megadása" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "" +"Build-eli a jelenlegi fájlt a make eszközzel és az alapértelmezett " +"célállománnyal" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" msgstr "" -"Adja meg a programokat és opciókat a (La)TeX fájlok fordításához és " -"megtekintéséhez." +"Build-eli a jelenlegi fájlt a make eszközzel és a megadott célállománnyal" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI létrehozása:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Lefordítja a jelenlegi fájlt a Make eszközzel" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF létrehozása:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "A folyamatot nem sikerült leállítani (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI előnézet:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Nincs több fordítási hiba." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF előnézet:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f helyére a jelenlegi fájlnév kerül, pl: test_file.c\n" -"%e helyére a fájlnév kerül, kiterjesztés nélkül, pl: test:file" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Adja meg az include állományokat és az argumentumokat" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Címke" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Adja meg a programok építéséhez és futtatásához szükséges parancsokat." +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Parancs" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "%s parancsok" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (%s könyvtárban)" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Fordítás:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Összeállítás:" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Fordító" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Végrehajtás:" +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Jelenlegi fájl fordítása" +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" +msgstr "%s parancsok" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Egyedi cél készítése" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Fájl_típus megadása" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "_Grep reguláris kifejezések" + +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" msgstr "" -"Adja meg itt az egyedi opciókat, minden bevitt szöveg átadásra kerül a make " -"parancs számára." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" -"Build-eli a jelenlegi fájlt a make eszközzel és az alapértelmezett " -"célállománnyal" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Egyedi parancsok megadása" + +#: ../src/build.c:1992 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Build-eli a jelenlegi fájlt a make eszközzel és a megadott célállománnyal" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Lefordítja a jelenlegi fájlt a Make eszközzel" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Egyedi parancsok megadása" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Nem sikerült végrehajtani a megjelenítő programot" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Fordítás" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "A folyamatot nem sikerült leállítani (%s)." +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "Ö_sszeállítás" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Nincs több fordítási hiba." +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Végrehajtás:" + +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Egyedi cél készí_tése" + +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Cél _készítése" + +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make mindet" -#: ../src/callbacks.c:152 +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Egyedi parancsok megadása" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Valóban ki szeretne lépni?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%s fájl elmentve." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Ú_jraolvasás" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Minden nem mentett változtatás el fog veszni." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Biztosan újra akarja olvasni '%s'-t?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Ugrás sorra" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Adja meg a sor számát, ahová ugorni szeretne:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Mielőtt ezt a funkciót használná, adja meg a jelenlegi fájl típusát." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "nn.hh.éééé" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "hh.nn.éééé" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "éééé/hh/nn" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "nn.hh.éééé óó:pp:mm" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "hh.nn.éééé óó:pp:mm" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "éééé/hh/nn óó:pp:mm" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Egyedi dát_umformátum használata" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Egyedi dátumformátum" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -383,25 +394,24 @@ "Adja meg itt az egyedi dátum és idő formátumot. Minden olyan konverziós " "jelölés használható, amit az ANSI C strftime függvénnyel használni lehet." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "A dátumformátum stringet nem lehetett átalakítani (feltehetően túl hosszú)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Nincs több üzenet." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Fájl megnyitása" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Nézet" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -409,28 +419,28 @@ "Csak olvasható módban nyitja meg a fájlt. Ha egynél több fájlt választ " "megnyitásra, mind csak olvashatóként nyílik meg." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Fájl kiterjesztés alapján megállapít" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Fájlból megállapít" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "To_vábbi beállítások" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "_Rejtett fájlokat is megjeleníti" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Kódolás megadása:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -445,11 +455,11 @@ "megnyitásra." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Fájltípus megadása:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -470,23 +480,23 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Fájl mentése" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Átnevezé_s" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Elmenti, majd átnevezi a fájlt" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "Ú_j ablakban nyitja meg a fájlt" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -494,41 +504,41 @@ "Megnyitva hagyja az aktuális dokumentumot és új fülön jeleníti meg az " "újonnan elmentett fájlt" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Hiba" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Kérdés" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Figyelmeztetés" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Információs" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Ne mentse" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "A(z) '%s' fájl nem kerül mentésre." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Szeretné menteni, mielőtt bezárja?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Betűtípus választása" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -536,106 +546,110 @@ "Hiba történt vagy nem lehetett a fájl információkat kinyerni (pl. új fájl " "esetén)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "ismeretlen" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Tulajdonságok" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Típus:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Méret:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Hely:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Csak olvasható:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(csak a Geany-n belül)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kódolás:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(BOM-mal)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(BOM nélkül)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Javítva:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Változott:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Legutóbbi elérés:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Engedélyek:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Olvasás:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Írás:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Végrehajtás:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Tulajdonos:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Csoport:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Egyéb:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "%s fájl bezárva." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "\"%s\" új fájl megnyitva." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Nem lehetett megnyitni a(z) %s fájlt (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -650,12 +664,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "A(z) \"%s\" fájl nem érvényes %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -664,30 +678,30 @@ "A(z) \"%s\" fájl nem tűnik szöveges fájlnak, vagy a fájl kódolása nem " "támogatott." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Szóközök" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulátorok" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabulátorok és szóközök" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%s behúzás üzemmód beállítása %s részére." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Érvénytelen fájlnév" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "%s fájl újraolvasva." @@ -695,20 +709,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "%s fájl megnyitva (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", csak olvasható" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Hiba a fájl átnevezésekor." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -717,7 +731,7 @@ "Hiba történt a fájl UTF-8-ból konvertálásakor itt: \"%s\". A fájl nem került " "mentésre." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -726,51 +740,51 @@ "Hibaüzenet: %s\n" "A hiba itt történt: \"%s\" (sor: %d, oszlop: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Hibaüzenet: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Hiba a fájl mentésekor." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Hiba a fájl mentésekor (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "%s fájl elmentve." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nem található." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Újbóli keresés a fájl elejétől?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Nincs találat erre: \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d előfordulás cserélve, \"%s\" helyett \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Újra akarja olvasni?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -779,23 +793,28 @@ "A(z) '%s' fájl a lemezen újabb, mint a\n" "pufferben lévő aktuális példány." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Újra akarja menteni a fájlt?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "A(z) \"%s\" fájl nem található a lemezen!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Tabulátor szélessége" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Adja meg, hogy hány szóköz kerüljön cserére tabulátor karakterrel." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Kelta" @@ -906,574 +925,637 @@ msgid "Without encoding" msgstr "Kódolás nélkül" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Nyugat-európai" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Kelet-európai" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Kelet-á_zsiai" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_DK- & DNy-ázsiai" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Köz_el-keleti" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s forráskód fájl" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "%s forráskód fájl" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Semmi" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell szkript fájl" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Make fájl" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML dokumentum" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL fájl" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Config fájl" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext fordítás fájl" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s szkript fájl" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Programozási nyelvek" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Paranc_sértelmezett nyelvek" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Jelölő nyelvek" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Egyéb _nyelvek" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Fájl_típus megadása" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Minden forrás" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Minden fájl" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Rossz reguláris kifejezés a(z) %s fájltípushoz: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "névtelen" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "'%s' fájl nem található." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "_Színválasztó" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Fájl" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Új (_Sablonból)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "láthatatlan" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr " " - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "K_ijelölt fájl megnyitása" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Legutóbbi _fájlok" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "_Mindet menti" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Újr_aolvasás mint" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "láthatatlan" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Oldal b_eállítása" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "_Többi dokumentum bezárása" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Öss_zeset bezár" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "S_zerkesztés" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Formázás" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "K_iválasztás kis/nagybetűssé tétele" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Aktuális fájl áthelyezése" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Soro_k megjegyzésbe" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Sorok _megjegyzésből kivétele" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "So_r megjegyzésbe/vissza" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "So_r vagy kiválasztás másolása" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Behúzás _növelése" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Behúzás _csökkentése" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "A kije_lölés küldése a terminálba" +#: ../src/interface.c:537 ../src/keybindings.c:361 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Intelligens sorbehúzás" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "A kije_lölés küldése" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Parancs" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Aktuális sor(ok) kivágása" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Aktuális sor(ok) másolása" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Aktuális sor(ok) törlése" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "So_r vagy kiválasztás másolása" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Aktuális sor(ok) kiválasztása" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Aktuális bekezdés kiválasztása" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Másféle szóköz beszúrása" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Következő jelölőhöz ugrás" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Előző jelölőhöz ugrás" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "A kije_lölés küldése a terminálba" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "_Megjegyzések beszúrása" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog bejegyzés beszúrása" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "_Fájl fejléc beszúrása" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Függvény _leírás beszúrása" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Többsoros _megjegyzés beszúrása" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "_GPL megjegyzés beszúrása" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "_BSD licensz megjegyzés beszúrása" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "_Dátum beszúrása" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" be_szúrása" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Beállítá_sok" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Beállítások" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Keresés" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Kö_vetkező találat" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Elő_ző találat" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Keresés _fájlokban" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Csere" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Kijelölé_s keresése" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "E_lőző kijelölés keresése" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Következő üzenet" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "_Előző üzenet" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Ugrá_s sorra" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "_Betűtípus cseréje" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Minden e_gyéb widget ki/bekapcsolása" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Teljes képernyő" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Üzenet _ablak megjelenítése" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "_Eszköztár megjelenítése" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Oldal_sáv megjelenítése" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Szerkesztő" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Jelölő _margó megjelenítése" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "S_orszámok megjelenítése" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Szóközök m_egjelenítése" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Sorvégek megje_lenítése" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "_Behúzás segédvonalak megjelenítése" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Dokumentum" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "So_rtörés" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "So_rtörés" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "A_utomatikus behúzás" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Be_húzás típusa" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabulátorok" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Szóközök" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abulátorok és szóközök" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Csak _olvasható" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Ír_jon Unicode BOM-ot" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Fájl_típus megadása" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Kódolás m_egadása" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Sorvégek b_eállítása" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Beállítás és átalakítás _CR/LF-re (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Beállítás és átalakítás _LF-re (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Beállítás és átalakítás _CR-re (Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Sorvégi szóközök levágása" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Tabulátorok cseréje szóközre" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Szóközök cseré_je tabulátorokra" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Minden blokk bezárása" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Minden _blokk kinyitása" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "_Jelzések eltávolítása" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "H_ibajelölések eltávolítása" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Ú_j" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Megnyit" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Legutóbbi p_rojektek" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Bezár" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "Es_zközök" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "Beállítások új_raolvasása" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "K_onfigurációs fájlok" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Színválasztó" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Szószámlálás" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Címkék _betöltése" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "Beállítások új_raolvasása" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Súgó" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Honlap" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Gyorsbillentyű_k" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Hi_baüzenetek" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Szimbólumok" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Dokumentumok" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Állapot" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Fordító" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Üzenetek" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Firka" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Ké_pek és szöveg" +#: ../src/interface.c:1887 +#, fuzzy +msgid "_Toolbar Preferences" +msgstr "Beállítások" -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Csak _képek" +#: ../src/interface.c:1900 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Eszköztár el_rejtése" -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Csak _szöveg" +#: ../src/interface.c:2112 +msgid "Find _Usage" +msgstr "_Használat keresése" -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Nagy ikonok" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "K_is ikonok" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Na_gyon kicsi ikonok" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Eszköztár el_rejtése" - -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "Eszköztár el_rejtése" - -#: ../src/interface.c:2094 -msgid "Find _Usage" -msgstr "_Használat keresése" - -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "_Dokumentum használat keresése" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Ugrás a _címke definíciójához" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Ugrás a címke _deklarációjához" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "_Tartalomfüggő művelet" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Beállítások" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Legutóbbi munkamenet fájljainak betöltése" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Induláskor megnyitja a legutóbbi munkamenetben nyitott fájlokat" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Töltse be a virtuális terminál emulációt" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1481,39 +1563,39 @@ "Betöltse-e a virtuális terminál emulációt (VTE) induláskor? Kapcsolja ki, ha " "nincs rá szüksége." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Engedélyezi bővítőmodulok támogatását" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Indulás" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Ablakméret és elhelyezkedés mentése" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Elmenti az ablak helyét és méretét, majd induláskor visszaállítja azt" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Kilépéskor rákérdez" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Kilépéskor megerősítő ablakot jelenít meg." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Leállás" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Indítókönyvtár:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1522,19 +1604,19 @@ "elérési útnak kell lennie. Hagyja üresen az aktuális munkakönyvtár " "használatához." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Tulajdonságok:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "A projekt fájlok megnyitásánál használt könyvtár" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "További bővítőmodulok útvonala:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1544,29 +1626,29 @@ "konfigurációs könyvtárban keres. Az itt megadott útvonalon is keresni fog " "bővítményeket. Letiltáshoz hagyja üresen." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Elérési utak" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Indulás" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Sípoljon hibáknál vagy a fordítás végén" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Sípoljon-e, ha hiba történt vagy befejeződött a fordítási folyamat?" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Új üzenetnél váltás az állapot üzenetek listájára" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1574,11 +1656,11 @@ "Átváltson-e az állapot üzenetek listájára (a lenti jegyzettömb ablakban), ha " "új állapot üzenet érkezik?" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Ne mutasson állapot üzeneteket az állapotsávon" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1586,12 +1668,12 @@ "Eltávolít minden üzenetet az állapotsávról. Az üzenetek ezután is " "megjelennek, az állapot üzenetek ablakon." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Automatikus fókusz (a fókusz követi az egér mozgását)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1601,15 +1683,25 @@ "Működik a fő szerkesztőablakban, a firkánál, az eszköztári keresésnél és " "sorra ugrásnál, valamint a VTE-ben." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Egyéb" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Mindig újbóli keresés a fájl elejétől és a Keresés ablak elrejtése" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1617,11 +1709,11 @@ "Mindig újból keres a dokumentum elejétől, valamint elrejti a Keresés " "dialógusablakot a Következő/Előző keresés gomb lenyomása után." -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Kurzor alatti szó használata a Keresés dialógushoz" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1629,19 +1721,19 @@ "A kurzor alatti szót használja a Keresés, Keresés fájlokban vagy Csere " "dialógusablakok megnyitásakor, ha amúgy nincs kijelölés." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Az aktuális fájl könyvtárát használja a fájlokban kereséshez" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Keresés" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Projekt-alapú munkamenet fájlok használata" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1649,11 +1741,11 @@ "Eltárolja-e a projekt munkamenet fájljait és megnyissa-e őket a projekt " "újbóli megnyitásakor?" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "A projekt alapkönyvtárába mentse a projekt fájlt" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1665,75 +1757,99 @@ "könyvtárba. A projekt fájl útvonalát az Új projekt dialógusablakon belül " "továbbra is meg lehet változtatni." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projektek" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Egyéb" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Általános" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Szimbólum lista megjelenítése" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Ki/bekapcsolja a szimbólumok listáját" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Megnyitott fájlok listájának megjelenítése" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Ki/bekapcsolja a megnyitott fájlok listáját" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Oldal_sáv megjelenítése" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Leírás:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Balra" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Jobbra" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Oldalsáv" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Szimbólum lista:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Üzenet ablak:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Szerkesztő:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Beállítja az üzenet ablakban használt betűtípust" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Beállítja a szimbólum listában használt betűtípust" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Beállítja a szerkesztő ablakban használt betűtípust" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Betűtípusok" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Fájl fülek megjelenítése" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Bezáró gombok megjelenítése" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1741,112 +1857,143 @@ "Megjelenít egy kis kereszt alakú gombot a fájl füleken, hogy arra kattintva " "könnyen be lehessen zárni a fájlokat (a Geany újraindítása szükséges)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Új fájl fülek elhelyezkedése:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Balra" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Az új fájl fülek a fülek listáján balra kerülnek" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Jobbra" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Az új fájl fülek a fülek listáján jobbra kerülnek" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "A jelenlegi fájl mentése" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "A duplakattintás elrejt minden további felületi elemet" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Meghívja a Nézet->Minden egyéb widget ki/bekapcsolása parancsot" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Szerkesztő ablak fülek" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Fent" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Lent" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Oldalsáv:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Fülek helye" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Állapotsor megjelenítése" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Megjelenítse-e az állapotsort a fő ablak alján?" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Felület" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Eszköztár me_gjelenítése" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "Eszköztár _illesztése a menühöz" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Összeilleszti az eszköztárat a főmenüvel a jobb függőleges helykihasználás " "érdekében" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Eszköztár" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +#, fuzzy +msgid "Customize Toolbar" +msgstr "_Eszköztár megjelenítése" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Ikon stílus:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Ikon méret:" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Megjelenés" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Ké_pek és szöveg" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Csak _képek" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Csak _szöveg" + +#: ../src/interface.c:3392 #, fuzzy -msgid "Customize Toolbar" -msgstr "_Eszköztár megjelenítése" +msgid "Icon Style" +msgstr "Betűtípusok" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "K_is ikonok" -#: ../src/interface.c:3363 +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Na_gyon kicsi ikonok" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Nagy ikonok" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Méret:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Eszköztár" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Eszköztár" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Sortörés" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1856,11 +2003,11 @@ "sortörés magas erőforrásigényű nagy dokumentumok esetén, tehát lassú gépeken " "ki kellene kapcsolni." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "\"Okos\" Home billentyű engedélyezése" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1874,11 +2021,11 @@ "a sor legelső karakterére viszi a kurzort, függetlenül attól, hogy mi az " "aktuális pozíciója." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Húzd és ejtsd módszer letiltása" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1886,19 +2033,19 @@ "Teljesen letiltja a húzd és ejtsd módszert a szerkesztőablakban, így nem " "lehet kijelölést a szerkesztőablak belsejében vagy azon kívül mozgatni." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Blokkok engedélyezése" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Engedélyezi-e a kód blokkokra osztását?" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Kinyitja/bezárja egy blokk összes gyermekét" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1906,11 +2053,11 @@ "Kinyitja vagy bezárja egy blokk összes gyermekét. A Shift billentyűt " "használva kattintás közben az ellentétes viselkedés történik." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Jelölés használata fordítási hibák kijelzéséhez" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1918,24 +2065,24 @@ "Használjon-e jelöléseket (cikkcakkos aláhúzást) azon sorok kiemelésére, ahol " "a fordító figyelmeztetést vagy hibát talált?" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Soremelés levágja a sorvégi szóközöket" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Engedélyezi, hogy soremeléskor az előző sor végéről levágja a szóközöket." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Sortörés oszlopa:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Megjegyzés jelölő:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1943,98 +2090,88 @@ "Olyan string, ami a forráskód sor megjegyzéssé kapcsolásakor kerül " "beszúrásra. Arra való, hogy jelölje a bekapcsolt megjegyzést." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Sajátságok" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Sajátságok" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Automatikus behúzás üzemmód:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Alap" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Jelenlegi karakterek" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Zárójelek illesztése" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Típus:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Szélesség:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "A behúzás mérete karakterekben" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Behúzás esetén szóközöket használjon" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Behúzás esetén tabulátor karaktert használjon" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Ha a behúzás kisebb, mint a tabulátor mérete, használjon szóközöket; " "egyébként használja mindkettőt" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Kemény tabulátor szélessége:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"A tabulátor karakter szélessége, ha a Tabulátorok & szóközök be van állítva " -"a dokumentumnál" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" "Fájl megnyitásakor megállapítsa-e a fájltartalom alapján a behúzások típusát?" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "A Tab billentyű sorbehúzást csinál" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "A Tab/Shift-Tab megnyomása növeli/csökkenti a behúzást, nem pedig tabulátor " "karaktert szúr be." -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Behúzás" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Behúzás" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Részlet kiegészítése" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2042,20 +2179,20 @@ "Gépeljen be egy meghatározott karaktersort és egészíttesse ki egy " "bonyolultabb szövegre egy gombnyomással." -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "XML címke automatikus kiegészítése" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Az XML címkék (beleértve a HTML címkéket is) automatikus kiegészítése" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Többsoros megjegyzések automatikus folytatása" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2063,11 +2200,11 @@ "Automatikusan folytatja a megjegyzést olyan nyelveknél, mint a C, a C++ és a " "Java, ha a megjegyzésen belül új sor karakter kerül bevitelre." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2075,28 +2212,28 @@ "A megnyitott fájlokban ismert szimbólumok (függvények neve, globális " "változók, stb.) automatikus kiegészítése" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Max. szimbólum név ajánlatok:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Kiegészítés lista magassága:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Kiegészítéshez használt karakterek:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " @@ -2105,119 +2242,115 @@ "A szimbólumok automatikus kiegészítése listájának megjelenítéséhez szükséges " "karakterek száma." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Az automatikus kiegészítés listánál megjelenítendő sorok magassága." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "Az automatikus kiegészítésnél megjelenítendő sorok maximális száma." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Kiegészítések" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Zárójel ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatikusan zárja be a zárójelet a megnyitás bevitelekor." -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Egyszeres idézőjelek ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Automatikusan zárja be az idézőjelet a megnyitó jel bevitelekor." -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Kapcsos zárójelek { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatikusan zárja be a kapcsos zárójelet a megnyitás bevitelekor." -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Szögletes zárójelek [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Automatikusan zárja be a szögletes zárójelet a megnyitás bevitelekor" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Dupla idézőjelek \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Automatikusan zárja be az idézőjelet a megnyitó jel bevitelekor." -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Idézőjelek és zárójelek automatikus bezárása" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Kiegészítések" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Szintaktis jelölő színek átfordítása" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Fehér szöveget használ fekete háttéren, valamint a színek inverzét. Ez a " -"beállítás a Geany újraindítását igényli!" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Behúzás segédvonalak megjelenítése" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Vékony pontvonalakat jelenít meg a helyes behúzás használatának " "megkönnyítésére." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Szóközök megjelenítése" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "A szóközöket pontokkal, a tabulátorokat kis nyilakkal jelöli." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Sorvégek megjelenítése" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Megjeleníti a sorvége karaktereket" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Sorszámok megjelenítése" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Ki/bekapcsolja a sorszám margót." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Jelölő margó megjelenítése" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2225,36 +2358,37 @@ "Ki/bekapcsolja a kis margót a sorszámoktól jobbra, ami a sorok megjelölésére " "szolgál." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Utolsó sornál ne görgessen tovább" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Továbbgörgessen-e egy oldallal a dokumentum utolsó sora után?" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Megjelenés" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Hosszú sor jelölése:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Hosszú sor jelölésének színe:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Cég:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Megadja a hosszú sor jelző színét" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Színválasztó" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2265,11 +2399,11 @@ "nál nagyobb értéket annak meghatározásához, hogy melyik oszlopban jelenjen " "meg a jelölés." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Sor" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2277,11 +2411,11 @@ "Függőleges vonalat húz a szerkesztő ablakban a megadott kurzorpozíciónál " "(ld. lejjebb)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Háttér" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2290,111 +2424,148 @@ "A megadott kurzorpozíción (ld. lejjebb) túli karakterek háttérszíne ez a " "szín lesz. (Ez akkor ajánlott, ha proporcionális betűtípust használ)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Kikapcsolva" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Engedélyezés" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Hosszú sor jelző" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Kikapcsolva" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Levágja a sorvégi szóköz és tabulátor karaktereket" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Eszközök elérési útjai" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Megjelenítés" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Új dokumentum megnyitása parancssorból" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Új fájlt hoz létre minden olyan parancssori fájlnév alapján, ami nem létezik." -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Alapértelmezett sorvége karaterek:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Új fájlok" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "" -"Beállítja az alapértelmezett kódolást az újonnan létrehozott fájlok esetén." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Alapértelmezett kódolás (új fájlok):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Alapértelmezett kódolás (létező fájlok):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Beállítja az alapértelmezett kódolást meglévő fájlok megnyitásakor." +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "" +"Beállítja az alapértelmezett kódolást az újonnan létrehozott fájlok esetén." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Meghatározott kódolás használata fájlok megnyitásakor" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Ez az opció letiltja a fájlok kódolásának automatikus megállapítását a fájl " "megnyitásakor, a fájlt a megadott kódolással nyitja meg (általában nem " "szükséges)." -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Alapértelmezett kódolás (létező fájlok):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Beállítja az alapértelmezett kódolást meglévő fájlok megnyitásakor." + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Kódolások" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Fájl végén legyen új sor" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Biztosítja, hogy a fájl végén mindig van egy új sor karakter" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Sorvégi szóközök és tabulátorok levágása" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Levágja a sorvégi szóköz és tabulátor karaktereket" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Tabulátorok cseréje szóközre" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "A dokumentumban az összes tabulátort szóközökre cseréli." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Fájlok mentése" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Legutóbbi fájlok listájának hossza:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Megadja, hogy hány fájl jelenjen meg a Legutóbbi fájlok listáján." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Lemezellenőrzés gyakorisága:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2402,27 +2573,20 @@ "Milyen gyakran ellenőrizze a lemezen lévő fájlok változását, másopercben. A " "nulla letiltja az ellenőrzést." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Fájlok" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminál:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Böngésző:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Make eszköz elérési útja és opciói" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2430,23 +2594,23 @@ "Egy terminál emulátor mint az xterm, a gnome-terminal vagy a konsole " "(kezelnie kell a -e argumentumot)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Elérési út (és kiegészítő argumentumok) a kedvenc böngészőjéhez" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Eszközök elérési útjai" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Környezetfüggő parancs:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2457,67 +2621,67 @@ "szerepelhet bárhol a megadott parancson belül és behelyettesításre kerül a " "parancs végrehajtása előtt." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Parancsok" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Eszközök" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "a fejlesztő e-mail címe" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "A fejlesztő monogramja" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Kezdeti verzió:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Az új fájl kezdeti verziószáma" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Cégnév" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Fejlesztő:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Cég:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "E-mail cím:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Kezdőbetűk:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "A fejlesztő neve" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Év:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Dátum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Dátum és idő:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2526,7 +2690,7 @@ "olyan konverziós jelölés használható, amit az ANSI C strftime függvénnyel " "használni lehet." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2535,7 +2699,7 @@ "konverziós jelölés használható, amit az ANSI C strftime függvénnyel " "használni lehet." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2544,63 +2708,63 @@ "konverziós jelölés használható, amit az ANSI C strftime függvénnyel " "használni lehet." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Sablon adatok" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Sablonok" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Változtatás" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Gyorsbillentyűk" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Billentyű hozzárendelések" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Parancs:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Elérési út a fájl nyomtatási parancshoz (használjon %f-et a fájlnév helyén)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Külső parancs használata nyomtatáshoz" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Sorszámok nyomtatása" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Sorszámozás hozzáadása a nyomtatott oldalon." -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Oldalszámozás nyomtatása" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Oldalszám elhelyezése minden oldal alján. Ez 2 sort foglal el az oldalon." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Oldal fejléc nyomtatása" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2608,19 +2772,19 @@ "Kisméretű fejlécet helyez minden oldalra az oldalszámmal, fájlnévvel és az " "aktuális dátummal (ld. lejjebb). Ez 3 sort foglal el az oldalon." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "A nyomtatott fájlt alap nevének használata" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Csak a nyomtatott fájl alap nevét (elérési út nélkül) írja ki" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Dátumformátum:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2630,552 +2794,580 @@ "időponthoz. Minden olyan konverziós jelölés használható, amit az ANSI C " "strftime függvénnyel használni lehet." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Natív GTK nyomtatás használata" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Kódolás:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Nyomtatás" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Projekt tulajdonságai" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Megjelenítés" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Kivágás" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Fájl" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Új" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Megnyit" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Kijelölt fájl megnyitása" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Ment" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Mentés másként" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Mindet menti" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Nyomtat" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Bezár" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Összeset bezár" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Fájl újraolvasása" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Projekt tulajdonságok" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Visszavonás" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Újra" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Sor vagy kiválasztás másolása" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Aktuális sor(ok) törlése" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Aktuális sor(ok) törlése" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Aktuális fájl áthelyezése" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Aktuális sorhoz görgeti" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Nézet egy sorral feljebb görgetése" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Nézet egy sorral lejjebb görgetése" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Részlet kiegészítése" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Kurzor mozgatás a részletben" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Részlet kiegészítés felfüggesztése" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Tartalomfüggő művelet" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Szó kiegészítése" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Hívás segítése megjelenítése" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Makró lista megjelenítése" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Részlet kiegészítése" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Sor(ok) megjegyzésbe" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Sor(ok) megjegyzésbe" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Vágólap" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Kivágás" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Másolás" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Beillesztés" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Aktuális sor(ok) másolása" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Aktuális sor(ok) kivágása" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Kijelölés" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Mindet kijelöli" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Aktuális szó kiválasztása" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Aktuális sor(ok) kiválasztása" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Előző szótaghoz ugrás" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Aktuális bekezdés kiválasztása" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Következő szótaghoz ugrás" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Formázás" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Kijelölés kis/nagybetűssé tétele" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Sor megjegyzésbe/vissza" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Sor(ok) megjegyzésbe" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Sor(ok) megjegyzésből kivétele" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Behúzás növelése" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Behúzás csökkentése" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Behúzás növelése egy szóközzel" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Behúzás csökkentése egy szóközzel" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Intelligens sorbehúzás" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "1. egyedi parancs" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "2. egyedi parancs" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "3. egyedi parancs" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "A kijelölés küldése a terminálba" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Beszúrás" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Dátum beszúrása" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Másféle szóköz beszúrása" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Beállítások" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Keresés" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Keresés" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Következő" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Előző" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Következő kijelölés" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Előző kijelölés" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Csere" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Keresés fájlokban" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Következő üzenet" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Előző üzenet" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Használat keresése" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Dokumentum használat keresése" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "_Make mindet" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Ugrás sorra" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Visszatérés egy helyhez" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Továbbhaladás egy helyhez" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Illeszkedő zárójelhez ugrás" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Jelölő ki/bekapcsolása" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Következő jelölőhöz ugrás" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Előző jelölőhöz ugrás" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Ugrás a címke definíciójához" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Ugrás a címke deklarációjához" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Ugrás sor elejére" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Ugrás sor végére" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Ugrás sor végére" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Előző szótaghoz ugrás" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Következő szótaghoz ugrás" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Nézet" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Minden egyéb widget ki/bekapcsolása" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Teljes képernyős" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Üzenetablak ki/bekapcsolása" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Oldalsáv ki/bekapcsolása" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Nagyítás" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Kicsinyítés" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Kicsinyítés" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Fókusz" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Szerkesztő ablakra kapcsol" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Firka ablakra kapcsol" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "VTE-re kapcsol" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Keresősávra kapcsol" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Oldalsávra kapcsol" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Fordítóra kapcsol" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Oldalsávra kapcsol" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Üzenet _ablak megjelenítése" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "A dokumentumra kapcsol" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Oldalsávra kapcsol" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Jegyzettömb fül" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Baloldali dokumentumra kapcsol" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Jobboldali dokumentumra kapcsol" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "A legutóbb használt dokumentumra kapcsol" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Dokumentum mozgatása balra" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Dokumentum mozgatása jobbra" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Dokumentum mozgatása első helyre" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Dokumentum mozgatása utolsó helyre" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Dokumentum" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Sortörés be/kikapcsolása" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Sor széttördelés be/kikapcsolása" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Szóközök cseréje tabulátorokra" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Aktuális blokk be/kikapcsolása" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Minden blokk bezárása" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Minden blokk kinyitása" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Szimbólum lista újraolvasása" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "_Jelzések eltávolítása" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "H_ibajelölések eltávolítása" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Összeállítás" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Fordítás" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make mindet" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Egyedi cél készítése" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Következő hiba" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Előző hiba" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Futtatás" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Futtatás (másik paranccsal)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Build opciók" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Színválasztó megjelenítése" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Súgó" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Gyorsbillentyűk" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "A következő gyorsbillentyűk állíthatók be:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "A dokumentumra kapcsol" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Írjon ide tetszés szerint, használja ezt úgy, mint egy jegyzettömböt/" "firkalapot" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Nem sikerült betölteni egy vagy több munkamenet fájlt." @@ -3183,7 +3375,12 @@ msgid "Debug Messages" msgstr "Hibaüzenetek" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Keresés" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3191,86 +3388,95 @@ "Állítsa be az első megnyitott fájl kezdő oszlopszámát (a --line opcióval " "együtt hasznos)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Másik konfigurációs könyvtár használata" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Legyen bőbeszédű" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Belső fájltípus nevek kiírása" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Hozzon létre globális címke fájlt (ld. dokumentáció)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "A cimkék generálásakor ne dolgozza fel előre a C/C++ fájlokat." -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Ne nyisson meg fájlokat egy már futó példányban, indítson új példányt" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Állítsa be az első megnyitott fájl kezdő sorszámát" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Induláskor ne mutasson üzenetablakot" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Ne töltse be az automatikus kiegészítés adatokat (ld. dokumentáció)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Ne töltse be a kiegészítő modulokat" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "A Geany telepítés prefix nyomtatása" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Ne töltse be az előző munkamenet fájljait" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Ne töltse be a terminál támogatást" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "libvte.so fájlneve" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Legyen bőbeszédű" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Verziószám megjelenítése és kilépés" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FÁJLOK...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(készült %s-on GTK %d.%d.%d, GLib %d.%d.%d verzióval)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Áthelyezi most?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "A régi konfigurációs könyvtárat a Geany-nek el kell mozgatni máshová " "indulása előtt." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3280,7 +3486,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3289,7 +3495,7 @@ "A régi konfigurációs könyvtárat (\"%s\") nem lehetett áthelyezni ide: \"%s" "\" (%s). Helyezze át kézzel a könyvtárat az új helyre." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3301,38 +3507,43 @@ "használja.\n" "Mindenképpen elindítja a Geany-t?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "'%s' fájl nem található." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Ez a Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "A konfigurációs könyvtárat nem lehetett létrehozni (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Beállítások újraolvasása kész." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Állapot üzenetek" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Másolás" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Összeset _másol" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Üzenet ablak el_rejtése" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3341,11 +3552,11 @@ "A(z) \"%s\" bővítmény binárisan nem kompatibilis a Geany ezen kiadásával - " "fordítsa újra azt!" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "_Bővítménykezelő" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3356,84 +3567,92 @@ "Leírás: %s\n" "Szerző(k): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Aktív" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Bővítmény" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Nincs elérhető bővítmény." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Bővítmények" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Lejjebb látható az elérhető bővítmények listája. Válassza ki azokat, " -"amelyeket a Geany indulásakor be kell tölteni." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Bővítmény részletei:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Billentyű beolvasása" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Üsse le a billentyű-kombinációt, amit a(z) \"%s\" parancshoz használni " "szeretne." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "Mind_et kinyitja" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Mindet be_zárja" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Parancs" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Gyorsbillentyű" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Felülbírálás" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Felülbírálja ezt a billentyű-hozzárendelést?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "A(z) '%s' kombináció már használatban van a(z) \"%s\" parancsnál." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminál" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Adja meg az eszközök elérési útját. Amelyik eszközre nincs szüksége, ott " "üresen lehet hagyni." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3441,7 +3660,7 @@ "Adja meg a sablonokban használni kívánt információkat. A részletekhez " "tekintse meg a dokumentációt." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3452,7 +3671,7 @@ ">Beállítások újraolvasása menüpont segítségével." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3464,7 +3683,7 @@ "rendelt gyorsbillentyű stringet is szerkesztheti." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3474,7 +3693,7 @@ "verzión fut." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3490,46 +3709,46 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "%d. oldal (összesen: %d)" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Dokumentum beállítások" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Csak a nyomtatott fájl alap nevét (elérési út nélkül) írja ki." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "%d. oldal (összesen: %d)" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "%s fájl nyomtatása megszakítva." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "%s fájl kinyomtatva." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s nyomtatása sikertelen (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" "Először állítson be egy nyomtatási parancsot a tulajdonságok " "párbeszédablakban!" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3540,38 +3759,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" nyomtatása sikertelen (visszatérési érték: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "%s fájl kinyomtatva." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projektek" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Új projekt" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Lét_rehozás" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Név:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Fájlnév:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Alapkönyvtár:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3581,123 +3805,117 @@ "létező elérési út is. Lehet használni a projekt fájlnevéhez képest relatív " "elérési utakat is." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Adja meg a projekt alapkönyvtárát" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Nem sikerült betölteni a(z) \"%s\" projekt fájlt." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Projekt megnyitása" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Projekt fájlok" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "\"%s\" projekt bezárva." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Leírás:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Make parancs az alapkönyvtárban" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Parancs indítása:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Sect1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"A projekt alapkönytárában futtatandó parancssor. A parancshoz opciókat is " -"lehet fűzni. Hagyja üresen az alapértelmezett futtatás parancs használatához." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Fájl minták:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Szeretné bezárni, mielőtt folytatja?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "A(z) '%s' projekt már nyitva van." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "A megadott projekt név túl rövid." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "A megadott projekt név túl hosszú (max. %d karakter)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Érvénytelen projekt fájlnevet adott meg." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Létre kívánja hozni a projekt alapkönyvtárát?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "A(z) \"%s\" elérési út nem létezik." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "A projekt alapkönyvtárát nem lehetett létrehozni (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "A projekt fájl nem írható (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "\"%s\" projekt létrehozásra került." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "\"%s\" projekt elmentve." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Adja meg a projekt nevét" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Adja meg a projekt futtatási parancsát" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "\"%s\" projekt megnyitásra került." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Reg_uláris kifejezések használata" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3705,15 +3923,15 @@ "POSIX-szerű reguláris kifejezések használata. A reguláris kifejezések " "használatáról szóló részletes információkért olvassa el a dokumentációt." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Keresés vi_sszafelé" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "_Escape szekvenciák használata" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3721,406 +3939,430 @@ "Helyettesítse a \\\\, \\t, \\n, \\r és \\uXXXX (Unicode karakterek) jeleket " "a megfelelő vezérlőkarakterekkel." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "_Kis/nagybetű számít" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Csak teljes s_zavak" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "S_zóeleji egyezés" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "Elő_ző" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "Kö_vetkező" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Keresés:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Mindet keresi" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Jelöl" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Megjelöli az összes találatot a jelenlegi dokumentumban." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "M_unkamenetben" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "_Dokumentumban" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Ablak _bezárása" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Kapcsolja ki ezt az opciót, hogy a dialógusablak ne záruljon be." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Cse_re & Keresés" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "C_sere erre:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Min_det cseréli" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "A kije_lölésben" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Minden előfordulást cseréljen le a jelenleg kijelölt szövegben" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Könyvtár:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Kód_olás:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "_Fix stringek" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep reguláris kifejezések" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "További információkért ld. a grep kézikönyvét." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Kibővített reguláris kifejezések" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Alkönyvtá_rakban is" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Ke_resési eredmények átfordítása" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Az egyezőség feltételének megfordítása, hogy a nem egyező sorok kerüljenek " "kiválasztásra." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "To_vábbi beállítások:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "A Grep-nek átadni kívánt további beállítások" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d találat erre: \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Szöveg cserélve %u fájlban." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Megjelöli az összes találatot a jelenlegi dokumentumban." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Érvénytelen könyvtár a fájlokban keresésnél." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Nincs keresendő szöveg." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Nem sikerült elindítani a(z) '%s' grep eszközt; ellenőrizze az elérési utat " "a Beállítások között." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Keresés..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (%s könyvtárban)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Nem sikerült megnyitni a könyvtárat (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "A keresés sikertelen (a részletekhez ld. Súgó->Hibaüzenetek)." +#: ../src/search.c:1601 +#, fuzzy +msgid "Search failed." +msgstr "_Keresés:" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "A keresés befejeződött, %d találat volt." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Nincs találat." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Rossz reguláris kifejezés a(z) %s fájltípushoz: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Fejezet" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Alfejezet" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Kiegészítések" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Egyéb" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Típusok" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Típus konstruktorok" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Függvények" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Fejezetek" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Kulcsok" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Változók" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Parancs" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Környezet" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Alfejezet" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Al-alfejezet" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Címke" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Struktúrák" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Csomag" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Saját" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Helyi" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Mienk" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Címkék" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Konstansok" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Felületek" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Osztályok" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Konstansok" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Horgonyok" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1 Címsor" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2 Címsor" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3 Címsor" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID kiválasztók" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Típus kiválasztók" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Modulok" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletonok" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Eljárások" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Névterek" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Tulajdonságok" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Exportálás" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "névtelen" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Struktúrák" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Tulajdonságok" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Változók" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Függvények" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Tagok" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Címkék" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Eljárások" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blokkok" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "makrók" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Definíciók" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Célok" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Struktúrák" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Típusdefiníciók / Enumerátorok" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Ismeretlen fájlkiterjesztés: \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Nem sikerült létrehozni a címkefájlt, feltehetően azért, mert nem sikerült " "címékéket találni.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4129,7 +4371,7 @@ "Használat: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4140,176 +4382,194 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Betöltött címkék" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany címkefájlok (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s címkefájl '%s' betöltésre került." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Nem sikerült betölteni a(z) '%s' címkefájlt." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "\"%s\" előzetes deklarációja nem található." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" definíciója nem található." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Rendezés _név alapján" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Rendezés megjelenés _alapján" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "A jelenlegi fájl mentése" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Minden megnyitott fájl mentése" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Újraolvassa a jelenlegi fájlt a lemezről" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "A jelenlegi fájl bezárása" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Bezár minden megnyitott fájlt" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "A jelenlegi kiválasztás kivágása" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "A jelenlegi kiválasztás másolása" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "A vágólap tartalmának beillesztése" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "A jelenlegi kiválasztás törlése" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Az utolsó változtatás visszavonása" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "A visszavont változtatás ismételt végrehajtása" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Lefordítja a jelenlegi fájlt" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Futtatja vagy megjeleníti a jelenlegi fájlt" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" "Megnyit egy színválasztó dialógus ablakot, hogy interaktív módon lehessen " "egy palettáról színt választani." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Szöveg nagyítása" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Szöveg kicsinyítése" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Behúzás csökkentése" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Behúzás növelése" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "A megadott szöveg keresése a jelenlegi fájlban" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Ugrás a megadott sorra" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "A beállítások párbeszédablak megjelenítése" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Kilépés a Geany-ből" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Dokumentum nyomtatása" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "Megjelöli az összes találatot a jelenlegi dokumentumban." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Új fájl létrehozása" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Új fájl létrehozása" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Létező fájl megnyitása" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Kijelölt fájl megnyitása" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Nincs több fordítási hiba." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Ugrás" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Megjelenítés" @@ -4337,7 +4597,7 @@ msgid "Custom command failed: %s" msgstr "Az egyedi parancs hibával tért vissza: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Egyedi parancsok megadása" @@ -4349,193 +4609,185 @@ "Az aktuális kijelölést ezen parancsok bármelyikének el lehet küldni, a " "parancs kimenete kerül az eredeti tartalom helyére." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Nincs megadva egyedi parancs." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Szószámlálás" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "kijelölés" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "teljes dokumentum" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Tartomány:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Sorok:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Szavak:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Karakterek:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Nem található címke" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "S_zimbólum lista megjelenítése" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Megnyitott fájlok listájának me_gjelenítése" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Oldalsáv e_lrejtése" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Állapotsor megjelenítése" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "sor: %d\t osz.: %d\t kij.: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "OLV" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "ÁTÍR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "BESZÚR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP " -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "Üzemmód: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "Kódolás: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "Fájltípus: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MÓDOSÍT" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "Érv.kör: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Betűtípus frissítve (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "E_gyedi dátumformátum megadása" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Könyvtár kiválasztása" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Fájl kiválasztása" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "K_onfigurációs fájlok" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Mindet menti" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Összeset bezár" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminál" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Könyvtárváltás _dokumentum alapján" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "T_erminál újraindítása" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Bev_iteli eljárások" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4543,47 +4795,35 @@ "Nem sikerült könyvtárat váltani a VTE-n belül, mert az feltehetően egy " "parancsot tartalmaz." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminál bővítmény" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"A virtuális terminál emulátor eszköz (VTE) ezen beállításai csak akkor " -"lépnek életbe, ha a VTE könyvtárat be sikerült tölteni." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Terminál betűtípus:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Megadja a terminál eszköz betűtípusát." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Betűszín:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Háttérszín:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Megadja a terminál eszközben használt betűk színét." -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Megadja a terminál eszközben használt betűk háttérszínét." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Mentett sorok:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" @@ -4591,11 +4831,11 @@ "Megadja a történeti sorok számát, amennyit vissza lehet görgetni a terminál " "eszközben." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Parancsértelmező:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" @@ -4603,46 +4843,46 @@ "Megadja a parancsértelmező elérési útját, amelyet a terminál emulációban " "indítani szeretne." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Görgetés billentyű lenyomásakor" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Az aljára ugorjon-e, ha egy billentyű leütésre került?" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Görgetés kimenetnél" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Az aljára ugorjon-e, ha kimenetre írás történt?" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Villogó kurzor" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Engedélyezi-e a kurzor villogását?" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Geany billentyű-hozzárendelések felülbírálata" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Engedélyezi, hogy a VTE billentyűparancsokat fogadjon (a fókusz parancsokon " "kívül)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Letiltja a menü gyorsbillentyűt (alapértelmezetten F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4652,11 +4892,11 @@ "(alapértelmezetten az F10). Akkor lehet hasznos letiltani, ha pl. Midnight " "Commander-t használ a VTE-n belül." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Az aktuális fájl elérési útjának követése" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Végrehajtson-e \"cd $path\" parancsot, amikor átvált megnyitott fájlok " @@ -4664,11 +4904,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Ne használjon futtató parancsfájlt" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4676,11 +4916,11 @@ "Ne használa az egyszerű futtató parancsfájlt, amit általában használunk a " "végrehajtott program kilépési állapotának megjelenítésére." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Programok futtatása a VTE-ben" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4688,90 +4928,123 @@ "A programokat a VTE-ben futtatja, nem egy külön megnyitott terminál emulátor " "ablakban. Figyelem: a VTE-n belül futó programokat nem lehet félbeszakítani." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany projekt fájlok" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Végrehajtható állományok" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Osztály tervező" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Forrásfájlokat készít új osztálytípusokból." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Osztály létrehozása" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Névterek" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Névterek" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Osztály" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Osztály neve:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Fejléc fájl:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Forráskód fájl:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Öröklés" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Szülő osztály:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "%s forráskód fájl" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Szülő fejléc:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Globális" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Szülő GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Beállítások" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Konstruktor létrehozása" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Destruktor létrehozása" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Singletonok" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ típusú konstruktor" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "O_sztály létrehozása" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ osztály" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ osztály" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "_C++ osztály" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML karakterek" @@ -4781,52 +5054,57 @@ msgstr "HTML különleges karaktereket szúr be, pl. '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "A Geany fejlesztői csapat" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML karakterek" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 karakterek" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Görög karakterek" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Matematikai karakterek" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Technikai karakterek" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Nyíl karakterek" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Elválasztás karakterek" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Egyéb karakterek" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "A bővítmény konfigurációs könyvtárat nem lehetett létrehozni." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Speciális karakterek" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Beszúrás" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4835,40 +5113,40 @@ "használja azt, vagy a gomb segítségével szúrja be azt a jelenlegi kurzor " "pozícióban." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Karakter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HML (név)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Spec_iális HTML karakterek beszúrása" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML csere" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTMLKapcsoló" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Speciális karakterek csoportos cseréje" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Speciális HTML karakterek beszúrása" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Speciális karakterek cseréje" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Bővítmény állapotának ki/bekapcsolása" @@ -4895,105 +5173,105 @@ "A dokumentum fontméretét a jelenlegi nagyítás mértékének megfelelően " "jeleníti meg." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "A dokumentum exportálása '%s' néven sikeresen megtörtént." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "A(z) '%s' fájlt nem lehetett írni (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "A(z) '%s' fájl már létezik. Felülírja?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exportálás" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "_HTML formátumban" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "_LaTeX formátumban" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Fájlböngésző" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Az oldalsávon megjelenít egy fájlböngészőt." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Túl sok elem került kiválasztásra!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Nem sikerült végrehajtani a beállított '%s' külső parancsot (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Külső m_egnyitás" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "Keresés _fájlokban" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "_Rejtett fájlok megjelenítése" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Fel" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Frissítés" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Saját könyvtár" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Könyvtárváltás a dokumentum alapján" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Szűrő törlése" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Szűrő:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Fókusz mozgatása a fájl listára" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Fókusz mozgatása az elérési út beviteli mezőre" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "A bővítmény konfigurációs könyvtárat nem lehetett létrehozni." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Külső megnyitás parancs:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5007,15 +5285,15 @@ "A %f helyére a fájlnév kerül, teljes elérési úttal.\n" "A %d helyére a kiválasztott fájl elérési útja kerül, a fájlnév nélkül." -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Rejtett fájlokat is megjeleníti" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Objektum fájlok elrejtése" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5023,12 +5301,12 @@ "Ne mutassa a fájl kiválasztó panelen a generált objektum fájlokat (*.o, *." "obj, *.so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Megadja a projekt alapkönyvtárát" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Az aktuálisan megnyitott projekt alapkönyvtárára vált" @@ -5134,38 +5412,207 @@ msgid "Splits the editor view into two windows." msgstr "A szerkesztés nézetet két ablakra osztja." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "Megjelöli az összes találatot a jelenlegi dokumentumban." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "Fel_osztás megszüntetése" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Ablak _felosztása" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Vízszintesen" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "Fü_ggőlegesen" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Felosztás vízszintesen" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Felosztás függőlegesen" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Felosztás megszüntetése" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Include állományok és argumentumok megadása" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "D_VI fájl megtekintése" + +#~ msgid "V_iew PDF File" +#~ msgstr "PD_F fájl megtekintése" + +#~ msgid "_Set Arguments" +#~ msgstr "_Argumentumok megadása" + +#~ msgid "Set Arguments" +#~ msgstr "Argumentumok megadása" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Adja meg a programokat és opciókat a (La)TeX fájlok fordításához és " +#~ "megtekintéséhez." + +#~ msgid "DVI creation:" +#~ msgstr "DVI létrehozása:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF létrehozása:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI előnézet:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF előnézet:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f helyére a jelenlegi fájlnév kerül, pl: test_file.c\n" +#~ "%e helyére a fájlnév kerül, kiterjesztés nélkül, pl: test:file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Adja meg az include állományokat és az argumentumokat" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "" +#~ "Adja meg a programok építéséhez és futtatásához szükséges parancsokat." + +#~ msgid "Compile:" +#~ msgstr "Fordítás:" + +#~ msgid "Build:" +#~ msgstr "Összeállítás:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Nem sikerült végrehajtani a megjelenítő programot" + +#~ msgid "Try to resave the file?" +#~ msgstr "Újra akarja menteni a fájlt?" + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr " " + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "Eszköztár el_rejtése" + +#~ msgid "Icon style:" +#~ msgstr "Ikon stílus:" + +#~ msgid "Icon size:" +#~ msgstr "Ikon méret:" + +#~ msgid "Appearance" +#~ msgstr "Megjelenés" + +#~ msgid "Hard tab width:" +#~ msgstr "Kemény tabulátor szélessége:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "A tabulátor karakter szélessége, ha a Tabulátorok & szóközök be van " +#~ "állítva a dokumentumnál" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Fehér szöveget használ fekete háttéren, valamint a színek inverzét. Ez a " +#~ "beállítás a Geany újraindítását igényli!" + +#~ msgid "Long line marker:" +#~ msgstr "Hosszú sor jelölése:" + +#~ msgid "Long line marker color:" +#~ msgstr "Hosszú sor jelölésének színe:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Make eszköz elérési útja és opciói" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Sor vagy kiválasztás másolása" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "A kijelölés küldése a terminálba" + +#~ msgid "Run (alternative command)" +#~ msgstr "Futtatás (másik paranccsal)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Lejjebb látható az elérhető bővítmények listája. Válassza ki azokat, " +#~ "amelyeket a Geany indulásakor be kell tölteni." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "%s fájl nyomtatása megszakítva." + +#~ msgid "Make in base path" +#~ msgstr "Make parancs az alapkönyvtárban" + +#~ msgid "Run command:" +#~ msgstr "Parancs indítása:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "A projekt alapkönytárában futtatandó parancssor. A parancshoz opciókat is " +#~ "lehet fűzni. Hagyja üresen az alapértelmezett futtatás parancs " +#~ "használatához." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Adja meg a projekt futtatási parancsát" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Szöveg cserélve %u fájlban." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "A keresés sikertelen (a részletekhez ld. Súgó->Hibaüzenetek)." + +#~ msgid "My" +#~ msgstr "Saját" + +#~ msgid "Local" +#~ msgstr "Helyi" + +#~ msgid "Our" +#~ msgstr "Mienk" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminál bővítmény" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "A virtuális terminál emulátor eszköz (VTE) ezen beállításai csak akkor " +#~ "lépnek életbe, ha a VTE könyvtárat be sikerült tölteni." + +#~ msgid "Terminal font:" +#~ msgstr "Terminál betűtípus:" + +#~ msgid "Unsplit" +#~ msgstr "Felosztás megszüntetése" #~ msgid "Diff file" #~ msgstr "Diff fájl" diff -Nru geany-0.18/po/it.po geany-0.19/po/it.po --- geany-0.18/po/it.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/it.po 2010-05-23 09:08:49.000000000 +0100 @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-05-04 21:37+0100\n" "Last-Translator: Max \n" "Language-Team: \n" @@ -24,7 +24,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE veloce e leggero che usa GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -32,53 +32,53 @@ msgid "Integrated Development Environment" msgstr "Ambiente di sviluppo integrato" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Informazioni su Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Un IDE veloce e leggero" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(generato il %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Informazioni" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Sviluppatori" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "curatore" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "sviluppatore" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "curatore delle traduzioni" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Traduttori" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Traduttori precedenti" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Contributori" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -86,15 +86,15 @@ "Alcuni dei principali contributori (per una lista più dettagliata vedere il " "file %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Ringraziamenti" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licenza" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -102,283 +102,296 @@ "Impossibile trovare il testo della licenza, per consultarlo online visitate " "http://www.gnu.org/licenses/gpl-2.0.txt." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Impossibile trovare il terminale \"%s\" (verificare il percorso per il " -"terminale nelle preferenze)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Impossibile cambiare la cartella di lavoro in \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Esecuzione di \"%s\" fallita (impossibile creare script di avvio)" +msgid "%s (in directory: %s)" +msgstr "%s (nella cartella: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Processo fallito (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (nella cartella: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Impossibile cambiare la cartella di lavoro in \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Esecuzione di \"%s\" fallita (impossibile creare script di avvio)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Impossibile eseguire il file nel terminale virtuale, probabilmente contiene " "un comando." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Impossibile trovare il terminale \"%s\" (verificare il percorso per il " +"terminale nelle preferenze)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Compilazione fallita." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Compilazione terminata correttamente." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compila" - -# http://lists.linux.it/pipermail/tp/2001-July/000665.html -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Genera" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Co_mpila tutto" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Compila su _destinazione scelta" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Compila su destinazione scelta" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Compila _oggetto" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Inserire opzioni personalizzate qui; tutto il testo inserito è passato al " +"comando «make»." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Errore _successivo" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Errori _precedenti" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Impo_sta include e argomenti" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Visualizza il file DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_isualizza il file PDF" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Imposta i comandi personalizzati" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Imposta gli argomenti" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Compila il file corrente" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Imposta gli argomenti" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Compila il file corrente con Make verso destinazione predefinita" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Imposta i programmi e le opzioni per compilare e visualizzare file (La)TeX." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Compila il file corrente con Make la destinazione specificata" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Creazione DVI:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Compila il file corrente con Make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Creazione PDF:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Impossibile interrompere il processo (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Anteprima DVI:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Non ci sono altri errori di compilazione." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Anteprima PDF:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f sarà sostituito dal nome del file corrente, p.e. test_file.c\n" -"%e sarà sostituito dal nome del file senza estensione, p.e. test_file" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Imposta inclusioni e argomenti" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Etichetta" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Comando" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Imposta i comandi per generare ed eseguire i programmi." +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (nella cartella: %s)" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Compilatore" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s comandi" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compila:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Genera:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Imposta il _tipo di file" -# Sbagliato tradurlo con esegui poiché si riferisce ai permessi di accesso al file. -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Esecuzione:" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "Espressioni regolari di _grep" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Compila il file corrente" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Compila su destinazione scelta" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" + +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Imposta i comandi personalizzati" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Inserire opzioni personalizzate qui; tutto il testo inserito è passato al " -"comando «make»." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Compila il file corrente con Make verso destinazione predefinita" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Imposta i comandi personalizzati" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Compila il file corrente con Make la destinazione specificata" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compila" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compila il file corrente con Make" +# http://lists.linux.it/pipermail/tp/2001-July/000665.html +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Genera" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Esecuzione del programma di visualizzazione fallita" +# Sbagliato tradurlo con esegui poiché si riferisce ai permessi di accesso al file. +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Esecuzione:" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Impossibile interrompere il processo (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Compila su _destinazione scelta" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Non ci sono altri errori di compilazione." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Compila _oggetto" + +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Co_mpila tutto" -#: ../src/callbacks.c:152 +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Imposta i comandi personalizzati" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Si vuole veramente uscire?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "File %s salvato." +msgstr[1] "File %s salvato." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Ripristina" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Le modifiche non salvate andranno perse." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Si è sicuri di voler ripristinare '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Vai alla riga" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Inserire la riga a cui si vuole andare:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Impostare il tipo di file per il file corrente prima di usare questa " "funzione." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "gg.mm.aaaa" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.gg.aaaa" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/mm/gg" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "gg.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.gg.aaaa hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/gg hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Usa il formato di data personalizzato" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Formato di data personalizzato" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -387,26 +400,25 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Impossibile convertire la stringa di formato della data (forse è troppo " "lunga)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Non ci sono altri messaggi." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Apri file" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Visualizza" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -414,28 +426,28 @@ "Apre il file in modalità di sola lettura. Se si sceglie più di un file da " "aprire, tutti i file saranno aperti in sola lettura." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Individua dall'estensione del file" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Individua dal file" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Altre opzioni" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Mostra file _nascosti" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Imposta _codifica:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -450,11 +462,11 @@ "selezionato." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Imposta il tipo del file:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -475,23 +487,23 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Salva file" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "_Rinomina" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Salva il file e lo rinomina." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Apre il file in una nuova scheda" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -499,41 +511,41 @@ "Mantiene aperto il documento corrente non salvato e apre il file appena " "salvato in una nuova scheda." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Errore" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Domanda" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Avviso" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Informazione" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Non salvare." -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Il file \"%s\" non è salvato." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Si desidera salvarlo prima della chiusura?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Selezionare il tipo di carattere" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -541,48 +553,48 @@ "Si è verificato un errore oppure non si sono potute ottenere le informazioni " "sul file (p.e. da un nuovo file)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "sconosciuto" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Proprietà" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Dimensione:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Posizione:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Sola lettura:" # La frase originale è troppo generica, ho cercato di rendere al meglio la spiegazione del flag. -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(modalità di apertura dei file in Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Codifica:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(con BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(senza BOM)" @@ -591,7 +603,7 @@ # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Ultimo editing:" @@ -600,7 +612,7 @@ # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Ultima modifica:" @@ -609,54 +621,59 @@ # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Ultimo accesso:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Permessi:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Lettura:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Scrittura:" +# Sbagliato tradurlo con esegui poiché si riferisce ai permessi di accesso al file. +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Esecuzione:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Proprietario:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Gruppo:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Altri:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "File %s chiuso." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Nuovo file \"%s\" aperto." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Impossibile aprire il file %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -671,12 +688,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Il file \"%s\" non è %s valido." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -687,30 +704,30 @@ # NdMax: # "Spazio dei nomi" che contiene classi e funzioni, per esempio System.IO oppure System.Windows.Forms del C#. Si puo' lasciare com'e' levando il plurale dato che in italiano le parole straniere diventano invarianti. -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Spazi" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulazioni" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabulazioni e spazi" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Impostati %s come modalità rientro automatico per %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Nome del file non valido" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "File %s ricaricato." @@ -718,20 +735,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "File %s aperto(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", sola lettura" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Errore nel salvataggio del file." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -740,7 +757,7 @@ "Si è verificato un errore nella conversione del file da UTF-8 a \"%s\". Il " "file resta non salvato." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -749,52 +766,52 @@ "Messaggio di errore: %s\n" "Errore verificatosi in corrispondenza di: \"%s\" (linea: %d, colonna: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Messaggio di errore: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Errore nel salvataggio del file." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Errore nel salvataggio del file (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "File %s salvato." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" non trovato." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Ricominciare la ricerca dall'inizio?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Nessuna corrispondenza trovata per \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: sostituita %d occorrenza di \"%s\" con \"%s\"." msgstr[1] "%s: sostituite %d occorrenze di \"%s\" con \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Ricaricare il file?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -803,24 +820,29 @@ "Il file '%s' presente sul disco è più recente della\n" "copia che si sta editando." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Provare di nuovo a salvare il file?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "File \"%s\" non trovato." -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Ampiezza delle tabulazioni:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Indicare il numero di spazi da sostituire con un carattere di tabulazione." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celtico" @@ -932,587 +954,650 @@ msgid "Without encoding" msgstr "Senza codifica" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Europee _occidentali" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Europee orientali" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "_Asiatiche orientali" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_SE & SO Asiatiche" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Medio orientali" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" # File sorgente C è troppo prolisso, Sorgente C è comprensibile allo stesso modo ed è più compatto. Chiaramente vale per tutte le stringhe "X suorce file". -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Sorgente %s" # File sorgente C è troppo prolisso, Sorgente C è comprensibile allo stesso modo ed è più compatto. Chiaramente vale per tutte le stringhe "X suorce file". -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "Sorgente %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Nessuno" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "File script shell" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Documento XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Foglio di stile (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "File dump SQL" # Si riferisce ai config di Geany -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "File di configurazione" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "File delle traduzioni per gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "File script %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Linguaggi di _programmazione" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Linguaggi di _scripting" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Linguaggi a _marcatori" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Linguaggi _vari" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Imposta il _tipo di file" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Tutti i file sorgente" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Tutti i file" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Espressione regolare non valida per il tipo di file %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "senza nome" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Impossibile trovare il file '%s'." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "Scelta _colori" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_File" # Ho eliminato le parentesi tonde perché superflue, la frase deve essere diretta. # OK -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nuovo da _modello" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisibile" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Apri f_ile selezionato" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_File recenti" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Salva _tutti" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "R_ipristina come" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "invisibile" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "_Impostazioni pagina" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Chiude _altri documenti" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "C_hiudi tutto" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Modifica" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Formatta" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Trasf_orma il testo selezionato in maiuscolo o minuscolo" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Trasponi la linea corrente " + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Commenta Riga" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Decomme_nta Riga" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "_Commenta/decommenta righe" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_plica la riga o il testo selezionato" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Aumenta Rientro" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Diminuisci Rientro" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Invia la selezione al terminale." +#: ../src/interface.c:537 ../src/keybindings.c:361 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Indentazione di riga intelligente" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Invia selezione a" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Comando" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Taglia la(e) linea(e) corrente(i)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Copia la(e) linea(e) corrente(i)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Cancella la(e) linea(e) corrente(i)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "Du_plica la riga o il testo selezionato" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Seleziona la(e) linea(e) corrente(i)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Seleziona il paragrafo corrente" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Usare le tabulazioni all'inserimento di spazi bianchi" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Vai al marcatore successivo" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Vai al marcatore precedente" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Invia la selezione al terminale." + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "In_serisci Commenti" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Inserisci voce del _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Inserisci i_ntestazione del file" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Inserisci descrizione di _funzione" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Inserisci commento _multilinea" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Inserisci il testo della _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Inserire il testo della licenza _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Inserisci _Data" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "I_nserisci \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Preferen_ze" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Preferenze" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Cerca" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Trova _successivo" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Trova in f_ile" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Sos_tituisci" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Trova _selezionato" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Trova selezione pre_cedente" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Messaggio successivo" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Messaggio pr_ecedente" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Vai alla _riga" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Cambia _tipo di carattere" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "M_ostra/nascondi tutti i controlli aggiuntivi" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Schermo intero" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Mostra _finestra messaggi" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Mostra _barra degli strumenti" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Mostra barra _laterale" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Mostra il margine per i _marcatori" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Mostra i numeri di _riga" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Mostra gli spazi _bianchi" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Mostra i _fine riga" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Mostra guide di _rientro" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_A capo automatico" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "A _capo automatico" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Rientro _automatico" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Tipo di in_dentazione" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabulazioni" # NdMax: # "Spazio dei nomi" che contiene classi e funzioni, per esempio System.IO oppure System.Windows.Forms del C#. Si puo' lasciare com'e' levando il plurale dato che in italiano le parole straniere diventano invarianti. -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Spazi" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abulazioni e spazi" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Sola _lettura" # Cercando su internet ho trovato anche l'espressione "Firma Unicode BOM" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Scrive il carattere Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Imposta il _tipo di file" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Imposta _codifica" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Imposta termi_natore di riga" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Converti e imposta a _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Converti e imposta a _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Converti e imposta a CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Elimina _spazi in coda" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Sostituisci le tabulazioni con spa_zi" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Sostituisci gli spazi con caratteri di _tabulazione" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "C_ontrai tutto" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Espandi tutto" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Rimuovi i _marcatori" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Rimuove gli _indicatori di errore" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Progetto" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nuovo" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Apri" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Progetti _recenti" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Chiudi" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Strumenti" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Ricarica la configurazione" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "File di c_onfigurazione" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Scelta _colori" # Conteggio parole è impreciso e poi in tutti i programmi di editing tale funzionalità è riportata come "statistiche documento" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Statistiche documento" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Carica t_ag" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Ricarica la configurazione" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Aiuto" # Sito web è veramente macabro ;-) l'ho sostituito con Sito Internet # OK :-) -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Sito Internet" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Scorciatoie da _tastiera" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Messaggi di _debug" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Simboli" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documenti" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Stato" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compilatore" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Messaggi" # Uhm... non mi è venuto in mente di meglio... # Io pensavo al nome di un "luogo" ove mettere bigliettini (Bacheca). Comunque appunti non è male. -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Appunti" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Immagini _e testo" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Solo _immagini" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Solo _testo" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Icone _grandi" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Icone _piccole" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Icone _molto piccole" - -#: ../src/interface.c:1769 +#: ../src/interface.c:1887 #, fuzzy -msgid "_Customize Toolbar" -msgstr "_Nascondi barra degli strumenti" +msgid "_Toolbar Preferences" +msgstr "Preferenze" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 #, fuzzy msgid "_Hide Toolbar" msgstr "_Nascondi barra degli strumenti" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "_Utilizzo del Trova" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "_Utilizzo del Trova" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Vai alla definizione del _tag" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Vai alla dichiarazione del t_ag" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Azione conte_stuale" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Preferenze" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Carica i file dell'ultima sessione" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Apre all'avvio i file dell'ultima sessione" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Carica l'emulatore del terminale virtuale" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1520,40 +1605,40 @@ "Imposta il caricamento dell'emulatore del terminale virtuale (VTE) " "all'avvio. Disabilitarla se non necessaria." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Abilita il supporto dei plugin" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Avvio" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Salva posizione e geometria della finestra" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Salva la posizione e la geometria della finestra e la ripristina all'avvio" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Conferma l'uscita" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Mostra un dialogo di conferma all'uscita." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Chiusura" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Percorso di avvio:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1561,19 +1646,19 @@ "Percorso iniziale per l'apertura o il salvataggio dei file. Dev'essere un " "percorso assoluto. Lasciare vuoto per usare la cartella di lavoro corrente." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "File di progetto:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Percorso iniziale all'apertura dei file di progetto" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Percorso aggiuntivo dei plugin:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1584,19 +1669,19 @@ "percorso inserito qui si cercheranno i plugin. Per disabilitare, lasciare " "vuoto." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Percorsi dei programmi" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Avvio" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Emette un suono in caso di errori o al termine della compilazione" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1604,11 +1689,11 @@ "Emette un suono in caso di errore o quando il processo di compilazione è " "terminato." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Passa alla lista dei messaggi di stato in caso di nuovo messaggio" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1616,11 +1701,11 @@ "Passa alla scheda dei messaggi di stato (nella finestra del blocco note in " "basso) in caso di arrivo di un nuovo messaggio di stato." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Sopprime i messaggi di stato nella barra di stato" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1628,12 +1713,12 @@ "Rimuove tutti i messaggi dalla barra di stato. I messaggi sono ancora " "visibili nella finestra dei messaggi di stato." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Seleziona automaticamente i controlli (il focus segue il mouse)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1644,15 +1729,25 @@ "appunti, la barra delle ricerche e dei salti a linea e per l'emulatore di " "terminale." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Varie" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Ricomincia sempre la ricerca dall'inizio e nascondi la finestra Trova" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1660,11 +1755,11 @@ "Ricomincia sempre la ricerca dall'inizio del documento e nascondi la " "finestra Trova dopo aver scelto Trova il Prossimo/Precedente" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usa la parola in corrispondenza del cursore per il dialogo Trova" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1672,19 +1767,19 @@ "Usa la parola in corrispondenza del cursore all'apertura dei dialoghi Trova, " "Trova nei file e Sostituisci e non è stato selezionato del testo." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Usa il percorso del file corrente per Trova nei File" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Ricerca" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Usa file di sessione per progetto" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1692,11 +1787,11 @@ "Per salvare i file della sessione del progetto e aprirli alla riapertura del " "progetto." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Salvare il file di progetto nel percorso base del progetto" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1708,75 +1803,99 @@ "percorso base. Si può sempre cambiare il percorso del file di progetto nel " "dialogo Nuovo Progetto." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Progetti" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Varie" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Generale" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Mostra la lista dei simboli" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Mostra/nasconde la lista dei simboli" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Mostra la lista dei documenti" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Mostra/nasconde la lista dei documenti" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Mostra barra _laterale" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Descrizione:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Sinistra" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Destra" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Barra laterale" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Lista dei simboli:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Finestra dei messaggi:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Imposta il carattere per la finestra dei messaggi" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Imposta il carattere per la finestra della lista simboli" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Imposta il carattere dell'editor" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Tipi di carattere" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Mostra le linguette dei file aperti" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Mostra il pulsante Chiudi" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1785,114 +1904,145 @@ "chiudere facilmente i file con un click su di esso (richiede il riavvio di " "Geany)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Posizione delle nuove linguette file:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Sinistra" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "" "Le nuove linguette file saranno posizionate alla sinistra della lista schede" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Destra" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "" "Le nuove linguette file saranno posizionate alla destra della lista schede" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Salva il file corrente" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Doppio click per nascondere tutti i controlli aggiuntivi" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Mostra/nascondi tutti i controlli aggiuntivi" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Linguette dell'editor" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "In alto" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "In basso" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Barra laterale:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Posizioni delle tabulazioni" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Mostra barra di stato" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Mostra/Nasconde la barra di stato nella finestra principale in basso." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Interfaccia" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Mostra barra degli _strumenti" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Appendi al Menù la barra degli strumenti" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Include la barra degli strumenti nel menù principale per risparmiare spazio " "in senso verticale." -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Barra degli strumenti" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Stile dell'icona:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Dimensioni dell'icona:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Aspetto" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy msgid "Customize Toolbar" msgstr "Mostra _barra degli strumenti" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Immagini _e testo" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Solo _immagini" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Solo _testo" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Tipi di carattere" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Icone _piccole" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Icone _molto piccole" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Icone _grandi" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Dimensione:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra degli strumenti" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Barra degli strumenti" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "A capo automatico" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1903,11 +2053,11 @@ "un alto impatto sulle prestazioni, perciò dovrebbe essere disabilitata su " "macchine lente." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Abilita il tasto Home \"intelligente\"" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1921,11 +2071,11 @@ "questa funzione è disabilitata, il tasto HOME sposta sempre il cursore " "all'inizio della riga corrente, qualsiasi sia la sua posizione corrente." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Disabilita il drag and drop" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1934,19 +2084,19 @@ "modo che non sarà possibile trascinare alcuna selezione all'interno o " "all'esterno della finestra dell'editor." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Contrai/espandi" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Abilita o meno la contrazione/espansione del codice" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Comprimi/Espandi tutti i figli di un punto di contrazione" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1955,11 +2105,11 @@ "Shift mentre si fa click su un simbolo di contrazione si ha il comportamento " "contrario." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Usa indicatori per evidenziare errori di compilazione" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1967,23 +2117,23 @@ "Usa o meno gli indicatori (una sottolineatura ondulata) per evidenziare le " "righe dove il compilatore ha trovato un warning o un errore." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "L'andata a capo elimina gli spazi in coda" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Abilita l'eliminazione degli spazi in coda alla riga precedente." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Colonna di interruzione riga:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Marcatore di selezione del commento:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1991,68 +2141,58 @@ "Stringa da aggiungere quando si seleziona una riga di commento in un file " "sorgente. Usata per marcare il commento come selezionato." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Funzionalità" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Caratteristiche" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Modalità rientro automatico:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Semplice" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Caratteri correnti" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Mostra parentesi corrispondente" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Ampiezza:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "L'ampiezza in caratteri di una singola indentazione" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Usa gli spazi per indentare" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Usa una tabulazione per indentazione" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Usa degli spazi se l'indentazione totale è minore dell'ampiezza della " "tabulazione, altrimenti usa entrambi" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Ampiezza delle tabulazioni:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"L'ampiezza di una tabulazione quando si impostano Tabulazioni & Spazi per un " -"documento" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2060,30 +2200,30 @@ "Per determinare il tipo di indentazione dal contenuto del file alla sua " "apertura." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Indentazione di riga intelligente" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "La pressione del tasto tab/shift-tab aumenta/diminuisce l'indentazione " "invece di inserire un carattere di tabulazione." -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Indentazione" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Indentazione" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Completamento del costrutto" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2091,21 +2231,21 @@ "Digitare una breve sequenza di caratteri predefinita e trasformarla in una " "stringa più complessa con la pressione di un solo tasto." -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Completamento automatico dei tag XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Completamento automatico e chiusura dei tag XML aperti (compresi i tag HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Continuazione automatica di commenti multiriga" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2113,11 +2253,11 @@ "Continua automaticamente i commenti multiriga in linguaggi come C, C++ e " "Java quando si va a capo in un commento di questo tipo." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2125,29 +2265,29 @@ "Completamento automatico di simboli conosciuti nei file sorgente aperti " "(nomi di funzione, variabili globali, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 #, fuzzy msgid "Drop rest of word on completion" msgstr "Disabilita completamento del costrutto" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Numero massimo di suggerimenti per il nome di un simbolo:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Altezza della lista di completamento:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Caratteri da digitare per il completamento:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " @@ -2156,128 +2296,125 @@ "La quantità di caratteri necessari per mostrare la lista dei simboli per il " "completamento automatico." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Numero di righe da mostrare nella lista di completamento automatico." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Massimo numero di righe da mostrare nella lista di completamento automatico." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Completamento automatico" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Parentesi tonde ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" "Chiude automaticamente la parentesi tonda quando si digita quella di " "apertura." -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Apici singoli ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Chiude automaticamente l'apice singolo quando si digita quello di apertura." -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Parentesi graffe { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" "Chiude automaticamente la parentesi graffa quando si digita quella di " "apertura." -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Parentesi quadre [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" "Chiude automaticamente la parentesi quadra quando si digita quella di " "apertura." -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Virgolette doppie \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" "Chiude automaticamente le virgolette doppie quando si digitano quelle di " "apertura." -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Chiusura automatica di virgolette e parentesi" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Completamento automatico" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Inverti i colori dell'evidenziazione della sintassi" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Mostra testo bianco su sfondo nero e inverte tutti i colori, questa opzione " -"richiede il riavvio di Geany." +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Usa testo bianco su sfondo nero." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Mostra guide di rientro" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Mostra sottili linee punteggiate per aiutare ad usare i rientri corretti." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Mostra gli spazi bianchi" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca gli spazi con punti e le tabulazioni con frecce." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Mostra i fine riga" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Mostra il carattere di fine riga" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Mostra i numeri di riga" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Mostra/nasconde il margine dei numeri di riga." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Mostra il margine per i marcatori" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2285,38 +2422,40 @@ "Mostra/nasconde il piccolo margine a destra dei numeri di riga, usato per " "marcare le righe." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Ferma lo scorrimento all'ultima riga" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Indica se fermare lo scorrimento una pagina dopo l'ultima riga di un " "documento." -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Display" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Marcatore di righe lunghe:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Colore del marcatore di righe lunghe:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Società:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Colore" + +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Imposta il colore dei marcatori di riga lunga" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Scelta colori" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2327,11 +2466,11 @@ "campo ad un valore maggiore di zero per specificare la colonna dove il " "margine deve apparire." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Linea" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2339,11 +2478,11 @@ "Stampa una linea verticale nella finestra dell'editor alla posizione del " "cursore indicata (vedere sotto)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Sfondo" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2353,110 +2492,147 @@ "(vedi sotto) è cambiata al colore impostato sotto (raccomandato se si usano " "caratteri proporzionali)." -#: ../src/interface.c:3902 +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Abilita" + +#: ../src/interface.c:3976 ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Marcatore di margine destro" + +#: ../src/interface.c:3995 ../src/interface.c:5309 msgid "Disabled" msgstr "Disabilitato" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Marcatore di margine destro" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Rimuove gli spazi e le tabulazioni in eccesso alla fine delle righe" -#: ../src/interface.c:3913 +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Percorsi dei programmi" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Display" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Apre nuovi documenti dalla linea di comando" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Crea un nuovo file per ogni nome file da riga di comando che non esiste." -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Caratteri predefiniti di fine riga:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "File nuovi" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Imposta la codifica predefinita per i file appena creati." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Codifica predefinita (nuovi file):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Codifica predefinita (file esistenti):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Imposta la codifica predefinita per l'apertura di file esistenti." +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Imposta la codifica predefinita per i file appena creati." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Usa codifica prefissata per aprire i file" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Questa opzione disabilita il rilevamento automatico della codifica del file " "all'apertura dei file, e apre i file con la codifica specificata (di solito " "non è necessario)." -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codifica predefinita (file esistenti):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Imposta la codifica predefinita per l'apertura di file esistenti." + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Codifica:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Forza carattere «a capo» a fine file" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Assicura che ci sia un carattere «a capo» alla file del file" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Elimina spazi in coda" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Rimuove gli spazi e le tabulazioni in eccesso alla fine delle righe" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Sostituisce le tabulazioni con gli spazi" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Sostituisce tutte le tabulazioni del documento con spazi." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Salvare i file" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Lunghezza della lista file recenti:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Specifica il numero di file memorizzati nella lista File recenti." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Timeout per il controllo su disco:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2464,27 +2640,20 @@ "Frequenza di controllo per i cambiamenti a documenti su disco. Il valore " "zero disabilita il controllo." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "File" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminale:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Percorso ed opzioni per il programma «make»" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2492,24 +2661,24 @@ "Un emulatore di terminale simile a xterm, gnome-terminal o konsole (dovrebbe " "accettare l'argomento -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Percorso (e possibilmente argomenti addizionali) del vostro browser preferito" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Percorsi dei programmi" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Azione contestuale:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2520,67 +2689,67 @@ "essere usata con %s. Può trovarsi ovunque nel comando dato e sarà sostituita " "prima dell'esecuzione." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Comandi" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Strumenti" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "Indirizzo di posta elettronica dello sviluppatore" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Iniziali del nome dello sviluppatore" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Versione iniziale:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Numero di versione assegnato inizialmente a un nuovo file" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Nome della società" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Sviluppatore:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Società:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Indirizzo di posta elettronica:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Iniziali:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Il nome dello sviluppatore" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Anno:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Data e ora:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2589,7 +2758,7 @@ "usare tutti gli specificatori di conversione che è possibile usare nella " "funzione ANSI C strftime." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2598,7 +2767,7 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2607,63 +2776,63 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Dati dei modelli" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Modelli" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Cambia" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Scorciatoie da tastiera" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Percorso del comando di stampa file (usare %f per il nome del file)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Usa un comando esterno per stampare" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Stampa i numeri di riga" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Aggiunge i numeri di riga alla pagina stampata." -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Stampa i numeri di pagina" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Aggiungi i numeri di pagina al piede di ogni pagina. Occupa 2 righe della " "pagina." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Stampa l'intestazione della pagina" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2672,19 +2841,19 @@ "pagina, il nome del file e la data corrente (vedere sotto). Occupa 3 righe " "della pagina." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usa il nome base del file stampato" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Stampa solo il nome base (senza il percorso) del file stampato." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Formato di data:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2694,552 +2863,580 @@ "di ogni pagina. Si possono usare tutti gli specificatori di conversione che " "è possibile usare nella funzione ANSI C strftime." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Usa la funzionalità di stampa nativa di GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Codifica:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Stampa" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Proprietà del progetto" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Display" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Taglia" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "File" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nuovo" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Apri" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Apre il file selezionato" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Salva" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Salva come" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Salva tutti" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Stampa" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Chiudi" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Chiudi tutto" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Ricarica file" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Progetto" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Proprietà del progetto" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Annulla" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Ripeti" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplica la riga o il testo selezionato" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Cancella la(e) linea(e) corrente(i)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Cancella la(e) linea(e) corrente(i)" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Trasponi la linea corrente " - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Scorre alla linea corrente" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Scorre in alto la visualizzazione di una riga" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Scorre in basso la visualizzazione di una riga" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Completa il costrutto" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Sposta il cursore nel frammento." -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Disabilita completamento del costrutto" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Azione contestuale" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Completa parola" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Mostra suggerimenti" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Mostra la lista delle macro" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Completamento del costrutto" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Commenta la riga" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Commenta la riga" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Appunti" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Taglia" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copia" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Incolla" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copia la(e) linea(e) corrente(i)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Taglia la(e) linea(e) corrente(i)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Seleziona" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Seleziona tutto" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Seleziona parola corrente" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Seleziona la(e) linea(e) corrente(i)" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Vai al marcatore precedente" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Seleziona il paragrafo corrente" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Vai al marcatore successivo" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Formatta" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Trasforma il testo selezionato in maiuscolo o minuscolo" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Commenta/Decommenta riga" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Commenta la riga" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Decommenta la riga" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Aumenta rientro" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Diminuisci rientro" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Aumenta il rientro di uno spazio" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Diminuisce il rientro di uno spazio" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Indentazione di riga intelligente" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Invia al comando personalizzato n. 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Invia al comando personalizzato n. 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Invia al comando personalizzato n. 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Invia la selezione al terminale." - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Inserisci" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Inserisci data" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Usare le tabulazioni all'inserimento di spazi bianchi" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Impostazioni" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Cerca" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Trova" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Trova successivo" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Trova precedente" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Trova prossima selezione" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Trova selezione precedente" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Sostituisci" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Trova in file" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Messaggio successivo" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Messaggio precedente" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Mostra utilizzo" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Uso del Trova Documento" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "Co_mpila tutto" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Vai alla riga" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Naviga una posizione indietro" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Naviga una posizione avanti" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Vai alla parentesi corrispondente" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Mostra/nascondi marcatore" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Vai al marcatore successivo" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Vai al marcatore precedente" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Vai alla definizione del tag" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Vai alla dichiarazione del tag" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Vai a inizio riga" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Vai a fine riga" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Vai a fine riga" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Vai al marcatore precedente" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Vai al marcatore successivo" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Visualizza" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Mostra/nascondi tutti i controlli aggiuntivi" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Schermo intero" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Mostra/nasconde la finestra messaggi" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Mostra/nasconde barra laterale" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Aumenta Ingrandimento" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Diminuisci Ingrandimento" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Diminuisci Ingrandimento" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Passa all'editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Passa agli appunti" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Passa all'emulatore di terminale virtuale" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Passa alla barra di ricerca" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Passa alla barra laterale" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Passa al compilatore" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Passa alla barra laterale" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Mostra _finestra messaggi" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Passa al documento" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Passa alla barra laterale" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Scheda del blocco note" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Passa al documento di sinistra" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Passa al documento di destra" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Passa all'ultimo documento usato" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Sposta il documento a sinistra" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Sposta il documento a destra" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Sposta il documento all'inizio" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Sposta il documento alla fine" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "A capo automatico" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Interruzione riga" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Sostituisci gli spazi con caratteri di tabulazione" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Seleziona punto di espansione corrente" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Comprimi tutto" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Espandi tutto" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Ricarica la lista dei simboli" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Rimuovi i _marcatori" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Rimuove gli _indicatori di errore" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Genera" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Compila" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Compila tutto" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Compila su destinazione scelta" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Compila oggetto" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Errore successivo" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Errore precedente" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Esegui" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Esegui (comando alternativo)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Opzioni per la generazione" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Mostra il dialogo di scelta colori" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Aiuto" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Scorciatoie da tastiera" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Sono definite le seguenti scorciatoie da tastiera:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Passa al documento" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "E' possibile scrivere qualunque cosa, questa è una bacheca per bozze e " "appunti" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Caricamento di uno o più file della sessione non riuscito." @@ -3247,7 +3444,12 @@ msgid "Debug Messages" msgstr "Messaggi di debug" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Cerca" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3255,90 +3457,99 @@ "Imposta il numero iniziale di colonna per il primo file aperto (utile " "insieme all'opzione --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Imposta una cartella di configurazione alternativa" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Messaggi verbosi" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Stampa i nomi di tipo di file interni" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Genera il file globale dei tag (consultare la documentazione)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Non preprocessare i file C/C++ quando si generano i tag." -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Non apre i file in un'istanza già in esecuzione, forza l'apertura di una " "nuova istanza." -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Imposta il numero di riga iniziale per il primo file aperto" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Non mostrare la finestra dei messaggi all'avvio" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "" "Non caricare i dati per il completamento automatico (consultare la " "documentazione)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Non caricare i plugin" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Stampa il prefisso del percorso base dell'installazione di Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 #, fuzzy msgid "Don't load the previous session's files" msgstr "Non apre i file di sessioni precedenti" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Non caricare il supporto del terminale " -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Imposta il file di libreria per il supporto al terminale (libvte.so)" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Messaggi verbosi" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Mostra le informazioni sulla versione ed esce" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FILE...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(compilato il %s con GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Spostare ora?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Geany deve spostare la vecchia directory di configurazione prima dell'avvio." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3349,7 +3560,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3358,7 +3569,7 @@ "Impossibile spostare la vecchia directory di configurazione \"%s\" in \"%s" "\" (%s). Spostare manualmente la directory nella nuova posizione." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3370,38 +3581,43 @@ "configurazione.\n" "Avviare ugualmente Geany?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Impossibile trovare il file '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Impossibile creare la cartella di configurazione (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "File di configurazione ricaricato." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Messaggi di stato" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Copia" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Copia _Tutto" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Nascondi la finestra dei messaggi" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Rimuove tutti gli indicatori di errore nel documento corrente." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3410,11 +3626,11 @@ "Il plugin \"%s\" non è compatibile con questa versione di Geany e dev'essere " "ricompilato." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Gestione _Plugin" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3425,82 +3641,90 @@ "Descrizione: %s\n" "Autore(i): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Attivo" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Nessun plugin disponibile." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Plugin" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Qui sotto è presente una lista di plugin disponibili. Selezionare i plugin " -"da caricare all'avvio di Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Dettagli del plugin" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Cattura tasto" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Premi una combinazione di tasti da usare per \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Espandi tutto" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "C_hiudi tutto" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Azione" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Scorciatoia" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Ridefinisci" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Ridefinire la scorciatoia?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinazione '%s' è già in uso per \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminale" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Inserire qui i percorsi dei programmi. I programmi non necessari possono " "essere lasciati in bianco." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3508,7 +3732,7 @@ "Inserire le informazioni da usare nei modelli. Per i dettagli vedere la " "documentazione." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3519,7 +3743,7 @@ "Strumenti -> Ricarica la configurazione." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3531,7 +3755,7 @@ "stringa che rappresenta la scorciatoia." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3541,7 +3765,7 @@ "e Geany è in esecuzione con la versione 2.10 (o superiore) di GTK." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3562,16 +3786,16 @@ # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Impostazione del documento" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Stampa solo il nome base (senza il percorso) del file stampato." @@ -3580,31 +3804,31 @@ # ultimo editing = l'ultima volta che sono stati cambiati i dati nel file # ultima modifica = l'ultima volta che si è cambiato l'inode del file (rinomina, etc) # Mi è sembrato più corretto rinominarli in questo modo. -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Stampa del file \"%s\" cancellata." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "File %s stampato." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Stampa del file \"%s\" fallita (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Definire prima un comando di stampa nella finestra delle preferenze." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3615,38 +3839,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Stampa del file \"%s\" fallita (codice errore: %s)" +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "File %s stampato." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "progetti" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Nuovo progetto" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "C_rea" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Nome:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Nome del file:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Percorso base:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3656,123 +3885,117 @@ "nuovo percorso, o una cartella esistente. Si possono usare percorsi relativi " "al nome file del progetto." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Scegliere il percorso base del progetto" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Impossibile caricare il file del progetto \"%s\"." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Apri progetto" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "File di progetto" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Progetto \"%s\" chiuso." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Descrizione:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Compila nel percorso base" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Esegui comando:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Sez1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Comando da eseguire nella directory base del progetto. È possibile passare " -"delle opzioni al comando. Lasciare vuoto per usare il comando predefinito." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Modelli dei nomi di file:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Si desidera chiudere prima di continuare?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Il progetto '%s' è già aperto." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Il nome di progetto specificato è troppo corto." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Il nome di progetto specificato è troppo lungo (max. %d caratteri)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "È stato specificato un nome di progetto non valido." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Creare il percorso base del progetto?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Il percorso \"%s\" non esiste." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Impossibile creare il percorso base del progetto (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Impossibile salvare il file del progetto (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Progetto \"%s\" creato." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Progetto \"%s\" salvato." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" -msgstr "Scegliere il nome del file di progetto" - -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Scegliere il comando di esecuzione del progetto" +msgstr "Scegliere il nome del file di progetto" -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Progetto \"%s\" aperto." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Usa espressioni regolari" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3781,15 +4004,15 @@ "dettagliate sull'uso delle espressioni regolari, consultare la " "documentazione." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Cerca all'_indietro" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Usa sequenze di _escape" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3797,428 +4020,445 @@ "Sostituisci \\\\, \\t, \\n, \\r e \\uXXXX (Caratteri Unicode) con i " "corrispondenti caratteri di controllo." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "_Maiuscole/Minuscole" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Solo parole _intere" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Trova dall'i_nizio della parola" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Precedente" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Successivo" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Cerca:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Trova tutti" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Marca" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Marca tutte le corrispondenze nel documento corrente." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "Nella sessi_one" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "Nel _documento" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Chiudi _dialogo" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Disabilita questa opzione per mantenere aperta la finestra." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "_Trova & sostituisci" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "_Sostituisci con:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Sostituisci _Tutto" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Nel testo se_lezionato" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Sostituisci tutte le occorrenze trovate nel testo selezionato" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Cartella:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Imposta _codifica:" # dovrebbero essere le stringhe la cui lunghezza e' specificata gia' alla dichiarazione, tipo char(16) del SQL -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Stringhe di lunghezza _fissa" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Espressioni regolari di _grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Per maggiori informazioni consultare la pagina di manuale di grep." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Espressioni regolari estese" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Esegui _ricorsivamente nelle sottocartelle" # Invertire i risultati di ricerca non ha significato. -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Inverti il senso di ricerca" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Inverte il senso della ricerca e mostra le righe senza occorrenze." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Opzioni e_xtra:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Altre opzioni da passare a grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Trovata %d corrispondenza per \"%s\"." msgstr[1] "Trovate %d corrispondenze per \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Sostituito testo in %u file." -msgstr[1] "Sostituito testo in %u file." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Marca tutte le corrispondenze nel documento corrente." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Cartella non valida per la ricerca nei file." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Nessuna stringa da trovare." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Impossibile eseguire il programma grep '%s'; verificarne il percorso nelle " "Preferenze." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Ricerca in corso..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (nella cartella: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Impossibile aprire la cartella (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Ricerca fallita (vedere Help->Messaggi di debug per i dettagli)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Ricerca fallita." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Ricerca completata con %d corrispondenza." msgstr[1] "Ricerca completata con %d corrispondenze." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Nessuna corrispondenza trovata." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Espressione regolare non valida per il tipo di file %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Capitolo" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sezione" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sez1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sez2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sez3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Appendice" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Altro" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Modulo" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Tipi" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Costruttori di tipo" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funzioni" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Sezioni" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Tasti" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variabili" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Comando" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Ambiente" # le stringhe di treeviews.c "quasi tutte" fanno riferimento a parti dei vari linguaggi, per esempio, il C (che poi è contrassegnato come defaults) ci sono functions, struct, etc. # Per il momento ho contrassegnato come fuzzy le voci dei linguaggi che non conosco, poi si vedrà. -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Sottosezione" # le stringhe di treeviews.c "quasi tutte" fanno riferimento a parti dei vari linguaggi, per esempio, il C (che poi è contrassegnato come defaults) ci sono functions, struct, etc. # Per il momento ho contrassegnato come fuzzy le voci dei linguaggi che non conosco, poi si vedrà. -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubsection" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etichetta" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Strutture" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Pacchetto" -# NdMax: -# my $variabile; -# e' una dichiarazione di variabile locale in perl -#: ../src/symbols.c:655 -msgid "My" -msgstr "My" - -# costrutto perl -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Etichette" -# costrutto perl -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Costanti" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfacce" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Classi" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Costanti" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Ancore" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Intestazione (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Intestazione (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Intestazione (H3)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Selettori di ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Selettori di tipo" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Moduli" # NdMax: # A volte tradotto cosi' altre volte lasciato in originale. Dovrebbe essere un oggetto di cui per definizione non possono esistere piu' istanze contemporaneamente (tentando di crearne una seconda in realta' si ha accesso a quella gia' esistente). -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singoletti" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Metodi" # NdMax: # "Spazio dei nomi" che contiene classi e funzioni, per esempio System.IO oppure System.Windows.Forms del C#. Si puo' lasciare com'e' levando il plurale dato che in italiano le parole straniere diventano invarianti. -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namespace" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Proprietà" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Esporta" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "senza nome" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Strutture" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Proprietà" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Variabili" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Funzioni" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Membri" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Etichette" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subroutine" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blocchi" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Macro" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Define" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Target" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Strutture" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedef / Enum" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Estensione sconosciuta per \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Creazione file dei tag fallita, probabilmente non sono stati trovati tag.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "Uso: %s -g \n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4229,176 +4469,194 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Carica tag" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "File dei tag di Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Caricati %s file dei tag '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Impossibile caricare il file dei tag '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Dichiarazione di \"%s\" non trovata." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definizione di \"%s\" non trovata." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Ordina per _nome" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Ordina per _aspetto" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Salva il file corrente" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Salva tutti i file aperti" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Ripristina il file corrente dal disco rigido" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Chiude il file corrente" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Chiude tutti i file aperti" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Taglia la selezione corrente" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Copia la selezione corrente" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Incolla il contenuto della clipboard" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Cancella la selezione corrente" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Annulla l'ultima modifica" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Ripete l'ultima modifica" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compila il file corrente" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Esegue o visualizza il file corrente" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" "Apre un dialogo di selezione colore, per scegliere i colori da una tavolozza " "in modo interattivo." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Aumenta ingrandimento" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Diminuisce ingrandimento" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Diminuisci rientro" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Aumenta rientro" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Trova il testo inserito nel file corrente" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Vai al numero di riga inserito." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Mostra il dialogo delle preferenze" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Chiude Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Stampa il documento." -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "Marca tutte le corrispondenze nel documento corrente." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Crea un nuovo file" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Crea un nuovo file" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Apre un file esistente" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Apre il file selezionato" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Non ci sono altri errori di compilazione." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Vai alla riga" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Display" @@ -4428,7 +4686,7 @@ msgid "Custom command failed: %s" msgstr "Comando utente non riuscito: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Imposta i comandi personalizzati" @@ -4440,198 +4698,190 @@ "È possibile inviare la selezione corrente a uno qualsiasi di questi comandi, " "e l'output del comando rimpiazzerà la selezione corrente." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Non sono stati definiti comandi personalizzati." # Conteggio parole è impreciso e poi in tutti i programmi di editing tale funzionalità è riportata come "statistiche documento" -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Statistiche documento" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "selezione" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "tutto il documento" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Intervallo:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Righe:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Parole:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Caratteri:" # Con tags si riferisce alle stringhe tipiche del codice che mettono in moto il meccanismo di ricerca dei simboli. # Teoricamente la stringa viene stampata solo se il file è vuoto o se il codice scritto non contiene riferimenti a funzioni, strutture, etc. # Nessun riferimento è più che sufficiente come messaggio. -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Nessun riferimento" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Mostra la lista dei _simboli" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Mostra la lista dei _documenti" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "_Nascondi barra laterale" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Mostra il percorso _completo" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "linea: %d\t col: %d\t sel: %d\t" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO" # Ho visto su OpenOffice, li' usa SSC per SovraSCrivi e INS e' uguale #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "SSC" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "modo: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "codifica: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "tipo del file: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "ambito: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Carattere aggiornato (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Libreria standard C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "Estensioni ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Libreria Standard C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Libreria standard C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Imposta il formato di data personalizzato" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Seleziona cartella" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Seleziona file" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "File di c_onfigurazione" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Salva _tutti" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "C_hiudi tutto" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminale" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "_Imposta il percorso dal documento" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Riavvia il terminale" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Metodi di _input" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4639,49 +4889,37 @@ "Impossibile cambiare directory nel terminale virtuale, probabilmente " "contiene un comando." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Emulazione terminale" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Le impostazioni per l'emulatore di terminale virtuale (VTE) hanno effetto " -"solo se la libreria VTE può essere caricata." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Carattere del terminale:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Imposta il carattere per il terminale." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Colore del carattere:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Colore dello sfondo:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Imposta il colore del testo nel terminale." -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Imposta il colore dello sfondo nel terminale." # Non saprei, non mi è venuto in mente niente di meglio. # NdMax: Ho cercato un po' in giro, in effetti su gnome-terminal pare che l'hanno tradotto allo stesso modo, in altri testi ho visto che e' stato mantenuto scrollback... -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Righe di scorrimento all'indietro:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" @@ -4689,56 +4927,56 @@ "Imposta il numero di righe del buffer di scorrimento all'indietro nel " "terminale." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Imposta il percorso alla shell da usare nell'emulazione del terminale." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Scorrere alla pressione dei tasti" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Fa scorrere verso il fondo alla pressione di un tasto." -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Scorrere in presenza di output" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Fa scorrere verso il fondo quando viene generato dell'output." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Cursore lampeggiante" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Abilita/Disabilita il lampeggio del cursore." -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Ridefinisce le scorciatoie da tastiera di Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Permette al terminale virtuale di ricevere le scorciatoie da tastiera (oltre " "ai comandi di focus)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Disabilita il tasto scorciatoia per il menù (F10 predefinito)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4748,21 +4986,21 @@ "essere utile se si usa, per esempio, Midnight Commander all'interno " "dell'emulatore di terminale virtuale." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Segui il percorso del file corrente" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Esegue \"cd $path\" quando si passa da un file aperto all'altro." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Non usare script per l'esecuzione" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4770,11 +5008,11 @@ "Non usare il semplice script per l'esecuzione usato di solito per mostrare " "lo stato di uscita del programma eseguito." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Esegui i programmi nel terminale virtuale." -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4783,91 +5021,131 @@ "emulazione terminale. Notare che i programmi eseguiti nel terminale virtuale " "non possono essere fermati." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "File di progetto di Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Eseguibili" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Creazione di classi" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Crea file sorgente per nuove classi." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Crea classe" -#: ../plugins/classbuilder.c:332 +# NdMax: +# "Spazio dei nomi" che contiene classi e funzioni, per esempio System.IO oppure System.Windows.Forms del C#. Si puo' lasciare com'e' levando il plurale dato che in italiano le parole straniere diventano invarianti. +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Namespace" + +# NdMax: +# "Spazio dei nomi" che contiene classi e funzioni, per esempio System.IO oppure System.Windows.Forms del C#. Si puo' lasciare com'e' levando il plurale dato che in italiano le parole straniere diventano invarianti. +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Namespace" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nome della classe:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "File di intestazioni:" # File sorgente C è troppo prolisso, Sorgente C è comprensibile allo stesso modo ed è più compatto. Chiaramente vale per tutte le stringhe "X suorce file". -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "File sorgente:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Ereditarietà" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Classe base:" -#: ../plugins/classbuilder.c:389 +# File sorgente C è troppo prolisso, Sorgente C è comprensibile allo stesso modo ed è più compatto. Chiaramente vale per tutte le stringhe "X suorce file". +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Sorgente Haskell" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Intestazione base:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Globale" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "GType base:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Opzioni" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Crea il costruttore" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Crea il distruttore" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +# NdMax: +# A volte tradotto cosi' altre volte lasciato in originale. Dovrebbe essere un oggetto di cui per definizione non possono esistere piu' istanze contemporaneamente (tentando di crearne una seconda in realta' si ha accesso a quella gia' esistente). +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Singoletti" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Tipo costruttore GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Crea cla_sse" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Classe _GTK+" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Classe _C++" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caratteri HTML" @@ -4877,52 +5155,57 @@ msgstr "Inserisce entità carattere HTML, come '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Il gruppo di sviluppatori di Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Caratteri HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Caratteri ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Caratteri greci" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Caratteri matematici" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Caratteri tecnici" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Caratteri freccia" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Caratteri di punteggiatura" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Caratteri vari" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Impossibile creare la cartella di configurazione dei plugin." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Caratteri speciali" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Inserisci data" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4931,40 +5214,40 @@ "di esso oppure usare il pulsante per inserirlo alla posizione corrente del " "cursore." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Carattere" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nome)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Inserisci caratteri HTML speciali" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Sostituzione HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "Abilita _HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Sostituzione di massa dei caratteri speciali" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Inserisce caratteri HTML speciali" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Sostituisce i caratteri speciali." -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Abilita/Disabilita lo stato dei plugin." @@ -4991,105 +5274,105 @@ "Visualizza la dimensione dei caratteri del documento insieme al livello di " "ingrandimento corrente." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documento esportato come '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Impossibile salvare il file '%s' (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "File '%s' già esistente. Si desidera sovrascriverlo?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Esporta" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Come _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Come _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Esplorazione file" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Aggiunge una scheda per l'esplorazione dei file alla barra laterale." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Selezionati troppi elementi!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Impossibile eseguire il comando esterno configurato '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Aprire _esternamente" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Trova in file" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Mostra file _nascosti" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Su" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Aggiorna" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Imposta il percorso dal documento" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Elimina il filtro" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Passa alla lista dei file" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Passa al percorso" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Impossibile creare la cartella di configurazione dei plugin." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Comando esterno di apertura:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5103,15 +5386,15 @@ "%f sarà sostituita dal nome file con il percorso completo\n" "%d sarà sostituita dal percorso del file selezionato senza il nome del file" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Mostra file nascosti" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Nascondi file oggetto" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5119,12 +5402,12 @@ "Non mostrare nell'esplorazione dei file i file oggetto generati, che " "comprendono *.o, *.obj, *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Crea il percorso base del progetto." -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Cambia la directory al percorso base del progetto corrente." @@ -5233,38 +5516,209 @@ msgid "Splits the editor view into two windows." msgstr "Divide la vista dell'editor in due finestre." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "Marca tutte le corrispondenze nel documento corrente." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Unisci" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Dividi la finestra" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Orizzontalmente" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Verticalmente" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Dividi orizzontalmente" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Dividi verticalmente" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Unisci" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Impo_sta include e argomenti" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_Visualizza il file DVI" + +#~ msgid "V_iew PDF File" +#~ msgstr "V_isualizza il file PDF" + +#~ msgid "_Set Arguments" +#~ msgstr "_Imposta gli argomenti" + +#~ msgid "Set Arguments" +#~ msgstr "Imposta gli argomenti" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Imposta i programmi e le opzioni per compilare e visualizzare file (La)" +#~ "TeX." + +#~ msgid "DVI creation:" +#~ msgstr "Creazione DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Creazione PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Anteprima DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Anteprima PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f sarà sostituito dal nome del file corrente, p.e. test_file.c\n" +#~ "%e sarà sostituito dal nome del file senza estensione, p.e. test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Imposta inclusioni e argomenti" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Imposta i comandi per generare ed eseguire i programmi." + +#~ msgid "Compile:" +#~ msgstr "Compila:" + +#~ msgid "Build:" +#~ msgstr "Genera:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Esecuzione del programma di visualizzazione fallita" + +#~ msgid "Try to resave the file?" +#~ msgstr "Provare di nuovo a salvare il file?" + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "_Nascondi barra degli strumenti" + +#~ msgid "Icon style:" +#~ msgstr "Stile dell'icona:" + +#~ msgid "Icon size:" +#~ msgstr "Dimensioni dell'icona:" + +#~ msgid "Appearance" +#~ msgstr "Aspetto" + +#~ msgid "Hard tab width:" +#~ msgstr "Ampiezza delle tabulazioni:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "L'ampiezza di una tabulazione quando si impostano Tabulazioni & Spazi per " +#~ "un documento" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Mostra testo bianco su sfondo nero e inverte tutti i colori, questa " +#~ "opzione richiede il riavvio di Geany." + +#~ msgid "Long line marker:" +#~ msgstr "Marcatore di righe lunghe:" + +#~ msgid "Long line marker color:" +#~ msgstr "Colore del marcatore di righe lunghe:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Percorso ed opzioni per il programma «make»" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplica la riga o il testo selezionato" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Invia la selezione al terminale." + +#~ msgid "Run (alternative command)" +#~ msgstr "Esegui (comando alternativo)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Qui sotto è presente una lista di plugin disponibili. Selezionare i " +#~ "plugin da caricare all'avvio di Geany." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Stampa del file \"%s\" cancellata." + +#~ msgid "Make in base path" +#~ msgstr "Compila nel percorso base" + +#~ msgid "Run command:" +#~ msgstr "Esegui comando:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Comando da eseguire nella directory base del progetto. È possibile " +#~ "passare delle opzioni al comando. Lasciare vuoto per usare il comando " +#~ "predefinito." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Scegliere il comando di esecuzione del progetto" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Sostituito testo in %u file." +#~ msgstr[1] "Sostituito testo in %u file." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Ricerca fallita (vedere Help->Messaggi di debug per i dettagli)." + +# NdMax: +# my $variabile; +# e' una dichiarazione di variabile locale in perl +#~ msgid "My" +#~ msgstr "My" + +# costrutto perl +#~ msgid "Local" +#~ msgstr "Local" + +# costrutto perl +#~ msgid "Our" +#~ msgstr "Our" + +#~ msgid "Terminal plugin" +#~ msgstr "Emulazione terminale" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Le impostazioni per l'emulatore di terminale virtuale (VTE) hanno effetto " +#~ "solo se la libreria VTE può essere caricata." + +#~ msgid "Terminal font:" +#~ msgstr "Carattere del terminale:" + +#~ msgid "Unsplit" +#~ msgstr "Unisci" #~ msgid "Diff file" #~ msgstr "File diff" @@ -5442,9 +5896,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Espande tutti i blocchi di codice contratti." -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Rimuove tutti gli indicatori di errore nel documento corrente." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5465,9 +5916,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Mostra tutte le scorciatoie da tastiera in Geany." -#~ msgid "Color" -#~ msgstr "Colore" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Inserisce un numero di riga e vai ad esso." @@ -5548,15 +5996,9 @@ #~ msgid "Items" #~ msgstr "Elementi" -#~ msgid "Use white text on a black background." -#~ msgstr "Usa testo bianco su sfondo nero." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Avvia in modalità debug (mostra più informazioni di esecuzione)" -#~ msgid "Search failed." -#~ msgstr "Ricerca fallita." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Impossibile trovare il file pixmap: %s" @@ -5732,10 +6174,6 @@ #~ msgstr "Sorgente Ferite" # File sorgente C è troppo prolisso, Sorgente C è comprensibile allo stesso modo ed è più compatto. Chiaramente vale per tutte le stringhe "X suorce file". -#~ msgid "Haskell source file" -#~ msgstr "Sorgente Haskell" - -# File sorgente C è troppo prolisso, Sorgente C è comprensibile allo stesso modo ed è più compatto. Chiaramente vale per tutte le stringhe "X suorce file". #~ msgid "Docbook source file" #~ msgstr "Sorgente Docbook" diff -Nru geany-0.18/po/ja.po geany-0.19/po/ja.po --- geany-0.18/po/ja.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/ja.po 2010-06-07 18:44:11.000000000 +0100 @@ -1,14 +1,14 @@ # Japanese translations for geany package. -# Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2006-2010 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # Tarot Osuji , 2008. -# Chikahiro Masami , 2008-2009. +# Chikahiro Masami , 2008-2010. # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-01-01 13:44+0100\n" "Last-Translator: Chikahiro Masami \n" "Language-Team: Japanese \n" @@ -24,7 +24,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "GTK2 を用いた高速で軽量な IDE" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -32,67 +32,67 @@ msgid "Integrated Development Environment" msgstr "統合開発環境" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Geany について" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "高速で軽量な IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(%s 以降にビルド)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "情報" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "開発者" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "保守担当" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "開発者" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "翻訳保守担当" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "翻訳者" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "以前の翻訳者" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "貢献者" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "多くの貢献者の一部です(詳細は %s ファイルを見てください):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "クレジット" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "ライセンス" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -100,277 +100,276 @@ "ライセンス文書が見つかりません。オンラインで http://www.gnu.org/licenses/gpl-" "2.0.txt を確認してください。" -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"端末 \"%s\" が見つかりません（「設定」にある端末ツールのパス設定を確認してく" -"ださい）" +msgid "failed to substitute %%p, no project active" +msgstr "%%p を置き換えに失敗, アクティブなプロジェクトがありません" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "プロセス失敗, 作業用ディレクトリがありません" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "\"%s\" の実行に失敗（開始スクリプトを作成できませんでした）" +msgid "%s (in directory: %s)" +msgstr "%s（ディレクトリ: %s）" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "プロセス失敗（%s）" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s（ディレクトリ: %s）" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "作業用ディレクトリを \"%s\" へ変更するのに失敗" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "\"%s\" の実行に失敗（開始スクリプトを作成できませんでした）" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." -msgstr "コマンドが含まれているため、仮想端末でファイルが実行できない" +msgstr "コマンドが含まれているため、仮想端末でファイルが実行できません" + +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"端末 \"%s\" が見つかりません（「設定」にある端末ツールのパス設定を確認してく" +"ださい）" -#: ../src/build.c:914 +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "コンパイル失敗" -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "コンパイル完了" -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "コンパイル(_C)" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "ビルド(_B)" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "すべてメイク(_M)" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "カスタムターゲットをメイク(_T)" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "オブジェクトをメイク(_O)" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "カスタムテキスト" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "ここにカスタムテキストを入力してください。入力されたテキストはコマンドに追加されます。" -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "次のエラー(_N)" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "前のエラー(_P)" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "インクルードと引数を設定(_S)" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "DVI ファイルを表示(_V)" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "PDF ファイルを表示(_I)" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "ビルドコマンドを設定(_S)" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "引数を設定(_S)" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "現在のファイルをビルド" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "引数を設定" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "現在のファイルをメイクとデフォルトのターゲットでビルドします" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"(La)TeX ファイルのコンパイルや表示を行う、プログラムやオプションを設定します" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "現在のファイルをメイクと指定のターゲットでビルドします" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI 作成:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "現在のファイルをメイクを使ってコンパイル" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF 作成:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "プロセスを停止できません（%s）" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI プレビュー:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "これ以上ビルドエラーはありません" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF プレビュー:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "メニュー項目ラベルを設定" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "項目" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f は現在のファイル名と置換されます（例：test_file.c）\n" -"%e は拡張子を除いたファイル名と置換されます（例：test_file）" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "ラベル" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "インクルードと引数の設定" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "コマンド" + +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "作業ディレクトリ" + +#: ../src/build.c:1792 +msgid "Clear" +msgstr "クリア" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "ビルドと実行プログラムのためのコマンドを設定します" +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "メニュー項目ラベルを設定するためにクリック" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1904 ../src/build.c:1906 #, c-format -msgid "%s commands" +msgid "%s Commands" msgstr "%s コマンド" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "コンパイル:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "ビルド:" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "ファイル種類なし" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "実行:" +#: ../src/build.c:1914 ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "正規表現エラー:" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "現在のファイルをビルド" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "ファイル種類なしの時のコマンド" + +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "注意: 項目 2 はダイアログを表示し、結果をコマンドに渡します" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "カスタムのターゲットをメイク" +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "コマンドを実行" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"ここに任意のオプションを入力してください。すべての入力されたテキストは make " -"コマンドに渡されます。" +"%d, %e, %f, %p はコマンドやディレクトリ項目に置き換えられます, " +"詳細はマニュアルを参照してください" -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "現在のファイルをメイクとデフォルトのターゲットでビルドします" +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "ビルドコマンドを設定" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "現在のファイルをメイクと指定のターゲットでビルドします" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "コンパイル(_C)" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "現在のファイルをメイクを使ってコンパイル" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "ビルド(_B)" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "表示プログラムの実行に失敗しました" +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +msgid "_Execute" +msgstr "実行(_E)" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "プロセスを停止できません（%s）" +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "カスタム ターゲットをメイク(_T)" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "これ以上ビルドエラーはありません" +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "オブジェクトをメイク(_O)" + +#: ../src/build.c:2462 ../src/build.c:2633 +msgid "_Make" +msgstr "メイク(_M)" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "すべてメイク(_M)" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "ビルドメニューコマンドを設定(_S)" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "本当に終了しますか?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d 個のファイルを保存しました" + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "再読み込み(_R)" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "保存されていない変更は失われます" -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "'%s' を再読み込みしてもよろしいですか?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "指定行へ移動" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "移動する行番号を指定:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "この機能を使う前に現在のファイルにファイルの種類を設定してください" -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "任意の日付書式を使用する(_U)" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "任意の日付書式" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -378,53 +377,52 @@ "ここに任意の日付と時刻の書式を入力してください。ANSI C の strftime 関数で用い" "られる変換指定子が使用できます。" -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "日付書式の文字列が変換できません (おそらく長過ぎます)" -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "これ以上メッセージ項目はありません" -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "ファイルを開く" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "表示(_V)" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." msgstr "" "ファイルを読み取り専用モードで開きます。複数のファイルを選択して開いた場合、" -"すべてのファイルは読み取り専用になります。" +"すべてのファイルが読み取り専用になります。" -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "拡張子から検出" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "ファイルから検出" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "オプション(_M)" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "隠しファイルを表示(_H)" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "エンコーディングの設定:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -439,11 +437,11 @@ "かれることに注意してください。" #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "ファイルの種類の設定:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -463,23 +461,23 @@ msgid "Filename already exists!" msgstr "ファイル名は既に存在します!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "ファイルを保存" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "名前の変更(_E)" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "ファイルを保存して名前を変更します" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "ファイルを新しいタブで開く(_O)" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -487,146 +485,150 @@ "現在の保存されていない文書を開いたまま、新しく保存されたファイルを新しいタブ" "に開きます。" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "エラー" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "質問" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "警告" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "情報" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "保存しない(_D)" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "ファイル '%s' は保存されていません" -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "閉じる前に保存しますか?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "フォントを選択" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "エラーが発生したかファイル情報が取得できません（例：新しいファイル）" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "不明" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "プロパティ" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "種類:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "サイズ:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "場所:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "読み取り専用:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "（Geany 内部のみ）" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "エンコーディング:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "（BOM あり）" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "（BOM なし）" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "作成日時:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "更新日時:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "アクセス日時:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "属性:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "読み取り:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "書き込み:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "実行:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "所有者:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "グループ:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "その他:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "ファイル %s を閉じました" -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "新しいファイル \"%s\" を開きました" -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "ファイル %s を開けません（%s）" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -641,12 +643,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "ファイル \"%s\" は有効な %s ではありません" -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -655,30 +657,30 @@ "ファイル \"%s\" はテキストファイルでないかエンコーディングがサポートされてい" "ません" -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "空白" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "タブ" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "タブと空白" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%s インデント形式に設定(ファイル %s )" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "無効なファイル名" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "ファイル %s を再読み込みしました" @@ -686,20 +688,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "ファイル %s を開きました（%d%s）" -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", 読み取り専用" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "ファイル名変更中にエラー" -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -708,7 +710,7 @@ "ファイルを UTF-8 から \"%s\" に変換するときにエラーがありました。ファイルは保" "存されていません。" -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -717,51 +719,51 @@ "エラーメッセージ: %s\n" "\"%s\" (行: %d, 桁: %d)でエラー" -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "エラーメッセージ: %s" -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "ファイル保存中にエラー" -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "ファイル保存エラー（%s）" -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "ファイル %s を保存しました" -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" が見つかりません" -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "もう一度折り返して検索しますか?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "\"%s\" に一致するものが見つかりません" -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d 個の \"%s\" を \"%s\" と置換しました" -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "再読み込みしますか?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -770,23 +772,28 @@ "ディスク上のファイル '%s' は現在のバッファの内容より\n" "新しいです" -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "ファイルを保存し直しますか?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "保存しないで閉じる(_W)" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "ディスク上にファイル \"%s\" が見つかりません" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "ディスク上にファイル \"%s\" にありません! ファイルを保存しなおしますか?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" -msgstr "タブの幅:" +msgstr "タブの幅を指定" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "タブ文字に置き換えられる空白の数を指定" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "警告: 非標準のタブ幅: %d != 8!" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "ケルト語" @@ -897,572 +904,620 @@ msgid "Without encoding" msgstr "エンコーディングなし" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "西ヨ－ロッパ(_W)" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "東ヨーロッパ(_E)" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "東アジア(_A)" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "東南・西南アジア(_S)" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "中東(_M)" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "Unicode(_U)" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s ソースファイル" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "%s ファイル" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "なし" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "シェルスクリプトファイル" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML 文書" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "カスケーディングスタイルシート" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL ダンプファイル" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Config ファイル" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext 翻訳ファイル" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s スクリプトファイル" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "プログラミング言語(_P)" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "スクリプト言語(_S)" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "マークアップ言語(_M)" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "その他の言語(_I)" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "カスタム ファイル種類(_C)" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "すべてのソース" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "すべてのファイル" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" -msgstr "ファイル種類 %s の regex が不正です: %s" +msgstr "ファイル種類 %s の正規表現が不正です: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "untitled" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "ファイル '%s' が見つかりません" + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "色の設定(_C)" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "標準(_D)" + +#: ../src/interface.c:295 msgid "_File" msgstr "ファイル(_F)" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "テンプレートから新規作成(_T)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "非表示" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "選択されたファイルを開く(_I)" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" -msgstr "最近使ったファイル(_F)" +msgstr "最近使用したファイル(_F)" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "すべて保存(_L)" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "読み直す(_E)" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "非表示" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "ページ設定(_U)" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "他のファイルを閉じる(_H)" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "すべて閉じる(_L)" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "編集(_E)" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "書式(_F)" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "複数行/ブロックを整形(_R)" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "選択範囲の大文字と小文字を反転(_O)" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "現在の行と直前の行を入れ替え(_T)" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "行をコメント化(_C)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "行のコメント化を解除(_N)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "行のコメント化を反転(_T)" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "行/選択範囲を複製(_P)" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "インデントを増やす(_I)" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "インデントを減らす(_D)" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "選択範囲を端末に送る(_S)" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "スマート行インデント(_S)" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "選択範囲を送る(_S)" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "コマンド(_C)" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "現在の行を切り取り(_C)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "現在の行をコピー(_C)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "現在の行を削除(_D)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "行/選択範囲を複製(_D)" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "現在の行を選択(_S)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "現在の段落を選択(_S)" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "複数の空白を挿入(_I)" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "次のマーカーへ移動(_G)" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "前のマーカーへ移動(_G)" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "選択範囲を端末に送る(_S)" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "コメントを挿入(_N)" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "ChangeLog エントリを挿入(_C)" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "ファイルのヘッダを挿入(_H)" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "関数の説明を挿入(_F)" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "複数行コメントを挿入(_M)" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "GPL 通知を挿入(_G)" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "BSD ライセンス通知を挿入(_B)" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "日付を挿入(_E)" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" 文を挿入(_I)" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "設定(_S)" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "プラグインの設定(_L)" + +#: ../src/interface.c:720 msgid "_Search" msgstr "検索(_S)" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "複数のファイルから検索(_I)" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "置換(_R)" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "選択文字列を検索(_S)" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "選択文字列を前に検索(_V)" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "次のメッセージ(_M)" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "前のメッセージ(_E)" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "指定行へ移動(_G)" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "フォントを変更(_F)" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "すべての追加ウィジェットを表示/非表示(_G)" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "全画面表示(_S)" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "メッセージウィンドウを表示(_W)" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "ツールバーを表示(_T)" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "サイドバーを表示(_B)" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "エディタ" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "行マーカーを表示(_M)" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "行番号を表示(_L)" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "空白を表示(_W)" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "行末を表示(_E)" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "インデントを表示(_I)" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "文書(_D)" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "行の折り返し(_L)" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "自動改行(_B)" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "自動インデント(_A)" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "インデント形式(_D)" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "タブ(_T)" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "空白(_S)" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "タブと空白(_A)" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "読み取り専用(_O)" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Unicode の BOM(_W)" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "ファイルの種類(_T)" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "エンコーディング(_E)" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "行末(_N)" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "_CR/LF (Win)に変換" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "_LF (Unix)に変換" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "CR (_Mac)に変換" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "末尾の空白を除去(_S)" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "タブを空白で置換(_R)" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "空白をタブで置換(_Y)" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "すべて折りたたむ(_F)" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "すべて広げる(_U)" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "マーカーを消去(_M)" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "エラーインジケータを消去(_I)" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "プロジェクト(_P)" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "新規(_N)" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "開く(_O)" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "最近のプロジェクト(_R)" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "閉じる(_C)" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "ツール(_T)" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "設定の再読み込み(_R)" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "設定ファイル(_O)" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "色の選択(_C)" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "ワードカウント(_W)" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "タグを読み込む(_G)" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "設定の再ロード(_R)" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "ウェブサイト(_W)" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "ショートカットキー(_K)" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "デバッグメッセージ(_D)" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "シンボル" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "文書" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "ステータス" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "コンパイラ" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "メッセージ" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "走り書き" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "画像とテキスト(_A)" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "画像のみ(_I)" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "テキストのみ(_T)" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "大きいアイコン(_L)" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "小さいアイコン(_S)" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "最小のアイコン(_V)" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "ツールバーをカスタマイズ(_C)" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "ツールバーの設定(_T)" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "ツールバーを隠す(_H)" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" -msgstr "使い方を検索(_U)" +msgstr "使用箇所を検索(_U)" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" -msgstr "文書の説明を検索(_D)" +msgstr "文書内で使用箇所を検索(_D)" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "タグ定義に移動(_T)" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "タグ宣言に移動(_A)" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "ユーザ定義コマンド(_X)" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "設定" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "最後のセッションからファイルを読み込む" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "起動時に最後のセッションからファイルを開く" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "仮想端末サポートを読み込む" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1470,39 +1525,39 @@ "起動時に仮想端末エミュレーション(VTE)を読み込むかどうか指定します。不要なら無" "効にできます。" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "プラグインサポートを有効にする" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "起動時" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "ウィンドウ位置とサイズを保存する" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "ウィンドウの位置とサイズを保存し、次回の起動時に復元します" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "終了時に確認する" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "終了時に確認ダイアログを表示します" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "終了時" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "起動時のパス:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1510,19 +1565,19 @@ "ファイルを開いたり保存するのに使用するパスです。必ず絶対パスで指定します。空" "白にすると、現在のディレクトリを使用します。" -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "プロジェクトファイル:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "プロジェクトファイルを開くときに使用するパスです。" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "プラグインのパス" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1532,29 +1587,29 @@ "ます。ここで指定したパスからもプラグインを検索するようになります。指定しない" "ときは空欄のままにしてください。" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "パス" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "起動/終了" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "エラーやコンパイル終了時にビープ音を鳴らす" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "エラー発生時やコンパイル終了時にビープ音を鳴らすかどうか指定します" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "新しいメッセージがあるとき、ステータスメッセージリストに切り替える" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1562,11 +1617,11 @@ "新しいステータスメッセージを受けとったとき、ステータスメッセージリストに切り" "替えます。" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "ステータスバーのステータスメッセージを抑制する" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1574,11 +1629,11 @@ "ステータスバーのすべてのメッセージを消去します。メッセージはステータスメッ" "セージリストに残っています。" -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "自動フォーカスウィジェット（マウスに追従します）" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1588,15 +1643,27 @@ "ディタウィジェット、走り書き、ツールバーの中の検索や行番号フィールド、仮想端" "末エミュレーションがマウスに従ってフォーカスされます。" -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Windowsのファイル選択ダイアログを使用" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Windowsのファイル選択ダイアログと、GTKのファイル選択ダイアログのどちらを" +"使うかを指定します。" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "その他" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "常に折り返して検索し、検索ダイアログを隠す" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1604,11 +1671,11 @@ "文書の先頭/末端から折り返して、常に文書全体を検索します。次を検索/前を検索を" "クリックすると検索ダイアログを非表示にします。" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "検索ダイアログはカーソル位置にある単語を使用する" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1616,30 +1683,30 @@ "文字列を選択せずに検索または置換ダイアログを表示すると、カーソル位置にある単" "語を検索文字列として使用します" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "検索に現在のディレクトリのファイルを使用" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "検索" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Geany プロジェクトのセッションファイルの使用" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" "プロジェクトのセッションファイルを保存し、次回起動時にプロジェクトを開きます" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "プロジェクトファイルをプロジェクトの基本ディレクトリに保存しますか?" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1651,75 +1718,97 @@ "ディレクトリに保存されます。新規プロジェクトダイアログで、プロジェクトファイ" "ルのパスを変更することも可能です。" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "プロジェクト" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "その他" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "全般" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "シンボルリストの表示" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "シンボルリストのオン／オフを切り替える" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "文書リストを表示" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "文書リストのオン／オフを切り替える" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "サイドバーを表示" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "位置:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "左" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "右" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "サイドバー" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "シンボルリスト:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "メッセージウィンドウ:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "エディタ:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "メッセージウィンドウのフォントを指定" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "シンボルリストのフォントを指定" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "エディタのフォントを指定" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "フォント" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "エディタタブを表示" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "閉じるボタンを表示" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1727,109 +1816,138 @@ "ファイルタブに小さな×印のボタンを表示し、クリックすると簡単にファイルを閉じる" "ことができます(Geanyの再起動が必要)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "新規ファイルタブの配置:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "左" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "ファイルタブは左側に配置されます" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "右" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "ファイルタブは右側に配置されます" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "現在のタブの次" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"ファイルタブを現在のタブの次に開くか最後のタブの次に開くかを指定" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "ダブルクリックによって、全ての追加ウィジェットを非表示にします" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "ファイルタブをダブルクリックすると、エディタ領域を最大にします" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "エディタタブ" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "上" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "下" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "サイドバー:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "タブ位置" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "ステータスバーを表示" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "ステータスバーをメインウィンドウの下部に表示するかどうか" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "インターフェース" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "ツールバーを表示(_O)" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "メニューにツールバーを追加(_A)" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "メインメニューにツールバーを縦に収納する" +msgstr "編集領域を確保するためメインメニューにツールバーを収納する" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "ツールバー" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "アイコンのスタイル:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "アイコンのサイズ:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "外観" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "ツールバーをカスタマイズ" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "システム標準(_D)" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "画像とテキスト(_A)" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "画像のみ(_I)" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "テキストのみ(_T)" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "アイコンのスタイル" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "システム標準(_Y)" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "小さいアイコン(_S)" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "最小のアイコン(_V)" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "大きいアイコン(_L)" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "アイコンのサイズ" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "ツールバー" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "ツールバー" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "行の折り返し" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1838,11 +1956,11 @@ "ウィンドウの境界で行を折り返し、次の行に続けます。注意: 大きな文書で行を折り" "返すと処理時間がかかるので、遅いコンピュータでは使わないでください。" -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "\"スマート\" ホームキーを有効にする" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1854,11 +1972,11 @@ "い文字へ移動させます。すでにそこにある場合は、行頭へ移動します。この機能が無" "効の場合、HOME キーは常にキャレットを現在行の初めに移動します。" -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "ドラッグアンドドロップを無効にする" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1867,19 +1985,19 @@ "ンドウの内部または外部で文字を選択してもドラッグアンドドロップに使用できませ" "ん。" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "折りたたみを有効にする" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "コードの折りたたみを有効にするかどうか" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "折りたたみ位置のすべてのコードを表示/非表示" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1887,11 +2005,11 @@ "折りたたみ位置のすべてのコードを表示または非表示にします。シフトキーを押しな" "がら折りたたマーカをクリックすることでも可能です。" -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "インジケータをコンパイルエラーの表示に使う" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1899,23 +2017,23 @@ "コンパイラがエラーや警告をした行を強調表示するためにインジケータ(ギザギザの下" "線)を使用するかどうかを指定します" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "改行時に行末の空白を除去" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "改行時に行末の空白を除去します" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "行の自動改行:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "行コメント文字列:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1923,64 +2041,56 @@ "「行をコメント化」コマンドを実行したときに、ソースファイルに追加される文字" "列。その行がコメントになったことを表すために使われます。" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "機能" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "機能" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "自動インデント:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "基本" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "現在の文字数" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "括弧の対応" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "形式:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "幅:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "１つのタブ文字に対する文字幅を文字数で指定" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "インデントに空白を使用" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "インデントにタブを使用" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "インデントがタブの幅に満たない場合は、タブと空白を併用" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "タブの幅:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "タブと空白がファイルに設定されているときのタブの幅" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1988,30 +2098,30 @@ "ファイルが開かれたときに、ファイルの内容からインデントのタイプを検出するかど" "うか" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "タブキーによるインデント" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "タブ文字を挿入する代わりに、タブキーを押すとインデントし、シフトとタブキーを" "押すとインデントを解除する" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "インデント" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "インデント" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "スニペット補完" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2019,21 +2129,21 @@ "数文字のフレーズを入力すると、候補になる文字列が表示され、1つのキーを押すだけ" "で入力が完了します" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XMLタグの自動補完" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "XMLタグを入力すると、それを閉じるタグが自動的に補完されます(HTMLタグも補完さ" "ます)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "複数行コメントを自動挿入" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2041,11 +2151,11 @@ "コメント記述中にEnterキーを押したとき、C, C++, Java言語のような複数行コメント" "を自動継続します" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "自動補完シンボル" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2053,176 +2163,172 @@ "編集中のファイルの既知のシンボルが自動的に補完されます(関数名、グローバル変数" "名、その他のシンボル)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "文書内のすべての単語を自動補完" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "補完のとき単語の残りを除去する" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "シンボル名候補数:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "補完リストの行数:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "自動補完を表示する文字数:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "シンボル自動補完リストを表示させるのに必要な文字数を指定します" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "自動補完リストの行数" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "自動補完リストとして表示する項目数" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "補完" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "括弧の補完 ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "開括弧を入力すると閉括弧を補完する" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "単一引用符の補完 ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "引用開始を入力すると引用終了を補完する" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "波括弧の補完 {}" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "開波括弧を入力すると閉波括弧を補完する" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "角括弧の補完 [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "開角括弧を入力すると閉角括弧を補完する" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "二重引用符の補完" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "二重引用開始を入力すると二重引用終了を補完する" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "引用符と括弧の自動補完" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "補完" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "構文色分けの色を反転" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"黒地に白文字を使用し、すべての色を反転します。このオプションはGeanyの再起動が" -"必要です。" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "すべての色を反転。色をカスタマイズしていないときは、黒い背景に白いテキストを使用します" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "インデント位置を表示" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "右インデント位置を示すために破線を表示します" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "空白を表示" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "空白を点で、タブを矢印で表示します" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "行末を表示" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "行末文字を表示します" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "行番号を表示" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "行番号を表示する領域を確保/解除します" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "行マーカーを表示" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "行番号の右に、行マーカーを表示する領域を確保/解除します" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "最後の行でスクロールしない" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "文書の最後の行でさらに1ページ分スクロールするかどうか" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "表示" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "長い行のマーカー:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "長い行のマーカーの色:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "列:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "色:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "長い行のマーカーの色を設定します" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "色の選択" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2232,22 +2338,22 @@ "るヒントになります。長い行のマーカーが表示される桁数として、0より大きい値を設" "定します。" -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "線" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" "エディタウィンドウの指定したカーソル位置に縦線を表示します(サンプルを確認)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "背景色" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2256,110 +2362,141 @@ "現在のカーソル位置にある文字の背景色を次の色に設定します。(プロポーショナル" "フォントを使用しているときは、この機能を有効にしてください)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "無効" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "有効" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "長い行のマーカー" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "無効" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "仮の空白を表示しない" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "矩形の範囲指定時に表示" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"矩形の範囲指定を行うときに、行末の後ろに仮の空白を表示する" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "常に表示" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "行末の仮の空白を常に表示します" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "仮の空白" + +#: ../src/interface.c:4021 msgid "Display" msgstr "表示" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "コマンドラインから新しい文書を作成" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "存在しないファイル名をコマンドラインに指定すると、新しい文書を作成します" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "デフォルトの改行文字:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "新規ファイル" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "新しく作成するファイルのデフォルトのエンコーディングを設定します" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "デフォルトのエンコーディング（新規ファイル）:" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "デフォルトのエンコーディング（存在するファイル）:" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "既存のファイルを開くときのデフォルトのエンコーディングを設定します" - -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "ファイルを開くときのエンコーディングを固定する" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "新しく作成するファイルのデフォルトのエンコーディングを設定します" + +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "非Unicodeファイルを開くときのエンコーディングを指定する" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" -"このオプションは、ファイルを開くとき、およびエンコーディングを指定してファイ" -"ルを開くときの、ファイルのエンコーディングの自動検出を無効にします。(この機能" -"は通常使われません)" +"このオプションは、非Unicodeファイルを開くときのファイルのエンコーディング" +"自動検出を無効にして、指定したエンコーディングでファイルを開きます。" +"(この機能は通常使われません)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "標準のエンコーディング（既存の非Unicodeファイル用）:" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "既存の非Unicodeファイルを開くときの標準のエンコーディングを設定します" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "エンコーディング:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "ファイルの終端に改行を追加" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "ファイルの終端に改行を追加します" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "行末の空白とタブを除去" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "行末の空白やタブを除去します" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "タブを空白に置換" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "文書のすべてのタブを空白で置換します" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "ファイルの保存" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" -msgstr "最近使ったファイルの項目数:" +msgstr "最近使用したファイルの項目数:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "最近使ったファイル一覧に保存されるファイル数を指定します" +msgstr "最近使用したファイル一覧に保存されるファイル数を指定します" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "ディスク チェック タイムアウト時間" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2367,27 +2504,20 @@ "ディスク上の文書ファイルが変更されているかどうかを確認する頻度を秒単位で指定" "します。0は確認しません。" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "ファイル" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "メイク:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "端末:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "ブラウザ:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "メイクのパスとオプション" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2395,23 +2525,23 @@ "xterm や gnome-terminal、konsole のような端末エミュレータ（-e 引数が利用でき" "るもの）" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "あなたのお気に入りのブラウザのパス(と必要なオプション)を指定" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "ツールのパス" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "ユーザ定義コマンド:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2421,67 +2551,67 @@ "ユーザ定義コマンドを指定。現在選択中の単語を %s で指定できます。指定したコマ" "ンドはどこでも表示でき、コマンド実行の時に現在の単語に置き換えられます。" -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "コマンド" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "ツール" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "開発者の email アドレス" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "開発者の頭文字" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "初期バージョン:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "新規ファイルが最初に持つバージョン番号" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "会社名" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "開発者:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "会社:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "メールアドレス:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "頭文字:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "開発者の名前" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "年:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "日:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "日時" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2489,7 +2619,7 @@ "{datetime}の書式を指定してください。ANSI C の strftime 関数で用いられる変換指" "定子が使用できます。" -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2497,7 +2627,7 @@ "{year}の書式を指定してください。ANSI C の strftime 関数で用いられる変換指定子" "が使用できます。" -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2505,61 +2635,61 @@ "{date}の書式を指定してください。ANSI C の strftime 関数で用いられる変換指定子" "が使用できます。" -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "テンプレートのデータ" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "テンプレート" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "変更(_H)" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "ショートカットキー" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "キーバインド" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "コマンド:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "ファイルを印刷するコマンドのパス（ファイル名は %f を使用）" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "外部コマンドを印刷に使用する" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "行番号を印刷" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "行番号を印刷ページに追加します" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "ページ番号を印刷" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "ページ番号をページ下部に追加します。２行分を必要とします。" -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "ページのヘッダを印刷" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2567,19 +2697,19 @@ "すべてのページにページ番号、ファイル名、現在の日付を含む小さなヘッダを追加し" "ます。3行分を必要とします。" -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "印刷ファイルのベース名を使用" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "印刷ファイルのベース名（パスを除いたもの）のみを印刷します" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "日付の書式:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2588,547 +2718,560 @@ "ページのヘッダに付加されるタイムスタンプの書式を指定してください。ANSI C の " "strftime 関数で用いられる変換指定子が使用できます。" -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "ネイティブな GTK の印刷機能を使用" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "印刷" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "印刷" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "プロジェクトのプロパティ" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "表示:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "カスタム" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "グローバルな設定を使用" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "ファイル" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "新規" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "開く" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "選択されたファイルを開く" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "保存" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "別名で保存" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "すべて保存" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "印刷" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "閉じる" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "すべて閉じる" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "再読み込み" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "最後に閉じたタブを再び開く" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "プロジェクト" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "プロジェクトのプロパティ" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "元に戻す" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "やり直し" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "行/選択範囲を複製" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "現在の行を削除" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "行末まで削除" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "現在の行と直前の行を入れ替える" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "現在の行へスクロール" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "１行上へスクロール" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "１行下へスクロール" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "スニペットを補完" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "スニペットにカーソルを移動" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "スニペット補完を抑制する" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "ユーザ定義コマンド" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "単語を補完" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "コールチップを表示" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "マクロリストを表示" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "単語部分補完" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "行を上に移動" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "行を下に移動" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "クリップボード" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "切り取り" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "コピー" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "貼り付け" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "現在の行をコピー" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "現在の行をカット" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "選択" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "すべて選択" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "現在の単語を選択" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "現在の行を選択" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "現在の段落を選択" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "前の単語の部分を選択" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "次の単語の部分を選択" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "書式" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "選択範囲の大文字と小文字を反転" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "行のコメント化を反転" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "行をコメント化" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "行のコメント化を解除" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "インデントを増やす" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "インデントを減らす" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "インデントを空白１文字増やす" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "インデントを空白１文字減らす" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "スマート行インデント" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "カスタムコマンド 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "カスタムコマンド 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "カスタムコマンド 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "選択範囲を端末に送る" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "複数行/ブロックを整形" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "挿入" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "日付を挿入" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "複数の空白を挿入" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "設定" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "検索" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "検索" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "次を検索" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "前を検索" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "選択文字列を検索" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "選択文字列を前に検索" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "置換" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "複数のファイルから検索" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "次のメッセージ" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "前のメッセージ" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "使い方を検索" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "文書の使い方を検索" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "すべてメイク" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "指定行へ移動" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "元の位置に戻る" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "次の位置に進む" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "対応する括弧へ移動" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "マーカーを切り替える" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "次のマーカーへ移動" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "前のマーカーへ移動" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "タグ定義へ移動" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "タグ宣言へ移動" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "行頭に移動" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "行末に移動" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "表示行の末端に移動" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "前の単語へ移動" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "次の単語に移動" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "表示" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "すべての追加ウィジェットを反転" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "全画面表示" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "メッセージウィンドウを表示" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "サイドバーを表示" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "拡大" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "縮小" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "標準サイズ" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "フォーカス" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "エディタに切り替える" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "走り書きに切り替える" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "VTE に切り替える" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "検索バーに切り替える" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "サイドバーに切り替える" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "サイドバーに切り替える" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "メッセージに切り替える" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "メッセージウィンドウに切り替える" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "文書リストサイドバーに切り替える" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "シンボルリストサイドバーに切り替える" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "走り書きタブ" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "左の文書に切り替える" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "右の文書に切り替える" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "最後に使用した文書に切り替える" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "文書を左に移動" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "文書を右に移動" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "文書を先頭に移動" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "文書を末尾に移動" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "文書" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "行の折り返し" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "自動改行" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "タブを空白で置換" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "行の折りたたみ" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "すべて折りたたみ" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "すべて広げる" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" -msgstr "シンボルリストを再読込" +msgstr "シンボルリストを再読み込み" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "マーカーを消去" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "エラーインジケータを消去" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "ビルド" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "コンパイル" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "すべてメイク" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "カスタムターゲットをメイク" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "オブジェクトをメイク" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "次のエラー" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "前のエラー" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "実行" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "実行（代替コマンド）" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "ビルドオプション" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "色の選択" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "ヘルプ" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "ショートカットキー" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "以下のショートカットキーが設定できます:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "文書に切り替える" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "メモとして、ここには自由に入力できます。" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "セッションファイルの読み込みに失敗" @@ -3136,92 +3279,105 @@ msgid "Debug Messages" msgstr "メッセージ" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "クリア(_E)" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "" "最初に開くファイルの、最初の桁番号を設定( --line と一緒に使うと便利です)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "標準でない設定ディレクトリを使用" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "詳細なメッセージを生成" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "ファイルの種類を印刷" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "グローバルタグファイルを生成(ドキュメントを参照)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "タグを生成するときに、C/C++ファイルのプリプロセッサを使用しない" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" +msgstr "実行中のインスタンスでファイルを開けません。新しいインスタンスで開きます。" + +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" msgstr "" -"実行中のインスタンスでファイルを開けません。新しいインスタンスで開きます。" +"実行中のGeanyのインスタンスとの通信にこのソケットファイル名を使用します" -#: ../src/main.c:134 +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "実行中のGeanyのインスタンスが開いている文書のリストを返します" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "最初に開かれるファイルの、最初の行番号を設定" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "起動時にメッセージウィンドウを表示しない" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "自動補完データを読み込まない(ドキュメントを参照)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "プラグインを読み込みません" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Geanyのインストール先ディレクトリを表示" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "以前のセッションファイルを読み込みません" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "端末サポートを読み込みません" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "libvte.so のファイル名" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "詳細なメッセージを生成" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "バージョンを表示して終了" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[ファイル...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(%s に GTK %d.%d.%d と GLib %d.%d.%d を使用してビルド)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "今移動しますか?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany を起動する前に、古い設定ディレクトリを移動する必要があります" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3230,7 +3386,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3239,7 +3395,7 @@ "古い設定ディレクトリ \"%s\" を \"%s\" に移動できません(%s)。手作業で移動して" "ください。" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3250,38 +3406,42 @@ "設定ディレクトリなしでGeanyを使うと問題が起きる場合があります。\n" "それでも Geany を実行しますか?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "ファイル '%s' が見つかりません" - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Geany %s を起動しました" -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "設定ディレクトリが作成できませんでした(%s)" -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." -msgstr "設定ファイルを読み込み直しました" +msgstr "設定ファイルを再読み込みしました" -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "ステータスメッセージ" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "コピー(_O)" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "すべてコピー(_A)" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "メッセージウィンドウを隠す(_H)" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "ファイル '%s' がありません - 現在の文書のパスを確認します。" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3290,11 +3450,11 @@ "プラグイン \"%s\" は この Geany のリリースとバイナリ互換性がありません - 再コ" "ンパイルしてください。" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "プラグインマネージャ(_P)" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3305,81 +3465,88 @@ "説明: %s\n" "作者: %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "アクティブ" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "プラグイン" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "プラグインが利用できません" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "プラグイン" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"以下は利用できるプラグインのリストです。Geany の起動時に読み込まれるプラグイ" -"ンを選択してください。" +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "起動時に読み込まれるプラグインを選択:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "プラグインの詳細:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "プラグインを設定" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "キーの読み取り" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "\"%s\"を使用するためのキーの組み合わせをタイプします" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "すべて展開(_E)" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "すべて閉じる(_C)" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "アクション" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "ショートカット" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "許可(_A)" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "変更(_O)" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "ショートカットキーを変更しますか?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "キーの組み合わせ '%s' は \"%s\" に割り当て済みです" +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "端末" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"ツールのパスを下に入力してください。不要なツールは空白のままで構いません。" +msgstr "ツールのパスを下に入力してください。不要なツールは空白のままで構いません。" #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3387,7 +3554,7 @@ "テンプレートで使われる情報を入力してください。詳細はドキュメントを参照してく" "ださい。" -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3397,7 +3564,7 @@ "す。またはツールメニューから設定の再読み込みを行ってください。" #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3408,7 +3575,7 @@ "表現を直接編集するには２回クリックします。" #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3417,7 +3584,7 @@ "GTK 2.10 以上で実行されていると利用可能になります。" #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3433,44 +3600,44 @@ msgid "Text will be wrongly spaced." msgstr "文字はおかしな間隔になるでしょう。" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "ページ %d / %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "文書の設定" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "印刷ファイルのベース名（パスを除いたもの）のみを印刷します" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "ページ %d / %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "ファイル %s の印刷は中止されました。" +msgid "Did not send document %s to the printing subsystem." +msgstr "文書 %s を印刷サブシステムに送信できません" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "ファイル %s は印刷されました。" +msgid "Document %s was sent to the printing subsystem." +msgstr "文書 %s は印刷サブシステムに送信されました" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." -msgstr "%s の印刷に失敗しました（%s）。" +msgstr "%s の印刷に失敗しました（%s）" -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "先に設定ダイアログで印刷コマンドを設定してください" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3481,38 +3648,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" の印刷に失敗(リターンコード: %s)" +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "ファイル %s は印刷されました。" + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "プロジェクト" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "新規プロジェクト" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "作成(_R)" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "プロジェクト名:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "ファイル名:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "基本パス:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3522,123 +3694,118 @@ "と既存のディレクトリのいずれかを指定できます。プロジェクトのファイル名に間接" "パスが使用できます。" -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "プロジェクトの基本パスを選択" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "プロジェクトファイル \"%s\" は読み込めませんでした" -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "プロジェクトを開く" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "プロジェクトファイル" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "プロジェクト \"%s\" を閉じました" -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "説明:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "基本パスでメイク" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "ファイル種類に依存しないビルドコマンド用の作業ディレクトリを設定:" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "実行コマンド:" +#: ../src/project.c:484 +msgid "Set" +msgstr "設定" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"プロジェクトの基本パスで実行するコマンド。コマンドにオプションを追加できま" -"す。標準の実行コマンドを使うときは空白にします。" +"ファイル種類に依存しないビルドコマンド用の基本パスとなる作業ディレクトリ" +"(ビルドタブに)を設定" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "ファイルパターン:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "実行する前にプロジェクトを閉じますか?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "'%s' プロジェクトはすでに開いています" -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "指定したプロジェクト名は短すぎます" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "指定したプロジェクト名は長すぎます(最大 %d 文字)" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "無効なプロジェクト名を指定しました" -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "プロジェクトの基本パスのディレクトリを作成しますか?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "パス \"%s\" は存在しません" -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "プロジェクト基本ディレクトリが作成できません(%s)" -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "プロジェクトファイルが書き込めません（%s）" -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "プロジェクト \"%s\" 作成しました" -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "プロジェクト \"%s\" を保存しました" #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "プロジェクトのファイル名を選択" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "プロジェクトの実行コマンドを選択" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "プロジェクト \"%s\" を開きました" -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "正規表現を使用(_U)" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3646,15 +3813,15 @@ "POSIX 風の正規表現を使用します。正規表現の使用についてはドキュメントを読んで" "ください。" -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "後方を検索(_B)" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "エスケープシーケンスを使用(_E)" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3662,398 +3829,419 @@ "\\\\, \\t, \\n, \\r および \\uXXXX (Unicode 文字)を対応する制御文字に置き換え" "ます" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "大文字と小文字を区別する(_A)" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "完全一致(_W)" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "前方一致(_T)" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "前へ(_P)" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "次へ(_N)" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "検索文字列(_S):" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "すべて検索(_F)" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "マーク(_M)" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "現在の文書で一致するものすべてにマークします" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "セッション内(_O)" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "文書内(_I)" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "ダイアログを閉じる(_D)" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "ダイアログを開いたままにするには、このオプションを無効にしてください" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "置換して検索(_N)" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "置換文字列(_H):" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "すべて置換(_P)" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "選択範囲内(_L)" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "現在選択されているテキストで一致しているものをすべて置換します" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "ディレクトリ(_D):" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "エンコーディング(_N):" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "固定文字列(_T)" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "正規表現(_G)" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "詳細は grep のマニュアルページを参照してください" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "拡張正規表現(_E)" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "サブフォルダを再帰的に検索(_R)" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "検索結果を反転する(_I)" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "検索文字列に合致しない行を選択するには、検索結果を反転してください" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "追加オプション(_X):" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Grep に渡すその他のオプション" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "%d 個の一致するものが見つかりました( \"%s\" を検索)" +msgstr[0] "%d 個が検索されました( \"%s\" を検索)" -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "%u ファイルでテキストを置換しました" +msgid "Replaced %u matches in %u documents." +msgstr "%u 個が置換されました( %u ファイル中)" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "複数のファイルから検索するときに無効なディレクトリ" -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "検索するテキストがありません" -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "grep ツール '%s' が実行できません。パス設定を確認してください。" -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "検索中..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (ディレクトリ: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "ディレクトリを開けませんでした (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "検索に失敗しました(ヘルプのデバッグメッセージを確認してください)。" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "検索失敗" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." -msgstr[0] "%d 個の一致するものが見つかりました" +msgstr[0] "%d 個が検索されました" -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." -msgstr "一致するものが見つかりません" +msgstr "一致しません" + +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "正規表現が不正です: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany は他のユーザとして実行している他のインスタンスの Unix ドメインソケットに" +"アクセスしようとしました。\n" +"これは致命的なエラーのため、Geanyを直ちに終了します。" -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "章" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "節" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "節1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "節2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "節3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "付録" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "その他" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "モジュール" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "型" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "型コンストラクタ" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "関数" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "セクション" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "キー" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "変数" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "コマンド" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "環境" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "サブセクション" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "サブサブセクション" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "ラベル" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "構造体" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "パッケージ" -#: ../src/symbols.c:655 -msgid "My" -msgstr "私の" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "ローカル" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "私達の" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "ラベル" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "定数" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "インターフェース" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "クラス" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "定数" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "アンカー" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "見出し (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "見出し (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "見出し (H3)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID 選択" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Type 選択" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "モジュール" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "シングルトン" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "メソッド" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "名前空間" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "手続き" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "インポート" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "エンティティ" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "アーキテクチャ" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "関数/手続き" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "変数/シグナル" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "プロセス/コンポーネント" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "イベント" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "機能/タスク" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "メンバ" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "ラベル" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "サブルーチン" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "ブロック" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "マクロ" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "定義" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "ターゲット" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "構造体" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" -msgstr "Typedef と Enum" +msgstr "Typedef/Enum" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\" は不明なファイル形式の拡張子です\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "タグが見つからないため、タグファイルの作成に失敗しました\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4062,7 +4250,7 @@ "使用法: %s -g <タグファイル> <ファイルリスト>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4073,163 +4261,178 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "タグを読み込む" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany タグファイル (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s タグファイル '%s' を読み込みました" -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "タグファイル '%s' を読み込めませんでした" -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "前方宣言 \"%s\" が見つかりません" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" の定義が見つかりません" -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "名前順に並び替え(_N)" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "出現順に並び替え(_A)" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Old" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "現在のファイルを保存" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "全ての開いているファイルを保存" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" -msgstr "ディスクから現在のファイルを読み直す" +msgstr "ディスクから現在のファイルを再読み込み" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "現在のファイルを閉じる" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "すべての開いているファイルを閉じる" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "選択中の範囲を切り取り" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "選択中の範囲をコピー" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "クリップボードの内容を貼り付け" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "選択中の範囲を削除" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "最後の変更を取り消し" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "最後の変更の取り消しを元に戻す" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "現在のファイルをコンパイル" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "現在のファイルを実行/表示" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" -msgstr "色選択ダイアログを表示し、パレットから色を選択する" +msgstr "色の選択ダイアログを表示し、パレットから色を選択する" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "文字を拡大" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "文字を縮小" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "インデントを減らす" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "インデントを増やす" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "指定した文字列を現在のファイルから検索" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "指定した行番号に移動" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "設定ダイアログを表示" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Geany を終了" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "文書を印刷" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "現在の文書の文字を置き換えます" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" -msgstr "新しいファイルを作成します" +msgstr "新しいファイルを作成" + +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "テンプレートから新しいファイルを作成" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:365 msgid "Open an existing file" -msgstr "存在するファイルを開きます" +msgstr "既存のファイルを開く" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "以前使用したファイルを開く" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "ビルドアクションを選択" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "移動" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "区切り線" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- 区切り線 ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4237,11 +4440,11 @@ "ツールバーに表示する項目を選びます。ドラッグアンドドロップで順番を変えること" "ができます。" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "利用できる項目" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "表示される項目" @@ -4268,7 +4471,7 @@ msgid "Custom command failed: %s" msgstr "カスタムコマンドが失敗しました: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "カスタムコマンドを設定" @@ -4280,293 +4483,273 @@ "現在選択している文字をこれらのコマンドに送り、コマンドの出力結果で現在選択し" "ている文字を置換します" -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "カスタムコマンドが定義されていません" -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "ワードカウント" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "選択範囲" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "文書全体" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "範囲:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "行数:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "語数:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "文字数:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "タグが見つかりません" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "シンボルリストを表示(_Y)" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "文書リストを表示(_D)" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "サイドバーを隠す(_I)" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "パスを表示(_P)" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "行: %d\t 桁: %d\t 選択: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "行: %d / %d\t 桁: %d\t 選択: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "モード: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "エンコーディング: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "ファイルの種類: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "スコープ: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "フォントを更新しました(%s)" -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C 標準ライブラリ" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++（C 標準ライブラリ）" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ 標準ライブラリ" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "任意の日付書式を設定(_S)" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "フォルダを選択" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "ファイルを選択" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "設定ファイル(_O)" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "すべて保存" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "すべて閉じる" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "端末" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "パスを文書から設定(_S)" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "端末を再起動(_R)" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "入力メソッド(_I)" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "おそらくコマンドが含まれているため、端末のディレクトリを変更できません" -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "端末プラグイン" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"仮想端末エミュレータウィジェット(VTE)向けのこれらの設定は、VTEライブラリが読" -"み込まれたときにのみ適用されます。" - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "端末フォント:" +#: ../src/vte.c:736 +msgid "Font:" +msgstr "フォント:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "端末ウィジェットのフォントを設定します" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "文字色:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "背景色:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "端末ウィジェットのテキストの文字色を設定します" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "端末ウィジェットのテキストの背景色を設定します" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "スクロール行数:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "端末ウィジェットでスクロールできる履歴の行数を指定します" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "シェル:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "端末エミュレーション内部で起動するシェルのパスを設定します。" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "キー入力でスクロール" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "キーを押したときに最後の行にスクロールするかどうか" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "出力によってスクロール" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "何か出力が生成されたときに最後の行にスクロールするかどうか" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "カーソルの点滅" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "カーソルを点滅させるかどうか" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Geanyのキーバインドを上書き" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "VTE がキーボードショートカットを受け取れるようにする(フォーカスコマンドから分" "離)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "メニューショートカットキーを無効(デフォルトでF10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4576,21 +4759,21 @@ "は F10です)。例えば、Midnight Commander をVTEで使用する場合に、このオプション" "は便利です。" -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "現在のファイルのパスに合わせる" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "開いているファイルを切り替えるときに、\"cd $path\" を実行するかどうか" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "起動スクリプトを使用しない" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4598,11 +4781,11 @@ "実行したプログラムの終了ステータスを表示するための簡単な起動スクリプトを使用" "せずに、直接プログラムを実行します。" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "VTEでプログラムを実行" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4610,90 +4793,118 @@ "端末エミュレーションウィンドウを開くかわりに、VTEの中でプログラムを実行しま" "す。VTEの中で実行したプログラムは中止できないことに注意してください。" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany プロジェクトファイル" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "実行ファイル" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "クラスビルダー" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "新しいクラスのソースファイルを作成します" -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "クラスを作成" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "名前空間" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "名前空間:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "クラス" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "クラス名:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "ヘッダファイル:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "ソースファイル:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "継承" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "基本クラス:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "基本ソース:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "基本ヘッダ:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "グローバル" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "基本 GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "実装:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "オプション" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "コンストラクタを作成" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "デストラクタを作成" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "抽象クラス" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "シングルトン" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ コンストラクタ型" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "クラスを作成(_S)" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ クラス" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ クラス" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP クラス" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML 記号" @@ -4703,52 +4914,57 @@ msgstr "'&' のような HTML 文字実体を挿入します" #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geany 開発チーム" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML 記号" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 記号" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "ギリシャ文字" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "数学記号" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "技術記号" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "矢印" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "句読記号" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "その他の記号" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "プラグインの設定ディレクトリを作成できませんでした" + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "特殊記号" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "挿入(_I)" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4756,40 +4972,40 @@ "以下のリストから特殊記号を選択して、ダブルクリックするかボタンを使用して現在" "のカーソル位置に挿入します" -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "記号" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML（実体）" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "特殊 HTML 記号を挿入(_I)" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML 置換" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "HTML 反転(_T)" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "特殊記号の一括置換" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "特殊 HTML 記号を挿入" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "特殊記号を置換" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "プラグインの状態を反転" @@ -4814,105 +5030,105 @@ "Renders the font size of the document together with the current zoom level" msgstr "文書のフォントサイズを現在のズームレベルでレンダリングします" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "文書は正常に '%s' へエクスポートされました" -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "ファイル '%s' は書き込めませんでした（%s）" -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "ファイル '%s' はすでに存在します。上書きしますか?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "エクスポート(_E)" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "_HTML 文書" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "_LaTeX 文書" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "ファイルブラウザ" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "ファイルブラウザのタブをサイドバーに追加します" -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "選択された項目が多すぎます!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "設定された外部コマンド '%s' が実行できませんでした（%s）" -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "外部から開く(_E)" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "複数のファイルから検索(_F)" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "隠しファイルを表示(_H)" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "上へ" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "更新" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "ホーム" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "パスを文書から設定" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "フィルタをクリア" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "フィルタ:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "ワイルドカードでファイルを制限します" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "ファイルリストをフォーカス" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "パス入力をフォーカス" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "プラグインの設定ディレクトリを作成できませんでした" - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "他のプログラムで開くコマンド:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4926,15 +5142,15 @@ "%f は完全パス指定のファイル名に置き換えられます。\n" "%d は選択したファイルがあるパス名に置き換えられます。(ファイル名なし)" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "隠しファイルを表示" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "オブジェクトファイルを隠す" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4942,11 +5158,11 @@ "生成されたオブジェクトファイルをファイルブラウザで非表示にします。これは *." "o, *.obj. *.so, *.dll, *.a, *.lib を含みます" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "プロジェクトの基本ディレクトリを使用" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "現在開かれているプロジェクトの基本ディレクトリに作業ディレクトリを変更" @@ -5052,37 +5268,198 @@ msgid "Splits the editor view into two windows." msgstr "編集ビューを2つのウィンドウに分割する" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "現在の文書を表示" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "ウィンドウを結合(_U)" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "ウィンドウを分割(_S)" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "左右に分割(_H)" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "上下に分割(_V)" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "左右に分割" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "上下に分割" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "ウィンドウを結合" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "インクルードと引数を設定(_S)" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "DVI ファイルを表示(_V)" + +#~ msgid "V_iew PDF File" +#~ msgstr "PDF ファイルを表示(_I)" + +#~ msgid "_Set Arguments" +#~ msgstr "引数を設定(_S)" + +#~ msgid "Set Arguments" +#~ msgstr "引数を設定" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "(La)TeX ファイルのコンパイルや表示を行う、プログラムやオプションを設定しま" +#~ "す" + +#~ msgid "DVI creation:" +#~ msgstr "DVI 作成:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF 作成:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI プレビュー:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF プレビュー:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f は現在のファイル名と置換されます（例：test_file.c）\n" +#~ "%e は拡張子を除いたファイル名と置換されます（例：test_file）" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "インクルードと引数の設定" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "ビルドと実行プログラムのためのコマンドを設定します" + +#~ msgid "Compile:" +#~ msgstr "コンパイル:" + +#~ msgid "Build:" +#~ msgstr "ビルド:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "表示プログラムの実行に失敗しました" + +#~ msgid "Try to resave the file?" +#~ msgstr "ファイルを保存し直しますか?" + +#~ msgid "_Customize Toolbar" +#~ msgstr "ツールバーをカスタマイズ(_C)" + +#~ msgid "Icon style:" +#~ msgstr "アイコンのスタイル:" + +#~ msgid "Icon size:" +#~ msgstr "アイコンのサイズ:" + +#~ msgid "Appearance" +#~ msgstr "外観" + +#~ msgid "Hard tab width:" +#~ msgstr "タブの幅:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "タブと空白がファイルに設定されているときのタブの幅" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "黒地に白文字を使用し、すべての色を反転します。このオプションはGeanyの再起" +#~ "動が必要です。" + +#~ msgid "Long line marker:" +#~ msgstr "長い行のマーカー:" + +#~ msgid "Long line marker color:" +#~ msgstr "長い行のマーカーの色:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "メイクのパスとオプション" + +#~ msgid "Duplicate line or selection" +#~ msgstr "行/選択範囲を複製" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "選択範囲を端末に送る" + +#~ msgid "Run (alternative command)" +#~ msgstr "実行（代替コマンド）" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "以下は利用できるプラグインのリストです。Geany の起動時に読み込まれるプラグ" +#~ "インを選択してください。" + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "ファイル %s の印刷は中止されました。" + +#~ msgid "Make in base path" +#~ msgstr "基本パスでメイク" + +#~ msgid "Run command:" +#~ msgstr "実行コマンド:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "プロジェクトの基本パスで実行するコマンド。コマンドにオプションを追加できま" +#~ "す。標準の実行コマンドを使うときは空白にします。" + +#~ msgid "Choose Project Run Command" +#~ msgstr "プロジェクトの実行コマンドを選択" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "%u ファイルでテキストを置換しました" + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "検索に失敗しました(ヘルプのデバッグメッセージを確認してください)。" + +#~ msgid "My" +#~ msgstr "私の" + +#~ msgid "Local" +#~ msgstr "ローカル" + +#~ msgid "Our" +#~ msgstr "私達の" + +#~ msgid "Terminal plugin" +#~ msgstr "端末プラグイン" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "仮想端末エミュレータウィジェット(VTE)向けのこれらの設定は、VTEライブラリが" +#~ "読み込まれたときにのみ適用されます。" + +#~ msgid "Terminal font:" +#~ msgstr "端末フォント:" + +#~ msgid "Unsplit" +#~ msgstr "ウィンドウを結合" #~ msgid "Diff file" #~ msgstr "Diff ファイル" @@ -5245,9 +5622,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "すべてのコードブロックを広げます" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "現在の文書のすべてのエラーインジケータを消去します" - #~ msgid "" #~ "Open a color chooser dialog, to interactively pick colors from a palette." #~ msgstr "色の選択ダイアログを表示し、パレットから色を選択します" @@ -5275,13 +5649,9 @@ #~ msgid "Show full path name in documents list" #~ msgstr "完全パス名を文書リストに表示" -#~ msgid "Use white text on a black background." -#~ msgstr "黒い背景に白いテキストを使用します" - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "デバッグモードで実行(多くのメッセージを表示)" -#, fuzzy #~ msgid "Found %d matches for \"%s\"." #~ msgid_plural "Found %d matches for \"%s\"." #~ msgstr[0] "%d 個の一致するものが見つかりました( \"%s\" を検索)。" @@ -5298,7 +5668,6 @@ #~ msgid "Rows of symbol completion list:" #~ msgstr "補完候補リストの行数:" -#, fuzzy #~ msgid "Strip trailing spaces" #~ msgstr "末尾の空白を除去(_S)" @@ -5317,9 +5686,6 @@ #~ msgid "Edit menu" #~ msgstr "編集 メニュー" -#~ msgid "Search menu" -#~ msgstr "検索 メニュー" - #~ msgid "View menu" #~ msgstr "表示 メニュー" diff -Nru geany-0.18/po/ko.po geany-0.19/po/ko.po --- geany-0.18/po/ko.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/ko.po 2010-05-23 09:08:49.000000000 +0100 @@ -6,11 +6,11 @@ # msgid "" msgstr "" -"Project-Id-Version: Genany 0.18\n" +"Project-Id-Version: Genany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2008-10-14 19:27+0100\n" -"Last-Translator: Frank Lanitz \n" +"Last-Translator: netkiss \n" "Language-Team: Korean\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -21,7 +21,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "빠르고 가벼운 GTK2 기반의 통합개발환경" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "지니" @@ -29,67 +29,67 @@ msgid "Integrated Development Environment" msgstr "통합 개발 환경" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "지니 프로그램정보" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "빠르고 가벼운 통합개발환경" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(제작일: %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "프로그램정보" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "개발" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "관리" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "개발" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "번역 관리" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "번역" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "이전 번역" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "공헌" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "많은 개발자 (상세목록파일 %s 참고) 중 몇사람:" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "공헌" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "사용권" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -97,277 +97,290 @@ "사용권 문서를 찾을 수 없습니다. http://www.gnu.org/licenses/gpl-2.0.txt를 보" "십시오." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"터미널(\"%s\") 오류: 기본 설정 메뉴의 터미널에서 경로가 정확한지 확인요망" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "작업 폴더를 \"%s\"(으)로 바꾸기 실패" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "\"%s\" 실행실패: start-script 만들 수 없음" +msgid "%s (in directory: %s)" +msgstr "%s (폴더: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "프로세스 실패: (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (폴더: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "작업 폴더를 \"%s\"(으)로 바꾸기 실패" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "\"%s\" 실행실패: start-script 만들 수 없음" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "VTE의 파일이 명령을 포함하고 있기때문에 실행할 수 없음." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"터미널(\"%s\") 오류: 기본 설정 메뉴의 터미널에서 경로가 정확한지 확인요망" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "컴파일 실패함." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "성공적으로 컴파일 완료함." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "컴파일(_C)" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "제작(_B)" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Make All(_M)" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make 맞춤타겟(_T)" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Make: 맞춤타겟" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make 오브젝트(_O)" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "입력한 맞춤 옵션을 make 명령으로 넘겨줍니다." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "다음 오류(_N)" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "이전 오류(_P)" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "연결파일 및 인수 설정(_S)" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI(_D)" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF(_P)" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "DVI 파일 보기(_V)" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "PDF 파일 보기(_i)" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "맞춤 명령 설정" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "인수 지정(_S)" +#: ../src/build.c:1623 ../src/toolbar.c:373 +#, fuzzy +msgid "Build the current file" +msgstr "현재 파일 컴파일" + +#: ../src/build.c:1637 +#, fuzzy +msgid "Build the current file with Make and the default target" +msgstr "현재 파일을 make 도구를 사용해서 제작 (기본타겟)" + +#: ../src/build.c:1639 +#, fuzzy +msgid "Build the current file with Make and the specified target" +msgstr "현재 파일을 make 도구를 사용해서 제작 (맞춤타겟)" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "인수 설정" +#: ../src/build.c:1641 +#, fuzzy +msgid "Compile the current file with Make" +msgstr "현재 파일 컴파일" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "(La)TeX 파일을 컴파일하고 보기위한 프로그램 및 옵션 설정." +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "프로세스 중단 실패 (%s)." -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI 만들기:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "제작오류 더이상 없음." -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF 만들기:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI 미리보기:" +#: ../src/build.c:1788 +msgid "Item" +msgstr "" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF 미리보기:" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" msgstr "" -"%f: 현재 파일 이름으로 바꾸기, 예) test_file.c\n" -"%e: 확장자 없는 현재 파일 이름으로 바꾸기, 예) test_file" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "연결파일 및 인수 설정" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (폴더: %s)" + +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "컴파일러" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "프로그램 제작 및 실행 명령 설정." +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s 명령" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "컴파일:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "제작:" - -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "실행:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "파일 형식 지정(_t)" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1914 ../src/build.c:1949 #, fuzzy -msgid "Build the current file" -msgstr "현재 파일 컴파일" +msgid "Error Regular Expression:" +msgstr "정규표현식 grep(_G)" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make: 맞춤타겟" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "입력한 맞춤 옵션을 make 명령으로 넘겨줍니다." +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" -#: ../src/build.c:1967 +#: ../src/build.c:1981 #, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "현재 파일을 make 도구를 사용해서 제작 (기본타겟)" +msgid "Execute Commands" +msgstr "맞춤 명령 설정" + +#: ../src/build.c:1992 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" -#: ../src/build.c:1970 +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "현재 파일을 make 도구를 사용해서 제작 (맞춤타겟)" +msgid "Set Build Commands" +msgstr "맞춤 명령 설정" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "컴파일(_C)" + +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "제작(_B)" -#: ../src/build.c:1973 +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Compile the current file with Make" -msgstr "현재 파일 컴파일" +msgid "_Execute" +msgstr "실행:" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "프로그램 보기 실행 실패" +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make 맞춤타겟(_T)" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "프로세스 중단 실패 (%s)." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make 오브젝트(_O)" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "제작오류 더이상 없음." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "make 프로그램:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Make All(_M)" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "맞춤 명령 설정" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "정말로 끝낼까요?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%s 파일 저장됨." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "다시 열기(_R)" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "저장되지 않은 모든 변경사항 무시." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "정말로 '%s' 파일을 다시 불러올까요" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "줄번호로 이동" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "이동하고 싶은 줄번호 입력:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "이 기능을 사용하기 전에 파일형식을 지정하십시오." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "일일.월월.년년년년" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "월월.일일.년년년년" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "년년년년/월월/일일" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "일일.월월.년년년년 시시:분분:초초" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "월월.일일.년년년년 시시:분분:초초" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "년년년년/월월/일일 시시:분분:초초" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "맞춤 날짜 형식 사용(_U)" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "맞춤 날짜 형식" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -375,24 +388,23 @@ "원하는 날짜와 시간 형식을 입력하십시오. ANSI C strftime함수의 모든 식별기호 " "사용가능." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "날짜형식 변환 실패: 너무 김." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "메시지 아이템 더이상 없음." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "파일 열기" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "보기(_V)" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -400,29 +412,29 @@ "읽기전용으로 파일 열기. 하나 이상의 파일을 열으면 모든 파일은 읽기전용으로열" "립니다." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "파일 확장자로 추정" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "파일에서 추정" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "옵션" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "숨김파일 보기(_h)" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "인코딩 설정:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -437,11 +449,11 @@ "게 됩니다." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "파일형식 설정:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -462,24 +474,24 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "파일 저장" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "이름 바꾸기(_e)" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 #, fuzzy msgid "Save the file and rename it" msgstr "파일을 저장하고 이름 바꾸기." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "새로운 탭에 파일 열기(_O)" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -487,41 +499,41 @@ msgstr "" "저장되지 않은 현재파일을 그대로 두고, 새로운 탭에 새로운 저장된 파일 열기." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "오류" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "질문" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "경고" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "정보" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "저장하지 않기(_D)" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' 파일이 저장되지 않았음." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "닫기 전에 저장하시겠습니까?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "글꼴 고르기" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -529,106 +541,110 @@ "오류가 발생했거나 파일 정보를 가져올 수 없음\n" "(예: 저장하지 않은 새 파일)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "알 수 없음" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "속성" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "형식:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "크기:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "위치:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "읽기전용:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(지니 내부에서만)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "인코딩:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(BOM과 함께)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(BOM 없이)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "수정:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "바뀜:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "접근:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "허가:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "읽기:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "쓰기:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "실행:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "소유자:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "그룹:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "%s 파일 닫음." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "새로운 \"%s\" 파일 열음." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "%s 파일 열 수 없음 (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -644,42 +660,42 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "\"%s\" 파일은 올바르지 않은 %s 입니다." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." msgstr "\"%s\" 파일은 텍스트 파일이 아니거나 지원되지 않는 인코딩 형식입니다." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "스페이스" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "탭" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "탭과 스페이스" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%2$s 파일 %1$s 들여쓰기모드 설정." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "올바르지 않은 파일 이름" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "%s 파일 다시 불러옴." @@ -687,21 +703,21 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "%s 파일 열음(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", 읽기전용" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "파일 저장 오류." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -710,7 +726,7 @@ "UTF-8로부터 변환이 \"%s\"에서 실패함.\n" " 파일 저장되지 않음." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -719,74 +735,79 @@ "오류 메시지: %s\n" "\"%s\"에서 오류 발생(%d행, %d열)" -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "오류 메시지: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "파일 저장 오류." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "%s 파일 저장 오류." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "%s 파일 저장됨." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" 없음." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "다시 처음부터 찾을까요?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "\"%s\" 찾을 수 없음." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d번 \"%s\" -> \"%s\" 바꿈." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "다시 불러올까요?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "디스크에 있는 '%s' 파일이 현재 버퍼보다 새롭습니다." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "다시 저장할까요?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "\"%s\"파일 없음" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "탭 너비 입력" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "탭을 몇개의 스페이스로 구성할지 입력하시오." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "켈트어" @@ -897,581 +918,644 @@ msgid "Without encoding" msgstr "인코딩 없음" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "서유럽(_W)" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "동유럽(_E)" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "동아시아(_A)" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "동남 & 서남 아시아(_S)" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "중동아시아(_M)" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "유니코드(_U)" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s 소스 파일" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "%s 소스 파일" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "없음" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "셸 스크립트 파일" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML 문서" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "CSS 스타일시트" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL 덤프 파일" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "환경설정 파일" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext 번역 파일" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s 스크립트 파일" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "프로그래밍 언어(_P)" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "스크립트 언어(_S)" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Markup 언어(_M)" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "기타 언어(_i)" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "파일 형식 지정(_t)" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "모든 소스" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "모든 파일" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "%s 파일형식에 맞지 않는 정규표현식: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "무제" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "'%s' 파일을 찾을 수 없습니다." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "색상 선택기(_C)" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "파일(_F)" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "템플릿으로 새로 만들기(_T)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "보이지 않는" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "선택한 파일 열기(_i)" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "최근에 사용한 파일들(_F)" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "모두 저장(_l)" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "다른 언어로 다시열기(_e)" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "보이지 않는" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "페이지 설정(_u)" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "다른 문서 닫기(_h)" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "모두 닫기(_l)" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "편집(_E)" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "형식(_F)" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "선택한 부분 활자케이스전환(_o)" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "현재 줄 자리바꾸기" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "주석만들기(_C)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "주석 해제(_n)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "한줄 주석 전환(_T)" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "복제(_p)" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "들여쓰기 증가(_I)" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "들여쓰기 감소(_D)" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "선택한 부분 보내기(_S)" +msgid "_Smart Line Indent" +msgstr "똑똑한 한줄 주석" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "선택한 부분 보내기(_S)" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "명령:" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "현재 줄(들) 잘라내기" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "현재 줄(들) 복사" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "현재 줄(들) 지우기" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "복제(_p)" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "현재 줄(들) 선택" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "현재 문단 선택" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "대안 공백 삽입" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "다음 표지로 이동" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "이전 표지로 이동" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "선택한 부분 보내기(_S)" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "주석 삽입(_n)" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "변경기록 항목 삽입(_C)" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "파일 헤더 삽입(_H)" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "함수 설명 삽입(_F)" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "다수행 주석 삽입(_M)" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "GPL 공지 삽입(_G)" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "BSD 사용권 공지 삽입(_B)" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "날짜 삽입(_e)" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" 템플릿 삽입(_I)" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "기본 설정" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "기본 설정" + +#: ../src/interface.c:720 msgid "_Search" msgstr "찾기(_S)" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "이전 찾기(_P)" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "파일 안에서 찾기(_i)" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "바꾸기(_R)" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "선택한 부분에서 찾기(_S)" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "선택한 부분에서 이전 찾기(_v)" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "다음 메시지(_M)" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "이전 메시지(_e)" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "이동(_G)" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "글꼴 바꾸기(_F)" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "모든 부가적인 위젯 보기 전환(_g)" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "전체 화면(_s)" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "메시지창 보기(_W)" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "도구모음 보기(_T)" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "가장자리창 보기(_b)" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "편집기" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "표지 여백 보기(_M)" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "줄번호 보기(_L)" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "공백 표시 보기" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "줄끝 표시 보기" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "들여쓰기 보조선 보기" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "문서(_D)" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "자동 줄바꾸기(_L)" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "자동 줄나누기(_B)" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "자동 들여쓰기(_A)" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "들여쓰기 형식(_d)" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "탭(_t)" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "스페이스(_S)" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "탭과 스페이스(_a)" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "읽기 전용(_O)" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "유니코드 BOM 삽입(_W)" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "파일 형식 지정(_t)" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "인코딩 형식 지정(_E)" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "줄바꾸기 형식 지정(_n)" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Windows 형식 CR/LF로 변환(_C)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Unix 형식 LF로 변환(_L)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Machintosh 형식 CR로 변환(_M)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "질질끌리는 공백 지우기(_S)" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "탭을 스페이스로 바꾸기(_R)" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "스페이스를 탭으로 바꾸기(_y)" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "모두 접기(_F)" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "모두 펴기(_U)" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "표지 지우기(_M)" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "오류 지표 지우기(_I)" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "프로젝트(_P)" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "새로 만들기(_N)" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "열기(_O)" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "프로젝트 열기" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "닫기(_C)" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "도구(_T)" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "환경설정 다시 불러오기(_R)" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "환경설정 파일 다시 불러옴." + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "색상 선택기(_C)" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "단어 세기(_W)" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Tags 불러오기(_g)" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "환경설정 다시 불러오기(_R)" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "도움말(_H)" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "웹사이트(_W)" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "바로 가기(_K)" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "디버그 메시지(_D)" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "심볼" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "문서" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "상태" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "컴파일러" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "메시지" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "낙서" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "아이콘옆에 텍스트(_a)" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "아이콘만(_I)" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "텍스트만(_T)" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "큰 아이콘(_L)" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "작은 아이콘(_S)" - -#: ../src/interface.c:1758 ../src/interface.c:3326 +#: ../src/interface.c:1887 #, fuzzy -msgid "_Very Small Icons" -msgstr "작은 아이콘(_S)" +msgid "_Toolbar Preferences" +msgstr "기본 설정" -#: ../src/interface.c:1769 +#: ../src/interface.c:1900 #, fuzzy -msgid "_Customize Toolbar" +msgid "_Hide Toolbar" msgstr "도구모음 감추기(_H)" -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "도구모음 감추기(_H)" - -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "사용법 찾기(_U)" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "문서 사용법 찾기(_D)" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Tag 정의로 이동(_T)" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Tag 선언으로 이동(_a)" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "컨텍스트 행동(_x)" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "기본 설정" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "지난 세션에 사용한 파일 불러오기" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "시작할 때 지난 세션에 사용한 파일을 열기" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "가상 터미날 지원" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1480,40 +1564,40 @@ "시작할 때 VTE(가상 터미널 에뮬레이터)를 지원할지 여부.필요 없으면 비활성화 하" "십시오." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "플러그인 지원 활성화 하기" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "시작" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "창 위치와 크기를 저장" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "창의 위치와 크기를 저장하고 시작할 때 복원하기" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "끝낼때 확인하기" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "끝낼때 확인 대화상자 보이기." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "끄기" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "시작 경로:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1521,51 +1605,51 @@ "파일 열기와 저장의 시작 경로.\n" "절대경로로 입력해야함. 지정하지 않으면 현재작업폴더를 사용함." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "프로젝트 파일:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "프로젝트 열기의 시작 경로" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 #, fuzzy msgid "Extra plugin path:" msgstr "플러그인 지원 활성화 하기" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "경로" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "상태" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "오류 발생시, 컴파일 끝낼 때 삑 소리를 냄" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "오류가 발생하거나 컴파일이 끝날때 삑 소리를 낼지 여부." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "새 메시지 발생시 메시지창으로 포커스 전환" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1574,11 +1658,11 @@ "새로운 상태 메시지가 발생하면 아래쪽 메시지창의 메시지 탭으로 포커스 전환하" "기." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "status bar의 상태 메시지 감추기" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1586,12 +1670,12 @@ "status bar의 모든 메시지를 지우기.\n" "모든 메시지를 상태 메시지창에 표시함." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "자동 포커스 위젯 (마우스위치에 포커스 맞추기)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1600,15 +1684,25 @@ "마우스 커서 아래의 위젯에 자동으로 포커스을 줌.\n" "편집창, 낙서탭, 찾기와 이동 도구모음, VTE에 작동함." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "기타" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "항상 찾기 반복하고 찾기 대화상자 감추기" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1617,11 +1711,11 @@ "항상 문서전체에서 찾기를 반복하고 찾기/이전찾기를 클릭한후 찾기대화상자를 감" "추기." -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "찾기 대화상자에 커서아래의 단어 사용하기" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 #, fuzzy msgid "" "Use current word under the cursor when opening the Find, Find in Files or " @@ -1630,30 +1724,30 @@ "찾기, 파일에서 찾기, 바꾸기 대화상자를 열 때 현재 커서아래의 단어를 선택되지 " "않은 상태로 사용함." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "파일에서 찾을 때 현재파일이 들어있는 폴더를 사용함" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "찾기" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "프로젝트 기반 세션 파일 사용" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "프로젝트 세션 파일을 저장하고 프로젝트를 다시 열 때 복원 여부." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "프로젝트 기반 폴더 안에 프로젝트 파일 저장하기" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 #, fuzzy msgid "" "When enabled, a project file is stored by default inside the project base " @@ -1666,76 +1760,100 @@ "\n" "프로젝트 파일의 경로는 \"새 프로젝트 대화상자\"에서 바꿀 수 있음." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "프로젝트" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "기타" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "일반" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "심볼 목록 보기" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "심볼 목록 보기전환" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "문서 목록 보기" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "문서 목록 보기 전환" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "가장자리창 보기(_b)" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "설명:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "왼쪽" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "오른쪽" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "가장자리창" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "심볼 목록:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "메시지창:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "편집창:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "메시지창 글꼴 설정" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "심볼 목록 글꼴 설정" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "편집창 글꼴 설정" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "글꼴" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "편집창 탭보기" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "닫기 단추 보기" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1744,125 +1862,157 @@ "파일을 쉽게 닫을 수 있게 파일탭에 작은 X자 단추를 보여줌.\n" "(지니를 다시 시작해야 함)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "새 파일탭 위치:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "왼쪽" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "파일탭을 메시지창 왼쪽에 놓기" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "오른쪽" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "파일탭을 메시지창 오른쪽에 놓기" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "현재 파일 저장" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "모든 부가적인 위젯 보기 전환" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "모든 부가적인 위젯 보기 전환" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "편지창 탭" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "위" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "아래" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "가장자리창:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "탭 위치" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "status bar 보기" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "프로그램창 아래쪽의 status bar 보기 여부." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "인터페이스" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "도구모음 보기" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "도구모음" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "아이콘 양식:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "아이콘 크기:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "모양새" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy msgid "Customize Toolbar" msgstr "도구모음 보기(_T)" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "아이콘옆에 텍스트(_a)" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "아이콘만(_I)" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "텍스트만(_T)" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "글꼴" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "작은 아이콘(_S)" + +#: ../src/interface.c:3429 +#, fuzzy +msgid "_Very Small Icons" +msgstr "작은 아이콘(_S)" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "큰 아이콘(_L)" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "크기:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "도구모음" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "도구모음" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "줄바꾸기" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." msgstr "자동으로 줄바꾸기. 주의:느린 시스템에서는 사용 지양." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "\"똑똑한\" home키 활성" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1876,11 +2026,11 @@ "활성화하지 않으면 현재 위치에 상관없이 언제나 캐럿을 행의 맨처음으로 이동시킵" "니다." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "드래그 앤 드롭 비활성" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1889,19 +2039,19 @@ "드래그 앤 드롭을 비활성화하면 편집창의 내/외부 어디에서도 선택한 부분을 드래" "그 앤 드롭 할 수 없습니다." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "접기 활성" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "코드 접기 활성 여부" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "접기 지점의 모든 자식 접기/펼치기" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1910,35 +2060,35 @@ "접기 지점의 모든 자식을 접거나 펼칩니다. 접기 심볼을 클릭할 때 Shift 키를 누" "르면반대의 행동을 합니다." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "컴파일 오류 표시에 지표 사용" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "컴파일러가 찾은 경고 및 오류 표시에 지표(구불부불한 밑줄) 사용 여부." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "새로운 줄에 질질끌리는 공백 지우기" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "새로운 줄에 이전 줄에서부터 질질끌리는 공백 지우기 활성." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "행 분리 열:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "표지 전환 주석:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 #, fuzzy msgid "" "A string which is added when toggling a line comment in a source file, it is " @@ -1946,114 +2096,106 @@ msgstr "" "소스파일 내의 한줄 주석을 전환할 때 추가된 문자열.주석이 전환되었음을 표시함." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "기능" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "기능" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "자동들여쓰기 모드:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "기본" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "현재 문자" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "괄호 일치" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "형식:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "너비:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "한단계 들여쓰기의 문자 너비" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "들여쓰기에 스페이스 사용" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "들여쓰기에 탭 사용" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "들여쓰기가 탭 너비보다 작으면 스페이스 사용, 그렇지 않으면 둘 다 사용" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "하드 탭 너비:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "텝 및 스페이스 설정시 탭 너비" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "파일 열기시 파일 내용으로 들여쓰기 추정 여부." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "탭 키 들여쓰기" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 #, fuzzy msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "탭 문자 입력 대신 탭키 및 shift-탭키로 들여쓰기 및 들여쓰기해제." -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "들여쓰기" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "들여쓰기" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "토막 완성" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "정의된 짧은 문자열을 입력하면 복잡한 문자열로 완성함." -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "XML tag 자동 완성" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "XML태그(HTML태그 포함)를 자동완성하고 닫아줌." -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "여러줄 주석 자동 잇기" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 #, fuzzy msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " @@ -2062,196 +2204,197 @@ "C, C++, Java등의 소스파일에서 여러줄 주석내에 새줄을 입력할 때 자동으로그 줄" "도 기존의 주석으로 이어줌." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "열린 파일내의 함수명, 전역변수등등의 알려진 심볼을 자동으로 완성함." -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "최대 심볼 이름 제안 횟수:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "자동완성 목록 높이:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "자동완성 필요문자 수:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "심볼 자동완성 목록을 나타내기 위해 필요한 문자의 수." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "자동완성 목록 줄 높이." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "자동완성 목록 최대 표시 수." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "자동완성" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "자동완성" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "구문강조 색상 반전" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "검정 배경 흰색 글자." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "들여쓰기 보조선 보기" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "들여쓰기 보조용 작은 점선 보기." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "공백 표시 보기" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "스페이스 대신 점, 탭 대신 화살표를 표시함." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "줄끝 표시 보기" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "줄끝 표시 보여줌." -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "줄번호 보기(_L)" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "줄번호 여백 보기 전환." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 #, fuzzy msgid "Show markers margin" msgstr "표지 여백 보기(_M)" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "줄번호 우측의 줄 표지 여백 보기 전환." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "마지막 줄에서 스크롤 멈추기" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 #, fuzzy msgid "Whether to stop scrolling one page past the last line of a document" msgstr "문서의 마지막 줄에서 스크롤을 멈출지 여부." -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "표시" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "긴줄 표지:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "긴줄 표지 색상:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "회사명:" + +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "색상" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "긴줄 표지 색상 설정" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "색상 선택기" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2261,22 +2404,22 @@ "긴줄 표지는 편집창내의 긴줄을 표사해주거나 행분리 힌트를 주는 얇은 세로선입니" "다. 0보다 큰 수를 지정하여 어느 열에 긴줄 표지를 나타낼지 설정하십시오." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "선" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "편집창내의 설정된 열에 세로선을 표시함." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "배경색" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2286,114 +2429,149 @@ "설정된 열 이후의 문자 배경을 아래의 색상으로 바꿈.\n" "(가변폭 글꼴 사용시 권함)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "사용안함" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "활성(_E)" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "긴줄 표지" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "사용안함" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "질질 끌리는 스페이스, 탭, 줄끝표시 지우기" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "도구 경로" + +#: ../src/interface.c:4021 msgid "Display" msgstr "표시" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "명령행에서 새 문서 열기" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 #, fuzzy msgid "Start a new file for each command-line filename that doesn't exist" msgstr "각 명령행 파일 이름으로 새로운 문서 시작." -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "줄끝 표시문자 기본값:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "새 파일" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "새로 생성된 파일 인코딩 기본값 설정." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "인코딩 기본값 (새 파일):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "인코딩 기본값 (기존 파일):" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" -msgstr "기존 파일 열 때 인코딩 기본값 설정." +msgid "Sets the default encoding for newly created files" +msgstr "새로 생성된 파일 인코딩 기본값 설정." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "파일 열 때 고정된 인코딩 사용." -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "파일 열 때 인코딩 자동 추정을 비활성화하고 지정한 인코딩으로 파일을 업니다.\n" "(보통의 경우 필요없음)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "인코딩 기본값 (기존 파일):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "기존 파일 열 때 인코딩 기본값 설정." + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "인코딩" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "파일 끝 개행표시 조치" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "파일 끝의 개행표시를 조치합니다." -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "질질 끌리는 스페이스와 탭 지우기" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "질질 끌리는 스페이스, 탭, 줄끝표시 지우기" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "탭을 스페이스로 바꾸기" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "문서내의 모든 탭을 스페이스로 바꿈." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "파일 저장" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "최근 파일목록 길이:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "최근 파일목록에 저장할 갯수 지정." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "디스크 검사 간격:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2401,50 +2579,43 @@ "디스크의 문서파일 변경 검사 간격을 \"초\"단위로 지정.\n" "0으로 지정하면 검사하지 않음." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "파일" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "make 프로그램:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "터미널 프로그램:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "웹브라우저:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "make 도구의 경로와 옵션" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" msgstr "" "-e 인수를 지정할 수 있는 xterm, gnome-terminal, konsole등의 터미널 에뮬레이터" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "선호하는 브라우저의 경로와 가능한 추가적인 인수" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "grep 프로그램:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "도구 경로" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "컨텍스트 행동:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2454,67 +2625,67 @@ "현재 선택한 단어를 인수로 지정한 명령을 실행합니다.\n" "예) \"geany %s\"은(는) 선택한 단어와 같은 이름의 파일을 geany로 편집합니다. " -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "명령" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "도구" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "개발자의 이메일 주소" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "개발자의 이니셜" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "최초 버전:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "새 파일의 최초 버전 번호" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "회사명" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "개발자:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "회사명:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "이메일 주소:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "이니셜:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "개발자 이름" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "년도:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "일자:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "일시:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2522,7 +2693,7 @@ "{날짜시간} 형식지정.\n" "ANSI C의 strftime 함수의 모든 식별기호 사용가능." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2530,7 +2701,7 @@ "{년도} 형식지정.\n" "ANSI C의 strftime 함수의 모든 식별기호 사용가능." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2538,63 +2709,63 @@ "{날짜} 형식지정.\n" "ANSI C의 strftime 함수의 모든 식별기호 사용가능." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "템플릿 데이터" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "템플릿" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "바꾸기(_h)" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "바로 가기" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "바로 가기" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "명령:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "인쇄 명령의 경로(인수 %f은(는) 파일 이름)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "외부명령으로 인쇄하기" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "줄 번호 인쇄" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 #, fuzzy msgid "Add line numbers to the printed page" msgstr "줄 번호를 추가해서 인쇄하기." -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "쪽 번호 인쇄" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 #, fuzzy msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "각 쪽의 하단에 쪽 번호를 인쇄함. 2줄을 사용함." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "머리말 인쇄" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2603,20 +2774,20 @@ "각쪽의 상단에 쪽 번호, 파일 이름, 현재날짜를 포함하는 작은 머리말을 인쇄함(아" "래 참조).3줄을 사용함." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "기본이름만 사용" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "경로명이 없는 기본이름만 인쇄." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "날짜 형식:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2625,552 +2796,579 @@ "각쪽의 머리말에 추가된 날짜와 인쇄시간 형식을 지정함.\n" "ANSI C의 strftime 함수의 모든 식별자를 사용할 수 있음." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "GTK 고유 인쇄 사용" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "인코딩:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "인쇄" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "프로젝트 속성" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "표시" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "잘라내기" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "파일" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "새로 만들기" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "열기" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "선택한 파일 열기" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "저장" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "다른 이름으로 저장" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "모두 저장" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "인쇄" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "닫기" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "모두 닫기" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "다시 불러오기" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "프로젝트" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "프로젝트 속성" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "실행취소" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "재실행" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "줄 및 선택한 부분 복제" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "현재 줄(들) 지우기" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "현재 줄(들) 지우기" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "현재 줄 자리바꾸기" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "현재 줄로 스크롤" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "한줄 위로 스크롤" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "한줄 아래로 스크롤" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "토막 완성" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "토막 완성 감춤" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "컨텍스트 행동" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "단어 완성" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "calltip 보기" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "매크로 목록 보기" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "토막 완성" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "줄(들) 주석" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "줄(들) 주석" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "클립보드" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "잘라내기" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "복사" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "붙여 넣기" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "현재 줄(들) 복사" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "현재 줄(들) 잘라내기" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "선택" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "모두 선택" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "현재 단어 선택" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "현재 줄(들) 선택" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "이전 단어부분으로 이동" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "현재 문단 선택" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "다음 단어부분으로 이동" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "형식" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "선택한 부분 활자 케이스 전환" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "한줄 주석 전환" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "줄(들) 주석" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "줄(들) 주석 해제" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "들여쓰기 증가" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "들여쓰기 감소" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "공백 하나만큼 들여쓰기 증가" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "공백 하나만큼 들여쓰기 감소" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "똑똑한 한줄 주석" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "맞춤 명령 1로 보냄" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "맞춤 명령 2로 보냄" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "맞춤 명령 3으로 보냄" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "선택한 부분 보내기(_S)" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "삽입" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "날짜 삽입" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "대안 공백 삽입" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "환경 설정" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "찾기" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "찾기" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "다음 찾기" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "이전 찾기" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "선택부분 다음 찾기" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "다선택부분 이전 찾기" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "바꾸기" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "파일 안에서 찾기" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "다음 메시지" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "이전 메시지" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "사용법 찾기" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "문서 사용법 찾기" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "Make All(_M)" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "이동" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "뒤로" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "앞으로" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "일치하는 괄호로 이동" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "표지 보기 전환" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "다음 표지로 이동" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "이전 표지로 이동" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "태그 정의로 이동" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "태그 선언으로 이동" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "줄 처음으로 이동" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "줄 끝으로 이동" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "줄 끝으로 이동" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "이전 단어부분으로 이동" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "다음 단어부분으로 이동" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "보기" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "모든 부가적인 위젯 보기 전환" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "전체 화면" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "메시지창 보기 전환" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "가장자리창 보기 전환" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "확대" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "축소" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "축소" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "포커스" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "편집창으로 포커스 전환" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "낙서창으로 포커스 전환" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "VTE로 포커스 전환" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "찾기 막대로 포커스 전환" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "가장자리창으로 포커스 전환" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "컴파일러창으로 포커스 전환" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "가장자리창으로 포커스 전환" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "메시지창 보기(_W)" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "왼쪽 문서로 포커스 전환" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "가장자리창으로 포커스 전환" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "노트북 탭" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "왼쪽 문서로 포커스 전환" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "오른쪽 문서로 포커스 전환" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "최근에 사용한 문서로 포커스 전환" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "문서를 왼쪽으로 이동" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "문서를 오른쪽으로 이동" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "문서를 처음으로 이동" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "문서를 끝으로 이동" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "문서" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "자동 줄바꿈 전환" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "자동 행분리 전환" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "스페이스를 탭으로 바꿈" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "현재 접기 전환" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "모두 접기" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "모두 펼치기" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "심볼 목록 다시 불러오기" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "표지 지우기(_M)" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "오류 지표 지우기(_I)" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "제작" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "컴파일" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make 맞춤타겟" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make 오브젝트" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "다음 오류" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "이전 오류" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "실행" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "실행 (대안 명령)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "제작 옵션" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "색상 선택기 보기" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "도움말" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "바로 가기" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "다음 바로 가기는 변경 가능:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "왼쪽 문서로 포커스 전환" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "메모 및 낙서로 사용할 문자열을 입력하십시오." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "하나 또는 그 이상의 세션 파일 불러오기 실패함." @@ -3178,90 +3376,104 @@ msgid "Debug Messages" msgstr "디버그 메시지" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "찾기(_S)" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "파일의 몇번째 열에서 시작할지 설정 (--line과 결합하여 사용하면 유용함)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "대안 환경설정 폴더를 사용함" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "지니가 지원하는 내장 파일형식 출력" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "전역적인 태그 파일 만들기 (도움말 문서 참고)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "실행중인 인스턴스가 아닌, 새로운 인스턴스를 사용하여 문서 열기" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "파일의 몇번째 줄에서 시작할지 설정" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "시작할 때 메시지창을 보여주지 않기" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "자동완성 데이터 불러오지 않기 (도움말 문서 참고)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "플러그인을 불러오지 않기" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "지니 설치 폴더 prefix 출력" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "이진 세션 파일을 불러오지 않기" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "내장 터미널 에뮬레이터 불러오지 않기" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "\"libvte.so\"의 절대경로 파일 이름" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "버전 출력" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[파일들...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(%s에 GTK %d.%d.%d, GLib %d.%d.%d 사용하여 제작됨)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3270,14 +3482,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3288,38 +3500,43 @@ "환경설정 폴더없이 지니를 실행하면 문제가 생길 수 있습니다.\n" "무시하고 지니를 시작할까요?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "'%s' 파일을 찾을 수 없습니다." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "지니 %s 입니다." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "환경설정 폴더를 만들 수 없습니다 (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "환경설정 파일 다시 불러옴." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "상태 메시지" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "복사" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "모두 복사(_A)" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "메시지창 감추기(_H)" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "현재 문서의 모든 오류 지표를 지우기." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3328,11 +3545,11 @@ "\"%s\" 플러그인은 지니와 바이너리 호환성이 없습니다.\n" "다시 컴파일해서 사용하십시오." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "플러그인 관리(_P)" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3343,82 +3560,90 @@ "설명: %s\n" "저자: %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "활성" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "플러그인" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "사용할 수 있는 플러그인이 없습니다." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "플러그인" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"아래는 사용가능한 플러그인 목록입니다.\n" -"지니가 시작할 때 불러올 플러그인들을 선택하십시오." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "플러그인 상술:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "키 가로채기" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "\"%s\"에 할당하고싶은 키 조합을 누르십시오." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "모두 찾기(_F)" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "모두 닫기(_l)" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "행동" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "바로 가기" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "변경(_O)" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "단축키를 변경하시겠습니까?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "'%s'은(는) 이미 \"%s\"에 할당되어 있습니다." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "터미널" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "도구 경로 입력." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3426,7 +3651,7 @@ "템플릿에 사용할 정보 설정.\n" "자세한 내용은 도움 문서 참고." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3436,7 +3661,7 @@ "\"도구->환경설정\" 다시불러오기를 실행해야 합니다." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3447,7 +3672,7 @@ "직접 단축키표현을 입력합니다." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3456,7 +3681,7 @@ "2.10 이상의 환경에서 지니를 실행해야 가능합니다." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3470,46 +3695,46 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "%2$d쪽 중 %1$d쪽" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "문서 설정" -#: ../src/printing.c:410 +#: ../src/printing.c:411 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "경로명이 없는 기본이름만 인쇄." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "%2$d쪽 중 %1$d쪽" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "%s 파일 인쇄 취소함." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "%s 파일 인쇄함." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s 파일 인쇄 실패 (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "먼저 속성 대화상자에서 인쇄 명령을 지정하십시오." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3520,38 +3745,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" 파일 인쇄 실패 (반환 코드: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "%s 파일 인쇄함." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "프로젝트" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "새로운 프로젝트" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "만들기(_r)" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "이름:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "파일 이름:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "기반 경로:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3560,123 +3790,117 @@ "프로젝트를 구성하는 모든 파일들의 기반 폴더. 새로 만들거나, 기존 폴더를 사용" "할 수 있습니다. 프로젝트 파일 이름에 상대경로를 사용할 수 있게합니다." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "프로젝트 기반 경로 선택" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "\"%s\" 프로젝트 파일을 불러올 수 없습니다." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "프로젝트 열기" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "프로젝트 파일" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "\"%s\" 프로젝트 닫음." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "설명:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "기반 경로내에서 Make" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "실행 명령:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "선택" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"프로젝트 기반 폴더내에서 실행할 명령. 옵션 추가 가능함. 비워두면 디폴트 명령" -"을 실행함." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "파일 패턴:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "계속하기 전에 닫을까요?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "'%s' 프로젝트는 이미 열렸습니다." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "지정된 프로젝트명이 너무 짧습니다." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "지정된 프로젝트명이 너무 깁니다. (최대 글자수: %d)" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "올바르지 않은 프로젝트 파일 이름을 지정했습니다." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "프로젝트 기반 경로 폴더를 만들까요?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "\"%s\" 경로는 존재하지 않습니다." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "프로젝트 기반 폴더를 만들 수 없습니다 (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "프로젝트 파일을 쓸 수 업습니다 (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "\"%s\" 프로젝트 만듬." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "\"%s\" 프로젝트 저장함." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "프로젝트 파일 이름 선택" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "프로젝트 실행 명령 선택" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "\"%s\" 프로젝트 열음." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "정규 표현식 사용(_U)" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3684,15 +3908,15 @@ "POSIX 호환 정규 표현식을 사용합니다. 정규표현식 사용에 관한 자세한 정보는 도" "움말 문서를 읽어보십시오." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "뒤로 찾기(_b)" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "예외처리문자 사용(_e)" -#: ../src/search.c:246 +#: ../src/search.c:263 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3701,410 +3925,431 @@ "\\\\, \\uXXXX(유니코드 문자), \\t, \\n, \\r 등을 상응하는 제어문자로 바꿉니" "다." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "대소문자 구분(_a)" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "단어 전체 일치(_w)" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "단어 시작부분 일치(_t)" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "이전(_P)" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "다음(_N)" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "찾기(_S):" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "모두 찾기(_F)" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "표시(_M)" -#: ../src/search.c:433 +#: ../src/search.c:450 #, fuzzy msgid "Mark all matches in the current document" msgstr "현재 문서의 모든 일치하는 부분 표시." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "세션(_o)" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "문서(_I)" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "대화상자 닫기(_d)" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "열린 대화상자를 유지하기 원하면 이 옵션을 비활성화." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "바꾸고 찾기(_n)" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "바꿀 문자열(_h):" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "모두 바꾸기(_p)" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "선택(_l)" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "선택한 부분에서 일치하는 것 모두 바꾸기" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "폴더(_D):" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "인코딩 설정:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "문자열 고정(_t)" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "정규표현식 grep(_G)" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 #, fuzzy msgid "See grep's manual page for more information" msgstr "자세한 정보는 grep 매뉴얼 참고." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "확장 정규표현식(_E)" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "하위 폴더 포함(_R)" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "찾기 결과 반전(_I)" -#: ../src/search.c:797 +#: ../src/search.c:826 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "일치하는 부분 반전." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "추가 옵션(_x):" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "grep에 사용할 추가 옵션" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d번의 \"%s\" 일치 찾음." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "%u 파일의 문자열 바꿈." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "현재 문서의 모든 일치하는 부분 표시." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "올바르지 않은 폴더." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "문자열 찾을 수 없음." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "grep 도구 '%s' 실행 실패; 기본 설정에서 경로설정을 점검하십시오." -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "찾기" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (폴더: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "%s 폴더를 열 수 없습니다." -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "찾기 실패함." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "" -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "일치 없음." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "%s 파일형식에 맞지 않는 정규표현식: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "키" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "상태" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "" -#: ../src/symbols.c:655 -msgid "My" -msgstr "" - -#: ../src/symbols.c:656 -msgid "Local" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" msgstr "" -#: ../src/symbols.c:657 -msgid "Our" +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" msgstr "" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "선택(_l)" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "선택" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "속성" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "내보내기" -#: ../src/symbols.c:766 ../src/symbols.c:855 -msgid "Members" +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "무제" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "상태" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "속성" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" msgstr "" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" msgstr "" -#: ../src/symbols.c:818 +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "" + +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "상태" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\" : 알 수 없는 파일확장자.\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "태그 파일 만들기 실패했습니다. 태그가 없는 것 같습니다.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4113,7 +4358,7 @@ "사용법: %s -g <태그파일> <파일목록>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4124,182 +4369,200 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "태그 불러오기" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "지니 태그 파일 (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "태그파일 %s 불러옴 '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "'%s' 태그파일 불러오기 실패." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "\"%s\" 선언을 찾을 수 없습니다." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" 정의를 찾을 수 없습니다." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "이름순으로 정렬(_N)" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "형태순으로 정렬(_A)" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "현재 파일 저장" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "열린 파일 모두 저장" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "현재 파일을 디스크로부터 다시 불러오기" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "현재 파일 닫기" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "열린 파일 모두 닫기" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "선택한 부분 형식변환" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "현재 파일 컴파일" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "선택한 부분 형식변환" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "최근 수정사항 취소" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "최근 수정사항 다시실행" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "현재 파일 컴파일" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "현재 파일 실행 또는 보기" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "팔레트에서 색상을 고를 수 있도록 색상선택기 실행." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "글꼴 확대" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "글꼴 축소" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "들여쓰기 감소" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "들여쓰기 증가" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "입력한 문자열을 현재파일에서 찾기" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "입력한 줄번호로 이동." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "지니 끝내기" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "XML 문서" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "현재 문서의 모든 일치하는 부분 표시." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "새 파일 만들기" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "새 파일 만들기" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "기존 파일 열기" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "선택한 파일 열기" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "제작오류 더이상 없음." + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "이동" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "표시" @@ -4327,7 +4590,7 @@ msgid "Custom command failed: %s" msgstr "맞춤 명령 실행: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "맞춤 명령 설정" @@ -4339,304 +4602,283 @@ "현재 선택한 부분을 이 명령들에 인계하여 실행하고 그 출력으로 현재 선택한 부분" "을 바꿉니다." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "맞춤 명령 없음." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "단어 세기" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "선택" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "문서 전체" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "범위:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "줄:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "단어:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "문자열:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "태그 없음" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "심볼 목록 보기(_y)" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "문서 목록 보기(_D)" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "가장자리창 감추기(_i)" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "전체 경로명 보기(_F)" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "행: %d\t 열: %d\t 선택: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "읽기전용" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "수정" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "삽입" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "탭" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "스페이스" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "탭/스페이스" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "개행: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "인코딩: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "파일형식: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "수정됨" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "유효범위: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "글꼴 바꿈 (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C 표준 라이브러리" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99 표준" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C 표준 라이브러리)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ 표준 라이브러리" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "맞춤 날짜 형식 설정(_S)" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "폴더 선택" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "파일 선택" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "환경설정 파일 다시 불러옴." - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "모두 저장(_l)" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "모두 닫기(_l)" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "윈도우 (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "매킨토시 (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "유닉스 (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "터미널" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "문서로부터 경로 설정(_S)" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "터미널 다시 시작(_R)" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "입력기(_I)" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "VTE내에서 폴더를 변경할 수 없습니다. 아마도 명령을 포함한것 같습니다." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "터미널 플러그인" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"가상 터미널 에뮬레이터 위젯 (VTE) 설정은 VTE 라이브러리를 불러올 수 있을때만 " -"적용이 가능합니다." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "터미널 글꼴:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "터미널 위젯용 글꼴 설정." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "글자색:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "배경색:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 #, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "터미널 위젯의 글자색 설정." -#: ../src/vte.c:775 +#: ../src/vte.c:771 #, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "터미널 위젯의 배경색 설정." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "명령기록 횟수:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 #, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "터미널 위젯에서 몇개의 명령을 기록해 놓을지 지정." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "셸:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 #, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "터미널 에뮬레이터에서 사용할 셸 지정." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "키누르면 스크롤" -#: ../src/vte.c:820 +#: ../src/vte.c:816 #, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" msgstr "키를 누르면 스크롤할지 여부." -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "출력있으면 스크롤" -#: ../src/vte.c:824 +#: ../src/vte.c:820 #, fuzzy msgid "Whether to scroll to the bottom when output is generated" msgstr "출력이 생기면 스크롤할지 여부." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "코드 접기 활성 여부" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "지니 단축키 변경" -#: ../src/vte.c:833 +#: ../src/vte.c:829 #, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "VTE에서 바로 가기 허가 (포커스 명령 별개)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "메뉴 바로 가기 (F10) 비활성" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4645,22 +4887,22 @@ "팝업메뉴 단축키 F10을 비활성화 합니다.\n" "Midnight Commander등의 프로그램을 VTE안에서 사용할 때 유용합니다." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "현재파일 경로 따르기" -#: ../src/vte.c:841 +#: ../src/vte.c:837 #, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "열린 문서간을 이동할 때 \"cd 경로명\"을 실행할지 여부." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "스크립트 실행 사용하지 않음" -#: ../src/vte.c:847 +#: ../src/vte.c:843 #, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " @@ -4669,11 +4911,11 @@ "실행된 프로그램의 끝내기 상태를 나타내는 간단한 스크립트 실행을 사용하지 않" "음." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "VTE내에서 프로그램 실행" -#: ../src/vte.c:851 +#: ../src/vte.c:847 #, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " @@ -4682,90 +4924,122 @@ "새로운 터미널창을 열지 않고 VTE내에서 프로그램 실행하기.\n" "주의: VTE안에서 실행한 프로그램은 멀출 수 없습니다." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "지니 프로젝트 파일" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "실행가능" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "클래스 빌더" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "새로운 클래스를 만들기 위한 소스파일 만들기." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "클래스 만들기" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "바꾸기" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "이름:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "클래스" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "클래스명:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "헤더 파일:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "소스 파일:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "상속" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "기본 클래스:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "%s 소스 파일" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "기본 헤더:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "전역" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "기본 GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "옵션" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "생성자 만들기" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "소멸자 만들기" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ 생성자 타입" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "클래스 만들기(_s)" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "C++ 클래스(_C)" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "GTK+ 클래스(_G)" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "C++ 클래스(_C)" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML 문자" @@ -4775,52 +5049,57 @@ msgstr "'&' 같은 HTML 문자요소를 삽입." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "지니 개발팀" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML 문자" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 문자" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "그리스어 문자" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "수학 문자" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "기술 문자" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "화살표" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "기능 문자" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "기타 문자" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "플러그인 환경설정 폴더를 만들 수 없습니다." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "특수문자" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "삽입(_I)" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4828,43 +5107,43 @@ "아래 목록에서 커서위치의 특수문자를 더블클릭하거나 삽입 단추를 클릭하여 특수 " "문자를 입력합니다." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "문자" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (이름)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "특수 HTML 문자 삽입(_I)" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "바꾸기" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 #, fuzzy msgid "Bulk replacement of special chars" msgstr "새 파일탭 위치:" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "특수 HTML 문자 삽입" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "특수문자" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 #, fuzzy msgid "Toggle plugin status" msgstr "한줄 주석 전환" @@ -4891,105 +5170,105 @@ "Renders the font size of the document together with the current zoom level" msgstr "현재 확대 수준에 맞게 문서의 글꼴 크기를 표현함." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "문서를 '%s' 형식으로 내보내기 성공." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "'%s' 파일에 쓸 수 없음 (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "기존의 '%s'파일이 있습니다. 바꾸시겠습니까?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "내보내기(_E)" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "HTML 형식으로(_H)" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "LaTeX 형식으로(_L)" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "파일 탐색기" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "가장자리창에 파일 탐색기탭을 추가하기." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "너무 많은 항목을 선택했습니다!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "맞춤 외부 명령 '%s' 실행 실패 (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "외부 파일 탐색기 열기(_e)" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "파일에서 찾기(_F)" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "숨김파일 보기(_H)" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "위로" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "새로 고침" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "내 폴더" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "현재문서 위치로 경로 이동" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "필터 지우기" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "필터:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "파일목록에 포커스 주기" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "경로입력필드에 포커스 주기" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "플러그인 환경설정 폴더를 만들 수 없습니다." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "외부 명령:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5003,27 +5282,27 @@ "%f: 전체 경로를 포함하는 파일 이름.\n" "%d: 파일 이름을 포함하지 않는 경로명." -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "숨김파일 보기" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "오브젝트 파일 감추기" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" "파일탐색기탭에서 오브젝트 파일 (*.o, *.obj, *.so, *.dll, *.a, *.lib) 감추기" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "프로젝트 기반 경로 폴더를 만들까요?" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 #, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" @@ -5129,40 +5408,182 @@ msgid "Splits the editor view into two windows." msgstr "편집창을 두개로 나눔." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "현재 문서의 모든 일치하는 부분 표시." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "창 나누지 않기(_U)" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "창 나누기(_S)" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "수평(_H)" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 #, fuzzy msgid "Split Horizontally" msgstr "수평(_H)" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 +#~ msgid "_Set Includes and Arguments" +#~ msgstr "연결파일 및 인수 설정(_S)" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> DVI(_D)" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> PDF(_P)" + +#~ msgid "_View DVI File" +#~ msgstr "DVI 파일 보기(_V)" + +#~ msgid "V_iew PDF File" +#~ msgstr "PDF 파일 보기(_i)" + +#~ msgid "_Set Arguments" +#~ msgstr "인수 지정(_S)" + +#~ msgid "Set Arguments" +#~ msgstr "인수 설정" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "(La)TeX 파일을 컴파일하고 보기위한 프로그램 및 옵션 설정." + +#~ msgid "DVI creation:" +#~ msgstr "DVI 만들기:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF 만들기:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI 미리보기:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF 미리보기:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f: 현재 파일 이름으로 바꾸기, 예) test_file.c\n" +#~ "%e: 확장자 없는 현재 파일 이름으로 바꾸기, 예) test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "연결파일 및 인수 설정" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "프로그램 제작 및 실행 명령 설정." + +#~ msgid "Compile:" +#~ msgstr "컴파일:" + +#~ msgid "Build:" +#~ msgstr "제작:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "프로그램 보기 실행 실패" + +#~ msgid "Try to resave the file?" +#~ msgstr "다시 저장할까요?" + #, fuzzy -msgid "Unsplit" -msgstr "창 나누지 않기(_U)" +#~ msgid "_Customize Toolbar" +#~ msgstr "도구모음 감추기(_H)" + +#~ msgid "Icon style:" +#~ msgstr "아이콘 양식:" + +#~ msgid "Icon size:" +#~ msgstr "아이콘 크기:" + +#~ msgid "Appearance" +#~ msgstr "모양새" + +#~ msgid "Hard tab width:" +#~ msgstr "하드 탭 너비:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "텝 및 스페이스 설정시 탭 너비" + +#~ msgid "Long line marker:" +#~ msgstr "긴줄 표지:" + +#~ msgid "Long line marker color:" +#~ msgstr "긴줄 표지 색상:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "make 도구의 경로와 옵션" + +#~ msgid "Duplicate line or selection" +#~ msgstr "줄 및 선택한 부분 복제" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "선택한 부분 보내기(_S)" + +#~ msgid "Run (alternative command)" +#~ msgstr "실행 (대안 명령)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "아래는 사용가능한 플러그인 목록입니다.\n" +#~ "지니가 시작할 때 불러올 플러그인들을 선택하십시오." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "%s 파일 인쇄 취소함." + +#~ msgid "Make in base path" +#~ msgstr "기반 경로내에서 Make" + +#~ msgid "Run command:" +#~ msgstr "실행 명령:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "프로젝트 기반 폴더내에서 실행할 명령. 옵션 추가 가능함. 비워두면 디폴트 명" +#~ "령을 실행함." + +#~ msgid "Choose Project Run Command" +#~ msgstr "프로젝트 실행 명령 선택" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "%u 파일의 문자열 바꿈." + +#~ msgid "Terminal plugin" +#~ msgstr "터미널 플러그인" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "가상 터미널 에뮬레이터 위젯 (VTE) 설정은 VTE 라이브러리를 불러올 수 있을때" +#~ "만 적용이 가능합니다." + +#~ msgid "Terminal font:" +#~ msgstr "터미널 글꼴:" + +#, fuzzy +#~ msgid "Unsplit" +#~ msgstr "창 나누지 않기(_U)" #~ msgid "Diff file" #~ msgstr "Diff 파일" @@ -5311,9 +5732,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "가능한 모든 코드블럭을 펴기" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "현재 문서의 모든 오류 지표를 지우기." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5330,9 +5748,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "지니 키보드 바로 가기 목록 보기." -#~ msgid "Color" -#~ msgstr "색상" - #~ msgid "Enter a line number and jump to it." #~ msgstr "입력한 줄번호로 이동." @@ -5407,15 +5822,9 @@ #~ msgid "Items" #~ msgstr "항목" -#~ msgid "Use white text on a black background." -#~ msgstr "검정 배경 흰색 글자." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "디버그 모드로 실행함 (장황함)" -#~ msgid "Search failed." -#~ msgstr "찾기 실패함." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "%s pixmap 파일을 찾을 수 없습니다." diff -Nru geany-0.18/po/lb.po geany-0.19/po/lb.po --- geany-0.18/po/lb.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/lb.po 2010-05-23 09:08:49.000000000 +0100 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-05-31 13:56+0100\n" "Last-Translator: Laurent HOELTGEN \n" "Language-Team: Letzebuergesch\n" @@ -22,7 +22,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "En klenge an schnelle IDE fir GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -30,53 +30,53 @@ msgid "Integrated Development Environment" msgstr "Integréiert Entwécklungsumgebung" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Iwwert Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "En klenge an schnelle IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(compiléiert den %s oder méi spéit)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Entwéckler" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "Haaptentwéckler" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "Entwéckler" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "Iwwersetzungskoordinator" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Iwwersetzer" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Vireg Iwwersetzer" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Kollaborateuren" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -84,15 +84,15 @@ "E puer Kollaborateuren (fir eng méi detailléiert Lescht, kuckt an den " "Fichier %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Credits" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Lizenz" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -100,282 +100,294 @@ "Den Lizenztext konnt net fonnt ginn, gitt w.e.g. op http://www.gnu.org/" "licenses/gpl-2.0.txt fir den Text online ze liesen." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Konnt den Terminal \"%s\" net fannen (kontrolléiert den Pad fir bei den " -"Terminal an den Astellungen)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Konnt d'Aarbechtsverzeechnis net an \"%s\" änneren" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Konnt \"%s\" net ausféieren (Start Skript konnt net erstallt ginn)" +msgid "%s (in directory: %s)" +msgstr "%s (am Ordner: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Prozess feelgeschloen (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (am Ordner: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Konnt d'Aarbechtsverzeechnis net an \"%s\" änneren" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Konnt \"%s\" net ausféieren (Start Skript konnt net erstallt ginn)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Konnt den Fichier net am VTE ausféieren, well en wahrscheinlech eng Commande " "enthält" -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Konnt den Terminal \"%s\" net fannen (kontrolléiert den Pad fir bei den " +"Terminal an den Astellungen)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Compiléieren feelgeschloen." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Compiléieren mat Erfolleg ofgeschloss." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compiléiren" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Erstellen" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make all" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make Custom _Target" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Make mat eegenem Ziel" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make _Object" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Gidd d'benotzerdefinéiert Optiounen hei an. Den ganzen Text gëtt sou un Make " +"weiderginn." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Nächsten Feeler" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "_Viregen Feeler" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Include Parameter an Argumenter uginn" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_DVI Fichier kucken" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "_PDF Fichier kucken" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Benotzerdefinéiert Commanden setzen" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Parameter vum Programm _uginn" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Aktuellen Fichier erstellen" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Parameter vum Programm uginn" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Den aktuellen Fichier mat Make an mam standard Ziel erstellen" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"D'Programmer an d'Optiounen fir (La)TeX Fichieren ze compiléieren an ze " -"kucken uginn" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Den aktuellen Fichier mat Make erstellen an en Ziel uginn" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI erstellen" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Den aktuellen Fichier mat Make compiléieren" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF erstellen" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Prozess konnt net gestoppt ginn (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI Virschau" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Keng weider Feelermeldungen" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF Virschau" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f gëtt duerch den aktuellen Numm vum Fichier ersat, z.B. fichier.c\n" -"%e gëtt duerch den aktuellen Numm ouni Endung vum Fichier ersat, z.B. fichier" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Include Parameter an Argumenter uginn" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Label" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Commande" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "D'Commanden fir Programmer ze erstellen an auszeféieren uginn" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (am Ordner: %s)" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Compiler" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "Commanden fir %s" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compiléieren:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Erstellen:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Den _Typ vun Fichier definéiren" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Ausféieren" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "_Grep regulär Ausdréck" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Aktuellen Fichier erstellen" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make mat eegenem Ziel" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" + +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Benotzerdefinéiert Commanden setzen" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Gidd d'benotzerdefinéiert Optiounen hei an. Den ganzen Text gëtt sou un Make " -"weiderginn." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Den aktuellen Fichier mat Make an mam standard Ziel erstellen" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Benotzerdefinéiert Commanden setzen" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Den aktuellen Fichier mat Make erstellen an en Ziel uginn" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compiléiren" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Den aktuellen Fichier mat Make compiléieren" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Erstellen" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Konnt den Programm fir ze betruechten net ausféieren" +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Ausféieren" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Prozess konnt net gestoppt ginn (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make Custom _Target" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Keng weider Feelermeldungen" +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make _Object" + +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make all" -#: ../src/callbacks.c:152 +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Benotzerdefinéiert Commanden setzen" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Well dier wierklech ophalen?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Fichier %s gespäichert." +msgstr[1] "Fichier %s gespäichert." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Nei lueden" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "All net gespäichert Ännerungen ginn verluer." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Well dier wierklech '%s' nei lueden?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Bei d'Zeil goen" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Gitt d'Zeil an bei déi dier wëllt goen:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Stellt w.e.g. den Fichierstyp fir den aktuellen Fichier an éier dier dës " "Fonctioun benotzt." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Benotzerdefinéierten Format fir den Dat_um benotzen" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Benotzerdefinéierten Format fir den Datum" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -384,24 +396,23 @@ "d'Spécificateuren benotzt ginn, déi och an der ANSI C Fonctioun strftime " "virkommen." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Den Datumsformat konnt net changéiert ginn (wahrscheinlech ze laang)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Keng weider Meldungen." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Fichier opmaachen" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Usicht" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -409,28 +420,28 @@ "Mëscht den Fichier am schreifgeschützten Modus op. Wann méi wei een Fichier " "opgemaach gëtt, dann sinn se all Schreifgeschützt." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Aus der Endung vum Fichier erausfannen" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Aus dem Fichier erausfannen" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Méi Optiounen" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "_Verstoppten Fichieren uweisen" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Zeechencodéierung setzen:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -445,11 +456,11 @@ "Zeechencodéierung opgemaach." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Den Typ vun Fichier definéiren" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -470,23 +481,23 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Fichier späicheren" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Ëmb_enennen" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Den Fichier späicheren an ëmbenennen" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "Fichier an engem neien tab _opmaachen" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -494,41 +505,41 @@ "Den momentan oppenen Fichier op loossen an den neien gespäicherten Fichier " "an engem neien Tab opmaachen" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Feeler" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Fro" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Informatioun" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Net späicheren" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Den Fichier '%s' ass net gespäichert." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Well dier virum zoumaachen späicheren?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Schrëft auswielen" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -536,106 +547,110 @@ "Et ass en Feeler opgetrueden oder d'Informatiounen vum Fichier konnten net " "fonnt ginn (e.g. vun engem neien Fichier)" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "onbekannt" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Eegenschaften" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Typ" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Gréisst:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Plaz:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Schreifgeschützt:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(nëmmen am Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Zeechencodéierung:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(mat BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(ouni BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modifiéiert:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Geännert:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Zougrëff:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Zougrëffsrechter:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Liesen:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Schreiwen:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Ausféieren" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Besëtzer:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grupp:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Anerer" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Den Fichier %s as zou" -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Neien Fichier \"%s\" opgemaach." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnt den fichier %s (%s) net opmaachen" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -650,12 +665,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Den Fichier \"%s\" as keen gültegen %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -664,30 +679,30 @@ "Den Fichier \"%s\" ass keen Text Fichier oder d'Zeechencodéierung gëtt net " "ënnerstetzt" -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Espacen" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabs" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabs an Espacen" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Stellt den Aréckungsmodus %s fir %s an." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Den Numm vum Fichier as ongülteg" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Fichier %s nei gelueden" @@ -695,20 +710,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Fichier %s opgemach(%d%s)" -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", schreifgeschützt" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Feeler beim ëmbenennen vum Fichier" -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -717,7 +732,7 @@ "Et ass en Feeler geschitt beim konvertéiren vum Fichier vun UTF-8 an \"%s\". " "Den Fichier ass net gespäichert." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -726,52 +741,52 @@ "Feelermeldung: %s\n" "Et as en Feeler em \"%s\" (Zeil: %d, Kolonn: %d) geschitt." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Feelermeldung: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Feeler beim späicheren vum Fichier" -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Feeler beim späicheren vum Fichier (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Fichier %s gespäichert." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" konnt net fonnt ginn." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "D'Sich um Ufank resp. Enn vum Dokument weiderféieren?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Keng Iwwerteneestëmmung fond fir \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mol gouf \"%s\" duerch \"%s\" ersaat." msgstr[1] "%s: %d mol gouf \"%s\" duerch \"%s\" ersaat." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Wierklech nei lueden?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -780,23 +795,28 @@ "Den Fichier '%s' um Disque ass manner al wei\n" "déi Versioun déi am Moment op ass." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Probéieren den Fichier nach eng kéier ze späicheren?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Den Fichier \"%s\" konnt net fonnt gin!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Breet vun engem Tab aginn" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "D'Unzuel un Espacen aginn déi en Tab sollen ersetzen" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltesch" @@ -907,574 +927,637 @@ msgid "Without encoding" msgstr "Ouni Zeechencodéierung" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Westeuropäesch" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "Ost_europäesch" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Ost_asiatesch" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_Südost & Südwest Asien" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Mëttleren Osten" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s Quellcode Fichier" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "%s Quellcode Fichier" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Ouni" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell Skript Fichier" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML Dokument" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump Fichier" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Config Fichier" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Fichier mat enger Gettext Iwwersetzung" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s Skript Fichier" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Programméiersproochen" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Skriptsproochen" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Markup Sproochen" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "_Aner Sproochen" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Den _Typ vun Fichier definéiren" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "All d'Quellen" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "All d'Fichieren" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechten regulären Ausdrock fir den Typ vun Fichier %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "ouni Titel" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Konnt den Fichier '%s' net fannen." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "_Faarwe auswielen" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Fichier" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nei (mat _Virlag)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "onsiichtbar" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "dummy tooltip, nët iwwersetzen." - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Ausgewielten F_ichier opmaachen" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Fir d'läscht opgemaach" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "A_ll späicheren" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Nei _lueden als" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "onsiichtbar" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Saitenastell_ungen" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Aner Dokumenter _zoumaachen" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "A_lles zoumaachen" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "B_eaarbeschten" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Formateiren" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Gr_ouss an Klengschreiwen an der Auswiel vertauschen" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Aktuell Zeil tauschen" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Zeil(en) _kommentéiren" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Zeil(en) auskomme_ntéiren" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Kommen_téierung ëmdréinen" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Zeil oder Auswiel ko_péieren" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Mé_i arécken" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "M_anner arécken" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "Au_swiel un den Terminal schecken" +#: ../src/interface.c:537 ../src/keybindings.c:361 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Intelligent Arécken" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Au_swiel verschécken un" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Commande" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Aktuell Zeil(en) ausschneiden" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Aktuell Zeil(en) kopéieren" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Aktuell Zeil(en) löschen" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "Zeil oder Auswiel ko_péieren" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Aktuell Zeil(en) auswielen" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Aktuellen Abschnitt auswielen" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Alternativ Ofstänn afügen" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Bei déi nächst Markéierung goen" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Bei d'Markéierung vun virdrun goen" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Au_swiel un den Terminal schecken" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Kommentar _afügen" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "_Changelog Entrée androen " -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "_Kappzeil afügen" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Beschreiwung vun der _Fonctioun afügen" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "En puer Zeilen laangen Ko_mmentar afügen" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "_GPL Notiz afügen" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "_BSD Lizenz Notiz afügen" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Datum afüg_en" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr " \"include <...>\" _afügen" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "A_stellungen" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Astellungen" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Sichen" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "_Nächsten fannen" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "_Viregen fannen" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "An den F_ichieren fannen" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "E_rsetzen" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Au_swiel fannen" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Sélectioun vun _virdrun fannen" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Nächsten _Message" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "M_essage vun virdrun" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Zur Zeil _goen" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Schrë_ft änneren" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "_Zousätzlech Infofënsteren aus- oder ablennen" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Vollbild_schierm" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Noriichtenfënster u_weisen" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "_Geschirleescht uweisen" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Säitenleescht u_weisen" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "_Markéierungsrand uweisen" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Zei_lennummer uweisen" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Espacen u_weisen" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Zeilen_enn uweisen" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "_Aréckungshëllef uweisen" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Dokument" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Opteschen Zei_lenëmbroch" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Zeilenem_broch" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Automatesch arécken" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Type vun _Aréckung" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabs" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Espacen" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abs an Espacen" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "_Nëmmen liesen" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Unicode BOM schrei_wen" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Den _Typ vun Fichier definéiren" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Z_eechencodéierung setzen" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Zeilen_enn festleeën" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Konvertéieren an anstellen op _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Konvertéieren an anstellen op _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Konvertéieren an anstellen op CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Of_stänn um Zeilenenn läschen" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Tabulatoren duerch Ofstänn e_rsetzen" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "_Ofstänn duerch Tabulatoren ersetzen" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Alles Zesumme_klappen" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Alles Era_usklappen" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "_Markéierung ewechmaachen" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Feelermarké_ierungen ewechmaachen" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projet" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nei" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Opmaachen" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Fi_r d'läscht opgematen Projeten" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Zoumaachen" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Geschir" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Configuratioun nei lueden" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Fichieren fir d'K_onfiguratioun" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Faarwe auswielen" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Wierder zielen" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Ta_gs lueden" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Configuratioun nei lueden" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Hëllef" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Websäit" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Kierzel" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Debug Messagen" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symboler" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Dokumenter" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Status" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Messagen" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Biller _an Text" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Nëmmen B_iller" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Nëmmen _Text" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Grouss Symboler" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Kleng Symboler" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Gan_z kleng Symboler" - -#: ../src/interface.c:1769 +#: ../src/interface.c:1887 #, fuzzy -msgid "_Customize Toolbar" -msgstr "Gesc_hirleescht verstoppen" +msgid "_Toolbar Preferences" +msgstr "Astellungen" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 #, fuzzy msgid "_Hide Toolbar" msgstr "Gesc_hirleescht verstoppen" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "_An allen Dokumenter nosichen" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Am _Dokument nosichen" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Bei d'Definitioun vum _Tag goen" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Bei d'Declaratioun vum T_ag goen" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Konte_xt Aktioun" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Astellungen" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Fichieren aus der leschter Sëtzung lueden" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Mëscht beim Starten d'Fichieren vun der leschter Sëtzung op" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Ënnerstëtzung fir en virtuellen Terminal lueden" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1482,41 +1565,41 @@ "Ob den virtuellen Terminal (VTE) beim Start gelueden soll ginn, dier kënnt " "en deaktivéieren wann dier en net braucht" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "PlugIn Ënnerstëtzung aschalten" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Positioun an d'Mossen vun der Fënster späicheren" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Späichert d'Positioun an d'Moss vun der Fënster an stellt se beim Start nees " "sou an" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Ophalen bestätegen" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "En Dialog uweisen fir d'Erausgoen ze bestätegen" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Ausschalten" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Startpad:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1525,19 +1608,19 @@ "absolut sinn. Fir den aktuellen Aarbeschtsordner ze benotzen loosst d'Feld " "eidel." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Fichieren vum Projet:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Pad fir Projetsfichieren opzemaachen" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Extra PlugIn Pad" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1547,19 +1630,19 @@ "Konfiguratiounsordner. En Pad den hei aginn gëtt, gëtt zousätzlech bei der " "Sich no PlugIn berücksichtegt. D'Feld gëtt ignoréiert wann et eidel ass." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Weeër" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Ufänken" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Pieptoun ausginn wann Feeler optrieden oder d'Compiléieren fäerdeg ass" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1567,11 +1650,11 @@ "Ob en Pieptoun ausginn gëtt wann en Feeler optrëtt oder wann den " "Compiléierviergang eriwwer ass" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Bei neien Meldungen an d'Fënster vun den Statusmeldungen wiesselen" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1579,11 +1662,11 @@ "Wiesselt automatesch an den Tab mat den Statusmeldungen am Infoberäich, wann " "eng nei Statusmeldung do ass." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Keng Statusmeldungen an der Statuszeil uweisen" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1591,12 +1674,12 @@ "Läscht all d'Meldungen an der Statuszeil. D'Meldungen ginn nach ëmmer an der " "Fënster fir Statusmeldungen ugewisen." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (den Fokus geet der Maus no)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1606,15 +1689,25 @@ "fir d'Haaptfënster, dem Notizbuch, dem Sich an Goen Feld an der " "Geschirleescht an fir den VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Verschiddenes" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Ëmmer dat ganzt Dokument duerchsichen an d'Sichfënster verstoppen" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1622,30 +1715,30 @@ "Ëmmer dat ganzt Dokument duerchsichen an den Sich-Dialog beim Klicken op " "Nächsten/Viregen zoumaachen" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Dat Wuert ennert dem Curseur sichen" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "Benotzt dat Wuert ënnert dem Curseur beim Sichen an Ersetzen" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "" "Den Ordner vum aktuellen Fichier benotzen fir 'An den Fichieren fannen'" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Sichen" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Sëtzung am Projet späichern an erëm opmaachen" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1653,11 +1746,11 @@ "Späichert déi oppen Fichieren (aktuell Sëtzung) zesummen mam Projet an " "mëscht déi Fichieren och erëm op wann den Projet opgemaach gëtt." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Projetsfichier am Projetsbasisordner erstellen" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1669,75 +1762,99 @@ "Ordner iwwert dem Basisordner. Dier kënnt den Pad vum Projetsfichier nach " "ëmmer am 'Neie Projet' Dialog änneren." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projeten" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Verschiddenes" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Allgemeng" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Lëscht mat den Symboler uweisen" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Lescht mat den Symboler un an ausschalten" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Lëscht mat den Fichieren uweisen" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Lescht mat den Dokumenter un an ausschalten " -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Säitenleescht u_weisen" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Beschreiwung:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Lenks" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Riets" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Saitenleescht" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Lëscht mat den Symboler" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Noriichtenfënster:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "D'Schrëft fir d'Noriichtenfënster astellen." -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Stellt d'Schrëft fir d'Symbollescht an" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Stellt d'Schrëft vum Editor an" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Schrëften" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Tabs vum Editor uweisen" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Knäppchen fir zouzemaachen uweisen" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1745,113 +1862,144 @@ "Weist en klengt Kräiz an den Tabs vun den Fichieren un fir se einfach duerch " "klicken op d'Kräiz zouzemaachen." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Positioun vun den Tabs vun neien Fichieren:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Lenks" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Nei Tabs ginn lenks vun der Lescht mat den Fichieren plazéiert" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Riets" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Nei Tabs ginn riets vun der Lescht mat den Fichieren plazéiert" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Den aktuellen Fichier späicheren" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Duebel-klicken verstoppt all déi zousätzlech Fënsteren" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Rifft d'Commande Usicht->Zousätzlech Infofënstern an/ausblennen" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Editor Tabs" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Uewen" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Ënnen" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Saitenleescht:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Tab Positioun" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Statusleescht uweisen" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ob d'Statusleescht ennen an der Haaptfënster soll ugewisen ginn" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 #, fuzzy msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "_Geschirleescht uweisen" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Geschirleescht un den Menü unhänken" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Setzt d'Geschirleescht direkt hannert den Haaptmenü fir vertikal Plaz ze " "spueren." -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Geschirleescht" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Symbolstil:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Symbolgréisst:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Apparence" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy msgid "Customize Toolbar" msgstr "_Geschirleescht uweisen" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Biller _an Text" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Nëmmen B_iller" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Nëmmen _Text" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Schrëften" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Kleng Symboler" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Gan_z kleng Symboler" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Grouss Symboler" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Gréisst:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Geschirleescht" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Geschirleescht" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Visuellen Zeilenëmbroch" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1862,11 +2010,11 @@ "Zeilenëmbroch vill Rechenleeschtung an sollt dowéinst op méi luesen " "Maschinnen deaktivéiert ginn." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "\"Intelligenten\" Home Knäppchen aschalten" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1880,11 +2028,11 @@ "spréngt den Curseur ëmmer un den Ufank vun der Zeil ouni op déi aktuell " "Positioun Récksiicht ze huelen." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivéieren" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1893,21 +2041,21 @@ "keng Auswiel innerhalb oder ausserhalb vun der Editorsfënster méi kënnt hin " "an hier beweegen." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Eranklappen aschalten" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "" "Leet fest op et méiglech soll sinn verschidden Deeler vum Quellcode " "auszeblennen" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "All ënnergeuerdnet Quellcodebléck eran/erausklappen" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1916,11 +2064,11 @@ "gedréckter Shift Tast gëtt den Géigendeel gemat wann op d'Symbol geklickt " "gëtt." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Markéierungen benotzen fir Feeler beim compiléieren unzeweisen" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1928,25 +2076,25 @@ "Ob Markéierungen (gewellten Stricher) sollen benotzt ginn fir Zeilen ze " "zeechnen an deenen den Compiler Feeler oder Warnungen fonnt huet" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Eng nei Zeil läscht d'Ofstänn um Enn vun der Zeil vun virdrun" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Beim wiessel an eng nei Zeil, ginn d'Ofstänn um Enn vun der Zeil vun virdrun " "geläscht" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Kolonn fir den automateschen Zeilenëmbroch" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Kommentaremschaltzeechen:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1955,68 +2103,58 @@ "Kommentar ze markéieren den duerch en Tastenkierzel an- oder ausgeschalt " "kann ginn." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Fonctiounen" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Fonctiounen" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Automatesch arécken Modus:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Momentan Buschtawen" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Klameren déi iwwerteneestëmmen" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Breet:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Breet an Buschtawen vun enger eenzelnen Aréckung" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Espacen benotzen fir anzerécken." -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Een Tab pro Aréckung benotzen" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Ofstänn benotzen wann déi ganz Aréckung méi kleng ass wei d'Breet vun engem " "Tabulator, soss déi zwee benotzen" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Breet vun engem Tabulator" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"D'Breet vun engem Tabulator wann Tabulatoren an Ofstänn fir d'Dokument " -"agestallt ass" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2024,30 +2162,30 @@ "Ob den Aréckungstyp mat Hëllef vum Inhalt vum Fichier beim opmaachen vum " "Fichier soll erausfonnt ginn" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Mat der Tabulator Tast arécken" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Tabulator an Shift+Tabulator récken den Text eran oder eraus aplaz en " "Tabulator Zeechen anzefügen" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Aréckung:" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Aréckung" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Code Vervollstännegung" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2055,21 +2193,21 @@ "Duerch drécken vun enger Tast en kuerzt Stéck Code zu engem méi komplexen " "Text erweideren" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Automatesch XML Tag Vervollstännegung" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Automatesch Vervollstännegung an Zoumaachen vun XML tags (och HTML tags)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Automatesch weiderfueren bei Kommentaren iwwert en puer Zeilen" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2077,11 +2215,11 @@ "Verlängert den Kommentarberäich an den Sproochen C, C++ an Java, wann eng " "nei Zeil an engem Kommentar derbäi gesat gëtt." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2089,28 +2227,28 @@ "Automatesch Vervollstännegung vun bekannten Symboler an oppenen Fichieren " "(Fonctiounsnimm, global variabelen, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Max. Unzuel un Virschléi fir Vervollstännegung vun Symboler:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Heischt vun Wuertvervollstännegungslescht" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Unzuel un agetippten Zeechen fir d'Wuertvervollstännegung:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " @@ -2119,119 +2257,115 @@ "D'Unzuel un Zeechen déi néideg sinn, fir d'Lescht mat der automatescher " "Wuertvervollstännegung unzeweisen" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Héicht vun der Vervollstännegungslescht" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Maximal Unzuel un Virschléi déi an der Vervollstännegungslescht ugewisen " "sollen ginn" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Vervollstännegungen" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Klameren ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Klameren automatesch zoumaachen wann eng Klamer opgemaach gëtt" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Einfach Gänseféisercher ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Einfach Gänseféisercher beim antippen automatesch zoumaachen" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Gewellten Klameren" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Ronn Klameren automatesch zoumaachen wann eng Klamer opgemaach gëtt" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Eckeg Klameren [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Eckeg Klameren automatesch zoumaachen wann eng Klamer opgemaach gëtt" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Duebel Gänseféisercher \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Duebel Gänseféisercher beim antippen automatesch zoumaachen" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Gänseféisercher an Klammeren automatesch zoumaachen" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Vervollstännegungen" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Syntaxervirhiewung emdréinen" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Wäissen Text op schwaarzem Hannergrond benotzen an all d'Faarwen ëmdréinen, " -"Geany muss duerfir nei gestart ginn" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Hëllef fir d'Aréckung uweisen" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Weist eng getëppelt Linn un fir d'Aréckung ze erliichteren" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Espacen uweisen" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markéiert Ofstänn mat Punkten an Tabulatoren mat Feiler" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Zeilenenn uweisen" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Zeechen fir Zeilenenn uweisen" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Zeilennummer uweisen" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Weist oder verstoppt den Rand mat den Zeilennummeren" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Markéierungsrand uweisen" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2239,36 +2373,37 @@ "Weist oder verstoppt den klengen Rand riets vun den Zeilennummeren, den " "benotzt gëtt fir d'Markéierungen unzeweisen" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Um Enn vum Dokument net méi weiderscrollen" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Ob um Enn vum Dokument nach eng Säit laang weidergescrollt kann ginn" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Uweisen" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Zeilenlängt markéieren bei:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Faarf vun der Markéierung:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Firma:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "" + +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Stellt d'Faarf vun der Ëmbrochhëllef fir laang Zeilen an" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Faarf auswielen" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2279,11 +2414,11 @@ "eventuellen Zeilenembroch hinzeweisen. Wäerter méi grouss wei 0 ginn Kolonn " "un an där d'Linn soll ugewisen ginn." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Zeil" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2291,11 +2426,11 @@ "Setzt eng vertikal Linn an d'Editorsfënster bei d'Positioun vum Curseur déi " "uginn gouf (kuckt ënnen)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Hannergrond" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2305,113 +2440,150 @@ "dei festgeluegt gouf (kuckt ënnen), gëtt an dei Faarf geännert déi uginn " "gouf. (praktesch fir proportional Schrëften." -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Deaktivéiert" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "Aschalt_en" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Zeilenlängt markéieren bei:" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Deaktivéiert" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Läscht Ofstänn an Tabulatoren um Enn vun enger Zeil" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Pad bei d'Geschir" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Uweisen" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Nei Fichieren vun der Kommandozeil aus opmaachen" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Mëscht en neien Fichieren op fir all Fichiersnumm den an der Kommandozeil " "aginn gouf mä net existéiert" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Standard Zeechen fir Zeilenenn:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nei Fichieren" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Stellt dei standard Zeechencodéierung fir nei Fichieren an" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Standard Zeechencodéierung (nei Fichieren):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Standard Zeechencodéierung (Fichieren déi existéieren):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Stellt dei standard Zeechencodéierung beim opmaachen vun Fichieren an" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Stellt dei standard Zeechencodéierung fir nei Fichieren an" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Eng bestëmmten Zeechencodéierung beim opmaachen vun Fichieren benotzen" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Dës Optioun deaktivéiert d'automatesch Erkennung vun der Zeechencodéierung " "beim opmaachen vun Fichieren an mëscht den Fichier mat der Zeechencodéierung " "op déi uginn gouf (am Prinzip net néideg)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Standard Zeechencodéierung (Fichieren déi existéieren):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Stellt dei standard Zeechencodéierung beim opmaachen vun Fichieren an" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Zeechencodéierungen" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Garantéiert dass déi Läscht Zeil vum Fichier eidel ass." -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Garantéiert dass um Enn vum Fichier ëmmer eng eidel Zeil steet." -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Läscht Ofstänn an Tabulatoren um Zeilenenn" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Läscht Ofstänn an Tabulatoren um Enn vun enger Zeil" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Tabs duerch Espacen ersetzen" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "All Tabs am Dokument duerch Espacen ersetzen" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Fichieren späicheren" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Unzuel vun den fir d'läscht opgematen Fichieren:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Setzt d'Unzuel un Fichieren déi an der Lescht vun den fir d'läscht opgematen " "Fichieren ugewisen ginn." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Zäitintervall zum Préiwen vun Ännerungen um Fichier:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2419,27 +2591,20 @@ "Wei oft kontrolléiert soll ginn op den Fichier op der Festplack changéiert " "huet. Null deaktivéiert d'Kontrolléieren." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Fichieren" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Pad an Optiounen fir den make Programm" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2447,23 +2612,23 @@ "En Terminal Emulator wei xterm, gnome-terminal oder konsole (en sollt den -e " "Argument unhuelen)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pad (an aner argumenter) zu ärem Browser" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Pad bei d'Geschir" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Kontext Aktioun:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2474,67 +2639,67 @@ "ginn. Et kann iwwerall an der Commande virkommen an gëtt virun der " "Ausféierung ersat." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Commanden" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Geschir" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "E-mail Adress vum Entwéckler" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Initialen vum Numm vun Entwéckler" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Ufänglech Versiounsnummer" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Ufänglech Versiounsnummer vun engem neien Fichier" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Numm vun der Firma" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Entwéckler:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "E-mail Adress:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Den Numm vum Entwéckler" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Joer:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Datum & Zäit:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2543,7 +2708,7 @@ "déi Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " "benotzt kënnen ginn." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2552,7 +2717,7 @@ "Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " "benotzt kënnen ginn." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2561,65 +2726,65 @@ "Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " "benotzt kënnen ginn." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Donnéeën vir Virlagen" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Virlagen" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Ä_nneren" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Tastatur Kierzel" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Kierzel" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Commande:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Pad zur Commande fir Fichieren ze drécken (benotzt %f fir den Numm vum " "Fichier)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Eng extern Commande fir ze drécken benotzen" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Zeilennummer drécken" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Mat Zeilennummeren drécken " -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Säitenzuel drécken" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Säitenzuel um Enn vun all Säit uginn. Duerfir ginn 2 Zeilen vun der Säit " "gebraucht." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Kappzeil drécken" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2628,19 +2793,19 @@ "Fichier an dem aktuellen Datum (c.f. Ënnen). Duerfir ginn 3 Zeilen vun der " "Säit gebraucht" -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Den Basisnumm vum gedréckten Fichier benotzen." -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Nemmen den Basisnumm (ouni den Pad) vum gedréckten Fichier drécken" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Format vum Datum:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2650,551 +2815,578 @@ "déi Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " "benotzt kënnen ginn." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "GTK-Dréckënnerstëtzung benotzen" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Zeechencodéierung:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Drécken" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Eegenschaften vum Projet" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Uweisen" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Ausschneiden" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Fichier" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nei" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Opmaachen" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Ausgewielten Fichier opmaachen" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Späicheren" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Späicheren als" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Alles späicheren" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Drécken" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Zoumaachen" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Alles zoumaachen" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Fichier nei lueden" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Projet" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Eegenschaften vum Projet" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Réckgängeg" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Widderhuelen" -#: ../src/keybindings.c:236 -#, fuzzy -msgid "Duplicate line or selection" -msgstr "Zeil oder Auswiel duplizéieren" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Aktuell Zeil(en) löschen" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Aktuell Zeil(en) löschen" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Aktuell Zeil tauschen" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Bei dei aktuell Zeil scrollen" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Eng Zeil no uewen scrollen" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Eng Zeil no ennen scrollen" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Code vervollstännegen" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Mauszeiger am Codestéck beweegen" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Keng Vervollstännegung vun Code" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Kontext Aktioun" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Wuert vervollstännegen" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Calltip uweisen" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Lescht mat den Makroen uweisen" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Code Vervollstännegung" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Zeil(en) kommentéiren" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Zeil(en) kommentéiren" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Zwëschenspäicher" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Ausschneiden" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopéieren" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Afügen" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Aktuell Zeil(en) kopéieren" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Aktuell Zeil(en) ausschneiden" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Auswielen" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Alles Auswielen" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Aktuellt Wuert auswielen" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Aktuell Zeil(en) auswielen" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Bei dat Deelwuert vun virdrun goen" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Aktuellen Abschnitt auswielen" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Bei dat nächst Deelwuert goen" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Grouss an Klengschreiwen an der Auswiel vertauschen" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Kommentéierung ëmdréinen" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Zeil(en) kommentéiren" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Zeil(en) auskommentéiren" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Méi arécken" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Manner arécken" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Aréckung ëm een Ofstand vergréisseren" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Aréckung ëm een Ofstand verklengeren" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Intelligent Arécken" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Un d'Benotzerdefinéiert Commande 1 schécken" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Un d'Benotzerdefinéiert Commande 2 schécken" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Un d'Benotzerdefinéiert Commande 3 schécken" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Auswiel un den Terminal schecken" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Afügen" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Datum afügen" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Alternativ Ofstänn afügen" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Astellungen" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Sichen" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Fannen" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Nächsten fannen" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Viregen fannen" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Déi nächst Auswiel fannen" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Vireg Auswiel fannen" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "An den Fichieren fannen" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Nächsten Message" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Viregen Message" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "An allen Dokumenter nosichen" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Am Dokument nosichen" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "_Make all" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Goen" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Eng Positioun no vir goen" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Eng Positioun no hannen goen" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Bei déi passend Klamer goen" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Markéierung setzen" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Bei déi nächst Markéierung goen" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Bei d'Markéierung vun virdrun goen" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Bei d'Definitioun vum Tag goen" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Bei d'Declaratioun vum Tag goen" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Un den Ufank vun der Zeil goen" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Un den Enn vun der Zeil goen" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Un den Enn vun der Zeil goen" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Bei dat Deelwuert vun virdrun goen" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Bei dat nächst Deelwuert goen" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Usicht" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Zousätzlech Infofënstern an/ausblennen" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Vollbildschierm" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Noriichtenfënster verstoppen" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Saitenleescht un an ausschalten" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Eran zoomen" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Eraus zoomen" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Eraus zoomen" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Fokusséiren" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Zum Editor wiesselen" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "An den Notizblock wiesselen" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "An den VTE wiesselen" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "An d'Sichfënster wiesselen" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "An d'Saitenleescht wiesselen" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Zum Compiler wiesselen" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "An d'Saitenleescht wiesselen" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Noriichtenfënster u_weisen" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Zum Dokument wiesselen" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "An d'Saitenleescht wiesselen" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Tab" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Zum lenken Dokument wiesselen" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Zum rietsen Dokument wiesselen" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Zum läscht benotzten Dokument wiesselen" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Dokument no lenks beweegen" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Dokument no riets beweegen" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Dokument un den Ufank beweegen" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Dokument un den Schluss beweegen" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Visuellen Zeilenembroch emschalten" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Automateschen Zeilenembroch emschalten" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Ofstänn duerch Tabulatoren ersetzen" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Aktuell Fal emdréinen" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Zesummeklappen" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Erausklappen" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Lescht mat den Symboler nei lueden" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "_Markéierung ewechmaachen" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Feelermarké_ierungen ewechmaachen" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Compiléieren" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make mat eegenem Ziel" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Nächsten Feeler" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Viregen Feeler" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Ausféiren" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Ausféieren (alternativ Commande):" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Optiounen fir d'Erstellung" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Faarwe Auswieler uweisen" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Hëllef" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Tastatur Kierzel" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Déi folgend Kierzel kënnen agestallt ginn:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Zum Dokument wiesselen" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Hei kënnt dier aginn wat dier wëllt, benotzt et wei en Notizbuch" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Konnt verschidden Sëtzungsfichieren net lueden." @@ -3202,7 +3394,12 @@ msgid "Debug Messages" msgstr "Debug Messagen" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Sichen" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3210,87 +3407,96 @@ "Setzt Kolonnennummer am fir d'éischt opgematen Fichier. Sënnvoll nëmmen an " "Kombinatioun mat der Optioun -l oder --line" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "En Alternativen Configuratiounsordner benotzen." -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Ausféierlech Angaben" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Weist déi ënnerstëtzen Fichierstypen un" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Globalen Tag Fichier erstellen (Dokumentatioun beuechten)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "C/C++ Präprozessor iwwersprangen, wann en Tag Fichier erstallt gëtt" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Fichieren net an enger schonns lafenden Instanz, mä an enger neien Instanz " "opmaachen" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Setzt d'Zeilennummer am fir d'éischt opgematen Fichier" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "D'Noriichtenfënster beim Start net uweisen" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "" "Automatesch Vervollstännegungsdonnéeen net lueden (Dokumentatioun beuechten)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Keng PlugIns lueden" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Den Installatiounsordner vun Geany ausginn" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Fichieren aus der Sëtzung vun virdrun net lueden" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Keng Ënnerstëtzung fir den Terminal lueden" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Den Numm vum Fichier libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Ausféierlech Angaben" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Versioun uweisen an nees erausgoen" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FICHIEREN...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(compiléiert den %s mat GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Elo Beweegen?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany muss ären aalen Configuratiounsordner virum Start beweegen." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3299,7 +3505,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3308,7 +3514,7 @@ "Ären aalen Configuratiounsordner \"%s\" konnt nët no \"%s\" beweegt ginn (%" "s). Beweegt den Ordner w.e.g. manuell." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3320,38 +3526,43 @@ "gëtt.\n" "Geany trotzdem starten?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Konnt den Fichier '%s' net fannen." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Dëst as Geany '%s'." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Den Cofiguratiounsordner konnt net erstallt ginn (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Fichier mat den Configuratiounen nei gelueden." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Status Messagen" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Kopéieren" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "_Alles kopeiren" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Noriic_htenfënster verstoppen" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3360,11 +3571,11 @@ "Den PlugIn \"%s\" ass net compatibel mat dëser Versioun vun Geany - dier " "musst en nei compiléieren." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "_PlugIn Manager" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3375,82 +3586,90 @@ "Beschreiwung: %s\n" "Auteur(en): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Keng PlugIns verfügbar" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Hei ass eng Lescht mat verfügbaren PlugIns. Wielt déi PlugIns eraus déi beim " -"start vun Geany gelueden sollen ginn." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Detailer vum PlugIn" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Knäppchen drécken" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Dréckt den Kierzel den dier fir \"%s\" wëllt benotzen." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "Alles _erausklappen" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Alles eran_klappen" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Aktioun" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Ofkierzung" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "I_wwerschreiwen" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Den Kierzel iwwerschreiwen?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Den Kierzel '%s' gëtt schonns fir \"%s\" benotzt." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Den Pad bei d'Geschir ënnen aginn. Den Pad fir Geschir dat dier net braucht " "kann eidel gelooss ginn." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3458,7 +3677,7 @@ "D'Informatiounen astellen déi an den Virlagen soll benotzt ginn. Kuckt an " "d'Dokumentatioun fir méi Detailer." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3469,7 +3688,7 @@ "opruffen" #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3480,7 +3699,7 @@ "zweemol op eng Aktioun fir den Kierzel direkt ze änneren." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3490,7 +3709,7 @@ "heich) ausgefouert gëtt." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3506,45 +3725,45 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Sait %d vun %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Dokument ariichten" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Nemmen den Basisnumm (ouni den Pad) vum gedréckten Fichier drécken" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Säit %d vun %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Drécken vum Fichier %s gouf ofgebrach." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Den Fichier %s gouf gedréckt" +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Den Fichier %s konnt net gedréckt gin (%s)" -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" "W.e.g. fir d'eischt eng Commande fir ze drécken an den Astellungen aginn." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3555,38 +3774,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Den Fichier %s konnt net gedréckt gin (Code: %s)" +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Den Fichier %s gouf gedréckt" + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "Projeten" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Neie Projet" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "E_rstellen" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Numm:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Numm vum Fichier:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Basis Pad:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3596,124 +3820,117 @@ "wielen deen et schon gëtt oder awer en neien Ordner uginn. Den Pad kann an " "absoluter oder relativer Form uginn ginn." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Den basis Pad vum Projet wielen" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projetsfichier \"%s\" konnt net gelueden gin." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Projet Opmaachen" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Fichieren vum Projet" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projet \"%s\" gouf zougemaach" -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Beschreiwung:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Make am basis Pad" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Commande ausféieren:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Sect1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Commande déi am Projetsbasisordner ausgefouert soll ginn. Parameteren kënnen " -"hannert der Commande kommen. Loosst d'Feld eidel wann dier " -"d'Standardcommande wëllt benotzen." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Muster vum Fichiersnumm:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Wëllt dier et zoumaachen virum weiderfueren?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Den Projet '%s' ass schonns op" -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Den Numm fir den Projet ass ze kuerz" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Den Numm fir den Projet ass ze laang (max. %d Buschtawen)" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Dier hutt en schlechten Numm fir den Projetsfichier uginn." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Soll den Projetsbasisordner erstallt ginn?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Den Pad \"%s\" existéiert net." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Den Projetsordner konnt net erstallt ginn (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Projetsfichier konnt net geschriwwen ginn (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projet \"%s\" erstallt." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Den Projet \"%s\" gouf gespäichert." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Fichiersnumm vum Projet wielen" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Commande auswielen fir den Projet auszeféieren." - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Den Projet \"%s\" ass op." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Reg_ulär Ausdréck benotzen" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3721,15 +3938,15 @@ "POSIX-ähnlech regulär Ausdréck benotzen. Fir weider Informatiounen iwwert " "regulär Ausdréck kuckt w.e.g. an d'Dokumentatioun." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "_Hannerzeg sichen" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "_Escape Sequenzen benotzen" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3737,410 +3954,433 @@ "Ersetzt \\\\, \\t, \\n, \\r an \\uXXXX (Unicode Zeechen) duerch déi " "entspriechend Zeechen" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Grouss _an Klengschreiwung ënnerscheeden" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Nëmmen ganz _Wierder fannen" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Wuert_ufank fannen" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "V_ireg" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Nächsten" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Sichen:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Alles _fannen" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Markéieren" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "All d'Iwwerteneestëmmungen am aktuellen Dokument markéieren" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "An der Sët_zung" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "Am _Dokument" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "_Dialog zoumaachen" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Dës Optioun deaktivéieren fir den Dialog net zouzemaachen" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Ersetzen & Fa_nnen" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Ersetzen duerc_h:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "A_lleguer ersetzen" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "An der Sé_lectioun" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "All Iwwerteneestëmmungen am momentan ausgewielten Text ersetzen" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Or_dner:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "E_ncodage:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Fes_t Zeechenketten" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep regulär Ausdréck" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Consultéiert d'grep Benotzerhandbuch fir weider Informatiounen" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Erweidert regulär Ausdréck benotzen" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_An den Ënnerordneren" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "S_ichmuster emdreinen." -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Changéiert d'Iwwerteneestëmmungen sou dass net ausgewielten Zeilen " "ausgewielt ginn" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "E_xtra Optiounen:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Aner Optioune fir un grep weiderzeginn" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d Iwwerteneestëmmung fonnt fir \"%s\"." msgstr[1] "%d Iwwerteneestëmmungen fonnt fir \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Text ersat an %u Fichier." -msgstr[1] "Text ersat an %u Fichieren" +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "All d'Iwwerteneestëmmungen am aktuellen Dokument markéieren" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Ongültegen Ordner" -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Keen Text fir ze fannen." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Kann den Programm grep '%s' net ausféieren; kontrolléiert den Pad an den " "Astellungen." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Am gaang ze sichen..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (am Ordner: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Konnt den Ordner net opmaachen (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Sich feelgeschloen (kuckt ënnert Hëllef->Debug Messagen fir Detailer)." +#: ../src/search.c:1601 +#, fuzzy +msgid "Search failed." +msgstr "_Sichen:" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "%d Iwwerteneestëmmung bei der Sich fonnt." msgstr[1] "%d Iwwerteneestëmmungen bei der Sich fonnt." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Keng Iwwerteneestëmmungen fonnt." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Schlechten regulären Ausdrock fir den Typ vun Fichier %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sectioun" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Unhank" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Anerer" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Typen" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Konstruktor Typ" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Fonctiounen" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Sectiounen" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Indicen" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variabelen" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Commande" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Environnement" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Ënner-sectioun" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Ënner-ënner-sectioun" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Label" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Strukturen" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Pak" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Mäin" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Lokal" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Eisen" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Label" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Konstanten" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interface" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Klassen" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Konstanten" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Ankeren" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1 Iwwerschrëft" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2 Iwwerschrëft" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3 Iwwerschrëft" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Typ" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Moduler" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 #, fuzzy msgid "Namespaces" msgstr "Namespaces" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Eegenschaften" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Exportéiren" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "ouni Titel" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Strukturen" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Eegenschaften" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Variabelen" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Fonctiounen" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Memberen" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Label" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subroutinen" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Bléck" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Makroen" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Definitiounen" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Zieler" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Strukturen" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typdefinitiounen / Enumeratiounen" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Onbekannten Fichierstyp Endung fir \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Erstellung vum Tag Fichier feelgeschloen, wahrscheinlech well keng Tags " "fonnt goufen.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4149,7 +4389,7 @@ "Benotzung: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4160,174 +4400,192 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Tags lueden" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany Tag Fichieren (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag Fichier '%s' gelueden." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnt den Tag Fichier '%s' net lueden." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Vijenzeg Deklaratioun vun \"%s\" net fonnt." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definitioun vun \"%s\" konnt net fonnt ginn." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "No _Numm sënneren" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "No _Optrieden sënneren" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Den aktuellen Fichier späicheren" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "All oppen Fichieren späicheren" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Den aktuellen Fichier nei lueden" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Aktuellen Fichier zoumaachen" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "All oppen Fichieren zoumaachen" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Aktuell Sélectioun erausschneiden" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Aktuell Sélectioun kopéieren" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Inhalt aus dem Zwëschenspäicher afügen" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Aktuell Auswiel läschen" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Läscht Ännerung réckgängeg maachen" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Läscht Ännerung widderhuelen" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Den aktuellen Fichier compiléieren" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Aktuellen Fichier ausféieren oder betruechten" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Den Faarfwieler Dialog zum Auswielen vun enger Faarf aus enger Palette" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "An den Text eranzoomen" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Aus dem Text erauszoomen" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Manner arécken" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Méi arécken" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Den agetippten Text am aktuellen Fichier fannen" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Bei dei agetippten Zeilennummer goen" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Den Dialog mat den Astellungen uweisen" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Geany verloossen" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Dokument drécken" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "All d'Iwwerteneestëmmungen am aktuellen Dokument markéieren" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "En neien Fichier erstellen" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "En neien Fichier erstellen" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "En Fichier opmaachen" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Ausgewielten Fichier opmaachen" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Keng weider Feelermeldungen" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Goen" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Uweisen" @@ -4357,7 +4615,7 @@ msgid "Custom command failed: %s" msgstr "Benotzerdefinéiert Commande feelgeschloen: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Benotzerdefinéiert Commanden setzen" @@ -4369,251 +4627,231 @@ "Dier kënnt déi aktuell Auswiel un all dës Commanden schécken. Déi aktuell " "Auswiel gëtt dann duerch d'Ausgab vum Programm ersat." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Keng Benotzerdefinéiert Commanden definéiert." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Wierder zielen" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "Sélectioun" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "ganzt Dokument" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Beräich:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Zeilen:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Wierder:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Buschtawen:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Keng Tags fonnt." -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Lescht mat den S_ymboler uweisen" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Lescht mat den _Dokumenter uweisen" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Sa_itenleescht verstoppen" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Statusleescht uweisen" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "Zeil: %d\t Kol.: %d\t Sél.: %d\t" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "Tabulator" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "Ofstand" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "Modus: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "Zeechencodéierung: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "Typ vum Fichier: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "Beräich: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Schrëft gewiesselt (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standard Bibliothéik" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothéik)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothéik" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Benotzerdefinéierten Format fir den Datum _setzen" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Ordner wielen" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Fichier wielen" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Fichieren fir d'K_onfiguratioun" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Alles späicheren" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Alles zoumaachen" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Den Pad vum Dokument au_s definéieren." -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "Terminal nei sta_rten" -#: ../src/vte.c:576 +#: ../src/vte.c:544 #, fuzzy msgid "_Input Methods" msgstr "Methoden fir anzeg_inn" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" "Konnt den Ordner am VTE net wiesselen. Eventuell steet eng Commande dran." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminal plugin" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"D'Astellungen fir den virtuellen Terminal emulator (VTE) sinn nëmmen dann " -"gülteg wann d'VTE Bibliothéik konnt gelueden ginn." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Schrëft fir den Terminal:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "D'Schrëft fir den Terminal astellen" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Virdergrondfaarf:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Hannergrondfaarf:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Virdergrondfaarf vum Text am Terminal astellen" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Hannergrondfaarf vum Text am Terminal astellen" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Zeilen zeréckscrollen" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Gëtt d'Unzuel un Zeilen un dei een am Terminal kann zeréckscrollen" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" @@ -4621,45 +4859,45 @@ "Den Pad vun der Shell astellen déi innerhalb der Terminal emulatioun gestart " "soll ginn" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Bei Tastendrock scrollen" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Ob bei engem Tastendrock bis zum Schluss gescrollt soll ginn" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Bei enger Ausgab scrollen" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Leet fest ob d'Fënster bei enger Ausgab gescrollt soll gin." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Curseur blénkt" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Ob den Curseur blénken soll" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Tastenkierzel vun Geany iwwerschreiwen" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Erlaabt dem VTE Tastenkierzel ze emfänken (ofgesinn vun den Fokus Commanden)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Menüskierzel deaktivéiren (standardméisseg F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4669,11 +4907,11 @@ "(standardméisseg F10). Deaktivéierung kann nëtzlech sinn, wann dier z.B. den " "Midnight Commander an der VTE benotzt." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Dem Pad vum aktuellen Fichier nogoen" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Ob \"cd $path\" soll ausgefouert soll ginn wann tëschent oppenen Fichieren " @@ -4681,11 +4919,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Run-Skript net benotzen" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4693,11 +4931,11 @@ "Den Run-Skript, den normalerweis benotzt gëtt fir den Status vun " "ausgefouerten Programmer zeréckzeginn, net benotzen" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Programmer am VTE ausféieren" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4706,90 +4944,123 @@ "Opgepasst: Programmer an déi an der VTE ausgefouert ginn, kënnen net " "gestoppt ginn." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany Projetsfichieren" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Ausféierbar Fichieren" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Klassengenerator" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Erstellt nei Klassen an engem neien Fichier." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Nei Klass" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Namespaces" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Klass" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Numm vun der Klass" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Header Fichier:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Quellcode Fichier:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Veriewung" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Basis Klass" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "%s Quellcode Fichier" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Basis Header Fichier:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Basis GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Optiounen" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Neie Konstruktor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Neie Destruktor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Singletons" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ Konstruktor Typ" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Nei Kla_ss" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ Klass" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ Klass" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "_C++ Klass" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML Zeechen" @@ -4799,52 +5070,57 @@ msgstr "HTML Zeechen wei '&' afügen" #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geany Entwéckler Equipe" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML Zeechen" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 Buschtawen" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Griichesch Buschtaawen" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Mathematesch Buschtaawen" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Technesch Buschtaawen" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Feiler" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Punktuatiounszeechen" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Verschidden Buschtawen" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Den Configuratiounsordner vum PlugIn konnt nët erstallt ginn." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Speziell Buschtawen" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Afügen" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4853,40 +5129,40 @@ "benotzt den Knäppchen fir et bei der aktueller Positioun vum Curseur " "anzefügen." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Buschtaaw" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (Numm)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Spez_iell HTML Zeechen afügen" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML ersetzen" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTMLToggle" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Speziell Zeechen ersetzen" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Speziell HTML Zeechen afügen" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Speziell Buschtawen ersetzen" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "PlugIn un an ausschalten" @@ -4912,105 +5188,105 @@ msgstr "" "Berücksichtegt den Zoomlevel fir d'Schrëftgréisst am exportéierten Dokument" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument mat Erfolleg als '%s' exportéiert." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Den Fichier '%s' konnt net geschriwwen ginn (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Den Fichier '%s' gëtt et schonns. Wëllt dier en iwwerschreiwen?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exportéiren" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Als _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Als _LateX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Fichier's Browser" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Fügt en Fichiersbrowser zur Saitenleescht bäi." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Zevill Elementer ausgewielt!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Konnt dei agestallten extern Commande '%s' (%s) net ausféieren." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Mat engem _externen Programm opmaachen" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "An den _Fichieren fannen" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Verstoppten Fic_hieren uweisen" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Erop" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Nei lueden" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Perséinlechen Ordner" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Den Pad vum Dokument aus astellen" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Filter läschen" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Lescht mat den Fichieren fokusseiren" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Pad fokusseiren" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Den Configuratiounsordner vum PlugIn konnt nët erstallt ginn." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Extern Opmaachen Commande:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5024,15 +5300,15 @@ "%f gëtt duerch den Fichiersnumm mam vollstännegen Pad ersat\n" "%d gëtt duerch den Pad vum ausgewielten Fichier ouni den Fichiersnumm ersaat" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Verstoppten Fichieren uweisen" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Objetsfichieren verstoppen" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5040,12 +5316,12 @@ "Erstallten Objetsfichieren net am Fichiersbrowser uweisen (*.o, *.obj. *." "so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Stellt den Projetsbasisordner an" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "" @@ -5159,38 +5435,210 @@ msgid "Splits the editor view into two windows." msgstr "Spléckt d'Editorsfënster an zwou Fënsteren op." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "All d'Iwwerteneestëmmungen am aktuellen Dokument markéieren" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "Opspléck_ung réckgängeg maachen" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Fën_ster opdeelen" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontal" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Vertikal" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Horizontal opdeelen" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Vertikal opdeelen" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Opspléckung réckgängeg maachen" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Include Parameter an Argumenter uginn" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_DVI Fichier kucken" + +#~ msgid "V_iew PDF File" +#~ msgstr "_PDF Fichier kucken" + +#~ msgid "_Set Arguments" +#~ msgstr "Parameter vum Programm _uginn" + +#~ msgid "Set Arguments" +#~ msgstr "Parameter vum Programm uginn" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "D'Programmer an d'Optiounen fir (La)TeX Fichieren ze compiléieren an ze " +#~ "kucken uginn" + +#~ msgid "DVI creation:" +#~ msgstr "DVI erstellen" + +#~ msgid "PDF creation:" +#~ msgstr "PDF erstellen" + +#~ msgid "DVI preview:" +#~ msgstr "DVI Virschau" + +#~ msgid "PDF preview:" +#~ msgstr "PDF Virschau" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f gëtt duerch den aktuellen Numm vum Fichier ersat, z.B. fichier.c\n" +#~ "%e gëtt duerch den aktuellen Numm ouni Endung vum Fichier ersat, z.B. " +#~ "fichier" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Include Parameter an Argumenter uginn" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "D'Commanden fir Programmer ze erstellen an auszeféieren uginn" + +#~ msgid "Compile:" +#~ msgstr "Compiléieren:" + +#~ msgid "Build:" +#~ msgstr "Erstellen:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Konnt den Programm fir ze betruechten net ausféieren" + +#~ msgid "Try to resave the file?" +#~ msgstr "Probéieren den Fichier nach eng kéier ze späicheren?" + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr "dummy tooltip, nët iwwersetzen." + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "Gesc_hirleescht verstoppen" + +#~ msgid "Icon style:" +#~ msgstr "Symbolstil:" + +#~ msgid "Icon size:" +#~ msgstr "Symbolgréisst:" + +#~ msgid "Appearance" +#~ msgstr "Apparence" + +#~ msgid "Hard tab width:" +#~ msgstr "Breet vun engem Tabulator" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "D'Breet vun engem Tabulator wann Tabulatoren an Ofstänn fir d'Dokument " +#~ "agestallt ass" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Wäissen Text op schwaarzem Hannergrond benotzen an all d'Faarwen " +#~ "ëmdréinen, Geany muss duerfir nei gestart ginn" + +#~ msgid "Long line marker:" +#~ msgstr "Zeilenlängt markéieren bei:" + +#~ msgid "Long line marker color:" +#~ msgstr "Faarf vun der Markéierung:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Pad an Optiounen fir den make Programm" + +#, fuzzy +#~ msgid "Duplicate line or selection" +#~ msgstr "Zeil oder Auswiel duplizéieren" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Auswiel un den Terminal schecken" + +#~ msgid "Run (alternative command)" +#~ msgstr "Ausféieren (alternativ Commande):" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Hei ass eng Lescht mat verfügbaren PlugIns. Wielt déi PlugIns eraus déi " +#~ "beim start vun Geany gelueden sollen ginn." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Drécken vum Fichier %s gouf ofgebrach." + +#~ msgid "Make in base path" +#~ msgstr "Make am basis Pad" + +#~ msgid "Run command:" +#~ msgstr "Commande ausféieren:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Commande déi am Projetsbasisordner ausgefouert soll ginn. Parameteren " +#~ "kënnen hannert der Commande kommen. Loosst d'Feld eidel wann dier " +#~ "d'Standardcommande wëllt benotzen." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Commande auswielen fir den Projet auszeféieren." + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Text ersat an %u Fichier." +#~ msgstr[1] "Text ersat an %u Fichieren" + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "Sich feelgeschloen (kuckt ënnert Hëllef->Debug Messagen fir Detailer)." + +#~ msgid "My" +#~ msgstr "Mäin" + +#~ msgid "Local" +#~ msgstr "Lokal" + +#~ msgid "Our" +#~ msgstr "Eisen" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminal plugin" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "D'Astellungen fir den virtuellen Terminal emulator (VTE) sinn nëmmen dann " +#~ "gülteg wann d'VTE Bibliothéik konnt gelueden ginn." + +#~ msgid "Terminal font:" +#~ msgstr "Schrëft fir den Terminal:" + +#~ msgid "Unsplit" +#~ msgstr "Opspléckung réckgängeg maachen" #~ msgid "Diff file" #~ msgstr "Diff Fichier" diff -Nru geany-0.18/po/LINGUAS geany-0.19/po/LINGUAS --- geany-0.18/po/LINGUAS 2009-08-12 17:51:34.000000000 +0100 +++ geany-0.19/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -be bg ca cs de el en_GB es fi fr hu it ja ko lb nl pl pt_BR pt_PT ro ru sl sv tr uk vi zh_CN zh_TW diff -Nru geany-0.18/po/Makefile.in.in geany-0.19/po/Makefile.in.in --- geany-0.18/po/Makefile.in.in 2009-08-16 18:29:11.000000000 +0100 +++ geany-0.19/po/Makefile.in.in 2010-06-12 13:14:19.000000000 +0100 @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: +dvi info ctags tags CTAGS TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -Nru geany-0.18/po/nl.po geany-0.19/po/nl.po --- geany-0.18/po/nl.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/nl.po 2010-05-30 19:12:17.000000000 +0100 @@ -1,427 +1,412 @@ -# translation of geany_0.9.po to Dutch +# translation of Geany to Dutch # This file is distributed under the same license as the GEANY package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Kurt De Bree , 2006. -# +# Peter Scholtens , 2009 +# Ayke van Laethem , 2009 msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2006-09-28 17:25+0200\n" -"Last-Translator: Kurt De Bree \n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-05-30 17:11+0100\n" +"Last-Translator: Peter Scholtens \n" "Language-Team: Dutch \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: KBabel 1.9.1\n" +"X-Poedit-Language: Dutch\n" #: ../geany.desktop.in.h:1 -#, fuzzy msgid "A fast and lightweight IDE using GTK2" -msgstr "Een snel en lichtgewicht IDE" +msgstr "Een snel en lichtgewicht, op GTK2 gebaseerde, IDE" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" #: ../geany.desktop.in.h:3 msgid "Integrated Development Environment" -msgstr "" +msgstr "Geintegreerde Ontwikkel Omgeving" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Over Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Een snel en lichtgewicht IDE" -#: ../src/about.c:210 -#, fuzzy, c-format +#: ../src/about.c:216 +#, c-format msgid "(built on or after %s)" -msgstr "(gebouwd op %s)" +msgstr "(gebouwd op of na %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Ontwikkelaars" -#: ../src/about.c:266 -#, fuzzy +#: ../src/about.c:272 msgid "maintainer" -msgstr "Hoofdontwikkelaar" +msgstr "beheerder" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "ontwikkelaar" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "vertalingscoördinator" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Vertalers" -#: ../src/about.c:311 -#, fuzzy +#: ../src/about.c:317 msgid "Previous Translators" -msgstr "Vertalers" +msgstr "Vorige vertalers" -#: ../src/about.c:332 -#, fuzzy +#: ../src/about.c:338 msgid "Contributors" -msgstr "Woord vervolledigen" +msgstr "Ontwikkelaars" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" +"Enkele van de vele ontwikkelaars (voor een gedetailleerde lijst, raadpleeg " +"bestand %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Credits" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licentie" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." msgstr "" +"Licentie tekst kon niet gevonden worden, raadpleeg http://www.gnu.org/" +"licenses/gpl-2.0.txt om het online te bekijken." -#: ../src/build.c:221 ../src/build.c:745 -#, fuzzy, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Kon terminal '%s' niet vinden (controleer de instelling van het pad voor " -"hulpprogramma terminal in Voorkeuren)" +#. fall back to %d +#: ../src/build.c:635 +#, c-format +msgid "failed to substitute %%p, no project active" +msgstr "mislukt om %%p te vervangen, geen geopend project" -#: ../src/build.c:236 ../src/build.c:650 -#, fuzzy, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Uitvoeren van %s mislukt (start-script kon niet worden aangemaakt)" +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Handeling mislukt. Geen werkmap beschikbaar." + +#: ../src/build.c:699 +#, c-format +msgid "%s (in directory: %s)" +msgstr "%s (in map: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Proces mislukt (%s)" -#: ../src/build.c:508 +#: ../src/build.c:790 #, c-format -msgid "%s (in directory: %s)" -msgstr "%s (in map: %s)" - -#: ../src/build.c:613 -#, fuzzy, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Kon werkmap niet veranderen naar %s" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Uitvoeren van '%s' mislukt (start-script kon niet worden aangemaakt)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" +"Kon bestand niet uitvoeren in de VTE omdat het waarschijnlijk een commando " +"bevat." + +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Kon terminal \"%s\" niet vinden (controleer het pad voor de terminal in " +"Voorkeuren)" -#: ../src/build.c:914 +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Compilatie mislukt." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Compilatie met succes beëindigd." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compileren" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "B_ouwen" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -#, fuzzy -msgid "_Make All" -msgstr "_Make all" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -#, fuzzy -msgid "Make Custom _Target" -msgstr "Make aangepast _doel" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Aangepaste tekst" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -#, fuzzy -msgid "Make _Object" -msgstr "Make _object" +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Voer hier de aangepaste opties in, alle ingevoerde tekst wordt aan het " +"commando 'make' doorgegeven." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 -#, fuzzy +#: ../src/build.c:1331 msgid "_Next Error" -msgstr "Fout" +msgstr "Volge_nde Fout" -#: ../src/build.c:1097 ../src/build.c:1194 -#, fuzzy +#: ../src/build.c:1333 msgid "_Previous Error" -msgstr "Zoek Vor_ige" - -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Programma parameters instellen" +msgstr "Zoek Vor_ige Fout" -#. DVI -#: ../src/build.c:1143 -#, fuzzy -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "_Bouwcommando's instellen" -#. PDF -#: ../src/build.c:1152 -#, fuzzy -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Huidig bestand bouwen" -#. DVI view -#: ../src/build.c:1206 -#, fuzzy -msgid "_View DVI File" -msgstr "DVI bestand weergeven" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Bouwt het huidig bestand met 'make' en het standaard doel" -#. PDF view -#: ../src/build.c:1216 -#, fuzzy -msgid "V_iew PDF File" -msgstr "PDF besand weergeven" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Bouwt het huidige bestand met 'make' en het opgegeven doel" -#. arguments -#: ../src/build.c:1231 -#, fuzzy -msgid "_Set Arguments" -msgstr "Argumenten instellen" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Huidig bestand met behulp van Make compileren" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Argumenten instellen" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Proces kon niet gestopt worden (%s)." -#: ../src/build.c:1313 -#, fuzzy -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Stelt programma's en opties in voor compilatie en weergave van (La)TeX " -"bestanden.\n" -"De bestandsnaam wordt automatisch aan het einde toegevoegd.\n" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Geen bouwfouten meer." -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Menu item label instellen" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "" +#: ../src/build.c:1788 +msgid "Item" +msgstr "Item" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Label" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Commando" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f zal worden vervangen door de huidige bestandsnaam, bijv test_bestand.c\n" -"%e zal worden vervangen door de bestandsnaam zonder extensie, bijv " -"test_bestand" +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Werkmap" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Programma parameters instellen" +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Ruim op" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Stel de commandos in voor het bouwen en draaien van programma's." +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Klik om menu item label in te stellen" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, fuzzy, c-format -msgid "%s commands" -msgstr " commandos" +#: ../src/build.c:1904 ../src/build.c:1906 +#, c-format +msgid "%s Commands" +msgstr "%s commando's" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compileer:" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Geen Bestandstype" -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Bouwen:" +#: ../src/build.c:1914 ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Reguliere expressie voor fouten:" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Uitvoeren:" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Geen-bestandstype commando's" -#: ../src/build.c:1892 ../src/toolbar.c:344 -#, fuzzy -msgid "Build the current file" -msgstr "Huidig bestand compileren" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" +"Opmerking: Item 2 open een dialoogvenster en voegt de respons toe aan het " +"commando." -#: ../src/build.c:1917 -#, fuzzy -msgid "Make Custom Target" -msgstr "Make aangepast doel" +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Commando's Uitvoeren" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Voer hier de aangepaste opties in, alle ingevoerde tekst wordt aan het " -"commando 'make' overgegeven." +"%d, %e, %f, %p worden vervangen in de commando en directory velden, zie " +"handleiding voor details." -#: ../src/build.c:1967 -#, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "Bouwt het huidig bestand met 'make' en het standaard doel" +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Bouwcommando's instellen" -#: ../src/build.c:1970 -#, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "Bouwt het huidig bestand met 'make' en het opgegeven doel" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "Compileer" -#: ../src/build.c:1973 -#, fuzzy -msgid "Compile the current file with Make" -msgstr "Huidig bestand compileren" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "B_ouwen" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Kon het weergaveprogramma niet uitvoeren" +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +msgid "_Execute" +msgstr "Uitvo_eren" -#: ../src/build.c:2073 -#, fuzzy, c-format -msgid "Process could not be stopped (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Maak aangepast _doel" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "" +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Maak _object" + +#: ../src/build.c:2462 ../src/build.c:2633 +msgid "_Make" +msgstr "_Maak" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make all" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "Bouw commando's instellen" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Wilt u Geany werkelijk afsluiten?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d Bestand opgeslagen." +msgstr[1] "%d Bestanden opgeslagen." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Herladen" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Niet opgeslagen wijzigingen zullen verloren gaan." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Bent u zeker om '%s' te herladen?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 -#, fuzzy +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Ga naar regel" -#: ../src/callbacks.c:1249 -#, fuzzy +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" -msgstr "Voer het regelnummer in waarnaar u wilt springen" +msgstr "Voer het regelnummer in waarnaar u wilt springen:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Gelieve het bestandstype voor het huidige bestand in te stellen vooraleer " "deze functie te gebruiken." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" -msgstr "dd.mm.yyyy" +msgstr "dd.mm.jjjj" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" -msgstr "mm.dd.yyyy" +msgstr "mm.dd.jjjj" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" -msgstr "yyyy/mm/dd" +msgstr "jjjj/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" -msgstr "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.jjjj uu:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" -msgstr "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.jjjj uu:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" -msgstr "yyyy/mm/dd hh:mm:ss" +msgstr "jjjj/mm/dd uu:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 -#, fuzzy +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" -msgstr "Gebruik het standaard datumformaat" +msgstr "Gebr_uik een aangepast datumformaat" -#: ../src/callbacks.c:1497 -#, fuzzy +#: ../src/callbacks.c:1446 msgid "Custom Date Format" -msgstr "Standaard datumformaat" +msgstr "Aangepast datumformaat" -#: ../src/callbacks.c:1498 -#, fuzzy +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Geef hier een aangepaste datum en tijdsindeling.U kunt gebruik maken van om " -"het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " -"C strftime functie. Lees \"man strftime\" voor meer informatie." +"Geef hier een aangepaste datum en tijdsindeling. U kunt gebruik maken van " +"elke conversie specifieerder die beschikbaar is voor de ANSI C strftime " +"functie." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" -"Datumformaatstring kon niet worden geconverteerd (waarschijlijk te lang)." +"Datumformaatstring kon niet worden geconverteerd (waarschijnlijk te lang)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." -msgstr "" +msgstr "Niet meer opmerkingen." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Bestand openen" -#: ../src/dialogs.c:144 ../src/interface.c:691 +# Wordt voor twee dingen gebruikt, ook voor het 'openen' dialoogvenster. Daar zou 'alleen-lezen' meer passen. +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Beeld" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -429,33 +414,28 @@ "Opent het bestand in alleen lezen modus. Indien u meer dan één bestand kiest " "om te openen, zullen alle bestanden als alleen lezen worden geopend." -#: ../src/dialogs.c:169 -#, fuzzy +#: ../src/dialogs.c:173 msgid "Detect by file extension" -msgstr "Herkenning door bestandsextensie" +msgstr "Herken door bestandsextensie" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 -#, fuzzy +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" -msgstr "Map selecteren" +msgstr "Haal uit bestand" -#: ../src/dialogs.c:258 -#, fuzzy +#: ../src/dialogs.c:262 msgid "_More Options" -msgstr "Functies" +msgstr "_Meer Opties" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" -msgstr "_Verborgen bestanden weergeven" +msgstr "Verborgen bestanden _weergeven" -#: ../src/dialogs.c:276 -#, fuzzy +#: ../src/dialogs.c:280 msgid "Set encoding:" -msgstr "_Codering instellen" +msgstr "Stel Codering in:" -#: ../src/dialogs.c:286 -#, fuzzy +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -463,17 +443,18 @@ "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"Definieert uitdrukkelijk een bestandstype voor het bestand, indien het niet " -"wordt herkend via de bestandsextensie.\n" -"Notitie: indien u meerdere bestanden kiest, worden deze allen geopend met " -"het gekozen bestandstype." +"Definieert uitdrukkelijk een codering voor het bestand, als het niet wordt " +"herkend. Dit is handig als je al weet dat de codering niet correct " +"gedetecteerd kan worden door Geany.\n" +"Opmerking: als u meerdere bestanden kiest, worden deze allemaal geopend met " +"de gekozen codering." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Bestandstype instellen:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -482,78 +463,76 @@ msgstr "" "Definieert uitdrukkelijk een bestandstype voor het bestand, indien het niet " "wordt herkend via de bestandsextensie.\n" -"Notitie: indien u meerdere bestanden kiest, worden deze allen geopend met " -"het gekozen bestandstype." +"Opmerking: indien u meerdere bestanden kiest, worden deze allemaal geopend " +"met het gekozen bestandstype." #: ../src/dialogs.c:389 msgid "Overwrite?" -msgstr "" +msgstr "Overschrijven?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "Bestandsnaam bestaat al!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Bestand opslaan" -#: ../src/dialogs.c:432 -#, fuzzy +#: ../src/dialogs.c:430 msgid "R_ename" -msgstr "Vietnamees" +msgstr "H_ernoem" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" -msgstr "" +msgstr "Bewaar en hernoem bestand" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" -msgstr "" +msgstr "_Open bestand in een nieuw tabblad" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" +"Houdt het huidige (veranderde) document open en open nieuw weggeschreven " +"bestand in een nieuw tabblad" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Fout" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Vraag" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" -msgstr "" +msgstr "Waarschuwing" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Informatie" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Niet opslaan" -#: ../src/dialogs.c:687 -#, fuzzy, c-format +#: ../src/dialogs.c:691 +#, c-format msgid "The file '%s' is not saved." -msgstr "Het bestand \"%s\" is niet geldig %s." +msgstr "Het bestand '%s' is niet opgeslagen." -#: ../src/dialogs.c:689 -#, fuzzy +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" -msgstr "" -"Het bestand werd niet opgeslagen.\n" -"Wenst u het op te slaan vooraleer af te sluiten?" +msgstr "Wilt u het bestand op slaan vooraleer af te sluiten?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Lettertype kiezen" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -561,107 +540,110 @@ "Er is een fout opgetreden of er kon geen bestandsinformatie worden opgehaald " "(bijv van een nieuw bestand)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" -msgstr "Ongekend" +msgstr "Onbekend" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Eigenschappen" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Bestandstype:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Grootte:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Locatie:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Alleen lezen:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(enkel binnenin Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Codering:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(met BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" -msgstr "(zonder BOM" +msgstr "(zonder BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" -msgstr "Gemodifieert:" +msgstr "Gemodificeerd:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Gewijzigd:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" -msgstr "Toegang tot:Geopend:" -#: ../src/dialogs.c:1201 -#, fuzzy +#: ../src/dialogs.c:1251 msgid "Permissions:" -msgstr "Lettertypes" +msgstr "Permissies:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Lezen:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Schrijven:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Uitvoeren:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Eigenaar:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Groep:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Andere:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Bestand %s gesloten." -#: ../src/document.c:745 -#, fuzzy, c-format +#: ../src/document.c:775 +#, c-format msgid "New file \"%s\" opened." -msgstr "Nieuw bestand geopend." +msgstr "Nieuw bestand \"%s\" geopend." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Kon bestand %s niet openen (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -669,49 +651,51 @@ "cause data loss.\n" "The file was set to read-only." msgstr "" +"Het bestand \"%s\" kon niet normaal gelezen worden en is afgekapt. Dit kan " +"gebeuren als het bestand een NULL byte bevat. Let op dat wegschrijven " +"informatie verlies kan veroorzaken.\n" +"Het bestand is alleen-lezen gemaakt." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Het bestand \"%s\" is niet geldig %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." msgstr "" -"Het bestand \"%s\" lijkt niet op een tekstbestand of een de bestandscodering " -"is niet ondersteund." +"Het bestand \"%s\" lijkt niet op een tekstbestand of de bestandscodering is " +"niet ondersteund." -#: ../src/document.c:1122 -#, fuzzy +#: ../src/document.c:1163 msgid "Spaces" -msgstr "Naamruimtes" +msgstr "Spaties" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" -msgstr "" +msgstr "Tabbladen" -#: ../src/document.c:1128 -#, fuzzy +#: ../src/document.c:1169 msgid "Tabs and Spaces" -msgstr "_Vervang tabs door spaties" +msgstr "Tabs en Spaties" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 -#, fuzzy, c-format +#: ../src/document.c:1174 +#, c-format msgid "Setting %s indentation mode for %s." -msgstr "Auto inspringing" +msgstr "Instellen automatisch inspringen van %s voor bestand %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Ongeldige bestandsnaam" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Bestand %s herladen." @@ -719,83 +703,83 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Bestand %s geopend (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", alleen lezen" -#: ../src/document.c:1512 -#, fuzzy +#: ../src/document.c:1558 msgid "Error renaming file." -msgstr "Fout bij het opslaan van het bestand." +msgstr "Fout bij het hernoemen van het bestand." -#: ../src/document.c:1587 -#, fuzzy, c-format +#: ../src/document.c:1643 +#, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." msgstr "" -"Er deed zich een fout voor yiijdens het converteren van het bestand van UTF-" -"8 in \"%s\". Het bestand blijft niet opgeslagen.\n" -"Foutmelding: %s\n" +"Er deed zich een fout voor tijdens het converteren van het bestand van UTF-8 " +"in \"%s\". Het bestand blijft onopgeslagen." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" +"Fout mededeling: %s\n" +"Deze fout is opgetreden in \"%s\" (regel: %d, kolom: %d)." -#: ../src/document.c:1614 -#, fuzzy, c-format +#: ../src/document.c:1670 +#, c-format msgid "Error message: %s." -msgstr "Fout bij het opslaan van het bestand (%s)." +msgstr "Foutmelding: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Fout bij het opslaan van het bestand." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Fout bij het opslaan van het bestand (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Bestand %s opgeslagen." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." -msgstr "" +msgstr "\"%s\" is niet gevonden." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" -msgstr "" +msgstr "Document opnieuw doorzoeken?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 -#, fuzzy, c-format +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 +#, c-format msgid "No matches found for \"%s\"." -msgstr "Geen overeenkomsten gevonden voor '%s'" +msgstr "Geen overeenkomsten gevonden voor '%s'." -#: ../src/document.c:2022 ../src/document.c:2031 -#, fuzzy, c-format +#: ../src/document.c:2080 ../src/document.c:2089 +#, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "Verving %d keer \"%s\" door\"%s\"." -msgstr[1] "Verving %d keer \"%s\" door\"%s\"." +msgstr[0] "%s: verving %d keer \"%s\" door \"%s\"." +msgstr[1] "%s: verving %d keer \"%s\" door \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Wenst u het opnieuw te laden?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -804,23 +788,27 @@ "Het bestand '%s' op de schijf is recenter als\n" "de huidig geopende versie." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Sluit zonder op te slaan" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "Bestand \"%s\" is niet gevonden! Opnieuw wegschrijven?" -#: ../src/editor.c:4288 -#, fuzzy +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Tabgrootte:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "" +msgstr "Geef het aantal spaties dat een tab karakter zou moeten vervangen." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Waarschuwing: niet-standaard tabbreedte %d != 8!" #: ../src/encodings.c:76 msgid "Celtic" @@ -929,1036 +917,1056 @@ msgstr "Koreaans" #: ../src/encodings.c:147 -#, fuzzy msgid "Without encoding" -msgstr "_Codering instellen" +msgstr "Zonder codering" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_West-Europees" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Oost-Europees" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" -msgstr "_Oost-_Aziatisch" +msgstr "Oost-_Aziatisch" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_ZO & ZW Aziatisch" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Midden Oosten" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 -#, fuzzy, c-format +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 +#, c-format msgid "%s source file" -msgstr "C bronbestand" +msgstr "%s bronbestand" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" -msgstr "C bronbestand" +msgstr "%s bronbestand" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Geen" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell scriptbestand" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makebestand" -#: ../src/filetypes.c:406 -#, fuzzy +#: ../src/filetypes.c:433 msgid "XML document" -msgstr "Volledig document" +msgstr "XML document" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 #, fuzzy msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump bestand" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Configuratiebestand" -#: ../src/filetypes.c:508 -#, fuzzy +#: ../src/filetypes.c:546 msgid "Gettext translation file" -msgstr "vertalingscoördinator" +msgstr "Gettext vertalingsbestand" -#: ../src/filetypes.c:541 -#, fuzzy, c-format +#: ../src/filetypes.c:579 +#, c-format msgid "%s script file" -msgstr "Shell scriptbestand" +msgstr "%s scriptbestand" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" -msgstr "" +msgstr "_Programmeertalen" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" -msgstr "" +msgstr "_Scripttalen" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" -msgstr "" +msgstr "Op_maaktalen" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" -msgstr "" +msgstr "Over_ige talen" + +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "aangepaste bestandstypes" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" -msgstr "" +msgstr "Alle bronbestanden" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Alle bestanden" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" -msgstr "" +msgstr "Verkeerde reguliere expressie voor bestandstype %s; %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "naamloos" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Kan bestand %s niet vinden." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "_Kleurkiezer" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Standaard" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Bestand" -#: ../src/interface.c:287 -#, fuzzy +#: ../src/interface.c:306 msgid "New (with _Template)" -msgstr "Nieuw (met _sjabloon)" - -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "onzichtbaar" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" +msgstr "Nieuw (met Sja_bloon)" -#: ../src/interface.c:311 ../src/interface.c:1940 -#, fuzzy +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" -msgstr "Bestand openen" +msgstr "Gesele_cteerd bestand openen" -#: ../src/interface.c:315 -#, fuzzy +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Recente bestanden" -#: ../src/interface.c:332 -#, fuzzy +#: ../src/interface.c:344 msgid "Save A_ll" -msgstr "A_lles opslaan" +msgstr "A_lles Opslaan" -#: ../src/interface.c:348 -#, fuzzy +# Alle letters zijn al in gebruik als hotkey. +#: ../src/interface.c:360 msgid "R_eload As" -msgstr "H_erladen als" +msgstr "He_rladen als" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "onzichtbaar" + +#: ../src/interface.c:388 msgid "Page Set_up" -msgstr "" +msgstr "_Pagina opmaak" -#: ../src/interface.c:393 ../src/notebook.c:240 -#, fuzzy +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" -msgstr "Huidig bestand sluiten" +msgstr "Sluit andere docu_menten" -#: ../src/interface.c:401 ../src/notebook.c:245 -#, fuzzy +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" -msgstr "_Alles sluiten" +msgstr "Alles sl_uiten" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "Be_werken" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "Inde_ling" -#: ../src/interface.c:475 ../src/interface.c:1956 -#, fuzzy +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "Herver_deel woorden in regel/tekstblok" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" -msgstr "Kloon regel of selectie" +msgstr "_Maak selectie onder- of bovenkast" -#: ../src/interface.c:484 ../src/interface.c:1965 -#, fuzzy +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Verwissel huidige met bovenstaande regel" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" -msgstr "_Plaats het hekje voor de regel" +msgstr "_Plaats commentaar teken voor de regel(s)" -#: ../src/interface.c:488 ../src/interface.c:1969 -#, fuzzy +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" -msgstr "Lijn" +msgstr "Haal commentaar tekens _weg" -#: ../src/interface.c:492 ../src/interface.c:1973 -#, fuzzy +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" -msgstr "_Regelcommentaar inschakelen" - -#: ../src/interface.c:496 ../src/interface.c:1977 -#, fuzzy -msgid "Du_plicate Line or Selection" -msgstr "Kloon regel of selectie" +msgstr "_Regelcommentaar in/uitschakelen" -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" -msgstr "I_nspringing vergroten" +msgstr "Inspringing vergr_oten" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" -msgstr "In_springing verkleinen" +msgstr "Inspringing verkl_einen" -#: ../src/interface.c:526 ../src/interface.c:2007 -#, fuzzy -msgid "_Send Selection to Terminal" -msgstr "_In selectie" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Slimme regel inspringing" -#: ../src/interface.c:530 ../src/interface.c:2011 -#, fuzzy +#: ../src/interface.c:546 msgid "_Send Selection to" -msgstr "_In selectie" +msgstr "Stuur Selectie _naar" + +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Commando's" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "Knip huidige regel(s)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "Kopiëer huidige regel(s)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "Verwijder huidige regel(s)" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "Kloon regel of selectie" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "Selecteer huidige regel(s)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "Selecteer huidige paragraaf" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "Voeg alternatieve lege spaties in" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Ga naar volgende marker" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Ga naar vorige marker" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Stuur Selectie naar Terminal" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "_Commentaren Invoegen" -#: ../src/interface.c:556 ../src/interface.c:2037 -#, fuzzy +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" -msgstr "Logboek item invoegen" +msgstr "Logboek item (ChangeLog) invoegen" -#: ../src/interface.c:560 ../src/interface.c:2041 -#, fuzzy +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" -msgstr "Bestandshoofding invoegen" +msgstr "Bestands_hoofd Invoegen" -#: ../src/interface.c:564 ../src/interface.c:2045 -#, fuzzy +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" -msgstr "Functiebschrijving invoegen" +msgstr "_Functiebschrijving Invoegen" -#: ../src/interface.c:568 ../src/interface.c:2049 -#, fuzzy +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" -msgstr "Multiregel commentaar invoegen" +msgstr "_Multiregelcommentaar Invoegen" -#: ../src/interface.c:572 ../src/interface.c:2053 -#, fuzzy +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" -msgstr "GPL-informatie invoegen" +msgstr "_GPL-informatie toevoegen" -#: ../src/interface.c:576 ../src/interface.c:2057 -#, fuzzy +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" -msgstr "GPL-informatie invoegen" +msgstr "_BSD licentie informatie invoegen" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "_Datum invoegen" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" _invoegen" -#: ../src/interface.c:613 -#, fuzzy +#: ../src/interface.c:704 msgid "Preference_s" -msgstr "Voorkeuren" +msgstr "Voo_rkeuren" + +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "P_lugin voorkeuren" -#: ../src/interface.c:621 +#: ../src/interface.c:720 msgid "_Search" msgstr "_Zoeken" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" -msgstr "V_olgende zoeken" +msgstr "Zoek v_olgende" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" -msgstr "Zoek Vor_ige" +msgstr "Zoek vor_ige" -#: ../src/interface.c:640 -#, fuzzy +#: ../src/interface.c:739 msgid "Find in F_iles" -msgstr "Zoek in _bestanden" +msgstr "Zoek _in bestanden" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Vervangen" -#: ../src/interface.c:657 -#, fuzzy +#: ../src/interface.c:756 msgid "Find _Selected" -msgstr "V_olgende zoeken" +msgstr "Vo_lgende selectie zoeken" -#: ../src/interface.c:661 -#, fuzzy +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" -msgstr "Zoek vorige" +msgstr "Vo_rige selectie zoeken" -#: ../src/interface.c:670 -#, fuzzy +#: ../src/interface.c:769 msgid "Next _Message" -msgstr "Berichten" +msgstr "Volgende Bericht" -#: ../src/interface.c:674 -#, fuzzy +#: ../src/interface.c:773 msgid "Pr_evious Message" -msgstr "Berichten" +msgstr "Vorige B_ericht" -#: ../src/interface.c:683 ../src/interface.c:2127 -#, fuzzy +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Ga naar regel" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "_Lettertype wijzigen" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" -msgstr "" +msgstr "Verberg/toon alle _extra widgets" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Volledig scherm" -#: ../src/interface.c:719 -#, fuzzy +#: ../src/interface.c:818 msgid "Show Message _Window" -msgstr "B_erichtenvenster weergeven" +msgstr "_Berichtenvenster weergeven" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "_Werkbalk weergeven" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "_Zijbalk weergeven" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "_Markeerrand weergeven" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "_Regelnummers weergeven" -#: ../src/interface.c:751 -#, fuzzy +#: ../src/interface.c:850 msgid "Show _White Space" -msgstr "Lege spaties weergeven" +msgstr "Lege spaties _weergeven" -#: ../src/interface.c:755 -#, fuzzy +#: ../src/interface.c:854 msgid "Show Line _Endings" -msgstr "Regeleinden weergeven" +msgstr "Regel_einden weergeven" -#: ../src/interface.c:759 -#, fuzzy +#: ../src/interface.c:858 msgid "Show _Indentation Guides" -msgstr "Inspringingsmarkeringen weergeven" +msgstr "_Inspringingsmarkeringen weergeven" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:787 -#, fuzzy +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Regelterugloop" -#: ../src/interface.c:792 -#, fuzzy +#: ../src/interface.c:891 msgid "Line _Breaking" -msgstr "Regelterugloop" +msgstr "Regelaf_breking" -#: ../src/interface.c:796 -#, fuzzy +#: ../src/interface.c:895 msgid "_Auto-indentation" -msgstr "Gebruik _auto-inspringing" +msgstr "_Automatisch inspringen" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" -msgstr "" +msgstr "I_nspringingstype" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" -msgstr "" +msgstr "_Tabs" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 -#, fuzzy +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" -msgstr "Naamruimtes" +msgstr "_Spaties" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 -#, fuzzy +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" -msgstr "_Vervang tabs door spaties" +msgstr "T_abs en Spaties" -#: ../src/interface.c:831 -#, fuzzy +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Alleen _lezen" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schrijven" -#: ../src/interface.c:844 -#, fuzzy +#: ../src/interface.c:943 msgid "Set File_type" -msgstr "_Bestandstype instellen" +msgstr "Bestandst_ype instellen" -#: ../src/interface.c:854 -#, fuzzy +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "_Codering instellen" -#: ../src/interface.c:864 -#, fuzzy +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Regel_einden instellen" -#: ../src/interface.c:871 -#, fuzzy +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Converteren en instellen op CR/LF (_Win)" -#: ../src/interface.c:877 -#, fuzzy +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Converteren en instellen op LF (_Unix)" -#: ../src/interface.c:883 -#, fuzzy +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Converteren en instellen op CR (_Mac)" -#: ../src/interface.c:894 -#, fuzzy +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" -msgstr "Lege spaties aan regeleinde verwijderen" +msgstr "_Lege spaties aan regeleinden verwijderen" -#: ../src/interface.c:898 -#, fuzzy +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" -msgstr "_Vervang tabs door spaties" +msgstr "Vervang tabs door s_paties" -#: ../src/interface.c:902 -#, fuzzy +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" -msgstr "_Vervang tabs door spaties" +msgstr "Vervang spaties door _tabs" -#: ../src/interface.c:911 -#, fuzzy +#: ../src/interface.c:1010 msgid "_Fold All" -msgstr "Alles _invouwen" +msgstr "Alles samen_vouwen" -#: ../src/interface.c:915 -#, fuzzy +#: ../src/interface.c:1014 msgid "_Unfold All" -msgstr "Alles _uitvouwen" +msgstr "Alles uitvou_wen" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" -msgstr "" +msgstr "Verwijder _markers" -#: ../src/interface.c:928 -#, fuzzy +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" -msgstr "Alle _markeringen verwijderen" +msgstr "Verwijder fout_indicaties" -#: ../src/interface.c:932 -#, fuzzy +#: ../src/interface.c:1031 msgid "_Project" -msgstr "Make _object" +msgstr "_Project" -#: ../src/interface.c:939 -#, fuzzy +#: ../src/interface.c:1038 msgid "_New" -msgstr "Nieuw" +msgstr "_Nieuw" -#: ../src/interface.c:947 -#, fuzzy +#: ../src/interface.c:1046 msgid "_Open" -msgstr "Openen" +msgstr "_Openen" -#: ../src/interface.c:955 -#, fuzzy +#: ../src/interface.c:1054 msgid "_Recent Projects" -msgstr "Make object" +msgstr "_Recente projecten" -#: ../src/interface.c:959 -#, fuzzy +#: ../src/interface.c:1058 msgid "_Close" -msgstr "Sluiten" +msgstr "_Sluiten" -#: ../src/interface.c:980 -#, fuzzy +#: ../src/interface.c:1079 msgid "_Tools" -msgstr "Hulpprogramma's" +msgstr "_Extra" -#: ../src/interface.c:987 -#, fuzzy +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "He_rlaad configuratie" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "C_onfiguratiebestanden" + +#: ../src/interface.c:1107 msgid "_Color Chooser" -msgstr "Kleurkiezer" +msgstr "_Kleurkiezer" -#: ../src/interface.c:995 -#, fuzzy +#: ../src/interface.c:1115 msgid "_Word Count" -msgstr "Woorden tellen" +msgstr "_Woorden tellen" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" -msgstr "" - -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "" +msgstr "_Labels laden" -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Help" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Website" -#: ../src/interface.c:1030 -#, fuzzy +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Sneltoetsen" -#: ../src/interface.c:1034 -#, fuzzy +#: ../src/interface.c:1146 msgid "_Debug Messages" -msgstr "Berichten" +msgstr "_Debug berichten" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symbolen" -#: ../src/interface.c:1087 -#, fuzzy +#: ../src/interface.c:1199 msgid "Documents" -msgstr "_Document" +msgstr "Documenten" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Status" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compiler" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Berichten" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Notities" -#: ../src/interface.c:1727 ../src/interface.c:3286 -#, fuzzy -msgid "Images _and Text" -msgstr "Pictogrammen met tekst" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -#, fuzzy -msgid "_Images Only" -msgstr "Enkel pictogrammen" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -#, fuzzy -msgid "_Text Only" -msgstr "Enkel tekst" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -#, fuzzy -msgid "_Large Icons" -msgstr "Grote pictogrammen" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -#, fuzzy -msgid "_Small Icons" -msgstr "Kleine pictogrammen" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Kleine pictogrammen" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Werkbalk verbergen" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Toolbar voorkeuren" -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "Werkbalk verbergen" -#: ../src/interface.c:2094 -#, fuzzy +#: ../src/interface.c:2112 msgid "Find _Usage" -msgstr "Zoek boodschappen" +msgstr "Zoek woord" -#: ../src/interface.c:2102 -#, fuzzy +#: ../src/interface.c:2120 msgid "Find _Document Usage" -msgstr "Zoek boodschappen" +msgstr "Zoek woord in document" -#: ../src/interface.c:2110 -#, fuzzy +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" -msgstr "Ga naar tag definitie" +msgstr "Ga naar _tag definitie" -#: ../src/interface.c:2114 -#, fuzzy +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" -msgstr "Ga naar tag declaratie" +msgstr "Ga naar t_ag declaratie" -#: ../src/interface.c:2118 -#, fuzzy +#: ../src/interface.c:2136 msgid "Conte_xt Action" -msgstr "_In selectie" +msgstr "Conte_xtactie" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Voorkeuren" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Laad bestanden van de laatste sessie" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Opent bij opstarten de bestanden van de laatste sessie" -#: ../src/interface.c:2708 -#, fuzzy +#: ../src/interface.c:2710 msgid "Load virtual terminal support" -msgstr "Virtuele terminalemulatie laden bij opstarten" +msgstr "Virtuele terminal laden bij opstarten" -#: ../src/interface.c:2710 -#, fuzzy +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" msgstr "" -"Of de virtuele terminalemulatie (VTE) moet worden geladen bij het opstarten." -"Schakel deze functie uit indien u dit niet nodig heeft." +"Of de virtuele terminalemulatie (VTE) moet worden geladen bij het opstarten. " +"Schakel deze functie uit indien u dit niet nodig heeft" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" -msgstr "" +msgstr "Zet plugin ondersteuning aan" -#: ../src/interface.c:2716 -#, fuzzy +#: ../src/interface.c:2718 msgid "Startup" -msgstr "Zijbalk" +msgstr "Opstarten" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Bewaar vensterpositie en geometrie" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Bewaart de vensterpositie en geometrie en herstelt dat bij het begin" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "afsluiten bevestigen" -#: ../src/interface.c:2743 -#, fuzzy +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Toont een bevestigingsvenster bij afsluiten." -#: ../src/interface.c:2745 -#, fuzzy +#: ../src/interface.c:2747 msgid "Shutdown" -msgstr "Lettertypes" +msgstr "Afsluiten" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" -msgstr "" +msgstr "Opstart pad:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." msgstr "" +"Beginpad om bestand te openen of te schrijven. Moet absoluut zijn. Laat veld " +"leeg om de huidige werk directory te gebruiken." -#: ../src/interface.c:2791 -#, fuzzy +#: ../src/interface.c:2793 msgid "Project files:" -msgstr "Eigenschappen" +msgstr "Project bestanden:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" -msgstr "" +msgstr "Begin pad voor het openen van project bestanden" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" -msgstr "" +msgstr "Extra plugin pad:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" +"Geany kijkt standaard in het globale installatie pad en in de " +"configuratiemap. Eventueel kan hier een pad worden toegevoegd om ook naar " +"plugins te zoeken. Laat leeg om uit te zetten." -#: ../src/interface.c:2841 -#, fuzzy +#: ../src/interface.c:2843 msgid "Paths" -msgstr "Lettertypes" +msgstr "Bestandspaden" -#: ../src/interface.c:2846 -#, fuzzy +#: ../src/interface.c:2848 msgid "Startup" -msgstr "Status" +msgstr "Opstarten" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Beep bij fouten of wanneer compilatie is beëindigd" -#: ../src/interface.c:2871 -#, fuzzy +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" -"Of er een beeptoon moet worden weergegeven bij een fout of wanneer het " +"Of er een pieptoon moet worden gegeven bij een fout of wanneer het " "compilatieproces is beëindigd." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Schakel naar statusmeldingsvenster bij nieuw bericht" -#: ../src/interface.c:2876 -#, fuzzy +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "" -"Schakel naar de tab statusberichten (onderaan in het notitieboek venster) " -"indien een er een nieuw statusbericht is." +"Schakel naar het statusvenster (onderaan in het berichtenvenster) als er een " +"nieuw bericht is" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" -msgstr "" +msgstr "Onderdruk status mededelingen in de statusregel" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "" +"Verwijder alle mededelingen van de statusregel. De medelingen blijven " +"zichtbaar in het statusmededelingenvenster." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" -msgstr "" +msgstr "Auto focus widgets (focus volgt muis)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." msgstr "" +"Geef de focus automatisch aan widgets onder de muiscursor. Werkt bij de " +"hoofdeditor, de notities, het werkbalkzoekvenster, de ga naar regel velden " +"en de VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 -#, fuzzy +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Gebruik Openen/Opslaan dialoog van Windows" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "Bepaald of de standaard Windows Openen/Opslaan of de GTK default dialoog gebruikt wordt" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" -msgstr "Weergave" +msgstr "Overige" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" -msgstr "" +msgstr "Ga door met zoeken en verberg het zoekdialoog" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "" +"Zoek altijd opnieuw en verberg het zoekvenster na klikken op Zoek volgende/" +"vorige" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" -msgstr "" +msgstr "Gebruik het woord onder de cursor voor het zoekdialoog" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" +"Gebruik het huidige woord onder de cursor als het Zoek, Zoek in bestanden of " +"Vervangen dialoog als er geen selectie is" -#: ../src/interface.c:2918 -#, fuzzy +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" -msgstr "Ongeldige map voor zoeken in bestanden." +msgstr "Gebruik de map van het huidige bestand voor Zoek in bestanden" -#: ../src/interface.c:2922 -#, fuzzy +#: ../src/interface.c:2929 msgid "Search" -msgstr "Zijbalk" +msgstr "Zoek" -#: ../src/interface.c:2941 -#, fuzzy +#: ../src/interface.c:2948 msgid "Use project-based session files" -msgstr "Eigenschappen" +msgstr "Gebruik project-gebaseerde sessiebestanden" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" +"Of het project's sessiebestand opgeslagen moet worden en weer geopend moet " +"worden als het project weer geopend wordt" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" -msgstr "" +msgstr "Sla het projectbestand in de projectbasismap op" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " "directory. You can still change the path of the project file in the New " "Project dialog." msgstr "" +"Als dit is aangezet wordt het project basisbestand standaard in het project " +"basismap gezet als een nieuw project wordt gemaakt en niet een map " +"daarboven. Je kunt het projectbestandspad dan nog steeds veranderen in het " +"Nieuw Projectdialoogvenster." -#: ../src/interface.c:2951 -#, fuzzy +#: ../src/interface.c:2958 msgid "Projects" -msgstr "Lettertypes" +msgstr "Projecten" -#: ../src/interface.c:2956 -#, fuzzy +#: ../src/interface.c:2963 msgid "Miscellaneous" -msgstr "Weergave" +msgstr "Overige" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Algemeen" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Toon symbolenlijst" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Schakelt de symbolenlijst aan en uit" -#: ../src/interface.c:2988 -#, fuzzy +#: ../src/interface.c:3009 msgid "Show documents list" -msgstr "Toon open bestanden lijst" +msgstr "Toon bestandenlijst" -#: ../src/interface.c:2991 -#, fuzzy +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" -msgstr "Schakelt de symbolenlijst aan en uit" +msgstr "Schakelt de bestandenlijst aan en uit" + +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "_Zijbalk weergeven" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Positie:" -#: ../src/interface.c:2993 +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Links" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Rechts" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Zijbalk" -#: ../src/interface.c:3014 -#, fuzzy +#: ../src/interface.c:3060 msgid "Symbol list:" -msgstr "Toon symbolenlijst" +msgstr "Lijst van symbolen:" -#: ../src/interface.c:3021 ../src/interface.c:3136 -#, fuzzy +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" -msgstr "Berichtenvenster" +msgstr "Berichtenvenster:" -#: ../src/interface.c:3028 ../src/interface.c:3172 -#, fuzzy +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" -msgstr "Editor" +msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Stelt het lettertype in voor het berichtenvenster" -#: ../src/interface.c:3048 -#, fuzzy +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" -msgstr "Stelt het lettertype in voor de symbolenlijst" +msgstr "Kies lettertype voor symbolenlijst" -#: ../src/interface.c:3056 -#, fuzzy +#: ../src/interface.c:3102 msgid "Sets the editor font" -msgstr "Lettertype editor" +msgstr "Kies editor lettertype" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Lettertypes" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" -msgstr "" +msgstr "Laat editor tabs zien" -#: ../src/interface.c:3081 -#, fuzzy +#: ../src/interface.c:3127 msgid "Show close buttons" -msgstr "Kleurkiezer knop weergeven" +msgstr "Toon afsluit knoppen" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" msgstr "" +"Toont een kleine knop met kruis in de bestandstabs, om gemakkelijk bestanden " +"te sluiten door daar op te klikken (vereist herstart van Geany)" -#: ../src/interface.c:3090 -#, fuzzy +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" -msgstr "Plaatsing van nieuwe bestanden tabs:" - -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Links" +msgstr "Plaats van nieuwe tabs:" -#: ../src/interface.c:3098 -#, fuzzy +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" -msgstr "Nieuwe bestanden tabs zullen links van de tab lijst worden geplaatst" - -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Rechts" +msgstr "Nieuwe bestandtabs zullen links van het tabbladvenster worden geplaatst" -#: ../src/interface.c:3106 -#, fuzzy +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" -msgstr "Nieuwe bestanden tabs zullen rechts van de tab lijst worden geplaatst" +msgstr "Nieuwe bestandtabs zullen rechts van het tabbladvenster worden geplaatst" + +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Naast huidige" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "Of de bestandstabbladen naast het huidige tabblad geplaatst worden, in plaats van aan de uiteinden van het tabbladvenster." -#: ../src/interface.c:3110 +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" -msgstr "" +msgstr "Dubbelklikken verbergt alle toegevoegde widgets" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "" +msgstr "Roept Bewerken->Verberg/toon alle extra widgets aan" -#: ../src/interface.c:3115 -#, fuzzy +#: ../src/interface.c:3176 msgid "Editor tabs" -msgstr "Lettertypes" +msgstr "Editor tabbladen" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Bovenaan" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Onderaan" -#: ../src/interface.c:3154 -#, fuzzy +#: ../src/interface.c:3215 msgid "Sidebar:" -msgstr "Zijbalk" +msgstr "Zijbalk:" -#: ../src/interface.c:3190 -#, fuzzy +#: ../src/interface.c:3251 msgid "Tab positions" -msgstr "Locatie:" +msgstr "Tab posities" -#: ../src/interface.c:3209 -#, fuzzy +#: ../src/interface.c:3270 msgid "Show status bar" -msgstr "Werkbalk weergeven" +msgstr "Statusregel weergeven" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "" +msgstr "Of de statusregel onder aan het hoofdvenster weergegeven moet worden" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3242 -#, fuzzy +#: ../src/interface.c:3311 msgid "Show T_oolbar" -msgstr "Werkbalk weergeven" +msgstr "_Werkbalk weergeven" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Voeg de toolbar toe aan het menu" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" +msgstr "Zet de werkbalk naast het menu om verticale ruimte te besparen" -#: ../src/interface.c:3251 -#, fuzzy -msgid "Toolbar" -msgstr "Lettertypes" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Werkbalk aanpassen" -#: ../src/interface.c:3272 -#, fuzzy -msgid "Icon style:" -msgstr "Pictogramstijl" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Systeem _standaard" -#: ../src/interface.c:3279 -#, fuzzy -msgid "Icon size:" -msgstr "Pictogramgrootte" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Pictogr_ammen en tekst" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Enkel p_ictogrammen" -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Uiterlijk" +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Enkel _tekst" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Icon style" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3413 #, fuzzy -msgid "Customize Toolbar" -msgstr "_Werkbalk weergeven" +msgid "S_ystem Default" +msgstr "_Standaard" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Kleine pictogrammen" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Miniscule pictogrammen" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Grote pictogrammen" -#: ../src/interface.c:3363 +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Icon grootte" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Werkbalk" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Werkbalk" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Regelterugloop" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1968,11 +1976,11 @@ "volgende regel. Let op: regelterugloop eist veel van uw systeem voor grote " "documenten, dus zou moeten worden uitgeschakeld op trage systemen." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" -msgstr "" +msgstr "Pas \"slimme\" home toets toe." -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1980,574 +1988,574 @@ "key always moves the caret to the start of the current line, regardless of " "its current position." msgstr "" +"Wanneer de \"slimme\" HOME toets is geactiveerd, zal de cursor naar het " +"begin van het eerste niet-spatie teken in de regel verplaatsen, tenzij het " +"daar als is en dan naar het begin van de regel verplaatsen. Wanneer deze " +"optie uitgeschakeld is, beweegt de HOME toets de cursor altijd naar het " +"begin van de regel." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" -msgstr "" +msgstr "'Drag and Drop' uitzetten" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" msgstr "" +"'Drag and Drop' geheel uitzetten in het editorvenster zodat je geen " +"selecties van of naar het venster kunt verslepen" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Invouwen activeren" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Of invouwen van code moet worden geactiveerd" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" -msgstr "" +msgstr "Samenvoegen/uitklappen van onderliggende objecten van een vouwpunt" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." msgstr "" +"Samenvoegen of uitklappen van een vouwpunt. Door tijdens het klikken op de " +"Shift toets te drukken wordt het tegenovergestelde gedrag bereikt." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Gebruik markeringen om compile fouten weer te geven" -#: ../src/interface.c:3418 -#, fuzzy +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "" -"Of er markeringen (gegolfde onderlijning) moeten worden gebruikt om de " +"Of er markeringen (gegolfde onderlijning) gebruikt moeten worden om de " "regels te markeren waarin de compiler een waarschuwing of een fout heeft " "gevonden." -#: ../src/interface.c:3420 -#, fuzzy +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" -msgstr "Lege spaties aan regeleinde verwijderen" +msgstr "Enter verwijderd lege spaties" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" +"Gebruik enter om lege spaties aan het einde van de vorige regel te " +"verwijderen" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" -msgstr "" +msgstr "Afbreekkolom:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "'Lange regel' marker" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." -msgstr "" +msgstr "Een string die wordt toegevoegd bij het activeren van eenregelig commentaar in een bronbestand. Deze wordt gebruikt om het actieve commentaar te markeren." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Functies" -#: ../src/interface.c:3457 -#, fuzzy +#: ../src/interface.c:3549 msgid "Features" -msgstr "Functies" +msgstr "Functies" -#: ../src/interface.c:3489 ../src/interface.c:5057 -#, fuzzy +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" -msgstr "Auto inspringing" +msgstr "Automatische inspringingsmode:" -#: ../src/interface.c:3502 ../src/interface.c:5070 -#, fuzzy +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" -msgstr "Baltisch" +msgstr "Basis" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" -msgstr "" +msgstr "Huidige chars" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" -msgstr "" +msgstr "haakjes" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 -#, fuzzy +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" -msgstr "Type" +msgstr "Type:" -#: ../src/interface.c:3513 ../src/interface.c:5081 -#, fuzzy +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" -msgstr "Schrijven:" +msgstr "Breedte:" -#: ../src/interface.c:3526 ../src/interface.c:5094 -#, fuzzy +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" -msgstr "De breedte in tekens, die één tabteken inneemt" +msgstr "De breedte in tekens van een inspringing" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" -msgstr "" +msgstr "Voeg spaties toe bij inspringen" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" -msgstr "" +msgstr "Gebruik enkele inspringing" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" +"Gebruik spaties als de inspringing kleiner is dan een tabbreedte, gebruik " +"anders beide" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Tabgrootte:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" +"Of het inspringingstype van het bestand gedetecteerd moet worden als het is " +"geopend" -#: ../src/interface.c:3589 -#, fuzzy +#: ../src/interface.c:3658 msgid "Tab key indents" -msgstr "Inspringing vergroten" +msgstr "Tabtoets springt in" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" +"Drukken op tab/shift-tab springt in/uit in plaat van een tabteken in te " +"voegen" -#: ../src/interface.c:3594 -#, fuzzy +#: ../src/interface.c:3663 msgid "Indentation" -msgstr "Locatie:" +msgstr "Inspringing" -#: ../src/interface.c:3599 ../src/interface.c:5157 -#, fuzzy +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" -msgstr "Locatie:" +msgstr "Inspringing" -#: ../src/interface.c:3622 -#, fuzzy +#: ../src/interface.c:3691 msgid "Snippet completion" -msgstr "Autovervollediging onderdrukken" +msgstr "Fragment voltooiing" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" +"Typ een ingegeven afkorting en voltooi het in een complexere string met een " +"druk op een knop" -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" -msgstr "XML-tag autovervollediging" +msgstr "XML-tag voltooiing" -#: ../src/interface.c:3630 -#, fuzzy +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" -msgstr "Automatische voltooiing van open XML-tags (HTML-tags inbegrepen)" +msgstr "" +"Automatische voltooiing en sluiting van open XML-tags (inclusief HTML-tags)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" -msgstr "" +msgstr "Automatisch doorgaan met multiregelcommentaar" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" +"Automatisch doorgaan met multiregelcommentaar in talen als C, C++ en Java " +"als er een nieuwe regel in zo'n commentaar wordt ingevoegd" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "Symbolen automatisch aanvullen" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" +"Automatisch aanvullen van bekende symbolen in open bestanden (functienamen, " +"globale variabelen, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Vul automatisch aan met alle woorden in het document" -#: ../src/interface.c:3646 -#, fuzzy +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "Autovervollediging onderdrukken" +msgstr "Automatische voltooiing onderdrukken" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" -msgstr "" +msgstr "Max. aantal symboolnaam suggesties:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" -msgstr "" +msgstr "Aanvullingslijst hoogte:" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" -msgstr "Autovervollediging van constructies" +msgstr "Automatische voltooiing van constructies" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" -msgstr "" +msgstr "Het aantal karakters dat nodig is om de autovoltooiingslijst te tonen" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" -msgstr "Weer te geven aantal regels in de autovoltooiingslijst." +msgstr "Weergavehoogte in regels van de autovoltooiingslijst" -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "Weer te geven aantal regels in de autovoltooiingslijst." +msgstr "Maximum aantal items weer te geven in de autovoltooiingslijst" -#: ../src/interface.c:3704 -#, fuzzy +#: ../src/interface.c:3773 msgid "Completions" -msgstr "Locatie:" +msgstr "Automatisch voltooien" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" -msgstr "" +msgstr "Haakjes ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" -msgstr "" +msgstr "Sluit haakjes automatisch af bij het typen van een nieuw haakje" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" -msgstr "" +msgstr "Enkele aanhalingstekens" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" -msgstr "" +msgstr "Sluit bij een nieuw aanhalingsteken deze automatisch af" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" -msgstr "" +msgstr "Gekrulde haken { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" -msgstr "" +msgstr "Sluit bij een nieuw gekrulde haakje deze automatisch af" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" -msgstr "" +msgstr "Vierkante haken [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" +msgstr "Sluit bij een nieuw vierkant haakje deze automatisch af" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" -msgstr "" +msgstr "Aanhalingstekens \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" -msgstr "" +msgstr "Sluit bij een nieuw aanhalingsteken deze automatisch af" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" -msgstr "" +msgstr "Automatisch sluiten van haakjes en aanhalingstekens" -#: ../src/interface.c:3764 -#, fuzzy +#: ../src/interface.c:3832 msgid "Completions" -msgstr "Locatie:" +msgstr "Voltooiing" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" -msgstr "" +msgstr "Draai syntaxisaccentuering kleuren om" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" +"Draai alle kleuren om, standaard met een witte tekst op een zwarte " +"achtergrond" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Inspringingsmarkeringen weergeven" -#: ../src/interface.c:3795 -#, fuzzy +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" -"Toont kleine puntjeslijnen om het gebruik van de juiste inspringing te " +"Toont kleine stippellijnen om het gebruik van de juiste inspringing te " "vergemakkelijken" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Lege spaties weergeven" -#: ../src/interface.c:3800 -#, fuzzy +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" -msgstr "Markeert lege spaties met punten en tabs met pijlen." +msgstr "Markeert spaties met punten en tabs met pijlen" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Regeleinden weergeven" -#: ../src/interface.c:3805 -#, fuzzy +#: ../src/interface.c:3873 msgid "Shows the line ending character" -msgstr "Toont het regeleinde teken" +msgstr "Toont het regeleindeteken" -#: ../src/interface.c:3807 -#, fuzzy +#: ../src/interface.c:3875 msgid "Show line numbers" -msgstr "_Regelnummers weergeven" +msgstr "Regelnummers weergeven" -#: ../src/interface.c:3810 -#, fuzzy +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Toont of verbergt de regelnummerrand" -#: ../src/interface.c:3812 -#, fuzzy +#: ../src/interface.c:3880 msgid "Show markers margin" -msgstr "_Markeerrand weergeven" +msgstr "Markeerrand weergeven" -#: ../src/interface.c:3815 -#, fuzzy +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "" -"Toont of verbergt de smalle rand rechts van de regelnummers, welke wordt " +"Toont of verbergt de smalle rand rechts van de regelnummers die wordt " "gebruikt om regels te markeren" -#: ../src/interface.c:3817 -#, fuzzy +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" -msgstr "Huidig bestand compileren" +msgstr "Stop scrollen bij de laatste regel" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" +"Of scrollen van een pagina na de laatste regel van een document gestopt moet " +"worden" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Weergave" -#: ../src/interface.c:3843 -#, fuzzy -msgid "Long line marker:" -msgstr "'Lange regel' marker" - -#: ../src/interface.c:3850 -#, fuzzy -msgid "Long line marker color:" -msgstr "Kleur 'lange regel' marker" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Kolom:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Kleur:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Stelt de kleur van de 'lange regel' marker in" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Kleurkiezer" -#: ../src/interface.c:3878 -#, fuzzy +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " "greater than 0 to specify the column where it should appear." msgstr "" "De 'lange regel' marker is een dunne verticale lijn in de editor. Het helpt " -"om lange regels te markeren, of als een hint om de regel te breken. Voer een " -"grotere waarde dan '0' in om de kolom te bepalen waar deze moet verschijnen." +"om lange regels te markeren, of als een hint om de regel af te breken. Voer " +"een grotere waarde dan '0' in om de kolom te bepalen waar deze moet " +"verschijnen." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Lijn" -#: ../src/interface.c:3891 -#, fuzzy +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" -"Geeft een verticale lijn weer in het bewerkingsvenster op de huidige " -"cursorpositie (zie hieronder)." +"Geeft een verticale lijn weer in het venster van de editor op de huidige " +"cursorpositie (zie hieronder)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Achtergrond" -#: ../src/interface.c:3898 -#, fuzzy +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "" -"De achtergrondkleur van tekens na de bepaalde cursorpositie (zie hieronder) " -"veranderde naar de kleurinstelling hieronder. (Aangeraden indien u " -"proportionele lettertypen gebruikt)" +"De achtergrondkleur van karakters na de bepaalde cursorpositie (zie " +"hieronder) veranderde naar de kleurinstelling hieronder. (Aangeraden indien " +"u proportionele lettertypen gebruikt)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Aang_ezet" + +#: ../src/interface.c:3976 ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Lange regel marker" -#: ../src/interface.c:3902 +#: ../src/interface.c:3995 ../src/interface.c:5309 msgid "Disabled" msgstr "Uitgeschakeld" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Lange regel marker" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Laat lege spaties niet zien" -#: ../src/interface.c:3913 -#, fuzzy +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Alleen voor rechthoekige selecties" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "Laat lege spaties voorbij regeleinden alleen zien wanneer een rechthoekige selectie gemaakt wordt" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Altijd" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Laat lege spaties aan regeleinden altijd zien" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Lege spaties" + +#: ../src/interface.c:4021 msgid "Display" -msgstr "Weergave" +msgstr "Weergave" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" -msgstr "" +msgstr "Open nieuwe bestanden van de opdrachtregel" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" +"Open een nieuw bestand voor elk bestand op de opdrachtregel die niet bestaat" -#: ../src/interface.c:3961 -#, fuzzy +#: ../src/interface.c:4069 msgid "Default end of line characters:" -msgstr "Standaard codering:" +msgstr "Standaard regeleindetekens:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nieuwe bestanden" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" - -#: ../src/interface.c:4000 -#, fuzzy +#: ../src/interface.c:4099 msgid "Default encoding (new files):" -msgstr "Standaard codering:" - -#: ../src/interface.c:4007 -#, fuzzy -msgid "Default encoding (existing files):" -msgstr "Standaard codering:" +msgstr "Standaard codering (nieuwe bestanden):" -#: ../src/interface.c:4019 -#, fuzzy -msgid "Sets the default encoding for opening existing files" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Gebruik vaste codering bij het openen van niet-Unicode bestanden" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" +"Deze optie schakelt het automatisch detecteren van de bestandscodering uit " +"bij openen van niet-Unicode bestanden en opent het bestand met de opgegeven " +"codering (meestal niet nodig)" -#: ../src/interface.c:4032 -#, fuzzy +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Standaard codering (bestaande niet-Unicode bestanden):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Stelt de standaard codering in voor bij het openen van niet-Unicode bestanden" + +#: ../src/interface.c:4136 msgid "Encodings" -msgstr "Codering:" +msgstr "Coderingen" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Nieuwe regel aan einde van het bestand" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "" -"Voegt aan het einde van het bestand een nieuwe regel in als er geen " -"voorhanden is" +"Voegt aan het einde van het bestand een nieuwe regel toe als er nog geen is" -#: ../src/interface.c:4056 -#, fuzzy +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" -msgstr "Lege spaties aan regeleinde verwijderen" +msgstr "Lege spaties aan regeleinden verwijderen" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Verwijdert lege spaties aan regeleinden" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Vervang tabs door spaties" -#: ../src/interface.c:4064 -#, fuzzy +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Vervangt alle tabs in het document door spaties" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" -msgstr "Saving files" +msgstr "Bij opslaan van bestanden" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Lengte 'laatst geopende bestanden' lijst:" -#: ../src/interface.c:4105 -#, fuzzy +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" -"Specificeert het aantal bestanden dat opgeslagen zijn in de 'laatst geopende " +"Specificeert het aantal bestanden die opgeslagen zijn in de 'laatst geopende " "bestanden' lijst" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" -msgstr "" +msgstr "Time-out van disk:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" +"Hoe vaak er naar veranderingen van documenten op de schijf gekeken moet " +"worden, uitgedrukt in seconden. Nul zet de controle uit." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 -#, fuzzy +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" -msgstr "_Bestand" - -#: ../src/interface.c:4164 -#, fuzzy -msgid "Make:" -msgstr "Make" +msgstr "Bestanden" -#: ../src/interface.c:4171 -#, fuzzy +#: ../src/interface.c:4268 msgid "Terminal:" -msgstr "Terminal" +msgstr "Terminal:" -#: ../src/interface.c:4178 -#, fuzzy +#: ../src/interface.c:4275 msgid "Browser:" -msgstr "Browser" +msgstr "Browser:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Pad en optie's voor het hulpprogramma 'make'" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2555,962 +2563,894 @@ "Een terminalemulator zoals xterm, gnome-terminal of konsole (zou het -e " "argument moeten accepteren" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pad (en mogelijke bijkomende argumenten)" -#: ../src/interface.c:4236 -#, fuzzy +#: ../src/interface.c:4316 msgid "Grep:" -msgstr "Grep" +msgstr "Grep:" -#: ../src/interface.c:4259 -#, fuzzy +#: ../src/interface.c:4339 msgid "Tool paths" -msgstr "Lettertypes" +msgstr "Hulpprogramma plaatsen" -#: ../src/interface.c:4280 -#, fuzzy +#: ../src/interface.c:4360 msgid "Context action:" -msgstr "_In selectie" +msgstr "Contextactie:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " "can appear anywhere in the given command and will be replaced before " "execution." msgstr "" +"Contextactie commando. Het geselecteerde woord kan gebruikt worden met %s. " +"Het kan overal in het commando zitten en wordt vervangen voor uitvoering." -#: ../src/interface.c:4304 -#, fuzzy +#: ../src/interface.c:4384 msgid "Commands" -msgstr "Tab plaatsing" +msgstr "Commando's" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Hulpprogramma's" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "E-mailadres van de ontwikkelaar" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Initialen van de ontwikkelaar" -#: ../src/interface.c:4352 -#, fuzzy +#: ../src/interface.c:4436 msgid "Initial version:" -msgstr "Initiële versie" +msgstr "Initiële versie:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Versienummer, welke een nieuw bestand initieel heeft" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Bedrijfsnaam" -#: ../src/interface.c:4373 -#, fuzzy +#: ../src/interface.c:4457 msgid "Developer:" -msgstr "Ontwikkelaar" +msgstr "Ontwikkelaar:" -#: ../src/interface.c:4380 -#, fuzzy +#: ../src/interface.c:4464 msgid "Company:" -msgstr "Bedrijf" +msgstr "Bedrijf:" -#: ../src/interface.c:4387 -#, fuzzy +#: ../src/interface.c:4471 msgid "Mail address:" -msgstr "E-mailadres" +msgstr "E-mailadres:" -#: ../src/interface.c:4394 -#, fuzzy +#: ../src/interface.c:4478 msgid "Initials:" -msgstr "Initialen" +msgstr "Initialen:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "De naam van de ontwikkelaar" -#: ../src/interface.c:4408 -#, fuzzy +#: ../src/interface.c:4492 msgid "Year:" -msgstr "Zijbalk" +msgstr "Jaar:" -#: ../src/interface.c:4415 -#, fuzzy +#: ../src/interface.c:4499 msgid "Date:" -msgstr "Make" +msgstr "Datum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" -msgstr "" +msgstr "Datum & Tijd;" -#: ../src/interface.c:4434 -#, fuzzy +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Geef hier een aangepaste datum en tijdsindeling.U kunt gebruik maken van om " -"het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " -"C strftime functie. Lees \"man strftime\" voor meer informatie." +"Geef hier een aangepast formaat voor de {datetime} wildcard. U kunt gebruik " +"maken van elke conversie specifieerder die beschikbaar is voor de ANSI " +"C strftime functie." -#: ../src/interface.c:4441 -#, fuzzy +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Geef hier een aangepaste datum en tijdsindeling.U kunt gebruik maken van om " -"het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " -"C strftime functie. Lees \"man strftime\" voor meer informatie." +"Geef hier een aangepast formaat voor de {year} wildcard. U kunt gebruik maken " +"van elke conversie specifieerder die beschikbaar is voor de ANSI C strftime " +"functie." -#: ../src/interface.c:4448 -#, fuzzy +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Geef hier een aangepaste datum en tijdsindeling.U kunt gebruik maken van om " -"het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " -"C strftime functie. Lees \"man strftime\" voor meer informatie." +"Geef hier een aangepast formaat voor de {date} wildcard. U kunt gebruik maken " +"van elke conversie specifieerder die beschikbaar is voor de ANSI C strftime " +"functie." -#: ../src/interface.c:4450 -#, fuzzy +#: ../src/interface.c:4534 msgid "Template data" -msgstr "Tab plaatsing" +msgstr "Sjablooninformatie" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Sjablonen" -#: ../src/interface.c:4493 -#, fuzzy +#: ../src/interface.c:4577 msgid "C_hange" -msgstr "Wijzigen" +msgstr "_Wijzigen" -#: ../src/interface.c:4497 -#, fuzzy +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" -msgstr "Sneltoetsen" +msgstr "Sneltoetsen" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Sneltoetsen" -#: ../src/interface.c:4525 -#, fuzzy +#: ../src/interface.c:4620 msgid "Command:" -msgstr "Commando" +msgstr "Commando:" -#: ../src/interface.c:4532 -#, fuzzy, c-format +#: ../src/interface.c:4627 +#, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Pad naar het commando om bestanden af te drukken (gebruik %f voor de " "bestandsnaam)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" -msgstr "" +msgstr "Gebruik een externe opdrachtregel om te printen" -#: ../src/interface.c:4562 ../src/printing.c:380 -#, fuzzy +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" -msgstr "_Regelnummers weergeven" +msgstr "Print regelnummers" -#: ../src/interface.c:4565 ../src/printing.c:382 -#, fuzzy +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" -msgstr "Pad van het huidige bestand volgen" +msgstr "Voeg regelnummers toe aan het te printen bestand" -#: ../src/interface.c:4567 ../src/printing.c:385 -#, fuzzy +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" -msgstr "_Regelnummers weergeven" +msgstr "Print paginanummers" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" +"Voeg paginanummers toe aan de onderkant van elke pagina. Kost 2 regels per " +"pagina." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" -msgstr "" +msgstr "Print paginahoofd" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." msgstr "" +"Voeg een klein paginahoofd toe aan elke pagina met het paginanummer, het " +"bestandsnaam en de huidige datum (zie hieronder). Kost 3 regels van de " +"pagina." -#: ../src/interface.c:4592 ../src/printing.c:408 -#, fuzzy +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" -msgstr "Pad van het huidige bestand volgen" +msgstr "Gebruik de naam van het te printen bestand" -#: ../src/interface.c:4595 -#, fuzzy +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" -msgstr "Pad van het huidige bestand volgen" +msgstr "" +"Print alleen de naam van het bestand (zonder het pad) van het te printen " +"bestand" -#: ../src/interface.c:4601 ../src/printing.c:416 -#, fuzzy +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" -msgstr "Standaard datumformaat" +msgstr "Datumformaat:" -#: ../src/interface.c:4608 ../src/printing.c:422 -#, fuzzy +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " "with the ANSI C strftime function." msgstr "" -"Geef hier een aangepaste datum en tijdsindeling.U kunt gebruik maken van om " -"het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " -"C strftime functie. Lees \"man strftime\" voor meer informatie." +"Geef hier een aangepaste datum en tijdsstempel die wordt toegevoegd aan de " +"kop van elke pagina. U kunt gebruik maken van elke conversie specifieerder " +"die beschikbaar is voor de ANSI C strftime functie." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" -msgstr "" +msgstr "Gebruik standaard GTK printing" -#: ../src/interface.c:4617 -#, fuzzy +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Afdrukken" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Afdrukken" -#: ../src/interface.c:5040 -#, fuzzy +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Eigenschappen" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 -#, fuzzy +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Weergave:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Aangepast" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Gebruik algemene instellingen" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" -msgstr "_Bestand" +msgstr "Bestand" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nieuw" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Openen" -#: ../src/keybindings.c:206 -#, fuzzy +#: ../src/keybindings.c:235 msgid "Open selected file" -msgstr "Bestanden openen" +msgstr "Geselecteerd bestand openen" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Opslaan" -#: ../src/keybindings.c:210 -#, fuzzy +#: ../src/keybindings.c:239 msgid "Save as" -msgstr "Alles opslaan" +msgstr "Opslaan als" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Alles opslaan" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Afdrukken" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Sluiten" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Alles sluiten" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Bestand herladen" -#: ../src/keybindings.c:224 ../src/project.c:495 -#, fuzzy +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Her-open laatst gesloten tabblad" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" -msgstr "Make _object" +msgstr "Project" -#: ../src/keybindings.c:227 -#, fuzzy +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Eigenschappen" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Ongedaan maken" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" -msgstr "Herdoen" +msgstr "Opnieuw" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Kloon regel of selectie" - -#: ../src/keybindings.c:239 -#, fuzzy -msgid "Delete current line(s)" -msgstr "Huidig bestand sluiten" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "Huidig bestand sluiten" - -#: ../src/keybindings.c:244 -#, fuzzy -msgid "Transpose current line" -msgstr "Drukt het huidige bestand af" +msgstr "Rest van de regel verwijderen" -#: ../src/keybindings.c:246 -#, fuzzy +#: ../src/keybindings.c:280 msgid "Scroll to current line" -msgstr "Huidig bestand compileren" +msgstr "Scroll naar huidige regel" -#: ../src/keybindings.c:248 -#, fuzzy +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" -msgstr "Huidig bestand compileren" +msgstr "Scroll een regel naar boven" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" -msgstr "" +msgstr "Scroll een regel naar beneden" -#: ../src/keybindings.c:253 -#, fuzzy +#: ../src/keybindings.c:286 msgid "Complete snippet" -msgstr "Woord vervolledigen" +msgstr "Fragment voltooiing" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" -msgstr "" +msgstr "Verplaats cursor in fragment" -#: ../src/keybindings.c:257 -#, fuzzy +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" -msgstr "Autovervollediging onderdrukken" +msgstr "Automatisch voltooien onderdrukken" -#: ../src/keybindings.c:259 -#, fuzzy +#: ../src/keybindings.c:292 msgid "Context Action" -msgstr "_In selectie" +msgstr "Contextactie" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" -msgstr "Woord vervolledigen" +msgstr "Woord aanvullen" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Hulptip weergeven" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Macrolijst weergeven" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Woord voltooien" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Verplaats regel(s) omhoog" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Verplaats regel(s) omlaag" + +#: ../src/keybindings.c:306 msgid "Clipboard" -msgstr "" +msgstr "Klembord-plugin" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" -msgstr "" +msgstr "Knip" -#: ../src/keybindings.c:272 -#, fuzzy +#: ../src/keybindings.c:311 msgid "Copy" -msgstr "Bedrijf" +msgstr "Kopieer" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" -msgstr "" - -#: ../src/keybindings.c:276 -#, fuzzy -msgid "Copy current line(s)" -msgstr "Huidig bestand compileren" +msgstr "Plak" -#: ../src/keybindings.c:278 -#, fuzzy -msgid "Cut current line(s)" -msgstr "Huidig bestand sluiten" - -#: ../src/keybindings.c:280 -#, fuzzy +#: ../src/keybindings.c:321 msgid "Select" -msgstr "Alles selecteren" +msgstr "Selecteer" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Alles selecteren" -#: ../src/keybindings.c:285 -#, fuzzy +#: ../src/keybindings.c:326 msgid "Select current word" -msgstr "Huidig bestand opslaan" +msgstr "Selecteer huidige woord" -#: ../src/keybindings.c:287 -#, fuzzy -msgid "Select current line(s)" -msgstr "Huidig bestand opslaan" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Ga naar vorige woorddeel" -#: ../src/keybindings.c:289 -#, fuzzy -msgid "Select current paragraph" -msgstr "Huidig bestand opslaan" +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Ga naar volgende woorddeel" -#: ../src/keybindings.c:291 -#, fuzzy +#: ../src/keybindings.c:338 msgid "Format" -msgstr "Inde_ling" +msgstr "Indeling" -#: ../src/keybindings.c:295 -#, fuzzy +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" -msgstr "Schakel regelcommentaar uit" +msgstr "Maak selectie onder- of bovenkast" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Schakel regelcommentaar uit" -#: ../src/keybindings.c:300 -#, fuzzy +#: ../src/keybindings.c:347 msgid "Comment line(s)" -msgstr "Plaats hekje voor regel" +msgstr "Commentarieer regel(s) uit" -#: ../src/keybindings.c:302 -#, fuzzy +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" -msgstr "Verwijder hekje voor regel" +msgstr "Maak uitcommentarieering regel(s) ongedaan." -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Inspringing vergroten" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Inspringing verkleinen" -#: ../src/keybindings.c:310 -#, fuzzy +#: ../src/keybindings.c:357 msgid "Increase indent by one space" -msgstr "Inspringing vergroten" +msgstr "Inspringing een spatie vergroten" -#: ../src/keybindings.c:312 -#, fuzzy +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" -msgstr "Inspringing verkleinen" - -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "" +msgstr "Inspringing een spatie verkleinen" -#: ../src/keybindings.c:316 -#, fuzzy +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" -msgstr "Aangepast datumformaat instellen" +msgstr "Zend naar Aangepast Commando 1" -#: ../src/keybindings.c:318 -#, fuzzy +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" -msgstr "Aangepast datumformaat instellen" +msgstr "Zend naar Aangepast Commando 2" -#: ../src/keybindings.c:320 -#, fuzzy +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" -msgstr "Aangepast datumformaat instellen" - -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "_In selectie" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" +msgstr "Zend naar Aangepast Commando 3" -#: ../src/keybindings.c:326 -#, fuzzy +#: ../src/keybindings.c:375 msgid "Insert" -msgstr "Datum invoegen" +msgstr "invoegen" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" -msgstr "Datum invoegen" - -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "" +msgstr "Datum invoegen" -#: ../src/keybindings.c:334 -#, fuzzy +#: ../src/keybindings.c:384 msgid "Settings" -msgstr "Sectie" +msgstr "Instellingen" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 -#, fuzzy +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" -msgstr "_Zoeken" +msgstr "Zoeken" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Zoek" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Zoek volgende" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Zoek vorige" -#: ../src/keybindings.c:350 -#, fuzzy +#: ../src/keybindings.c:402 msgid "Find Next Selection" -msgstr "_In selectie" +msgstr "Volgende selectie zoeken" -#: ../src/keybindings.c:352 -#, fuzzy +#: ../src/keybindings.c:404 msgid "Find Previous Selection" -msgstr "Zoek vorige" +msgstr "Vorige selectie zoeken" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Vervangen" -#: ../src/keybindings.c:356 ../src/search.c:686 -#, fuzzy +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" -msgstr "Zoek in _bestanden" +msgstr "Zoek in bestanden" -#: ../src/keybindings.c:359 -#, fuzzy +#: ../src/keybindings.c:411 msgid "Next Message" -msgstr "Berichten" +msgstr "Volgende Bericht" -#: ../src/keybindings.c:361 -#, fuzzy +#: ../src/keybindings.c:413 msgid "Previous Message" -msgstr "Berichten" +msgstr "Vorige Bericht" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 +#, fuzzy msgid "Find Usage" -msgstr "Zoek boodschappen" +msgstr "Zoek woord" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" -msgstr "Zoek boodschappen" +msgstr "Zoek woord in document" -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "_Make all" +msgstr "Alles markeren" -#: ../src/keybindings.c:369 -#, fuzzy +#: ../src/keybindings.c:421 msgid "Go to" -msgstr "Ga naar regel" +msgstr "Ga naar" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" -msgstr "" +msgstr "Ga een plaats terug" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" -msgstr "" +msgstr "Ga een plaats vooruit" -#: ../src/keybindings.c:379 -#, fuzzy +#: ../src/keybindings.c:431 msgid "Go to matching brace" -msgstr "Ga naar regel" +msgstr "Ga naar bijbehorend haakje" -#: ../src/keybindings.c:382 -#, fuzzy +#: ../src/keybindings.c:434 msgid "Toggle marker" -msgstr "'Lange regel' marker" - -#: ../src/keybindings.c:385 -#, fuzzy -msgid "Go to next marker" -msgstr "'Lange regel' marker" +msgstr "Zet regel lengte marker aan/uit" -#: ../src/keybindings.c:388 -#, fuzzy -msgid "Go to previous marker" -msgstr "'Lange regel' marker" - -#: ../src/keybindings.c:390 -#, fuzzy +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Ga naar tag definitie" -#: ../src/keybindings.c:392 -#, fuzzy +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Ga naar tag declaratie" -#: ../src/keybindings.c:394 -#, fuzzy +#: ../src/keybindings.c:446 msgid "Go to Start of Line" -msgstr "Ga naar regel" +msgstr "Ga naar begin van de regel" -#: ../src/keybindings.c:396 -#, fuzzy +#: ../src/keybindings.c:448 msgid "Go to End of Line" -msgstr "Ga naar regel" +msgstr "Ga naar eind van de regel" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" -msgstr "Ga naar regel" +msgstr "Ga naar eind van zichtbare regel" -#: ../src/keybindings.c:400 -#, fuzzy +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" -msgstr "'Lange regel' marker" +msgstr "Ga naar vorige woorddeel" -#: ../src/keybindings.c:402 -#, fuzzy +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" -msgstr "'Lange regel' marker" +msgstr "Ga naar volgende woorddeel" -#: ../src/keybindings.c:404 -#, fuzzy +#: ../src/keybindings.c:456 msgid "View" -msgstr "_Beeld" +msgstr "Beeld" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" -msgstr "" +msgstr "Verberg/toon alle extra widgets" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Volledig scherm" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Berichtenvenster verbergen" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Zijbalk verbergen" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Inzoomen" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Uitzoomen" -#: ../src/keybindings.c:421 -#, fuzzy +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Normale afmeting" + +#: ../src/keybindings.c:475 msgid "Focus" -msgstr "_Document" +msgstr "Focus" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" -msgstr "Sckakel naar Editor" +msgstr "Schakel naar Editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Schakel naar Notities" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Schakel naar VTE" -#: ../src/keybindings.c:430 -#, fuzzy +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" -msgstr "Schakel naar Notities" +msgstr "Schakel naar Zoekbalk" -#: ../src/keybindings.c:432 -#, fuzzy +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" -msgstr "Schakel naar Notities" +msgstr "Schakel naar Zijbalk" -#: ../src/keybindings.c:434 -#, fuzzy +#: ../src/keybindings.c:488 msgid "Switch to Compiler" -msgstr "Schakel naar Notities" +msgstr "Schakel naar Compiler" -#: ../src/keybindings.c:436 -#, fuzzy +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Schakel naar Berichten" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Schakel naar berichtenvenster" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Schakel naar documentenlijst in zijbalk" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Schakel naar symbollijst in zijbalk" + +#: ../src/keybindings.c:498 msgid "Notebook tab" -msgstr " commandos" +msgstr "Tabblad" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Schakel naar linker document" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Schakel naar rechter document" -#: ../src/keybindings.c:443 -#, fuzzy +#: ../src/keybindings.c:505 msgid "Switch to last used document" -msgstr "Schakel naar linker document" +msgstr "Schakel naar laatst gebruikte document" -#: ../src/keybindings.c:445 -#, fuzzy +#: ../src/keybindings.c:507 msgid "Move document left" -msgstr "Volledig document" +msgstr "Verplaats document naar links" -#: ../src/keybindings.c:447 -#, fuzzy +#: ../src/keybindings.c:509 msgid "Move document right" -msgstr "Volledig document" +msgstr "Verplaats document naar rechts" -#: ../src/keybindings.c:449 -#, fuzzy +#: ../src/keybindings.c:511 msgid "Move document first" -msgstr "Volledig document" +msgstr "Verplaats document naar eerste positie" -#: ../src/keybindings.c:451 -#, fuzzy +#: ../src/keybindings.c:513 msgid "Move document last" -msgstr "Volledig document" +msgstr "Verplaats document naar laatste positie" -#: ../src/keybindings.c:453 -#, fuzzy +#: ../src/keybindings.c:515 msgid "Document" -msgstr "_Document" +msgstr "Document" -#: ../src/keybindings.c:456 -#, fuzzy +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" -msgstr "Regelterugloop" +msgstr "Regelterugloop in/uitschakelen" -#: ../src/keybindings.c:458 -#, fuzzy +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" -msgstr "_Regelcommentaar inschakelen" +msgstr "Regelafbreking in/uitschakelen" -#: ../src/keybindings.c:462 -#, fuzzy +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" -msgstr "_Vervang tabs door spaties" +msgstr "Vervang spaties door tabs" -#: ../src/keybindings.c:464 -#, fuzzy +#: ../src/keybindings.c:526 msgid "Toggle current fold" -msgstr "Huidig bestand opslaan" +msgstr "Vouw in of uit" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Alles invouwen" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Alles uitvouwen" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Symbolenlijst herladen" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Verwijder _markers" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Verwijder fout_indicatoren" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Bouwen" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Compileer" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make aangepast doel" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" -msgstr "" +msgstr "Volgende fout" -#: ../src/keybindings.c:488 -#, fuzzy +#: ../src/keybindings.c:554 msgid "Previous error" -msgstr "Vertalers" +msgstr "Vorige fout" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Uitvoeren" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Uitvoeren (alternatief commando)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Bouwopties" -#: ../src/keybindings.c:499 -#, fuzzy +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Kleurkiezer weergeven" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 -#, fuzzy +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "_Help" -#: ../src/keybindings.c:799 -#, fuzzy +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "_Sneltoetsen" -#: ../src/keybindings.c:812 -#, fuzzy +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" -msgstr "Volgende sneltoetsen zijn gedefinieert:" +msgstr "De volgende sneltoetsen zijn gedefinieerd:" -#: ../src/keybindings.c:1583 -#, fuzzy +#: ../src/keybindings.c:1791 msgid "Switch to Document" -msgstr "Schakel naar linker document" +msgstr "Schakel naar document" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Type hier wat u wilt, gebruik het als notitie/krabbelbord" -#: ../src/keyfile.c:1015 -#, fuzzy +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." -msgstr "bestanden van vorige sessies niet laden" +msgstr "Kon bestanden van vorige sessies niet laden." #: ../src/log.c:181 -#, fuzzy msgid "Debug Messages" -msgstr "Berichten" +msgstr "Debug berichten" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "Ruim op" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "" +"Stel initiële kolomnummer in voor het eerstgeopende bestand (handig in " +"samenwerking met --line)" -#: ../src/main.c:125 -#, fuzzy +#: ../src/main.c:123 msgid "Use an alternate configuration directory" -msgstr "gebruik een alternatieve configuratiemap" +msgstr "Gebruik een alternatieve configuratiemap" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" -msgstr "" +msgstr "Geef interne bestandstype-namen weer" -#: ../src/main.c:128 -#, fuzzy +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" -msgstr "autovoltooiingsdata niet laden (zie documentatie)" +msgstr "Genereer globale labels bestand (zie documentatie)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" +"Laat voorbewerking C/C++ bestanden achterwege bij het genereren van labels" -#: ../src/main.c:132 -#, fuzzy +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" -"open geen bestanden tijdens een actie, forceer openen van een nieuwe " -"instantie" +"Open geen bestanden in een reeds geopend venster van Geany, maar gebruik een " +"nieuw venster" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "Gebruik deze bestandsnaamsocket om te communiceren met een lopende Geany instantatie" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Geeft een lijst met geopende documenten van een lopende Geany instantiatie" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" -msgstr "" +msgstr "Stel initiële regelnummer in voor het eerstgeopende bestand" -#: ../src/main.c:135 -#, fuzzy +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "toon geen berichtenvenster bij opstarten" -#: ../src/main.c:136 -#, fuzzy +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" -msgstr "autovoltooiingsdata niet laden (zie documentatie)" +msgstr "Autovoltooiingsdata niet laden (zie documentatie)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" -msgstr "" +msgstr "Plugins niet laden" -#: ../src/main.c:140 +# Of installatiedirectory's? +#: ../src/main.c:138 msgid "Print Geany's installation prefix" -msgstr "" +msgstr "Print Geany's installatieprefix" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "bestanden van vorige sessies niet laden" -#: ../src/main.c:143 -#, fuzzy +#: ../src/main.c:141 msgid "Don't load terminal support" -msgstr "terminalondersteuning niet laden" +msgstr "Terminalondersteuning niet laden" -#: ../src/main.c:144 -#, fuzzy +#: ../src/main.c:142 msgid "Filename of libvte.so" -msgstr "bestandsnaam van libvte.so" +msgstr "Bestandsnaam van libvte.so" -#: ../src/main.c:147 -#, fuzzy +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Uitvoerig toelichten" + +#: ../src/main.c:145 msgid "Show version and exit" -msgstr "toon versie en sluit af" +msgstr "Toon versie en sluit af" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" -msgstr "" +msgstr "[BESTANDEN...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(gebouwd op %s met GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" -msgstr "" +msgstr "Nu verplaatsen?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." -msgstr "" +msgstr "Geany moet je oude configuratiemap verplaatsen voor het starten." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." -msgstr "" +msgstr "Je configuratiemap is succesvol verplaatst van \"%s\" naar \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" +"Je oude configuratiemap \"%s\" kon niet worden verplaatst naar \"%s\" (%s). " +"Verplaats de map alstublieft naar de nieuwe plaats." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3522,233 +3462,245 @@ "configuratiemap.\n" "Geany sowieso starten?" -#: ../src/main.c:780 ../src/socket.c:164 -#, fuzzy, c-format -msgid "Could not find file '%s'." -msgstr "Kon pixmap bestand %s niet vinden" - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Dit is Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/main.c:1224 -#, fuzzy +#: ../src/main.c:1244 msgid "Configuration files reloaded." -msgstr "%s configuratiebestand, bewerk het inien nodig" +msgstr "Configuratie bestanden opnieuw ingeladen." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Statusberichten" -#: ../src/msgwindow.c:515 -#, fuzzy +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "Kopieer" + +#: ../src/msgwindow.c:533 msgid "Copy _All" -msgstr "_Alles sluiten" +msgstr "_Alles kopiëren" -#: ../src/msgwindow.c:545 -#, fuzzy +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" -msgstr "Berichtenvenster" +msgstr "Ver_berg berichtenvenster" + +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Kan bestand \"%s\" niet vinden - probeer huidige document pad." -#: ../src/plugins.c:425 +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" +"Plugin \"%s\" is binair niet compatibel met deze release van Geany - " +"hercompileren vereist." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" -msgstr "" +msgstr "_Plugin beheer" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" "Description: %s\n" "Author(s): %s" msgstr "" +"Plugin: %s %s\n" +"Beschrijving: %s\n" +"Auteur(s): %s" -#: ../src/plugins.c:1087 -#, fuzzy +#: ../src/plugins.c:1159 msgid "Active" -msgstr "Actie" +msgstr "Actief" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" -msgstr "" +msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." -msgstr "" +msgstr "Geen plugins beschikbaar" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" -msgstr "" +msgstr "Plugins" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Kies welke plugins bij het starten geladen moeten worden:" -#: ../src/plugins.c:1263 -#, fuzzy +#: ../src/plugins.c:1301 msgid "Plugin details:" -msgstr "Locatie:" +msgstr "Plugin details:" -#: ../src/prefs.c:160 -#, fuzzy +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configureer Plugins" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Toets vastleggen" -#: ../src/prefs.c:166 -#, fuzzy, c-format +#: ../src/prefs.c:171 +#, c-format msgid "Press the combination of the keys you want to use for \"%s\"." -msgstr "Type de combinatie van de toetsen die u wenst te gebruiken voor \"%s\"" +msgstr "" +"Type de combinatie van de toetsen die u wenst te gebruiken voor \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 -#, fuzzy +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" -msgstr "Zoek" +msgstr "_Alles uitvouwen" -#: ../src/prefs.c:214 ../src/symbols.c:1853 -#, fuzzy +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" -msgstr "_Alles sluiten" +msgstr "Alles _invouwen" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Actie" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Sneltoets" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Toestaan" + +#: ../src/prefs.c:1410 msgid "_Override" -msgstr "" +msgstr "_Overschrijf" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" -msgstr "" +msgstr "Overschrijf die sneltoets?" -#: ../src/prefs.c:1400 -#, fuzzy, c-format +#: ../src/prefs.c:1412 +#, c-format msgid "The combination '%s' is already used for \"%s\"." -msgstr "" -"Ge combinatie '%s' is reeds in gebruik voor \"%s\". Gelieve een andere te " -"kiezen." +msgstr "De combinatie '%s' is al in gebruik voor \"%s\"." + +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 -#, fuzzy +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" -"Voer hier de paden in voor de hulpprogramma's 'make' en 'compiler'\n" -"(hulpprogramma's die u niet nodig heeft kunt u leeg laten)" +"Voer hier de paden in voor hulpprogramma's. Hulpprogramma's die je niet " +"gebruikt kunnen leeg gelaten worden." #. page Templates -#: ../src/prefs.c:1519 -#, fuzzy +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" -"Specificeer hier de informatie die u wenst te gebruiken in sjablonen.\n" -"Lees de documentatie indien u niet weet hoe sjablonen werken." +"Specificeer hier de informatie die je wenst te gebruiken in sjablonen. Zie " +"de documentatie voor details." -#: ../src/prefs.c:1523 -#, fuzzy +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." "" msgstr "" -"Informatie: Voor alle wijzigingen die u hier maakt,\n" -"dient u Geany te herstarten om deze te activeren." +"Opmerking: Voor alle wijzigingen die je hier uitvoert moet je Geany " +"herstarten of dwingen tot het herladen van de instellingen met Tools-" +">Herlaad Configuratie." #. page Keybindings -#: ../src/prefs.c:1529 -#, fuzzy +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " "action to edit the string representation of the shortcut directly." msgstr "" -"Hier kunt u sneltoetsen wijzigen voor verscheidene acties. Dubbelklik op of " -"selecteer een actie en druk op de knop 'Wijzigen'om een nieuwe snelkoppeling " -"in te geven. U kunt ook de stringrepresentatie rechtstreeks wijzigen." +"Hier kunt u sneltoetsen wijzigen voor allerlei acties. Selecteer er een en " +"druk op de 'Wijzigen' knop om een nieuwe sneltoets toe te wijzen, of " +"dubbelklik op een actie om de stringrepresentatie direct te wijzigen." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" +"Opmerking: Native GTK printing is alleen beschikbaar als Geany was " +"gebouwd met GTK 2.10 (of nieuwer) en Geany draait op GTK 2.10 (of " +"nieuwer)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" +"Waarschuwing: deze instellingen worden overschreven door het huidige " +"project. Zie Project->Eigenschappen." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "Het edit font is niet enkelgespatiëerd!" #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "Tekst zal verkeerd gespatieerd worden." -#: ../src/printing.c:305 -#, fuzzy, c-format +#: ../src/printing.c:306 +#, c-format msgid "Page %d of %d" -msgstr "Gewijzigd:" +msgstr "Pagina %d van %d:" -#: ../src/printing.c:375 -#, fuzzy +#: ../src/printing.c:376 msgid "Document Setup" -msgstr "Locatie:" +msgstr "Document Opmaak" -#: ../src/printing.c:410 -#, fuzzy +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" -msgstr "Pad van het huidige bestand volgen" +msgstr "" +"Print alleen de naam van het bestand (zonder het pad) van het te printen " +"bestand" -#: ../src/printing.c:526 -#, fuzzy, c-format +#: ../src/printing.c:527 +#, c-format msgid "Page %d of %d" -msgstr "Gewijzigd:" +msgstr "Bladzijde %d van %d" -#: ../src/printing.c:776 -#, fuzzy, c-format -msgid "Printing of file %s was cancelled." -msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "Kon document %s niet naar printer verzenden." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Bestand %s afgedrukt." +msgid "Document %s was sent to the printing subsystem." +msgstr "Document %s verzonden naar printer." -#: ../src/printing.c:827 -#, fuzzy, c-format +#: ../src/printing.c:835 +#, c-format msgid "Printing of %s failed (%s)." -msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." +msgstr "Afdrukken van %s mislukt (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." -msgstr "" +msgstr "Stel eerst het print commando in, onder 'voorkeuren'." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3759,170 +3711,164 @@ "\n" "%s" -#: ../src/printing.c:891 -#, fuzzy, c-format +#: ../src/printing.c:899 +#, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." +msgstr "Afdrukken van \"%s\" mislukt (foutcode: %s)." + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Bestand %s afgedrukt." #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" -msgstr "" +msgstr "projecten" -#: ../src/project.c:118 -#, fuzzy +#: ../src/project.c:117 msgid "New Project" -msgstr "Make _object" +msgstr "Nieuw Project" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" -msgstr "" +msgstr "C_reëer" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" -msgstr "" +msgstr "Naam:" -#: ../src/project.c:149 ../src/project.c:399 -#, fuzzy +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" -msgstr "Vietnamees" +msgstr "Bestandsnaam:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" -msgstr "" +msgstr "Basis pad:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 "" +"Basis directory van alle bestanden die samen het project vormen. Dit mag een " +"nieuw of bestaande padnaam zijn. Je kunt relatieve paden t.o.v. de " +"projectnaam gebruiken." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" -msgstr "" +msgstr "Kies Project Basispad" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 -#, fuzzy, c-format +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 +#, c-format msgid "Project file \"%s\" could not be loaded." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Projectbestand '%s' kon niet worden geladen." -#: ../src/project.c:264 ../src/project.c:276 -#, fuzzy +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" -msgstr "Make object" +msgstr "Open Project" -#: ../src/project.c:296 -#, fuzzy +#: ../src/project.c:289 msgid "Project files" -msgstr "Eigenschappen" +msgstr "Project bestanden" -#: ../src/project.c:330 -#, fuzzy, c-format +#: ../src/project.c:339 +#, c-format msgid "Project \"%s\" closed." -msgstr "Bestand %s gesloten." +msgstr "Project %s gesloten." -#: ../src/project.c:412 -#, fuzzy +#: ../src/project.c:439 msgid "Description:" -msgstr "Sectie" +msgstr "Beschrijving:" -#: ../src/project.c:447 -msgid "Make in base path" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" msgstr "" -#: ../src/project.c:452 -#, fuzzy -msgid "Run command:" -msgstr "Pint commando" +#: ../src/project.c:484 +msgid "Set" +msgstr "Stel in" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -#: ../src/project.c:476 -#, fuzzy +#: ../src/project.c:501 msgid "File patterns:" -msgstr "_Midden Oosten" +msgstr "Bestandspatroon:" -#: ../src/project.c:578 -#, fuzzy +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" -msgstr "" -"Het bestand werd niet opgeslagen.\n" -"Wenst u het op te slaan vooraleer af te sluiten?" +msgstr "Wil je het sluiten voordat je doorgaat?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." -msgstr "" +msgstr "Het project '%s' is al geopend." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." -msgstr "" +msgstr "De opgegeven projectnaam is te kort." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." -msgstr "" +msgstr "De opgegeven projectnaam is te lang (max. %d karakters)" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." -msgstr "" +msgstr "Je hebt een ongeldige bestandsnaam voor het project opgegeven." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" -msgstr "" +msgstr "Creëer basisdirectory van het project?" -#: ../src/project.c:661 -#, fuzzy, c-format +# directory? map? inplaats van pad? +#: ../src/project.c:696 +#, c-format msgid "The path \"%s\" does not exist." -msgstr "Het bestand \"%s\" is niet geldig %s." +msgstr "Het pad \"%s\" bestaat niet." -#: ../src/project.c:670 -#, fuzzy, c-format +#: ../src/project.c:705 +#, c-format msgid "Project base directory could not be created (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Projectbasismap kon niet worden aangemaakt (%s)." -#: ../src/project.c:682 -#, fuzzy, c-format +#: ../src/project.c:717 +#, c-format msgid "Project file could not be written (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Projectbestand kon niet worden aangemaakt (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." -msgstr "" +msgstr "Project \"%s\" gecreëerd." -#: ../src/project.c:732 -#, fuzzy, c-format +#: ../src/project.c:796 +#, c-format msgid "Project \"%s\" saved." msgstr "Bestand %s opgeslagen." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 -#, fuzzy +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" -msgstr "Eigenschappen" - -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "" +msgstr "Kies project bestandsnaam" -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." -msgstr "" +msgstr "Project \"%s\" geopend." -#: ../src/search.c:216 +# _r wordt al gebruikt door Vo_rige +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Gebruik _reguliere expressies" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3930,655 +3876,651 @@ "Gebruik POSIX-achtige reguliere expressies. Voor gedetailleerde informatie " "over het gebruik van reguliere expressies, gelieve de documentatie te lezen." -#: ../src/search.c:227 -#, fuzzy +#: ../src/search.c:244 msgid "Search _backwards" -msgstr "_Achterwaarts zoeken" +msgstr "Achter_uit zoeken" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Gebruik _escape sequences" -#: ../src/search.c:246 -#, fuzzy +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" msgstr "" -"Vervang \\\\, \\t, \\n, \\r en \\uXXXX (Unicode tekens) met de " -"overeenkomende besturingstekens." +"Vervang \\\\, \\t, \\n, \\r en \\uXXXX (Unicode tekens) met de bijbehorende " +"stuurtekens" -#: ../src/search.c:255 ../src/search.c:781 -#, fuzzy +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "_Hoofdlettergevoelig" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Alleen op _volledig woord zoeken" -#: ../src/search.c:265 -#, fuzzy +# _v is al gebruikt in _Volgende +#: ../src/search.c:282 msgid "Match from s_tart of word" -msgstr "Alleen op _volledig woord zoeken" +msgstr "Komt _overeen met begin van woord" -#: ../src/search.c:386 -#, fuzzy +#: ../src/search.c:403 msgid "_Previous" -msgstr "Zoek Vor_ige" +msgstr "Vo_rige" -#: ../src/search.c:392 -#, fuzzy +#: ../src/search.c:409 msgid "_Next" -msgstr "V_olgende zoeken" +msgstr "_Volgende" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 -#, fuzzy +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" -msgstr "Zoek naar:" +msgstr "Zoek _naar:" #. Now add the multiple match options -#: ../src/search.c:424 -#, fuzzy +#: ../src/search.c:441 msgid "_Find All" -msgstr "Zoek" +msgstr "Zoek _alles" -#: ../src/search.c:431 -#, fuzzy +#: ../src/search.c:448 msgid "_Mark" -msgstr "Make" +msgstr "_Markeer" -#: ../src/search.c:433 -#, fuzzy +#: ../src/search.c:450 msgid "Mark all matches in the current document" -msgstr "Verwijdert alle markeringen in het huidige document." +msgstr "Markeert alle overeenkomsten in het huidige document" -#: ../src/search.c:438 ../src/search.c:595 -#, fuzzy +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" -msgstr "_In selectie" +msgstr "In _sessie" -#: ../src/search.c:443 ../src/search.c:600 -#, fuzzy +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" -msgstr "_Document" +msgstr "_In document" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 -#, fuzzy +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" -msgstr "Alles sluiten" +msgstr "Sluit _dialoogvenster" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" -msgstr "" +msgstr "Schakel deze optie uit om het dialoogvenster open te houden" -#: ../src/search.c:529 -#, fuzzy +#: ../src/search.c:556 msgid "Replace & Fi_nd" -msgstr "Vervangen met:" +msgstr "Verva_ngen & zoeken" -#: ../src/search.c:538 -#, fuzzy +#: ../src/search.c:565 msgid "Replace wit_h:" -msgstr "Vervangen met:" +msgstr "Verv_angen met:" #. Now add the multiple replace options -#: ../src/search.c:588 -#, fuzzy +#: ../src/search.c:615 msgid "Re_place All" -msgstr "_Alles vervangen" +msgstr "A_lles vervangen" -#: ../src/search.c:605 -#, fuzzy +#: ../src/search.c:632 msgid "In Se_lection" -msgstr "_In selectie" +msgstr "In sele_ctie" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "" "Vervang alle overeenkomsten die werden gevonden in de geselecteerde tekst" -#: ../src/search.c:696 -#, fuzzy +#: ../src/search.c:725 msgid "_Directory:" -msgstr "Map:" +msgstr "_Map:" -#: ../src/search.c:727 -#, fuzzy +#: ../src/search.c:756 msgid "E_ncoding:" -msgstr "_Codering instellen" +msgstr "Coderin_g:" -#: ../src/search.c:752 -#, fuzzy +#: ../src/search.c:781 msgid "Fixed s_trings" -msgstr "_Herstelde strings" +msgstr "Vaste s_trings" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep reguliere expressies" -#: ../src/search.c:764 ../src/search.c:772 -#, fuzzy +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" -msgstr "Zie greps man-pagina voor meer informatie." +msgstr "Zie greps man-pagina voor meer informatie" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Uitgebreide reguliere expressies" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" -msgstr "" +msgstr "_Daal af in submappen" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" -msgstr "Zoekresultaten omkeren" +msgstr "Zoekresultaten _omkeren" -#: ../src/search.c:797 -#, fuzzy +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -"Keert de zoekresultaten om, zodoende enkel de niet-overeenkomende regels te " -"selecteren" +"Keert de zoekresultaten om, om niet-overeenkomstige regels te selecteren" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" -msgstr "" +msgstr "E_xtra opties:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" -msgstr "" +msgstr "Andere opties die aan Grep meegegeven moeten worden" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 -#, fuzzy, c-format +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 +#, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "Geen overeenkomsten gevonden voor '%s'" -msgstr[1] "Geen overeenkomsten gevonden voor '%s'" +msgstr[0] "%d overeenkomst gevonden met '%s'." +msgstr[1] "%d overeenkomsten gevonden met '%s'." -#: ../src/search.c:1203 -#, fuzzy, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Vervangen in alle _geopende bestanden" -msgstr[1] "Vervangen in alle _geopende bestanden" +#: ../src/search.c:1177 +#, c-format +msgid "Replaced %u matches in %u documents." +msgstr "In totaal %u maal vervangen in %u documenten." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Ongeldige map voor zoeken in bestanden." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Geen tekst te vinden." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Kon hulpprogramma grep '%s' niet uitvoeren; controleer de padinstelling in " "Voorkeuren." -#: ../src/search.c:1419 -#, fuzzy +#: ../src/search.c:1483 msgid "Searching..." -msgstr "_Zoeken" +msgstr "Zoeken..." -#: ../src/search.c:1431 -#, fuzzy, c-format +#: ../src/search.c:1495 +#, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "%s (in map: %s)" +msgstr "%s %s -- %s (in map: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Kon de map niet openen (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Zoeken mislukt." -#: ../src/search.c:1586 -#, fuzzy, c-format +#: ../src/search.c:1621 +#, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." -msgstr[0] "Zoeken beëindigd." -msgstr[1] "Zoeken beëindigd." +msgstr[0] "Zoeken beëindigd met %d resultaat." +msgstr[1] "Zoeken beëindigd met %d resultaten." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Geen overeenkomsten gevonden." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Verkeerde reguliere expressie: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany probeerde als andere gebruiker de Unix Domain socket van een andere lopende instantiatie te benaderen.\n" +"Dit is een fatale fout en Geany zal nu stoppen." + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Hoofdstuk" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sectie" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Appendix" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Andere" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" -msgstr "" +msgstr "Module" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 -#, fuzzy +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" -msgstr "Type" +msgstr "Types" -#: ../src/symbols.c:611 -#, fuzzy +#: ../src/symbols.c:625 msgid "Type constructors" -msgstr "Woord vervolledigen" +msgstr "Type constructors" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Functies" -#: ../src/symbols.c:617 ../src/symbols.c:623 -#, fuzzy +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" -msgstr "Sectie" +msgstr "Secties" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" -msgstr "" +msgstr "Sleutels" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variabelen" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Commando" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Omgeving" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Subsectie" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubsectie" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Label" - -#: ../src/symbols.c:646 -#, fuzzy +#: ../src/symbols.c:660 msgid "Structures" -msgstr "Status" +msgstr "Structures" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Pakket" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Mijn" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Lokaal" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Onze" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Labels" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 -#, fuzzy +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constanten" + +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" -msgstr "Interface" +msgstr "Interfaces" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Klassen" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" -msgstr "" +msgstr "Ankers" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" -msgstr "" +msgstr "H1 kopregels" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" -msgstr "" +msgstr "H2 kopregels" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" -msgstr "" +msgstr "H3 kopregels" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "_In selectie" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "Woord vervolledigen" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" -msgstr "" +msgstr "Modulen" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Wezen" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Naamruimtes" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "Eigenschappen" +msgstr "Procedures" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entiteiten" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Architecturen" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Functies / Procedures" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variabelen / Signalen" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Processen / Componenten" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Functies / taken" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Leden" -#: ../src/symbols.c:806 ../src/symbols.c:829 -#, fuzzy -msgid "Labels" -msgstr "Label" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" -msgstr "" +msgstr "Subroutines" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Macro's" -#: ../src/symbols.c:831 -#, fuzzy +#: ../src/symbols.c:851 msgid "Defines" -msgstr "Lijn" +msgstr "Definities" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 -#, fuzzy +#: ../src/symbols.c:876 msgid "Structs" -msgstr "Status" +msgstr "Constructies" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" -msgstr "" +msgstr "Onbekende bestandsextensie \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" +"Kon geen label bestand maken, misschien omdat er geen labels gevonden zijn.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" +"Gebruik: %s -g \n" +"\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" msgstr "" +"Voorbeeld:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" -msgstr "" +msgstr "Laad Labels" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" -msgstr "" +msgstr "Geany label files (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 -#, fuzzy, c-format +#: ../src/symbols.c:1438 +#, c-format msgid "Loaded %s tags file '%s'." -msgstr "Kon pixmap bestand %s niet vinden" +msgstr "Bestand met %s labels geladen '%s'." -#: ../src/symbols.c:1409 -#, fuzzy, c-format +#: ../src/symbols.c:1440 +#, c-format msgid "Could not load tags file '%s'." -msgstr "Kon pixmap bestand %s niet vinden" +msgstr "Kon labe bestand '%s' niet laden." -#: ../src/symbols.c:1555 -#, fuzzy, c-format +#: ../src/symbols.c:1573 +#, c-format msgid "Forward declaration \"%s\" not found." -msgstr "Declaratie van \"%s()\" niet gevonden" +msgstr "Declaratie van '%s' niet gevonden." -#: ../src/symbols.c:1557 -#, fuzzy, c-format +#: ../src/symbols.c:1575 +#, c-format msgid "Definition of \"%s\" not found." -msgstr "Definitie van \"%s()\" niet gevonden" +msgstr "Definitie van '%s' niet gevonden." -#: ../src/symbols.c:1863 -#, fuzzy +#: ../src/symbols.c:1881 msgid "Sort by _Name" -msgstr "Uiterlijk" +msgstr "Sorteer op _Naam" -#: ../src/symbols.c:1870 -#, fuzzy +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" -msgstr "Uiterlijk" +msgstr "Sorteer op _plaats in document" + +#: ../src/templates.c:278 +msgid "Old" +msgstr "Oud" #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Huidig bestand opslaan" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Alle geopende bestanden opslaan" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Huidig bestand van schijf herladen" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Huidig bestand sluiten" -#: ../src/toolbar.c:59 -#, fuzzy +#: ../src/toolbar.c:60 msgid "Close all open files" -msgstr "Sluit alle bestanden af" +msgstr "Sluit alle open bestanden" -#: ../src/toolbar.c:60 -#, fuzzy +#: ../src/toolbar.c:61 msgid "Cut the current selection" -msgstr "Converteert de hoofdletter van de huidige selectie" +msgstr "Knip de huidige selectie" -#: ../src/toolbar.c:61 -#, fuzzy +#: ../src/toolbar.c:62 msgid "Copy the current selection" -msgstr "Huidig bestand compileren" +msgstr "Kopieer de huidige selectie" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" -msgstr "" +msgstr "Plak de inhoud van het klembord" -#: ../src/toolbar.c:63 -#, fuzzy +#: ../src/toolbar.c:64 msgid "Delete the current selection" -msgstr "Converteert de hoofdletter van de huidige selectie" +msgstr "Verwijder de huidige selectie" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Laatste wijziging ongedaan maken" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Laatste wijziging herhalen" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Huidig bestand compileren" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Huidig bestand uitvoeren of weergeven" -#: ../src/toolbar.c:70 -#, fuzzy +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" -"Open een kleurkiesvenster, om interactief een kleur te kiezen uit een " -"kleurpalet." +"Open een kleurkiesdialoog om interactief een kleur te kiezen uit een " +"kleurenpalet" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Inzoomen" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Uitzoomen" -#: ../src/toolbar.c:73 -#, fuzzy +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Inspringing verkleinen" -#: ../src/toolbar.c:74 -#, fuzzy +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Inspringing vergroten" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Zoek de aangegeven tekst in het huidig document" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 -#, fuzzy +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Ga naar het ingevoerde regelnummer" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" -msgstr "" +msgstr "Laat het voorkeurendialoog zien" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" -msgstr "Gean_y afsluiten" +msgstr "Geany afsluiten" -#: ../src/toolbar.c:79 -#, fuzzy +#: ../src/toolbar.c:80 msgid "Print document" -msgstr "Volledig document" +msgstr "Document afdrukken" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "Verwijdert alle markeringen in het huidige document." +msgstr "Vervang tekst in het huidige document" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Nieuw bestand aanmaken" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Nieuw bestand aanmaken van sjabloon" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Bestaand bestand openen" -#: ../src/toolbar.c:358 -#, fuzzy +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Open een recent bestand" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Kies meer bouw acties" + +#: ../src/toolbar.c:389 msgid "Goto" -msgstr "Ga naar regel" +msgstr "Ga naar" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "Scheidingsteken" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- Scheidingsteken ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" +"Selecteer items die in de werkbalk moeten komen. Je kunt ze verplaatsen door " +"te slepen." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "Beschikbare Items" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "Weergave" +msgstr "Getoonde items" #: ../src/tools.c:153 #, c-format @@ -4586,726 +4528,691 @@ "The executed custom command returned an error. Your selection was not " "changed. Error message: %s" msgstr "" +"Het uitgevoerde commando geeft een foutmelding. Je selectie is niet " +"gewijzigd. Foutmelding: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." msgstr "" +"Het uitgevoerde aangepaste commando is geëindigd met een niet-succesvolle " +"beëindigingscode." #: ../src/tools.c:246 #, c-format msgid "Passing data and executing custom command: %s" -msgstr "" +msgstr "Data doorgeven aan aangepaste commando: %s" #: ../src/tools.c:290 -#, fuzzy, c-format +#, c-format msgid "Custom command failed: %s" -msgstr "Aangepast datumformaat instellen" +msgstr "Aangepast commando faalt: %s" -#: ../src/tools.c:304 ../src/tools.c:538 -#, fuzzy +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" -msgstr "Aangepast datumformaat instellen" +msgstr "Aangepast commando instellen" #: ../src/tools.c:311 msgid "" "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." msgstr "" +"Je kunt de huidige selectie naar een van deze commando's sturen en de " +"uitvoer van dit commando zal dan de huidige selectie vervangen." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." -msgstr "" +msgstr "Geen aangepaste commando's gedefinieerd." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Woorden tellen" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "Selectie" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "Volledig document" -#: ../src/tools.c:640 -#, fuzzy +#: ../src/tools.c:611 msgid "Range:" -msgstr "Wijzigen" +msgstr "Bereik:" -#: ../src/tools.c:652 -#, fuzzy +#: ../src/tools.c:623 msgid "Lines:" -msgstr "Lijn" +msgstr "Regels:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" -msgstr "" +msgstr "Woorden:" -#: ../src/tools.c:680 -#, fuzzy +#: ../src/tools.c:651 msgid "Characters:" -msgstr "Hoofdstuk" +msgstr "Karakters:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Geen tags gevonden" -#: ../src/treeviews.c:508 -#, fuzzy +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" -msgstr "Toon symbolenlijst" +msgstr "Toon s_ymbolenlijst" -#: ../src/treeviews.c:516 -#, fuzzy +#: ../src/sidebar.c:554 msgid "Show _Document List" -msgstr "Toon open bestanden lijst" +msgstr "Toon _bestandenlijst" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 -#, fuzzy +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" -msgstr "Zijbalk verbergen" +msgstr "Zijbalk _verbergen" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "Werkbalk weergeven" +msgstr "_Paden weergeven" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "" +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "regel: %d / %d\t kol: %d\t sel: %d\t " +# Alleen Lezen #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " -msgstr "" +msgstr "AL" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "DEL" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" -msgstr "" +msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" -msgstr "" +msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" -msgstr "" +msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" -msgstr "" +msgstr "mode: %s" -#: ../src/ui_utils.c:215 -#, fuzzy, c-format +#: ../src/ui_utils.c:221 +#, c-format msgid "encoding: %s %s" -msgstr "_Codering instellen" +msgstr "codering: %s %s" -#: ../src/ui_utils.c:221 -#, fuzzy, c-format +#: ../src/ui_utils.c:227 +#, c-format msgid "filetype: %s" -msgstr "Bestandstype instellen:" +msgstr "bestandstype: %s" -#: ../src/ui_utils.c:225 +# Gewijzigd +#: ../src/ui_utils.c:231 msgid "MOD" -msgstr "" +msgstr "WIJ" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" -msgstr "" +msgstr "scoop: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Lettertype gewijzigd (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C standaard bibliotheek" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C standaard bibliotheek" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ standaard bibliotheek" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 -#, fuzzy +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" -msgstr "Aangepast datumformaat instellen" +msgstr "Aangepast _datumformaat instellen" -#: ../src/ui_utils.c:1644 -#, fuzzy +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Map selecteren" -#: ../src/ui_utils.c:1644 -#, fuzzy +#: ../src/ui_utils.c:1659 msgid "Select File" -msgstr "Alles selecteren" +msgstr "Bestand selecteren" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "%s configuratiebestand, bewerk het inien nodig" - -#: ../src/ui_utils.c:1785 -#, fuzzy +#: ../src/ui_utils.c:1813 msgid "Save All" -msgstr "A_lles opslaan" +msgstr "Alles opslaan" -#: ../src/ui_utils.c:1786 -#, fuzzy +#: ../src/ui_utils.c:1814 msgid "Close All" -msgstr "_Alles sluiten" +msgstr "Alles sluiten" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 -#, fuzzy +#: ../src/vte.c:516 msgid "_Set Path From Document" -msgstr "Schakel naar linker document" +msgstr "_Haal pad van document" -#: ../src/vte.c:553 -#, fuzzy +#: ../src/vte.c:521 msgid "_Restart Terminal" -msgstr "Terminal" +msgstr "He_rstart Terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Invoermethoden" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" +"Kon de directory niet veranderen in de terminal omdat er waarschijnlijk een " +"commando in staat." -#: ../src/vte.c:721 -#, fuzzy -msgid "Terminal plugin" -msgstr "Terminalemulatie" - -#: ../src/vte.c:729 -#, fuzzy -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Dit zijn instellingen voor het virtuele terminal emulatoronderdeel (VTE). " -"Wijzigingen zijn enkel van kracht als de VTE-bibliotheek kon worden geladen." +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Lettertype:" -#: ../src/vte.c:740 -#, fuzzy -msgid "Terminal font:" -msgstr "Terminal lettertype" - -#: ../src/vte.c:750 -#, fuzzy +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" -msgstr "Stelt het lettertype in voor het terminalonderdeel." +msgstr "Stelt het lettertype in voor de terminal." -#: ../src/vte.c:752 -#, fuzzy +#: ../src/vte.c:748 msgid "Foreground color:" -msgstr "Voorgrondkleur" +msgstr "Letterkleur:" -#: ../src/vte.c:758 -#, fuzzy +#: ../src/vte.c:754 msgid "Background color:" -msgstr "Achtergrondkleur" +msgstr "Achtergrondkleur:" -#: ../src/vte.c:768 -#, fuzzy +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" -msgstr "Stelt de voorgrondkleur in van de de tekst in het terminalonderdeel." +msgstr "Stelt de letterkleur in van de de tekst in de terminal" -#: ../src/vte.c:775 -#, fuzzy +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" -msgstr "Stelt de achtergrondkleur in van de tekst in het terminalonderdeel." +msgstr "Stelt de achtergrondkleur in van de de tekst in de terminal" -#: ../src/vte.c:778 -#, fuzzy +#: ../src/vte.c:774 msgid "Scrollback lines:" -msgstr "Regels om terug te schuiven" +msgstr "Aantal regels:" -#: ../src/vte.c:790 -#, fuzzy +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" -msgstr "" -"Specificeert de historiek van de regels, welke u terug kunt schuiven in het " -"terminalonderdeel." +msgstr "Stelt het aantal regels in die u terug kunt schuiven in de terminal" -#: ../src/vte.c:794 -#, fuzzy +#: ../src/vte.c:790 msgid "Shell:" -msgstr "Shell" +msgstr "Shell:" -#: ../src/vte.c:802 -#, fuzzy +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" -msgstr "" -"Stelt het pad in naar de shell welke moet worden gestart in de " -"terminalemulatie." +msgstr "Stelt het pad in naar de shell die moet worden gestart in de terminal" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Schuiven op toetsaanslag" -#: ../src/vte.c:820 -#, fuzzy +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" -msgstr "Of het schuiven naar beneden als een toets wordt ingedrukt." +msgstr "" +"Of de terminal naar beneden moet schuiven als er een toets werd ingedrukt" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Schuiven op uitvoer" -#: ../src/vte.c:824 -#, fuzzy +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" -msgstr "Of het schuiven naar beneden als een uitvoer werd gegenereerd." +msgstr "" +"Of de terminal naar beneden moet schuiven als er uitvoer is geproduceert" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" -msgstr "" +msgstr "Cursor knippert" -#: ../src/vte.c:828 -#, fuzzy +#: ../src/vte.c:824 msgid "Whether to blink the cursor" -msgstr "Of invouwen van code moet worden geactiveerd" +msgstr "Of de cursor moet knipperen" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" -msgstr "" +msgstr "Overschrijf Geany's toetsbindingen" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" +msgstr "Laat de terminal sneltoetsen krijgen (op focuscommando's na)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Sneltoetsmenu uitschakelen (standaard: F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " "within the VTE." msgstr "" "Deze optie schakelt de sneltoets uit om de menu taakbalk naar de voorgrond " -"te brengen (standaard: F10). Dit kan nuttig zijn als u bijv Midnight " +"te brengen (standaard: F10). Dit kan nuttig zijn als u bijv. Midnight " "Commander gebruikt binnenin de VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Pad van het huidige bestand volgen" -#: ../src/vte.c:841 -#, fuzzy +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Of \"cd $path\" moet worden uitgevoerd als u tussen geopende bestanden " -"wisselt." +"wisselt" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" -msgstr "" +msgstr "Gebruik geen runscript" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" msgstr "" +"Gebruik niet het simpele runscript dat meestal wordt gebruikt om de exit " +"status van een programma weer te geven" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" -msgstr "" +msgstr "Voer programmas uit in VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" msgstr "" +"Voer programma's uit in de virtuele terminal in plaats van een nieuw " +"terminalvenster te openen. Let wel, programma's uitgevoerd in de virtuele " +"terminal kunnen niet gestopt worden." -#: ../src/win32.c:135 -#, fuzzy +#: ../src/win32.c:161 msgid "Geany project files" -msgstr "Eigenschappen" +msgstr "Geany Project bestanden" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Uitvoerbare" -#: ../plugins/classbuilder.c:37 -#, fuzzy +#: ../plugins/classbuilder.c:36 msgid "Class Builder" -msgstr "Klassen" +msgstr "Class Maker" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." -msgstr "" +msgstr "Creer bronbestanden voor nieuwe class types." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" -msgstr "" +msgstr "Creer Class" -#: ../plugins/classbuilder.c:332 -#, fuzzy +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Naamruimte" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Naamruimte:" + +#: ../plugins/classbuilder.c:402 msgid "Class" -msgstr "Klassen" +msgstr "Class" -#: ../plugins/classbuilder.c:341 -#, fuzzy +#: ../plugins/classbuilder.c:411 msgid "Class name:" -msgstr "Klassen" +msgstr "Class naam:" -#: ../plugins/classbuilder.c:352 -#, fuzzy +#: ../plugins/classbuilder.c:424 msgid "Header file:" -msgstr "Bestand herladen" +msgstr "Headerbestand:" -#: ../plugins/classbuilder.c:361 -#, fuzzy +#: ../plugins/classbuilder.c:434 msgid "Source file:" -msgstr "C bronbestand" +msgstr "Bronbestand:" -#: ../plugins/classbuilder.c:367 -#, fuzzy +#: ../plugins/classbuilder.c:440 msgid "Inheritance" -msgstr "Interface" +msgstr "Overerving" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" -msgstr "" +msgstr "Basis class:" + +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Bronbestand:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:465 msgid "Base header:" -msgstr "" +msgstr "Basis header:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" -msgstr "" +msgstr "Globaal" -#: ../plugins/classbuilder.c:406 -#, fuzzy +#: ../plugins/classbuilder.c:485 msgid "Base GType:" -msgstr "Type" +msgstr "" -#: ../plugins/classbuilder.c:414 -#, fuzzy +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" -msgstr "Functies" +msgstr "Opties" -#: ../plugins/classbuilder.c:423 -#, fuzzy +#: ../plugins/classbuilder.c:514 msgid "Create constructor" -msgstr "Woord vervolledigen" +msgstr "Maak constructor" -#: ../plugins/classbuilder.c:427 -#, fuzzy +#: ../plugins/classbuilder.c:518 msgid "Create destructor" -msgstr "Woord vervolledigen" +msgstr "Maak destructor" + +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Is abstract" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Wezen" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" -msgstr "" +msgstr "Creer Cla_ss" -#: ../plugins/classbuilder.c:750 -#, fuzzy +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" -msgstr "Klassen" +msgstr "_C++ Class" -#: ../plugins/classbuilder.c:753 -#, fuzzy +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" -msgstr "Klassen" +msgstr "_GTK+ Class" + +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP klasse" #: ../plugins/htmlchars.c:38 -#, fuzzy msgid "HTML Characters" -msgstr "Hoofdstuk" +msgstr "HTML Karakters" #: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." -msgstr "" +msgstr "Voeg HTML karakters toe zoals '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 -#, fuzzy msgid "The Geany developer team" -msgstr "De naam van de ontwikkelaar" +msgstr "Het Geany ontwikkelingsteam" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" -msgstr "" +msgstr "HTML karakters" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" -msgstr "" +msgstr "ISO 8859-1 characters" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" -msgstr "" +msgstr "Griekse karakters" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" -msgstr "" +msgstr "Wiskundige karakters" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" -msgstr "" +msgstr "Technische karakters" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" -msgstr "" +msgstr "Richting karakter" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" -msgstr "" +msgstr "Interpunctie karakters" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" -msgstr "" +msgstr "Overige karakters" -#: ../plugins/htmlchars.c:447 -#, fuzzy +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Plugin configuratiemap kon niet worden aangemaakt." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" -msgstr "Hoofdstuk" +msgstr "Speciale karakters" -#: ../plugins/htmlchars.c:449 -#, fuzzy +#: ../plugins/htmlchars.c:484 msgid "_Insert" -msgstr "Datum invoegen" +msgstr "_Invoegen" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." msgstr "" +"Kies een speciaal karakter uit de lijst hieronder en dubbelklik erop of " +"gebruik de invoegknop om het op de huidige cursor positie in te voegen." -#: ../plugins/htmlchars.c:472 -#, fuzzy +#: ../plugins/htmlchars.c:507 msgid "Character" -msgstr "Hoofdstuk" +msgstr "Karakter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" -msgstr "" +msgstr "HTML (naam)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" -msgstr "" +msgstr "Voeg spec_iale HTML karakters toe" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 -#, fuzzy +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" -msgstr "Tab plaatsing" +msgstr "HTML vervanging" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" -msgstr "" +msgstr "_HTML tekens vervangen" -#: ../plugins/htmlchars.c:706 -#, fuzzy +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" -msgstr "Plaatsing van nieuwe bestanden tabs:" +msgstr "Alle speciale tekens in selectie _vervangen" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" -msgstr "" +msgstr "Voeg Speciale HTML Karakters in." -#: ../plugins/htmlchars.c:724 -#, fuzzy +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" -msgstr "Hoofdstuk" +msgstr "Vervang speciale karakters" -#: ../plugins/htmlchars.c:727 -#, fuzzy +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" -msgstr "Schakel regelcommentaar uit" +msgstr "Zet plug-in aan/uit" #: ../plugins/export.c:37 msgid "Export" -msgstr "" +msgstr "Exporteer" #: ../plugins/export.c:37 -#, fuzzy msgid "Exports the current file into different formats." -msgstr "Compileert het huidig bestand in een DVI bestand" +msgstr "Exporteert het huidige bestand naar verschillende formaten." #: ../plugins/export.c:166 -#, fuzzy msgid "Export File" -msgstr "Bestand openen" +msgstr "Bestand exporteren" #: ../plugins/export.c:183 msgid "_Use current zoom level" -msgstr "" +msgstr "_Gebruik huidig zoom niveau" #: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" -msgstr "" +msgstr "Slaat de huidige lettergrootte samen met het huidige zoomniveau op" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." -msgstr "" +msgstr "Document succesvol geëxporteerd als '%s'." -#: ../plugins/export.c:269 -#, fuzzy, c-format +#: ../plugins/export.c:270 +#, c-format msgid "File '%s' could not be written (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Bestand '%s' kon niet worden opgeslagen (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Het bestand '%s' bestaat reeds. Wenst u deze te overschrijven?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" -msgstr "" +msgstr "_Exporteer" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" -msgstr "" +msgstr "Als _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" -msgstr "" +msgstr "Als _LaTeX" -#: ../plugins/filebrowser.c:40 -#, fuzzy +#: ../plugins/filebrowser.c:43 msgid "File Browser" -msgstr "Browser" +msgstr "Bestandsbrowser" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." -msgstr "" +msgstr "Voeg een bestandsbrowser tabblad toe aan het zijpaneel." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" -msgstr "" +msgstr "Teveel items geselecteerd!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." -msgstr "" +msgstr "Kon extern geconfigureerd commando '%s' niet uitvoeren (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" -msgstr "" +msgstr "Open _extern" -#: ../plugins/filebrowser.c:561 -#, fuzzy +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" -msgstr "Zoek in _bestanden" +msgstr "_Zoek in bestanden" -#: ../plugins/filebrowser.c:571 -#, fuzzy +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" -msgstr "_Verborgen bestanden weergeven" +msgstr "Ver_borgen bestanden weergeven" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" -msgstr "" +msgstr "Omhoog" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" -msgstr "" +msgstr "Vernieuwen" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" -msgstr "" +msgstr "Thuis" -#: ../plugins/filebrowser.c:778 -#, fuzzy +#: ../plugins/filebrowser.c:856 msgid "Set path from document" -msgstr "Schakel naar linker document" +msgstr "Haal pad van document" -#: ../plugins/filebrowser.c:786 -#, fuzzy +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" -msgstr "Huidig bestand sluiten" +msgstr "Filter leegmaken" -#: ../plugins/filebrowser.c:800 -#, fuzzy +#: ../plugins/filebrowser.c:880 msgid "Filter:" -msgstr "_Bestand" +msgstr "Filter" + +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Zeef de bestanden met de gebruikelijke jokertekens" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" -msgstr "" +msgstr "Focus bestandenlijst" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" -msgstr "" - -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -#, fuzzy -msgid "Plugin configuration directory could not be created." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Focus pad invoerveld" -#: ../plugins/filebrowser.c:1092 -#, fuzzy +#: ../plugins/filebrowser.c:1185 msgid "External open command:" -msgstr " commandos" +msgstr "Extern open commando:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5314,815 +5221,211 @@ "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" +"Het commando dat wordt uitgevoerd als \"Openen met\" wordt gebruikt. Je kunt " +"%f en %d wildcards gebruiken.\n" +"%f wordt vervangen door de bestandsnaam met het volle pad\n" +"%d wordt vervangen door het pad van het geselecteerde bestand zonder de " +"bestandsnaam" -#: ../plugins/filebrowser.c:1107 -#, fuzzy +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" -msgstr "_Verborgen bestanden weergeven" +msgstr "Verborgen bestanden weergeven" -#: ../plugins/filebrowser.c:1113 -#, fuzzy +# +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" -msgstr "Eigenschappen" +msgstr "Verberg object bestanden" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" +"Verberg gegenereerde object bestanden in de bestandbrowser, inclusief *.o, *." +"obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "" +msgstr "Gebruik de project basisdirectory" -#: ../plugins/filebrowser.c:1132 -#, fuzzy +# +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" -msgstr "Huidig bestand opslaan" +msgstr "Verander de directory naar de basis van het huidige geopende project" +# #: ../plugins/saveactions.c:39 -#, fuzzy msgid "Save Actions" -msgstr "Sectie" +msgstr "Opslag Acties" #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." -msgstr "" +msgstr "Deze plugin bevat verschillende acties mbt. het opslaan van bestanden." #: ../plugins/saveactions.c:169 -#, fuzzy, c-format +#, c-format msgid "Backup Copy: Directory could not be created (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Backupkopie: Directory kon niet worden aangemaakt (%s)." #. it's unlikely that this happens #: ../plugins/saveactions.c:201 -#, fuzzy, c-format +#, c-format msgid "Backup Copy: File could not be read (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Backupkopie: Bestand kon niet worden gelezen (%s)." #: ../plugins/saveactions.c:219 -#, fuzzy, c-format +#, c-format msgid "Backup Copy: File could not be saved (%s)." -msgstr "Configuratiemap kon niet worden aangemaakt (%s)." +msgstr "Backupkopie: Bestand kon niet worden opgeslagen (%s)." #: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Autosave: %d bestand automatisch opgeslagen." +msgstr[1] "Autosave: %d bestanden automatisch opgeslagen." #. initialize the dialog #: ../plugins/saveactions.c:380 -#, fuzzy msgid "Select Directory" -msgstr "Huidig bestand opslaan" +msgstr "Kies directory" #: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." -msgstr "" +msgstr "Backup directory bestaat niet of er kan niet in weggeschreven worden." #: ../plugins/saveactions.c:543 -#, fuzzy msgid "Auto Save" -msgstr "Opslaan" +msgstr "Automatisch opslaan" #: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" -msgstr "" +msgstr "Aanz_etten" #: ../plugins/saveactions.c:553 msgid "Auto save _interval:" -msgstr "" +msgstr "_Interval voor automatische backup:" #: ../plugins/saveactions.c:561 -#, fuzzy msgid "seconds" -msgstr " commandos" +msgstr "seconden" #: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" -msgstr "" +msgstr "Druk status informatie af als bestanden automatisch o_pgeslagen worden" #: ../plugins/saveactions.c:578 -#, fuzzy msgid "Save only current open _file" -msgstr "Huidig bestand opslaan" +msgstr "Sla alleen _huidig open bestand op" #: ../plugins/saveactions.c:585 -#, fuzzy msgid "Sa_ve all open files" -msgstr "Alle geopende bestanden opslaan" +msgstr "_Alle geopende bestanden opslaan" #: ../plugins/saveactions.c:605 -#, fuzzy msgid "Instant Save" -msgstr "Datum invoegen" +msgstr "Instant opslaan" +# Of nieuw aangemaakte bestanden? #: ../plugins/saveactions.c:615 -#, fuzzy msgid "_Filetype to use for newly opened files:" -msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" +msgstr "_Bestandstype voor nieuw geopende bestanden:" #: ../plugins/saveactions.c:646 msgid "Backup Copy" -msgstr "" +msgstr "Backupkopie" #: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" -msgstr "" +msgstr "_Directory om backup bestanden op te slaan:" #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" +"Datum/_Tijd format for backup bestanden (zie \"man strftime\" voor details):" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" -msgstr "" +msgstr "Aanta_l directory niveau's dat bij een backup wordt meegenomen:" #: ../plugins/splitwindow.c:36 msgid "Split Window" -msgstr "" +msgstr "Splits Venster" #: ../plugins/splitwindow.c:36 -#, fuzzy msgid "Splits the editor view into two windows." -msgstr "Stelt het lettertype in voor de editorvensters" +msgstr "Splitst de editor in twee delen." -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "Verwijdert alle markeringen in het huidige document." +msgstr "Toon huidige document." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" -msgstr "" +msgstr "_Maak splitsing ongedaan" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" -msgstr "" +msgstr "_Splits Venster" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" -msgstr "" +msgstr "_Horizontaal" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" -msgstr "" +msgstr "_Verticaal" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" -msgstr "" +msgstr "Splits Horizontaal" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" -msgstr "" - -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "" - -#~ msgid "Diff file" -#~ msgstr "Diff bestand" - -#~ msgid "Select _All" -#~ msgstr "_Alles selecteren" - -#, fuzzy -#~ msgid "Automatic symbol completion" -#~ msgstr "Autovervollediging onderdrukken" - -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "Weergave van %s mislukt (controleer of het reeds is gecomileerd)" - -#~ msgid "Jump to the entered line number." -#~ msgstr "Ga naar het ingevoerde regelnummer" - -#, fuzzy -#~ msgid "From Current _File" -#~ msgstr "Fout bij het opslaan van het bestand." - -#, fuzzy -#~ msgid "Make a diff from the current active file" -#~ msgstr "Huidig bestand opslaan" - -#, fuzzy -#~ msgid "From Current _Directory" -#~ msgstr "Make object" - -#, fuzzy -#~ msgid "Make a diff from the directory of the current active file" -#~ msgstr "Huidig bestand opslaan" - -#, fuzzy -#~ msgid "From Current _Project" -#~ msgstr "Make object" - -#, fuzzy -#~ msgid "Make a diff from the current project's base path" -#~ msgstr "Huidig bestand opslaan" - -#, fuzzy -#~ msgid "Command stopped because the current file has no extension." -#~ msgstr "Converteert de hoofdletter van de huidige selectie" - -#, fuzzy -#~ msgid "Failed to execute \"%s\" (make sure it is already built)" -#~ msgstr "Uitvoeren van %s mislukt (controleer of het reeds gebouwd is)" - -#~ msgid "Compiles the current file" -#~ msgstr "Compileert het huidig bestand" - -#~ msgid "Builds the current file (generate an executable file)" -#~ msgstr "Bouwt het huidig bestand (genereert een uitvoerbaar bestand)" - -#~ msgid "Compiles the current file using the make tool" -#~ msgstr "Compileert het huidig bestand gebruikmakend van 'make'" - -#~ msgid "" -#~ "Sets the includes and library paths for the compiler and the program " -#~ "arguments for execution" -#~ msgstr "" -#~ "Stelt de parameters en de bibliotheekpaden in voor de compiler en de " -#~ "programma argumenten voor uitvoering" +msgstr "Splits Verticaal" -#~ msgid "Compiles the current file into a DVI file" -#~ msgstr "Compileert het huidig bestand in een DVI bestand" +#~ msgid "Try to resave the file?" +#~ msgstr "Opnieuw proberen net bestand weg te schrijven?" -#~ msgid "Compiles the current file into a PDF file" -#~ msgstr "Compileert het huidig bestand in een PDF bestand" +#~ msgid "_Customize Toolbar" +#~ msgstr "Werkbalk _aanpassen" -#, fuzzy -#~ msgid "Compile and view the current file" -#~ msgstr "Compileert en toont het huidig bestand" - -#~ msgid "Sets the program paths and arguments" -#~ msgstr "Stelt de programmapaden en argumenten in" - -#~ msgid "Saves all open files" -#~ msgstr "Slaat alle geopende bestanden op" - -#~ msgid "Prints the current file" -#~ msgstr "Drukt het huidige bestand af" - -#~ msgid "Inserts a typical ChangeLog entry in the current file" -#~ msgstr "Voegt een typisch logboek item in in het huidig bestand" - -#~ msgid "Inserts a file header at the beginning of the file" -#~ msgstr "Voegt een bestandshoofding toe aan het begin van van het bestand" - -#~ msgid "Inserts a description before the current function" -#~ msgstr "Voegt een beschrijving in vóór de huidige functie" - -#~ msgid "Inserts a multiline comment" -#~ msgstr "Voegt een multiregel commmentaar in" - -#~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" -#~ msgstr "" -#~ "Voegt een GPL-informatie in (zou aan het begin van het bestand moeten " -#~ "gebeuren)" - -#, fuzzy -#~ msgid "" -#~ "Inserts a BSD license notice (should be done at the beginning of the file)" -#~ msgstr "" -#~ "Voegt een GPL-informatie in (zou aan het begin van het bestand moeten " -#~ "gebeuren)" - -#~ msgid "Change the default font" -#~ msgstr "Wijzigt het standaard lettertype" - -#~ msgid "Toggle the window with status and compiler messages on and off" -#~ msgstr "" -#~ "Schakelt het berichtenvenster met status- en compilerberichten aan en uit" +#~ msgid "Icon style:" +#~ msgstr "Pictogramstijl:" -#~ msgid "Toggle the toolbar on and off" -#~ msgstr "Schakelt de weergave van de werkbalk aan en uit" - -#~ msgid "Treat this file as read-only. No changes can be made." -#~ msgstr "" -#~ "Behandel dit bestand als alleen lezen. Er zijn geen wijzigingen mogelijk." - -#, fuzzy -#~ msgid "Replaces all spaces in the document by tab characters." -#~ msgstr "Vervangt alle tabs in het document door spaties" - -#~ msgid "Folds all contractible code blocks" -#~ msgstr "Vouwt alle samentrekbare codeblokken in" - -#~ msgid "Unfolds all contracted code blocks" -#~ msgstr "Vouwt alle samengetrokken codeblokken uit" - -#, fuzzy -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Verwijdert alle markeringen in het huidige document." - -#~ msgid "" -#~ "Counts the words and characters in the current selection or the whole " -#~ "document" -#~ msgstr "" -#~ "Telt de woorden en tekens in de huidige selectie of het volledige document" - -#~ msgid "Shows a list of all keyboard shortcuts for Geany." -#~ msgstr "Toont een lijst met alle sneltoetsen voor Geany." - -#~ msgid "Color" -#~ msgstr "Kleur" - -#~ msgid "Enter a line number and jump to it." -#~ msgstr "Voer het regelnummer in waarnaar u wilt gaan. " - -#, fuzzy -#~ msgid "Go to the entered line" -#~ msgstr "Ga naar ingevoerde regel" +#~ msgid "Icon size:" +#~ msgstr "Pictogramgrootte:" -#, fuzzy -#~ msgid "Show full path name in documents list" -#~ msgstr "Toon open bestanden lijst" - -#~ msgid "Show file operation buttons" -#~ msgstr "Aktieknoppen voor bestanden weergeven" - -#~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -#~ msgstr "" -#~ "Toont de knoppen Nieuw, Openen, Sluiten, Opslaan en Herladen in de " -#~ "werkbalk" - -#~ msgid "Show Redo and Undo buttons" -#~ msgstr "Knoppen Herdoen en Ongedaan maken weergeven" - -#~ msgid "Display the Redo and Undo buttons in the toolbar" -#~ msgstr "Toont de knoppen Herdoen en Ongedaan maken in de werkbalk" - -#, fuzzy -#~ msgid "Show Back and Forward buttons" -#~ msgstr "Knoppen Herdoen en Ongedaan maken weergeven" - -#, fuzzy -#~ msgid "" -#~ "Display the Back and Forward buttons in the toolbar used for code " -#~ "navigation" -#~ msgstr "Toont de knoppen Herdoen en Ongedaan maken in de werkbalk" - -#, fuzzy -#~ msgid "Show Compile and Run buttons" -#~ msgstr "Compileer en uitvoeren weergeven" - -#~ msgid "Display the Compile and Run buttons in the toolbar" -#~ msgstr "Toont de knoppen Compileer en Uitvoeren in de werkbalk" - -#, fuzzy -#~ msgid "Show Color Chooser button" -#~ msgstr "Kleurkiezer knop weergeven" - -#, fuzzy -#~ msgid "Display the Color Chooser button in the toolbar" -#~ msgstr "Toont de knop Kleurkiezer in de werkbalk" - -#, fuzzy -#~ msgid "Show Zoom In and Zoom Out buttons" -#~ msgstr "Inzoomen en Uitzoomen weergeven" - -#~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" -#~ msgstr "Toont de knoppen Inzoomen en Uitzoomen in de werkbalk" - -#, fuzzy -#~ msgid "Show Increase and Decrease Indentation buttons" -#~ msgstr "Knoppen Herdoen en Ongedaan maken weergeven" - -#, fuzzy -#~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" -#~ msgstr "Toont de knoppen Herdoen en Ongedaan maken in de werkbalk" - -#~ msgid "Show Search field" -#~ msgstr "Zoekveld weergeven" - -#~ msgid "Display the search field and button in the toolbar" -#~ msgstr "Toont het veld en de knop zoeken in de werkbalk" - -#, fuzzy -#~ msgid "Show Go to Line field" -#~ msgstr "Veld 'Ga naar regelnummer' weergeven" - -#~ msgid "Display the line number field and button in the toolbar" -#~ msgstr "Toont het veld en de knop 'Ga naar regelnummer' in de werkbalk" - -#, fuzzy -#~ msgid "Show Quit button" -#~ msgstr "Aktieknoppen voor bestanden weergeven" - -#, fuzzy -#~ msgid "Display the quit button in the toolbar" -#~ msgstr "Toont de knop Kleurkiezer in de werkbalk" - -#~ msgid "Items" -#~ msgstr "Items" - -#, fuzzy -#~ msgid "Runs in debug mode (means being verbose)" -#~ msgstr "draait in debug modus (betekent geeft veel informatie)" - -#~ msgid "Search failed." -#~ msgstr "Zoeken mislukt." - -#~ msgid "Couldn't find pixmap file: %s" -#~ msgstr "Kon pixmap bestand %s niet vinden" - -#, fuzzy -#~ msgid "JavaScript functions" -#~ msgstr "Java bronbestand" - -#~ msgid "Structs / Typedefs" -#~ msgstr "Structs / Typedefs" - -#, fuzzy -#~ msgid "Terminal emulation:" -#~ msgstr "Terminalemulatie" - -#, fuzzy -#~ msgid "" -#~ "Controls how the terminal emulator should behave. Do not change this " -#~ "value unless you know exactly what you are doing." -#~ msgstr "" -#~ "Beheert de wijze waarop de terminalemulator zich moet gedragen. xterm is " -#~ "een goede start." - -#, fuzzy -#~ msgid "Found %d matches for \"%s\"." -#~ msgid_plural "Found %d matches for \"%s\"." -#~ msgstr[0] "Geen overeenkomsten gevonden voor '%s'" -#~ msgstr[1] "Geen overeenkomsten gevonden voor '%s'" - -#~ msgid "Failed to execute the terminal program" -#~ msgstr "Kon het terminalprogramma niet uitvoeren" - -#, fuzzy -#~ msgid "Whether to use tabs or spaces when indentation is inserted." -#~ msgstr "Of het schuiven naar beneden als een uitvoer werd gegenereerd." - -#, fuzzy -#~ msgid "Rows of symbol completion list:" -#~ msgstr "Aantal regels voor autovervolledigingslijst:" - -#~ msgid "Insert Comments" -#~ msgstr "Commentaren invoegen" - -#~ msgid "Insert \"include <...>\"" -#~ msgstr "\"include <...>\" invoegen" - -#, fuzzy -#~ msgid "File menu" -#~ msgstr "Tab plaatsing" - -#, fuzzy -#~ msgid "Edit menu" -#~ msgstr "Codering:" - -#, fuzzy -#~ msgid "Search menu" +#~ msgid "Appearance" #~ msgstr "Uiterlijk" #, fuzzy -#~ msgid "View menu" -#~ msgstr "Nieuwe bestanden" +#~ msgid "Hard tab width:" +#~ msgstr "Tabgrootte:" -#, fuzzy -#~ msgid "Document menu" -#~ msgstr "Locatie:" - -#, fuzzy -#~ msgid "Build menu" -#~ msgstr "Zijbalk" - -#, fuzzy -#~ msgid "Tools menu" -#~ msgstr "Lettertypes" - -#, fuzzy -#~ msgid "Focus commands" -#~ msgstr " commandos" - -#, fuzzy -#~ msgid "Editing commands" -#~ msgstr " commandos" - -#, fuzzy -#~ msgid "Tag commands" -#~ msgstr " commandos" - -#~ msgid "Mixins" -#~ msgstr "Mixins" - -#, fuzzy -#~ msgid "C source file" -#~ msgstr "C bronbestand" - -#~ msgid "C++ source file" -#~ msgstr "C++ bronbestand" - -#, fuzzy -#~ msgid "C# source file" -#~ msgstr "C bronbestand" - -#~ msgid "D source file" -#~ msgstr "D bronbestand" - -#~ msgid "Java source file" -#~ msgstr "Java bronbestand" - -#~ msgid "Pascal source file" -#~ msgstr "Pascal bronbestand" - -#~ msgid "Assembler source file" -#~ msgstr "Assembler bronbestand" - -#, fuzzy -#~ msgid "FreeBasic source file" -#~ msgstr "Pascal bronbestand" - -#~ msgid "Fortran source file (F77)" -#~ msgstr "Fortran bronbestand (F77)" - -#~ msgid "(O)Caml source file" -#~ msgstr "(O) Caml bronbestand" - -#~ msgid "Perl source file" -#~ msgstr "Perl bronbestand" - -#~ msgid "PHP source file" -#~ msgstr "PHP bronbestand" - -#~ msgid "Python source file" -#~ msgstr "Python bronbestand" - -#~ msgid "Ruby source file" -#~ msgstr "Ruby bronbestand" - -#~ msgid "Tcl source file" -#~ msgstr "Tcl bronbestand" - -#, fuzzy -#~ msgid "Lua source file" -#~ msgstr "LaTeX bronbestand" - -#~ msgid "Ferite source file" -#~ msgstr "Ferite bronbestand" - -#, fuzzy -#~ msgid "Haskell source file" -#~ msgstr "Pascal bronbestand" - -#~ msgid "Docbook source file" -#~ msgstr "Docbook bronbestand" - -#~ msgid "HTML source file" -#~ msgstr "HTML bronbestand" - -#~ msgid "LaTeX source file" -#~ msgstr "LaTeX bronbestand" - -#~ msgid "O-Matrix source file" -#~ msgstr "O-Matrix bronbestand" - -#, fuzzy -#~ msgid "VHDL source file" -#~ msgstr "D bronbestand" - -#, fuzzy -#~ msgid "Haxe source file" -#~ msgstr "Pascal bronbestand" - -#~ msgid "Open files" -#~ msgstr "Bestanden openen" - -#, fuzzy -#~ msgid "Show open files list" -#~ msgstr "Toon open bestanden lijst" - -#~ msgid "Automatic completion of often used constructs like if and for" -#~ msgstr "" -#~ "Automatisch vervolledigen van veel gebruikte constructies zoals if en for" - -#, fuzzy -#~ msgid "Symbol autocompletion" -#~ msgstr "Autovervollediging van constructies" - -#, fuzzy -#~ msgid "Print:" -#~ msgstr "Afdrukken" - -#~ msgid "Find in files" -#~ msgstr "Zoek in bestanden" - -#~ msgid "Go to line" -#~ msgstr "Ga naar regel" - -#, fuzzy -#~ msgid "Complete construct" -#~ msgstr "Woord vervolledigen" - -#~ msgid "Go to tag definition" -#~ msgstr "Ga naar tag definitie" - -#~ msgid "Go to tag declaration" -#~ msgstr "Ga naar tag declaratie" - -#, fuzzy -#~ msgid "Hide" -#~ msgstr "Verbergen" - -#~ msgid "Reload" -#~ msgstr "Herladen" - -#, fuzzy -#~ msgid "" -#~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " -#~ "%s filetype: %s scope: %s" -#~ msgstr "" -#~ "%c Regel: % 4d kolom: % 3d selectie: % 4d %s modus: %s%s " -#~ "act. functie: %s codering: %s %s bestandstype: %s" - -#, fuzzy -#~ msgid "Do you realy want to revert '%s'?" -#~ msgstr "Wilt u Geany werkelijk afsluiten?" - -#, fuzzy -#~ msgid "Do you want to save all opened files before processing?" +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" #~ msgstr "" -#~ "Het bestand werd niet opgeslagen.\n" -#~ "Wenst u het op te slaan vooraleer af te sluiten?" - -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "Map:" - -#, fuzzy -#~ msgid "Convert Selection to _Lower-case" -#~ msgstr "Converteert selectie naar _kleine letters" - -#, fuzzy -#~ msgid "Convert Selection to _Upper-case" -#~ msgstr "Converteert selectie naar _hoofdletters" - -#~ msgid "Convert Selection to lower-case" -#~ msgstr "Converteer selectie naar kleine letters " +#~ "De breedte van een tab als Tabs en Spaties voor een document is ingesteld" -#~ msgid "Convert Selection to upper-case" -#~ msgstr "Converteer selectie naar hoofdletters" +#~ msgid "Long line marker:" +#~ msgstr "'Lange regel' marker:" -#, fuzzy -#~ msgid "Editing menu" -#~ msgstr "Codering:" +#~ msgid "Long line marker color:" +#~ msgstr "Kleur van 'lange regel' marker:" -#, fuzzy -#~ msgid "Behaviour" -#~ msgstr "Functies" - -#, fuzzy -#~ msgid "Misc." -#~ msgstr "Weergave" - -#~ msgid "language" -#~ msgstr "taal" - -#~ msgid "XML source file" -#~ msgstr "XML bronbestand" - -#, fuzzy -#~ msgid "Insert BSD license Notice" -#~ msgstr "GPL-informatie invoegen" - -#, fuzzy -#~ msgid "Print command:" -#~ msgstr "Pint commando" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Focus commands\n" -#~ msgstr "Lettertypes" - -#~ msgid "Keyboard shortcuts" -#~ msgstr "Sneltoetsen" - -#~ msgid " - A fast and lightweight IDE" -#~ msgstr " - Een snelle en lichtgewicht IDE" - -#~ msgid "Function" -#~ msgstr "Functie" - -#~ msgid "Add the same indentation as the previous line after pressing enter" -#~ msgstr "" -#~ "Voegt dezelfde inspringing van de vorige regel toe na het indrukken van " -#~ "enter" +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Tekst vervangen in %u bestand." +#~ msgstr[1] "Tekst vervangen in %u bestanden." -#, fuzzy -#~ msgid "" -#~ "There is already an open project \"%s\". Do you want to close it before " -#~ "proceed?" -#~ msgstr "" -#~ "Het bestand werd niet opgeslagen.\n" -#~ "Wenst u het op te slaan vooraleer af te sluiten?" - -#~ msgid "" -#~ "You have opened too many files. There is a limit of %d concurrent open " -#~ "files." -#~ msgstr "" -#~ "U heeft teveel bestanden geopend. Er is een limiet van %d tegelijkertijd " -#~ "geopende bestanden." - -#~ msgid "Du_plicate Line" -#~ msgstr "Lijn" - -#~ msgid "Count _words" -#~ msgstr "_Tel woorden" - -#~ msgid "Show _Colour Chooser" -#~ msgstr "_Kleurkiezer openen" - -#~ msgid "Find usage" -#~ msgstr "Zoek boodschappen" - -#~ msgid "Symbol list font" -#~ msgstr "Lettertype symbolenlijst" - -#~ msgid "Message window font" -#~ msgstr "Lettertype berichtenvenster" - -#~ msgid "Enter custom options for the make tool" -#~ msgstr "Aangepaste opties voor het hulpprogramma 'make'" - -#~ msgid "" -#~ "The file '%s' is not saved.\n" -#~ "Do you want to save it before closing?" -#~ msgstr "" -#~ "Het bestand '%s' werd niet opgeslagen.\n" -#~ "Wenst u het op te slaan vooraleer af te sluiten?" - -#~ msgid "" -#~ "Range:\t\t%s\n" -#~ "\n" -#~ "Lines:\t\t%d\n" -#~ "Words:\t\t%d\n" -#~ "Characters:\t%d\n" -#~ msgstr "" -#~ "Bereik:\t\t%s\n" -#~ "\n" -#~ "Regels:\t\t%d\n" -#~ "Woorden:\t\t%d\n" -#~ "Tekens:\t%d\n" - -#~ msgid "" -#~ "Enter here the (La)TeX command (for DVI creation) and some useful options." -#~ msgstr "" -#~ "Voer hier het (La)TeX commando en nuttige opties in voor het aanmaken van " -#~ "DVI." - -#~ msgid "" -#~ "Enter here the (La)TeX command (for PDF creation) and some useful options." -#~ msgstr "" -#~ "Voer hier het (La)TeX commando en nuttige opties in voor het aanmaken van " -#~ "PDF." - -#~ msgid "" -#~ "Enter here the (La)TeX command (for DVI preview) and some useful options." -#~ msgstr "" -#~ "Voer hier het (La)TeX commando en nuttige opties in voor het weergeven " -#~ "van DVI." - -#~ msgid "" -#~ "Enter here the (La)TeX command (for PDF preview) and some useful options." -#~ msgstr "" -#~ "Voer hier het (La)TeX commando en nuttige opties in voor het weergeven " -#~ "van PDF." - -#~ msgid "" -#~ "The document has been searched completely but the match \"%s\" was not " -#~ "found. Wrap search around the document?" -#~ msgstr "" -#~ "Het document is volledig doorzocht maar de overeenkomst \"%s\" werd niet " -#~ "gevonden. Bij het begin van het document starten?" - -#~ msgid "(Unsaved)" -#~ msgstr "(Niet opgeslagen)" - -#~ msgid "Begin" -#~ msgstr "Begin" - -#~ msgid "Match only word s_tart" -#~ msgstr "Alleen op woord_begin zoeken" - -#~ msgid "" -#~ "Replaces the search text in all opened files. This option is only useful" -#~ "(and used) if you click on \"Replace All\"." -#~ msgstr "" -#~ "Vervangt de zoektekst in alle geopende bestanden. Deze optie is enkel " -#~ "nuttig (en wordt gebruikt) indien u op \"Replace All\" klikt." +#~ msgid "Terminal plugin" +#~ msgstr "Terminal emulatie plugin" -#~ msgid "_Don't close this dialog" -#~ msgstr "Dit _dialoogvenster niet sluiten" +#~ msgid "Terminal font:" +#~ msgstr "Terminal lettertype:" -#~ msgid "The dialog window won't be closed when you start the operation." -#~ msgstr "Het dialoogvenster zal niet worden gesloten als u de actie start." +#~ msgid "Send Selection to Terminal" +#~ msgstr "Stuur selectie naar terminal" diff -Nru geany-0.18/po/pl.po geany-0.19/po/pl.po --- geany-0.18/po/pl.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/pl.po 2010-05-23 09:08:49.000000000 +0100 @@ -9,9 +9,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2007-09-26 21:22+0000\n" "Last-Translator: Jaroslaw Foksa \n" "Language-Team: polski \n" @@ -26,7 +26,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Geany - szybkie i lekkie środowisko programistyczne" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -34,70 +34,70 @@ msgid "Integrated Development Environment" msgstr "Zintegrowane środowisko programistyczne" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "O programie" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "" "Geany - szybkie i lekkie\n" "środowisko programistyczne" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(kompilacja: %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Informacje" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Programiści" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "opiekun" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "programista" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "opiekun tłumaczeń" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Tłumacze" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Poprzedni tłumacze" -#: ../src/about.c:332 +#: ../src/about.c:338 #, fuzzy msgid "Contributors" msgstr "Konstruktory typów" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Zasługi" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licencja" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -105,287 +105,296 @@ "Tekst licencji nie został odnaleziony na komputerze. Przejdź pod adres " "http://www.gnu.org/licenses/gpl-2.0.txt aby zobaczyć licencję." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Nie można odnaleźć terminala %s (sprawdź w ustawieniach ścieżkę do programu " -"odpowiedzialnego za emulację terminala)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Nie można zmienić katalogu bieżącego na \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Nie udało się wykonać %s (skrypt startowy nie mógł zostać utworzony)" +msgid "%s (in directory: %s)" +msgstr "%s (w katalogu %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Proces zakończył działanie z niepowodzeniem (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (w katalogu %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Nie można zmienić katalogu bieżącego na \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Nie udało się wykonać %s (skrypt startowy nie mógł zostać utworzony)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Nie można odnaleźć terminala %s (sprawdź w ustawieniach ścieżkę do programu " +"odpowiedzialnego za emulację terminala)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Kompilacja nie powiodła się" -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Kompilacja została ukończona pomyślnie" -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Skompiluj" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "Z_buduj" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Zbuduj _wszystko" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Zbuduj przy użyciu własnych parame_trów" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Zbuduj przy użyciu własnych parametrów" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Zbuduj _obiekt" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Wprowadź tutaj swoje opcje, wpisany tutaj tekst jest przekazywany do " +"polecenia make" -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Następny błąd" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 #, fuzzy msgid "_Previous Error" msgstr "_Poprzedni" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "U_stawienia budowania i kompilacji " - -#. DVI -#: ../src/build.c:1143 +#: ../src/build.c:1343 #, fuzzy -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI" +msgid "_Set Build Commands" +msgstr "Ustaw zewnętrzne polecenia" -#. PDF -#: ../src/build.c:1152 +#: ../src/build.c:1623 ../src/toolbar.c:373 #, fuzzy -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF" +msgid "Build the current file" +msgstr "Kompiluje bieżący plik" -#. DVI view -#: ../src/build.c:1206 +#: ../src/build.c:1637 #, fuzzy -msgid "_View DVI File" -msgstr "Wyświetl plik DVI" +msgid "Build the current file with Make and the default target" +msgstr "Buduje bieżący plik z użyciem narzędzia make i domyślnych parametrów" -#. PDF view -#: ../src/build.c:1216 +#: ../src/build.c:1639 #, fuzzy -msgid "V_iew PDF File" -msgstr "Wyświetl plik PDF" +msgid "Build the current file with Make and the specified target" +msgstr "Buduje bieżący plik przy użyciu narzędzia make" -#. arguments -#: ../src/build.c:1231 +#: ../src/build.c:1641 #, fuzzy -msgid "_Set Arguments" -msgstr "Ustaw argumenty" +msgid "Compile the current file with Make" +msgstr "Kompiluje bieżący plik" + +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Proces nie może zostać zatrzymany(%s)." -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Ustaw argumenty" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Nie wystąpiło więcej błędów podczas budowania." -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Ustaw programy i opcje dla kompilacji i wyświetlania plików (La)TeX." +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Tworzenie DVI:" +#: ../src/build.c:1788 +msgid "Item" +msgstr "" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Tworzenie PDF:" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Etykieta" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Podgląd DVI:" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Polecenie" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Podgląd PDF:" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "Ka_talog:" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Kompilator" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" msgstr "" -"%f zostanie zastąpione przez bieżącą nazwę pliku, np. plik_testowy.c\n" -"%e zostanie zastąpione nazwą pliku bez rozszerzenia, np. plik_testowy" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Ustaw pliki nagłówkowe i argumenty " +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" +msgstr "%s poleceń" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Ustaw komendy odpowiedzialne za budowanie i uruchamianie programów" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Ustaw typ _pliku" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "%s poleceń" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "Wyrażenia regularne _Grep" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Skompiluj:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Buduj:" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Wykonaj:" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1981 #, fuzzy -msgid "Build the current file" -msgstr "Kompiluje bieżący plik" - -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Zbuduj przy użyciu własnych parametrów" +msgid "Execute Commands" +msgstr "Ustaw zewnętrzne polecenia" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Wprowadź tutaj swoje opcje, wpisany tutaj tekst jest przekazywany do " -"polecenia make" -#: ../src/build.c:1967 +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "Buduje bieżący plik z użyciem narzędzia make i domyślnych parametrów" +msgid "Set Build Commands" +msgstr "Ustaw zewnętrzne polecenia" -#: ../src/build.c:1970 -#, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "Buduje bieżący plik przy użyciu narzędzia make" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Skompiluj" + +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "Z_buduj" -#: ../src/build.c:1973 +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Compile the current file with Make" -msgstr "Kompiluje bieżący plik" +msgid "_Execute" +msgstr "Wykonaj:" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Nie udało się uruchomić programu wyświetlającego" +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Zbuduj przy użyciu własnych parame_trów" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Proces nie może zostać zatrzymany(%s)." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Zbuduj _obiekt" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Nie wystąpiło więcej błędów podczas budowania." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Program Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Zbuduj _wszystko" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Ustaw zewnętrzne polecenia" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr " Czy na pewno chcesz zakończyć program? " -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Plik %s został zapisany." +msgstr[1] "Plik %s został zapisany." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Wczytaj _ponownie" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Wszystkie niezapisane zmiany zostaną utracone." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Czy na pewno chcesz czytać ponownie '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Przejdź do wiersza" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Wprowadź numer wiersza do którego chcesz przejść:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Ustaw typ dla bieżącego pliku zanim użyjesz tę funkcję" -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.rrrr" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.rrrr" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "rrrr/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.rrrr gg:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.rrrr gg:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "rrrr/mm/dd gg:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 #, fuzzy msgid "_Use Custom Date Format" msgstr "Użyj własnego formatu daty" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Własny format daty" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -393,24 +402,23 @@ "Wprowadź własny format daty i czasu. Możesz używać dowolne operatory " "konwersji dostępne w funkcji strftime języka ANSI C." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Format daty nie mógł zostać skonwertowany (prawdopodobnie za długi)" -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Nie ma więcej komunikatów" -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Otwieranie pliku" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "P_okaż" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -418,29 +426,29 @@ "Otwiera plik w trybie tylko do odczytu. Jeżeli wybierzesz więcej niż jeden " "plik do otwarcia, wszystkie pliki zostaną otwarte w tym trybie." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Według rozszerzenia" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Według zawartości pliku" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "Opcje" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Wyświetlanie _ukrytych plików" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Ustaw kodowanie znaków" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -454,11 +462,11 @@ "kodowaniem." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Typ pliku:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -478,24 +486,24 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Zapisz plik" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Z_mień nazwę" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 #, fuzzy msgid "Save the file and rename it" msgstr "Zapisz plik i zmień jego nazwę." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "O_twórz plik w nowej zakładce" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -503,41 +511,41 @@ msgstr "" "Otwórz plik w nowej zakładce (nie zamykaj bieżących niezapisanych plików)." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Błąd" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Pytanie" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Ostrzeżenie" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Informacja" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Nie zapisuj" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Plik %s nie został zapisany." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Czy chcesz go zapisać przed zamknięciem programu?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Wybór czcionki" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -545,106 +553,110 @@ "Wystąpił błąd lub pobieranie informacji o pliku nie powiodło się (czy plik " "został zapisany?)" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "nieznany" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Właściwości" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Rozmiar:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Położenie:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Tylko do odczytu:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(tylko wewnątrz Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kodowanie:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(z BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(bez BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Ostatnia modyfikacja:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Ostatnia zmiana:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Ostatni dostęp:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Uprawnienia:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Odczyt:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Zapis:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Wykonaj:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Właściciel:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grupa:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Inni:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Zamknięto plik %s." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Został otwarty nowy plik \"%s\"" -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Nie można otworzyć pliku %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -659,12 +671,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Plik \"%s\" nie istnieje %s" -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -673,31 +685,31 @@ "Plik \"%s\" nie jest plikiem tekstowym lub jego kodowanie nie jest " "obsługiwane." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Spacje" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Znaki tabulacji" -#: ../src/document.c:1128 +#: ../src/document.c:1169 #, fuzzy msgid "Tabs and Spaces" msgstr "Zamień znaki tabulacji na _spacje" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Automatyczne wcięcia" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Niepoprawna nazwa pliku" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Wczytano ponownie plik %s." @@ -705,21 +717,21 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Otwarto plik %s (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", tylko do odczytu" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "Błąd przy zapisywaniu pliku." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, fuzzy, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -729,59 +741,59 @@ "zapisany.\n" "Komunikat błędu: %s\n" -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, fuzzy, c-format msgid "Error message: %s." msgstr "Błąd przy zapisywaniu pliku (%s)." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Błąd przy zapisywaniu pliku." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Błąd przy zapisywaniu pliku (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Plik %s został zapisany." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nie został znaleziony" -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Rozpocząć wyszukiwanie od początku pliku?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Nie znaleziono tekstu '%s'." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, fuzzy, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: zastąpiono %d wystąpienia ciągu %s na ciąg \"%s\"." msgstr[1] "%s: zastąpiono %d wystąpienia ciągu %s na ciąg \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Chcesz wczytać go ponownie?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -790,24 +802,29 @@ "Plik '%s' na dysku jest nowszy niż plik\n" "znajdujący się w bieżącym buforze." -#: ../src/document.c:2890 -msgid "Try to resave the file?" +#: ../src/document.c:2915 +msgid "Close _without saving" msgstr "" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, fuzzy, c-format -msgid "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "\"%s\" nie został znaleziony" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 #, fuzzy msgid "Enter Tab Width" msgstr "Szerokość tabulacji" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celtyckie" @@ -918,614 +935,672 @@ msgid "Without encoding" msgstr "Bez kodowania" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Zachodnioeuropejskie" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Wschodnioeuropejskie" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "_Południowoazjatyckie" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_Azja Płd.-Wsch. i Płd.-Zach." -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Bliskowschodnie" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, fuzzy, c-format msgid "%s source file" msgstr "C" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "C" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Brak" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Pliki skryptów powłoki" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Plik sterujący dla make" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 #, fuzzy msgid "Cascading StyleSheet" msgstr "Arkusz stylów CSS" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Zrzut bazy SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Plik konfiguracyjny" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 #, fuzzy msgid "Gettext translation file" msgstr "opiekun tłumaczeń" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, fuzzy, c-format msgid "%s script file" msgstr "Pliki skryptów powłoki" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Języki p_rogramowania" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Języki _skryptowe" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Języki _znacznikowe" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Róż_ne języki" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Ustaw typ _pliku" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Wszystkie pliki źródłowe" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Wszystkie pliki" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "bez nazwy" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Nie można odnaleźć pliku %s" + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "_Wybór koloru" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Plik" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nowy (z _szablonu)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "Niewidoczny" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Otwórz wybrany pl_ik" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Ostatnio o_twierane" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Za_pisz wszystko" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Wczytaj ponowni_e z kodowaniem" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "Niewidoczny" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 #, fuzzy msgid "Close Ot_her Documents" msgstr "Zamyka bieżący plik" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Zamknij wszystk_o" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Edycja" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Odwróć w_ielkość zaznaczonych liter" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Zamień miejscami bieżący wiersz z wierszem poprzedzającym" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Komentuj linie" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Odkomentuj linie" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "P_rzełącz komentowanie linii" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "D_uplikuj wiersz albo zaznaczenie" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Z_większ wcięcie" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Z_mniejsz wcięcie" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "_Wyślij zaznaczenie do" +msgid "_Smart Line Indent" +msgstr "Inteligentne wcięcia wierszy" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Wyślij zaznaczenie do" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Polecenie" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Wycina bieżącą linię" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Kopiuje bieżącą linię" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Usuń bieżącą linię" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "D_uplikuj wiersz albo zaznaczenie" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Zaznacz bieżący wiersz" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Zaznacz bieżący akapit" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Wstaw alternatywną wolną przestrzeń" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Idź do następnego znacznika" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Idź do poprzedniego znacznika" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "_Wyślij zaznaczenie do" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "W_staw komentarze" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Wstawia wpis pliku dziennika (ChangeLog)" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 #, fuzzy msgid "Insert File _Header" msgstr "Wstaw nagłówek pliku" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 #, fuzzy msgid "Insert _Function Description" msgstr "Wstaw opis funkcji" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Wstaw długi komentarz" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 #, fuzzy msgid "Insert _GPL Notice" msgstr "Wstaw informację o licencji GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Wstaw informację o licencji _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Wstaw _datę" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Wstaw \"_include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "Ustawienia" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Ustawienia" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Szukaj" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Znajdź _następny" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Znajdź _poprzedni" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Znajdź w _plikach" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Z_astąp" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Zna_jdź zaznaczone" -#: ../src/interface.c:661 +#: ../src/interface.c:760 #, fuzzy msgid "Find Pre_vious Selected" msgstr "Znajdź zaznaczone (_wstecz)" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Następny ko_munikat" -#: ../src/interface.c:674 +#: ../src/interface.c:773 #, fuzzy msgid "Pr_evious Message" msgstr "Następny komunikat" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Przejdź _do wiersza" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Zmień _czcionkę" -#: ../src/interface.c:711 +#: ../src/interface.c:810 #, fuzzy msgid "To_ggle All Additional Widgets" msgstr "Przełącz wszystkie dodatkowe panele" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Pełny ekran" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "_Okno komunikatów" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Pasek _narzędzi" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Panel _boczny" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Edytor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Mar_gines ze znacznikami" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "Wyświetlanie ukrytych znaków" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "Wyświetlanie znaków końca wiersza" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "Wyświetlanie prowadnic" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Dokument" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Zawijanie wierszy" -#: ../src/interface.c:792 +#: ../src/interface.c:891 #, fuzzy msgid "Line _Breaking" msgstr "Zawijanie wierszy" -#: ../src/interface.c:796 +#: ../src/interface.c:895 #, fuzzy msgid "_Auto-indentation" msgstr "_Automatyczne wcięcia" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 #, fuzzy msgid "_Tabs" msgstr "Znaki tabulacji" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 #, fuzzy msgid "_Spaces" msgstr "Spacje" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 #, fuzzy msgid "T_abs and Spaces" msgstr "Zamień znaki tabulacji na _spacje" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Tylko do _odczytu" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Zapisz _BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Ustaw typ _pliku" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Ustaw _kodowanie znaków" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Wyświetlani_e znaków końca wiersza" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Konwertuj i ustaw na _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Konwertuj i ustaw na _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Konwertuj i ustaw na CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 #, fuzzy msgid "_Strip Trailing Spaces" msgstr "Usuwanie spacji i znaków tabulacji na końcach linii" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Zamień znaki tabulacji na _spacje" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 #, fuzzy msgid "Replace Spaces b_y Tabs" msgstr "Zamień znaki tabulacji na _spacje" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Zwiń wsz_ystkie" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Rozwiń wszystkie" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "_Usuń znaczniki" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Usuń _wszystkie znaczniki błędów" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "P_rojekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nowy" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Otwórz" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "Otwórz projekt" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Zamknij" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Narzędzia" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "Kompilacja nie powiodła się" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Wybór koloru" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Zliczanie _słów" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Wczytaj z_naczniki" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "Pomo_c" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Strona domowa" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Skróty _klawiszowe" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 #, fuzzy msgid "_Debug Messages" msgstr "Komunikaty" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 #, fuzzy msgid "Documents" msgstr "_Dokument" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Status" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Kompilator" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Komunikaty" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Brudnopis" -#: ../src/interface.c:1727 ../src/interface.c:3286 +#: ../src/interface.c:1887 #, fuzzy -msgid "Images _and Text" -msgstr "Napisy i ikony" +msgid "_Toolbar Preferences" +msgstr "Ustawienia" -#: ../src/interface.c:1732 ../src/interface.c:3318 +#: ../src/interface.c:1900 #, fuzzy -msgid "_Images Only" -msgstr "Tylko ikony" +msgid "_Hide Toolbar" +msgstr "Ukryj pasek narzędzi" -#: ../src/interface.c:1737 ../src/interface.c:3310 +#: ../src/interface.c:2112 #, fuzzy -msgid "_Text Only" -msgstr "Tylko napisy" +msgid "Find _Usage" +msgstr "Znajdź" -#: ../src/interface.c:1748 ../src/interface.c:3302 +#: ../src/interface.c:2120 #, fuzzy -msgid "_Large Icons" -msgstr "Duże ikony" +msgid "Find _Document Usage" +msgstr "Znajdź" -#: ../src/interface.c:1753 ../src/interface.c:3294 +#: ../src/interface.c:2128 #, fuzzy -msgid "_Small Icons" -msgstr "Małe ikony" +msgid "Go to _Tag Definition" +msgstr "Przejdź do definicji znacznika" -#: ../src/interface.c:1758 ../src/interface.c:3326 +#: ../src/interface.c:2132 #, fuzzy -msgid "_Very Small Icons" -msgstr "Małe ikony" +msgid "Go to T_ag Declaration" +msgstr "Przejdź do deklaracji znacznika" -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Ukryj pasek narzędzi" - -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "Ukryj pasek narzędzi" - -#: ../src/interface.c:2094 -#, fuzzy -msgid "Find _Usage" -msgstr "Znajdź" - -#: ../src/interface.c:2102 -#, fuzzy -msgid "Find _Document Usage" -msgstr "Znajdź" - -#: ../src/interface.c:2110 -#, fuzzy -msgid "Go to _Tag Definition" -msgstr "Przejdź do definicji znacznika" - -#: ../src/interface.c:2114 -#, fuzzy -msgid "Go to T_ag Declaration" -msgstr "Przejdź do deklaracji znacznika" - -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 #, fuzzy msgid "Conte_xt Action" msgstr "Akcja kontekstowa" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Ustawienia" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Wczytywanie plików z ostatniej sesji" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "" "Przy uruchomieniu programu zostaną otwarte wszystkie pliki z poprzedniej " "sesji" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Wsparcie dla wirtualnego terminala" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1534,42 +1609,42 @@ "Określa, czy wirtualny terminal powinien być uruchamiany przy starcie " "programu. Odznacz tę opcję, jeżeli go nie potrzebujesz." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Obsługa wtyczek" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 #, fuzzy msgid "Startup" msgstr "Panel boczny" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Zapisywanie pozycji i wymiarów okna" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Zapisuje pozycję i rozmiar okna i wczytuje je przy starcie programu" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Potwierdzanie zakończenia programu" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Wyświetla okno dialogowe potwierdzenia przy zamykaniu programu" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 #, fuzzy msgid "Shutdown" msgstr "Uruchamianie i wylączanie" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Katalog początkowy:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1577,42 +1652,42 @@ "Ścieżka do domyślnego katalogu dla otwieranych i zapisywanych plików. Musi " "być ścieżką absolutną. Pozostaw to pole puste, aby używać bieżący katalog." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Katalog z plikami projektu" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "" "Ścieżka to domyślnego katalogu wyświetlanego podczas otwierania plików " "projektu" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 #, fuzzy msgid "Extra plugin path:" msgstr "Obsługa wtyczek" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Katalogi" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "Status" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Sygnał dźwiękowy przy wystąpieniu błędów lub po zakończeniu kompilacji" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1621,13 +1696,13 @@ "Uruchamia sygnał dźwiękowy przy wystąpieniu błędów lub po zakończeniu " "procesu kompilacji" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "" "Przełączanie okna komunikatów do zakładki \"Status\" przy nadejściu nowego " "komunikatu" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1637,11 +1712,11 @@ "pojawi się nowy komunikat dotyczący statusu (np. zapis pliku, szukanie ciągu " "znaków, itp.)" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Ukryj informacje statusu na pasku statusu" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1649,12 +1724,12 @@ "Usuwa wszystkie informacje na pasku statusu. Informacje są jednak nadal " "dostępne w oknie z informacjami o statusie." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Automatycznie aktywuj panele po najechaniu kursorem" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1664,15 +1739,25 @@ "głównego okna edytora, pola wyszukiwania, pola skoku do wiersza i " "wbudowanego emulatora terminala." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Różne" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Zapętlanie wyszukiwanie i ukrywanie okna dialogowego wyszukiwania" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1682,43 +1767,43 @@ "nastepnie rozpoczyna przeszukiwanie od jego początku. Ukrywa także okno " "dialogowe wyszukiwania po naciśnięciu przycisku \"Znajdź następny/poprzedni\"" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Nieprawidłowy katalog." -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 #, fuzzy msgid "Search" msgstr "Panel boczny" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 #, fuzzy msgid "Use project-based session files" msgstr "Pliki projektów Geany" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Utworzyć katalog podstawowy dla projektu?" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1726,79 +1811,103 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 #, fuzzy msgid "Projects" msgstr "Katalogi" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "Różne" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Ogólne" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Wyświetlanie listy symboli" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Wyświetla lub ukrywa listę symboli" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 #, fuzzy msgid "Show documents list" msgstr "Wyświetlanie listy otwartych plików" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 #, fuzzy msgid "Toggle the documents list on and off" msgstr "Wyświetla lub ukrywa listę otwartych plików" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Panel _boczny" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Opis:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Lewo" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Prawo" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Panel boczny" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Lista symboli:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Okno komunikatów:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Edytor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Ustawia czcionkę dla okna komunikatów" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Ustawia czcionkę dla listy symboli" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Ustawia czcionkę edytora" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Czcionki" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Wyświetlanie zakładek edytora" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Wyświetlanie przycisków zamykania na zakładkach" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1808,114 +1917,151 @@ "szybkie zamykanie plików (po zmianie tej opcji należy ponownie uruchomić " "Geany aby zadziałała)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Położenie nowych zakładek plików:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Lewo" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Zakładki nowych plików będą umieszczane na lewym końcu listy zakładek" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Prawo" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Zakładki nowych plików będą umieszczane na prawym końcu listy zakładek" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Zapisuje bieżący plik" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Włącz/Wyłącz tryb minimalistyczny" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Przełącz wszystkie dodatkowe panele" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Zakładki edytora" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Góra" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Dół" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Panel boczny" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Położenie elementów interfejsu:" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Wyświetlanie paska statusu" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Przełącza widok paska statusu wyświetlanego na dole okna programu." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Interfejs" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "Wyświetlanie paska narzędzi" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Pasek narzędzi" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Styl ikon" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Rozmiar ikon" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Wygląd" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy msgid "Customize Toolbar" msgstr "Pasek _narzędzi" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +#, fuzzy +msgid "Images _and Text" +msgstr "Napisy i ikony" + +#: ../src/interface.c:3376 +#, fuzzy +msgid "_Images Only" +msgstr "Tylko ikony" + +#: ../src/interface.c:3384 +#, fuzzy +msgid "_Text Only" +msgstr "Tylko napisy" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Czcionki" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +#, fuzzy +msgid "_Small Icons" +msgstr "Małe ikony" + +#: ../src/interface.c:3429 +#, fuzzy +msgid "_Very Small Icons" +msgstr "Małe ikony" + +#: ../src/interface.c:3437 +#, fuzzy +msgid "_Large Icons" +msgstr "Duże ikony" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Rozmiar:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Pasek narzędzi" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Pasek narzędzi" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Zawijanie wierszy" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1925,11 +2071,11 @@ "przypadku dużych dokumentów może być zasobochłonne (tj. spowalniać działanie " "programu) na starszych starszych komputerach." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "\"Inteligentny\" klawisz Home" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1943,11 +2089,11 @@ "wyłączona, klawisz HOME zawsze przesuwa karetkę na początek wiersza, " "niezależnie od bieżącej pozycji." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Wyłączenie przeciągania i upuszczania" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1957,30 +2103,30 @@ "przeciąganie i upuszczanie dowolnego zaznaczenia wewnątrz lub na zewnątrz " "okna edytora." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Zwijanie sekcji kodu" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Określa czy włączyć zawijanie sekcji kodu" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Rozwijanie potomne punktów zwinięcia" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." msgstr "" -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Podkreślanie miejsc, w których wystąpiły błędy kompilacji" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1989,156 +2135,147 @@ "Podkreśla te części kodu źródłowego, w których kompilator znalazł błędy lub " "których dotyczyły ostrzeżenia kompilatora." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Usuwanie spacji i znaków tabulacji na końcach linii" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 #, fuzzy msgid "Line breaking column:" msgstr "Zawijanie wierszy" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "Przełącz znacznik" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Opcje" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 #, fuzzy msgid "Features" msgstr "Opcje" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 #, fuzzy msgid "Auto-indent mode:" msgstr "Automatyczne wcięcia" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Podstawowe" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Bieżące znaki" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Idź do nawiasu zamykającego/otwierającego" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 #, fuzzy msgid "Width:" msgstr "Zapis:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 #, fuzzy msgid "The width in chars of a single indent" msgstr "" "Szerokość znaku tabulacji wyrażona szerokością jednego znaku standardowego" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Szerokość tabulacji" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 #, fuzzy msgid "Tab key indents" msgstr "Inteligentne wcięcia wierszy" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Wcięcie" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "Wcięcie" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 #, fuzzy msgid "Snippet completion" msgstr "Automatyczne uzupełnianie konstrukcji" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Automatyczne uzupełnianie znaczników XML i HTML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 #, fuzzy msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Automatyczne kończenie otwartych znaczników XML(także znaczników HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 #, fuzzy msgid "Automatic continuation of multi-line comments" msgstr "Wstawia komentarz dłuższy niż jedna linia" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2146,153 +2283,152 @@ "Automatyczne uzupełnianie wyrażeń występujących w otwartych plikach (np. " "nazw funkcji, zmiennych globalnych, itp.) " -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 #, fuzzy msgid "Drop rest of word on completion" msgstr "Automatyczne uzupełnianie konstrukcji" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "_Automatyczne uzupełnianie pętli" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Liczba wierszy wyświetlanych przez listę autouzupełniania" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "Liczba wierszy wyświetlanych przez listę autouzupełniania" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 #, fuzzy msgid "Completions" msgstr "Automatyczne uzupełnianie" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 #, fuzzy msgid "Completions" msgstr "Automatyczne uzupełnianie" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Odwróć kolory podświetlania składni" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Stosuj biały kolor tekstu na czarnym tle" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Wyświetlanie prowadnic" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Pokazuje małe przerywane linie, które pomagają w wyborze odpowieniej " "prowadnicy" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Wyświetlanie ukrytych znaków" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Oznacza spacje za pomocą kropek, a znaki tabulacji strzałkami" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Wyświetlanie znaków końca wiersza" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "Włącza wyświetlanie znaków końca wiersza" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Wyświetla lub ukrywa numerowanie wierszy na marginesie." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 #, fuzzy msgid "Show markers margin" msgstr "Mar_gines ze znacznikami" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2301,37 +2437,39 @@ "Pokazuje lub ukrywa mały margines po prawej stronie pola z numerami wierszy, " "który umożliwia zaznaczanie wierszy" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 #, fuzzy msgid "Stop scrolling at last line" msgstr "Przewiń do bieżącej linii" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Wyświetlanie" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Znacznik długiej linii" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Kolor znacznika długiej linii" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Firma:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Kolor" + +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Ustawia kolor znacznika długiej linii" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Wybór koloru" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2343,11 +2481,11 @@ "dzieleniu zbyt długich wierszy. Podaj liczbę znaków w poziomie, jaką ma " "wydzielać ta linia." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Wiersz" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2356,153 +2494,181 @@ "Wyświetla pionową linię w oknie edytora w określonej pozycji kursora (patrz " "poniżej)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Tło" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Brak" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "Zwijanie sekcji kodu" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Znacznik długiej linii" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Brak" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Usuwa spacje i znaki tabulacji na końcu linii" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Ścieżki do narzędzi" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Wyświetlanie" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 #, fuzzy msgid "Default end of line characters:" msgstr "Domyślne kodowanie (dla nowych plików):" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nowe pliki" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "Ustaw domyślne kodowanie dla nowych plików." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Domyślne kodowanie (dla nowych plików):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Domyślne kodowanie (dla istniejących plików):" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" -msgstr "Ustaw domyślne kodowanie dla otwieranych plików." +msgid "Sets the default encoding for newly created files" +msgstr "Ustaw domyślne kodowanie dla nowych plików." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Używaj określonego kodowania dla otwieranych plików" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Ta opcja wyłącza automatyczne wykrywanie kodowania przy otwieraniu plików, " "zamiast tego pliki będą otwierane z określonym kodowaniem." -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Domyślne kodowanie (dla istniejących plików):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Ustaw domyślne kodowanie dla otwieranych plików." + +#: ../src/interface.c:4136 #, fuzzy msgid "Encodings" msgstr "Kodowanie:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Nowa linia na końcu pliku" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Ustawia pustą nową linię na końcu pliku" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Usuwanie spacji i znaków tabulacji na końcach linii" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Usuwa spacje i znaki tabulacji na końcu linii" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Zamiana tabulacji na spacje" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Zamienia wszystkie znaki tabulacji na spacje." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Zapis plików" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Rozmiar listy ostatnio używanych plików:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Określa liczbę plików wyświetlanych w menu \"Ostatnio otwierane\"." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Pliki" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Program Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Przeglądarka:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Ścieżka i opcje dla narzędzia make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2510,25 +2676,25 @@ "Emulacja terminala takiego jak xterm, gnome-terminal czy konsole (powinien " "akceptować argument -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Ścieżka (oraz ewentualnie dodatkowe parametry) do twojej ulubionej " "przeglądarki" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Program Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Ścieżki do narzędzi" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Akcja kontekstowa:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2539,69 +2705,69 @@ "połączeniu z %s. Może pojawić się w dowolnym miejscu podanego polecenia i " "zostanie zamienione przed jego wykonaniem." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Polecenia" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Narzędzia" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "adres e-mail programisty" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Inicjały programisty" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Wstępna wersja:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Numer wersji" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Nazwa firmy" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Programista:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Adres e-mail:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Inicjały:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Nazwisko programisty" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 #, fuzzy msgid "Year:" msgstr "Panel boczny" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 #, fuzzy msgid "Date:" msgstr "Program Make:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2610,7 +2776,7 @@ "Wprowadź własny format daty i czasu. Możesz używać dowolne operatory " "konwersji dostępne w funkcji strftime języka ANSI C." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2619,7 +2785,7 @@ "Wprowadź własny format daty i czasu. Możesz używać dowolne operatory " "konwersji dostępne w funkcji strftime języka ANSI C." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2628,89 +2794,89 @@ "Wprowadź własny format daty i czasu. Możesz używać dowolne operatory " "konwersji dostępne w funkcji strftime języka ANSI C." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Dane szablonu" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Szablony" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Zmi_eń" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Skróty klawiszowe" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Skróty klawiszowe" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 #, fuzzy msgid "Command:" msgstr "Polecenie" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Pełna ścieżka wraz z opcjami do komendy umożliwiającej drukowanie plików (w " "miejsce nazwy pliku wstaw %f)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 #, fuzzy msgid "Print line numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 #, fuzzy msgid "Print page numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 #, fuzzy msgid "Print page header" msgstr "Nagłówek podstawowy" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." msgstr "" -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 #, fuzzy msgid "Use the basename of the printed file" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 #, fuzzy msgid "Date format:" msgstr "Własny format daty" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 #, fuzzy msgid "" "Specify a format for the date and time stamp which is added to the page " @@ -2720,583 +2886,608 @@ "Wprowadź własny format daty i czasu. Możesz używać dowolne operatory " "konwersji dostępne w funkcji strftime języka ANSI C." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Kodowanie:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 #, fuzzy msgid "Printing" msgstr "Wydrukuj" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Właściwości projektu" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Wyświetlanie" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 #, fuzzy msgid "File" msgstr "_Plik" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nowy" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Otwórz" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Otwórz wybrany plik" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Zapisz" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Zapisz jako" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Zapisz wszystko" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Wydrukuj" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Zamknij" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Zamknij wszystko" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Wczytaj plik ponownie" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 #, fuzzy msgid "Project" msgstr "P_rojekt" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Właściwości projektu" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Cofnij" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Ponowienie" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplikuj wiersz albo zaznaczenie" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Usuń bieżącą linię" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Usuń bieżącą linię" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Zamień miejscami bieżący wiersz z wierszem poprzedzającym" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Przewiń do bieżącej linii" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Przewiń widok o jedną linię w górę" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Przesuń widok o jedną linię w dół" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 #, fuzzy msgid "Complete snippet" msgstr "Zatwierdź sugerowane uzupełnienie konstrukcji" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 #, fuzzy msgid "Suppress snippet completion" msgstr "Automatyczne uzupełnianie konstrukcji" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Akcja kontekstowa" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Całe słowo" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Pokaż podpowiedzi" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Pokaż listę makr" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Automatyczne uzupełnianie konstrukcji" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Komentuj linie" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Komentuj linie" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 #, fuzzy msgid "Copy" msgstr "Firma:" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Kopiuje bieżącą linię" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Wycina bieżącą linię" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 #, fuzzy msgid "Select" msgstr "Zaznacz wszystko" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Zaznacz wszystko" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Zaznacz bieżące słowo" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Zaznacz bieżący wiersz" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Idź do poprzedniego znacznika" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Zaznacz bieżący akapit" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Idź do następnego znacznika" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 #, fuzzy msgid "Format" msgstr "_Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Przełącz rozmiar dla zaznaczenia" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Przełącz komentowanie linii" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Komentuj linie" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Odkomentuj linie" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Zwiększ wcięcie" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Zmniejsz wcięcie" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Zwiększ wcięcie o jedną spację" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Zmniejsz wcięcie o jedną spację" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Inteligentne wcięcia wierszy" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Wyślij do zewnętrznego polecenia 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Wyślij do zewnętrznego polecenia 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Wyślij do zewnętrznego polecenia 3" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "_Wyślij zaznaczenie do" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 #, fuzzy msgid "Insert" msgstr "Ws_taw" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Wstaw datę" -#: ../src/keybindings.c:332 -#, fuzzy -msgid "Insert alternative white space" -msgstr "Wstaw alternatywną wolną przestrzeń" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 #, fuzzy msgid "Settings" msgstr "Sekcje" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 #, fuzzy msgid "Search" msgstr "_Szukaj" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Szukaj" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Znajdź następny" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Znajdź poprzedni" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Znajdź następne zaznaczenie" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Znajdź poprzednie zaznaczenie" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Zastąp" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Znajdź w _plikach" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Następny komunikat" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 #, fuzzy msgid "Previous Message" msgstr "Następny komunikat" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Znajdź" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" msgstr "Znajdź" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "Zbuduj _wszystko" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 #, fuzzy msgid "Go to" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Przejdź do poprzedniej lokacji" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Przejdź do następnej lokacji" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Idź do nawiasu zamykającego/otwierającego" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Przełącz znacznik" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Idź do następnego znacznika" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Idź do poprzedniego znacznika" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Przejdź do definicji znacznika" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Przejdź do deklaracji znacznika" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 #, fuzzy msgid "Go to Start of Line" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 #, fuzzy msgid "Go to End of Line" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 #, fuzzy msgid "Go to Previous Word Part" msgstr "Idź do poprzedniego znacznika" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 #, fuzzy msgid "Go to Next Word Part" msgstr "Idź do następnego znacznika" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 #, fuzzy msgid "View" msgstr "P_okaż" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Przełącz wszystkie dodatkowe panele" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Pełny _ekran" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Przełącz okno komunikatów" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Przełącz panel boczny" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Powiększ" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Pomniejsz" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Pomniejsz" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Przejdź do edytora" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Przejdź do Scribble" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Przejdź do terminala" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Przejdź do paska wyszukiwania" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 #, fuzzy msgid "Switch to Sidebar" msgstr "Przejdź do paska wyszukiwania" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 #, fuzzy msgid "Switch to Compiler" msgstr "Przejdź do paska wyszukiwania" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Przejdź do paska wyszukiwania" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "_Okno komunikatów" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Przejdź do lewego dokumentu" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Przejdź do paska wyszukiwania" + +#: ../src/keybindings.c:498 #, fuzzy msgid "Notebook tab" msgstr "Polecenia składni" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Przejdź do lewego dokumentu" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Przejdź do prawego dokumentu" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Przejdź do ostatnio używanego dokumentu" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Przesuń dokument w lewo" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Przesuń dokument w prawo" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 #, fuzzy msgid "Move document first" msgstr "Przesuń dokument w lewo" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 #, fuzzy msgid "Move document last" msgstr "Przesuń dokument w lewo" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 #, fuzzy msgid "Document" msgstr "_Dokument" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 #, fuzzy msgid "Toggle Line wrapping" msgstr "Zawijanie wierszy" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 #, fuzzy msgid "Toggle Line breaking" msgstr "P_rzełącz komentowanie linii" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 #, fuzzy msgid "Replace spaces by tabs" msgstr "Zamień znaki tabulacji na _spacje" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 #, fuzzy msgid "Toggle current fold" msgstr "Zaznacz bieżące słowo" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Zwiń wszystkie" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Rozwiń wszystkie" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Wczytaj ponownie listę symboli" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "_Usuń znaczniki" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Usuń _wszystkie znaczniki błędów" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Buduj" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Skompiluj" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Zbuduj wszystko" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Zbuduj przy użyciu własnych parametrów" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Zbuduj obiekt" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Następny błąd" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 #, fuzzy msgid "Previous error" msgstr "Poprzedni tłumacze" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Uruchom" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Uruchom (polecenie alternatywne)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Opcje budowania" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Przycisk wyboru kolorów" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Pomoc" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Skróty klawiszowe" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Poniższe skróty klawiszowe są konfigurowalne:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "Przejdź do lewego dokumentu" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "To jest brudnopis. Możesz wpisać tu cokolwiek chcesz." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Wczytywanie jednego lub więcej plików sesji zakończone niepowodzeniem." @@ -3305,7 +3496,12 @@ msgid "Debug Messages" msgstr "Komunikaty" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Szukaj" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3313,86 +3509,95 @@ "Ustawia początkową liczbę kolumn dla pierwszego otwartego pliku (użyteczne w " "połączeniu z --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Użyj innego katalogu z konfiguracją" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Drukuj wewnętrzne nazwy typów plików" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Generuje globalny plik ze znacznikami (zobacz dokumentację)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Nie otwieraj plików w działającej instancji, wymuszaj otwieranie w nowej " "instancji" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Ustaw początkowy numer wiersza dla pierwszego otwartego pliku" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Nie pokazuj okna komunikatów przy starcie" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Nie wczytuj danych autouzupełniania (zobacz dokumentację)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Nie wczytuj wtyczek" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Nie wczytuj plików z poprzedniej sesji" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Nie wczytuj obsługi wbudowanego terminala" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Nazwa pliku libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Wyświetl informacje o wersji i zakończ program" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[PLIKI...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(zbudowano %s z użyciem GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3401,14 +3606,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3419,51 +3624,56 @@ "Geany może nie działać poprawnie bez swojego katalogu z konfiguracją.\n" "Uruchomić program pomimo tego?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Nie można odnaleźć pliku %s" - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Używasz Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 #, fuzzy msgid "Configuration files reloaded." msgstr "Kompilacja nie powiodła się" -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Komunikaty stanu" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Firma:" + +#: ../src/msgwindow.c:533 #, fuzzy msgid "Copy _All" msgstr "Zamknij wszystk_o" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Ukryj okno komunikatów" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Usuwa wszystkie znaczniki błędów w bieżącym dokumencie" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3471,87 +3681,97 @@ "Author(s): %s" msgstr "" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 #, fuzzy msgid "Active" msgstr "Działanie" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 #, fuzzy msgid "Plugin details:" msgstr "Wcięcie" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Przechwyć klawisz" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Wciśnij klawisz/kombinację klawiszy, którą chcesz używać dla akcji: \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "Szukaj wszystkie" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "Zamknij wszystk_o" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Działanie" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Skrót" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, fuzzy, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" "Kombinacja klawiszy \"%s\" jest już używana przez \"%s\". Spróbuj wybrać " "inną kombinację." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Wprowadź tutaj ścieżki do narzędzi. \n" "Pola ścieżek do nieużywanych narzędzi mogą zostać pozostawione puste" #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3559,7 +3779,7 @@ "Ustaw informacje wykorzystywane przez szablony. Więcej informacji na ten " "temat znajduje się w dokumentacji." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3570,7 +3790,7 @@ "i>" #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3581,14 +3801,14 @@ "skrót klawiszowy." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3602,46 +3822,46 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Ostatnia zmiana:" -#: ../src/printing.c:375 +#: ../src/printing.c:376 #, fuzzy msgid "Document Setup" msgstr "Menu Dokument" -#: ../src/printing.c:410 +#: ../src/printing.c:411 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Ostatnia zmiana:" -#: ../src/printing.c:776 -#, fuzzy, c-format -msgid "Printing of file %s was cancelled." -msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)." +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Wydrukowano plik %s." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3652,38 +3872,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Wydrukowano plik %s." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projekty" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Nowy projekt" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Utwó_rz" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Nazwa:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Nazwa pliku:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Katalog podstawowy" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 #, fuzzy msgid "" "Base directory of all files that make up the project. This can be a new " @@ -3693,124 +3918,117 @@ "Katalog w którym znajdują się wszystkie pliki wchodzące w skład projektu. To " "może być ścieżka do nowego lub już istniejącego katalogu." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Wybierz katalog podstawowy dla projektu" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Plik projektu \"%s\" nie mógł zostać wczytany." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Otwórz projekt" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Katalog z plikami projektu" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" został zamknięty." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Opis:" -#: ../src/project.c:447 -msgid "Make in base path" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Wykonaj polecenie:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Sekcja1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Określa polecenie konsolowe wykonywane w katalogu podstawowym projektu. " -"Polecenie może zawierać dodatkowe opcje. Pozostaw to pole puste aby używać " -"domyślne polecenie." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Wzory plików:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Czy chcesz go zamknąć przed kontynuowaniem?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, fuzzy, c-format msgid "The '%s' project is already open." msgstr "Projekt '%s' jest już otwarty" -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Podana nazwa projektu jest za krótka" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Podana nazwa projektu jest zbyt długa (maksymalnie %d znaków)" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Podałeś niewłaściwą nazwę pliku projektu." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Utworzyć katalog podstawowy dla projektu?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Katalog \"%s\" nie istnieje." -#: ../src/project.c:670 +#: ../src/project.c:705 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "Plik projektu nie mógł zostać odczytany." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" utworzony." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" zapisany." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Wybierz nazwę pliku projektu" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Wybierz komendę uruchamianą podczas wciśniecia przycisku \"Wykonaj\"" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" otwarty" -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Użycie wyrażeń _regularnych" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3818,15 +4036,15 @@ "Używaj wyrażeń regularnych w stylu POSIX. Więcej informacji na ten temat " "znajduje się w dokumentacji." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Wyszukiwanie _wstecz" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Uż_ycie sekwencji specjalnych" -#: ../src/search.c:246 +#: ../src/search.c:263 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3835,425 +4053,449 @@ "Zastąp \\\\, \\t, \\n, \\r oraz \\uXXXX (znaki Unicode) odpowiednimi znakami " "kontrolnymi." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Rozróżnianie wielkości _liter" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Tylko całe _wyrazy" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Tylko wyrazy o takich samych _początkach" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Poprzedni" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Następny" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Szukaj:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 #, fuzzy msgid "_Find All" msgstr "Szukaj wszystkie" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "Ust_aw znaczniki" -#: ../src/search.c:433 +#: ../src/search.c:450 #, fuzzy msgid "Mark all matches in the current document" msgstr "" "Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje " "szukany ciąg" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "W _sesji" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "_W dokumencie" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "_Zamknij po ustawieniu znaczników" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Zamyka okno po ustawieniu znaczników" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Za_stąp i znajdź" -#: ../src/search.c:538 +#: ../src/search.c:565 #, fuzzy msgid "Replace wit_h:" msgstr "Za_stąp ciągiem:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 #, fuzzy msgid "Re_place All" msgstr "Zastąp wszystkie" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "W _zaznaczeniu" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Zamieć wszystkie ciągi znalezione w aktualnie zaznaczonym tekście" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Ka_talog:" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "Ustaw kodowanie znaków" -#: ../src/search.c:752 +#: ../src/search.c:781 #, fuzzy msgid "Fixed s_trings" msgstr "Stałe _ciągi" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Wyrażenia regularne _Grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 #, fuzzy msgid "See grep's manual page for more information" msgstr "Zobacz podręcznik programu Grep aby uzyskać więcej informacji." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Rozszerzone wyrażenia regularne" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Szukaj w _podkatalogach" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Odwróć wyniki wyszukiwania" -#: ../src/search.c:797 +#: ../src/search.c:826 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Odwróć tak, żeby zaznaczone zostały linie nie spełniające zadanego kryterium." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Opcje _dodatkowe:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Inne opcje przekazywane programowi Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Znaleziono %d wyników wyszukiwania ciągu \"%s\"." msgstr[1] "Znaleziono %d wyników wyszukiwania ciągu \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, fuzzy, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Zamieniono ciąg w %u plikach." -msgstr[1] "Zamieniono ciąg w %u plikach." +msgid "Replaced %u matches in %u documents." +msgstr "" +"Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje " +"szukany ciąg" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Nieprawidłowy katalog." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Nie znaleziono tekstu" -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Nie można uruchomić programu grep: \"%s\". Sprawdź, czy podałeś właściwą " "ścieżkę do programu w ustawieniach Geany." -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "_Szukaj" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (w katalogu: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Nie można otworzyć katalogu %s" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Wyszukiwanie nieudane" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Wyszukiwanie zakończone z %d wynikami" msgstr[1] "Wyszukiwanie zakończone z %d wynikami" -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Nie znaleziono ciągu." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Rozdział" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sekcja" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sekcja1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sekcja2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sekcja3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Dodatek" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Inne" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Moduł" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Typy:" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Konstruktory typów" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funkcje" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Sekcje" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Przyciski" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Zmienne" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Polecenie" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Środowisko" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Podsekcja" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Podsekcja" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etykieta" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "Status" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Pakiet" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Moje" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Lokalny" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Nasze" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +#, fuzzy +msgid "Labels" +msgstr "Etykieta" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Stałe" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfejsy" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Klasy" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Stałe" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "W _zaznaczeniu" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "Konstruktory typów" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 #, fuzzy msgid "Modules" msgstr "Moduł" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Wzorce singletonu" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Metody" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Przestrzenie nazw" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Właściwości" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Eksportuj" -#: ../src/symbols.c:766 ../src/symbols.c:855 -msgid "Members" -msgstr "Atrybuty/metody w klasach" +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "bez nazwy" -#: ../src/symbols.c:806 ../src/symbols.c:829 +#: ../src/symbols.c:761 #, fuzzy -msgid "Labels" -msgstr "Etykieta" +msgid "Architectures" +msgstr "Status" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Właściwości" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Zmienne" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Funkcje" + +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "Atrybuty/metody w klasach" -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Makra" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 #, fuzzy msgid "Defines" msgstr "Wiersze:" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "Status" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Nieznane rozszerzenie pliku dla \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, fuzzy, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Nie udało się utworzyć pliku ze znacznikami.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4262,7 +4504,7 @@ "Użycie: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4273,103 +4515,107 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Wczytaj znaczniki" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Pliki Geany ze znacznikami (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Wczytano %s pliku ze znacznikami %s" -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Nie można wczytać pliku ze znacznikami: %s" -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Nie odnaleziono deklaracji \"%s\"" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Brak Definicji \"%s\"" -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 #, fuzzy msgid "Sort by _Name" msgstr "Uporządkuj według nazw" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 #, fuzzy msgid "Sort by _Appearance" msgstr "Uporządkuj według kolejności wystąpienia" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Zapisuje bieżący plik" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Zapisuje wszystkie otwarte pliki" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Ponownie wczytuje bieżący plik z dysku" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Zamyka bieżący plik" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "Zamyka wszystkie otwarte pliki" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "Konwertuj zaznaczone znaki do małych/dużych liter" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "Kompiluje bieżący plik" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "Konwertuj zaznaczone znaki do małych/dużych liter" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Cofnij ostatnią modyfikację" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Ponów ostatnią modyfikację" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Kompiluje bieżący plik" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Uruchamia lub włącza podgląd bieżącego pliku" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" @@ -4377,86 +4623,100 @@ "Otwiera okno dialogowe wyboru kolorów, które umożliwia wybór koloru w sposób " "interaktywny z palety" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Powiększa tekst" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Zmniejsza tekst" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 #, fuzzy msgid "Decrease indentation" msgstr "Zmniejsz wcięcie" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 #, fuzzy msgid "Increase indentation" msgstr "Zwiększ wcięcie" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Szuka podanego tekstu w bieżącym pliku" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "Przechodzi do podanego numeru wiersza." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Zamknij Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "XML" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "" "Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje " "szukany ciąg" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Tworzy nowy plik" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Tworzy nowy plik" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Otwiera plik" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Otwórz wybrany plik" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Nie wystąpiło więcej błędów podczas budowania." + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "Przejdź do wiersza" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Wyświetlanie" @@ -4482,7 +4742,7 @@ msgid "Custom command failed: %s" msgstr "Nie zdefiniowano zewnętrznych poleceń" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Ustaw zewnętrzne polecenia" @@ -4494,251 +4754,230 @@ "Możesz wysłać bieżące zaznaczenie do jednej z tych komend, w wyniku czego " "wyjście z działania wybranej komendy zastąpi zaznaczony obszar." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Nie zdefiniowano zewnętrznych poleceń" -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Ilość słów" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "zaznaczenie" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "cały dokument" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Zakres:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Wiersze:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Słowa:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Znaki:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Nie znaleziono" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 #, fuzzy msgid "Show S_ymbol List" msgstr "Wyświetlanie listy symboli" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 #, fuzzy msgid "Show _Document List" msgstr "Wyświetlanie listy otwartych plików" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 #, fuzzy msgid "H_ide Sidebar" msgstr "Ukryj panel boczny" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Wyświetlanie paska statusu" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "NDP" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "WST" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Ustaw kodowanie znaków" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, fuzzy, c-format msgid "filetype: %s" msgstr "Typ pliku:" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Zaktualizowano czcionkę (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Standardowa biblioteka C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Standardowa biblioteka C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Standardowa biblioteka C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 #, fuzzy msgid "_Set Custom Date Format" msgstr "Ustaw własny format daty" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Wybierz katalog" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Wybierz plik" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "Kompilacja nie powiodła się" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "Za_pisz wszystko" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "Zamknij wszystk_o" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 #, fuzzy msgid "_Set Path From Document" msgstr "Przejdź do lewego dokumentu" -#: ../src/vte.c:553 +#: ../src/vte.c:521 #, fuzzy msgid "_Restart Terminal" msgstr "Terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Meto_dy wejściowe" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Wtyczka terminala" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Te ustawienia wbudowanego terminala zadziałają tylko wtedy, gdy w systemie " -"będą dostępne odpowiednie biblioteki umożliwiające jego emulację." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Czcionka terminala" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "Ustawia czcionkę dla okna terminala" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Kolor tekstu:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Kolor tła" -#: ../src/vte.c:768 +#: ../src/vte.c:764 #, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Ustawia kolor czcionki dla okna terminala." -#: ../src/vte.c:775 +#: ../src/vte.c:771 #, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Ustawia kolor tła dla okna terminala" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Liczba linii:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 #, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " @@ -4746,11 +4985,11 @@ msgstr "" "Określa maksymalną liczbę linii, o jaką można przewinąć wstecz terminal." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Powłoka:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 #, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " @@ -4759,51 +4998,51 @@ "Określa ścieżkę do powłoki, która powinna być uruchamiana przez wbudowany " "emulator terminala" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Przewijanie przy _naciśnięciu klawisza" -#: ../src/vte.c:820 +#: ../src/vte.c:816 #, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" msgstr "" "Określa czy przewinąć do końca zawartość terminala kiedy zostanie naciśnięty " "klawisz " -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Przewijanie terminala przy nowej zawartości" -#: ../src/vte.c:824 +#: ../src/vte.c:820 #, fuzzy msgid "Whether to scroll to the bottom when output is generated" msgstr "" "Określa czy przewinąć do końca zawartość terminala kiedy zostanie " "wygenerowana nowa zawartość wyjścia" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "Określa czy włączyć zawijanie sekcji kodu" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Wyłączenie skrótu klawiszowy menu (domyślnie F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4814,11 +5053,11 @@ "jeżeli używasz inne programy wykorzystujące ten skrót (np. Midnight " "Commander we wbudowanym emulatorze terminala)" -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/vte.c:841 +#: ../src/vte.c:837 #, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" @@ -4827,21 +5066,21 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" msgstr "" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Wykonywanie programów we wbudowanym terminalu" -#: ../src/vte.c:851 +#: ../src/vte.c:847 #, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " @@ -4851,92 +5090,125 @@ "programu Geany) zamiast otwierać nowe osobne okno z terminalalem. Programy " "uruchamiane we wbudowanym oknie nie mogą być zatrzymywane." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Pliki projektów Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Pliki wykonywalne" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Konstruktor klasy" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Tworzy pliki źródłowe dla nowych typów klas" -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Utwórz klasę" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Przestrzenie nazw" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Przestrzenie nazw" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Klasa" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nazwa klasy:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Plik nagłówkowy:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Plik źródłowy" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Dziedziczenie" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Klasa podstawowa:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Haskell" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Nagłówek podstawowy" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Globalne" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "GType podstawowy" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Opcje" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Utwórz konstruktor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Utwórz destruktor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Wzorce singletonu" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Typ konstruktora GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Utwó_rz klasę" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 #, fuzzy msgid "_C++ Class" msgstr "Klasa C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 #, fuzzy msgid "_GTK+ Class" msgstr "Klasa GTK+" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Klasa C++" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Znaki HTML" @@ -4946,53 +5218,59 @@ msgstr "Wstawia znaki HTML." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "Nazwisko programisty" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "znaki HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Znaki ISO-8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Znaki greckie" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Znaki matematyczne" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Znaki techniczne" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Znaki strzałek" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Znaki interpunkcyjne" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Różne znaki" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +#, fuzzy +msgid "Plugin configuration directory could not be created." +msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Znaki specjalne" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "Ws_taw" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -5000,43 +5278,43 @@ "Wybierz znak specjalny z poniższej listy i kliknij go lub wciśnij przycisk " "\"Wstaw\", aby wstawić znak w bieżącej pozycji kursora" -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Znak" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nazwa)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Znaki specjalne _HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "Zastąp" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Położenie nowych zakładek plików:" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Wstaw specjalne znaki HTML" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "Znaki specjalne" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 #, fuzzy msgid "Toggle plugin status" msgstr "Przełącz komentowanie linii" @@ -5065,115 +5343,114 @@ "Wyświetla rozmiar czcionki bieżącego dokumentu razem z bieżącym poziomem " "powiększenia." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument został pomyślnie wyeksportowany do '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Plik '%s' nie mógł zostać zapisany (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Pliki '%s' już istnieje. Czy chcesz go nadpisać?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Eksportuj" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 #, fuzzy msgid "As _HTML" msgstr "Do HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 #, fuzzy msgid "As _LaTeX" msgstr "Do LateX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 #, fuzzy msgid "File Browser" msgstr "Przeglądarka:" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "" -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 #, fuzzy msgid "_Find in Files" msgstr "Znajdź w _plikach" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 #, fuzzy msgid "Show _Hidden Files" msgstr "Wyświetlanie _ukrytych plików" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 #, fuzzy msgid "Set path from document" msgstr "Przejdź do lewego dokumentu" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 #, fuzzy msgid "Clear the filter" msgstr "Zamyka bieżący plik" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 #, fuzzy msgid "Filter:" msgstr "_Plik" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -#, fuzzy -msgid "Plugin configuration directory could not be created." -msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 #, fuzzy msgid "External open command:" msgstr "%s poleceń" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5183,28 +5460,28 @@ "filename" msgstr "" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 #, fuzzy msgid "Show hidden files" msgstr "Wyświetlanie _ukrytych plików" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 #, fuzzy msgid "Hide object files" msgstr "Katalog z plikami projektu" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Utworzyć katalog podstawowy dla projektu?" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 #, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" @@ -5319,40 +5596,184 @@ msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "" "Ustawia znaczniki we wszystkich liniach danego dokumentu w których występuje " "szukany ciąg" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "U_stawienia budowania i kompilacji " + +#, fuzzy +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> DVI" + +#, fuzzy +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> PDF" + +#, fuzzy +#~ msgid "_View DVI File" +#~ msgstr "Wyświetl plik DVI" + +#, fuzzy +#~ msgid "V_iew PDF File" +#~ msgstr "Wyświetl plik PDF" + +#, fuzzy +#~ msgid "_Set Arguments" +#~ msgstr "Ustaw argumenty" + +#~ msgid "Set Arguments" +#~ msgstr "Ustaw argumenty" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Ustaw programy i opcje dla kompilacji i wyświetlania plików (La)TeX." + +#~ msgid "DVI creation:" +#~ msgstr "Tworzenie DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Tworzenie PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Podgląd DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Podgląd PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f zostanie zastąpione przez bieżącą nazwę pliku, np. plik_testowy.c\n" +#~ "%e zostanie zastąpione nazwą pliku bez rozszerzenia, np. plik_testowy" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Ustaw pliki nagłówkowe i argumenty " + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Ustaw komendy odpowiedzialne za budowanie i uruchamianie programów" + +#~ msgid "Compile:" +#~ msgstr "Skompiluj:" + +#~ msgid "Build:" +#~ msgstr "Buduj:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Nie udało się uruchomić programu wyświetlającego" + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "Ukryj pasek narzędzi" + +#~ msgid "Icon style:" +#~ msgstr "Styl ikon" + +#~ msgid "Icon size:" +#~ msgstr "Rozmiar ikon" + +#~ msgid "Appearance" +#~ msgstr "Wygląd" + +#, fuzzy +#~ msgid "Hard tab width:" +#~ msgstr "Szerokość tabulacji" + +#~ msgid "Long line marker:" +#~ msgstr "Znacznik długiej linii" + +#~ msgid "Long line marker color:" +#~ msgstr "Kolor znacznika długiej linii" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Ścieżka i opcje dla narzędzia make" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplikuj wiersz albo zaznaczenie" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "_Wyślij zaznaczenie do" + +#~ msgid "Run (alternative command)" +#~ msgstr "Uruchom (polecenie alternatywne)" + +#, fuzzy +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)." + +#~ msgid "Run command:" +#~ msgstr "Wykonaj polecenie:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Określa polecenie konsolowe wykonywane w katalogu podstawowym projektu. " +#~ "Polecenie może zawierać dodatkowe opcje. Pozostaw to pole puste aby " +#~ "używać domyślne polecenie." + +#~ msgid "Choose Project Run Command" +#~ msgstr "" +#~ "Wybierz komendę uruchamianą podczas wciśniecia przycisku \"Wykonaj\"" + +#, fuzzy +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Zamieniono ciąg w %u plikach." +#~ msgstr[1] "Zamieniono ciąg w %u plikach." + +#~ msgid "My" +#~ msgstr "Moje" + +#~ msgid "Local" +#~ msgstr "Lokalny" + +#~ msgid "Our" +#~ msgstr "Nasze" + +#~ msgid "Terminal plugin" +#~ msgstr "Wtyczka terminala" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Te ustawienia wbudowanego terminala zadziałają tylko wtedy, gdy w " +#~ "systemie będą dostępne odpowiednie biblioteki umożliwiające jego emulację." + +#~ msgid "Terminal font:" +#~ msgstr "Czcionka terminala" #~ msgid "Diff file" #~ msgstr "Plik Diff" @@ -5484,9 +5905,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Rozwija wszystkie zwinięte sekcje kodu" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Usuwa wszystkie znaczniki błędów w bieżącym dokumencie" - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5499,9 +5917,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Wyświetla listę skrótów klawiszowych Geany" -#~ msgid "Color" -#~ msgstr "Kolor" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Tu wpisz numer wiersza, do którego chcesz przejść." @@ -5581,15 +5996,9 @@ #~ msgid "Items" #~ msgstr "Widoczne elementy" -#~ msgid "Use white text on a black background." -#~ msgstr "Stosuj biały kolor tekstu na czarnym tle" - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Pracuj w trybie debuggera (wyświetlaj więcej komunikatów)" -#~ msgid "Search failed." -#~ msgstr "Wyszukiwanie nieudane" - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Nie można odnaleźć pliku z piksmapą: %s" @@ -5726,9 +6135,6 @@ #~ msgid "Ferite source file" #~ msgstr "Ferite" -#~ msgid "Haskell source file" -#~ msgstr "Haskell" - #~ msgid "Docbook source file" #~ msgstr "Docbook" @@ -5820,7 +6226,3 @@ #, fuzzy #~ msgid "Do you want to save all opened files before processing?" #~ msgstr "Czy chcesz go zapisać przed zamknięciem programu?" - -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "Ka_talog:" diff -Nru geany-0.18/po/POTFILES.in geany-0.19/po/POTFILES.in --- geany-0.18/po/POTFILES.in 2009-02-26 01:25:38.000000000 +0000 +++ geany-0.19/po/POTFILES.in 2009-09-28 12:16:59.000000000 +0100 @@ -23,10 +23,10 @@ src/navqueue.c src/notebook.c src/plugins.c +src/pluginutils.c src/prefs.c src/printing.c src/project.c -src/queue.c src/sciwrappers.c src/search.c src/socket.c @@ -34,7 +34,7 @@ src/templates.c src/toolbar.c src/tools.c -src/treeviews.c +src/sidebar.c src/ui_utils.c src/utils.c src/vte.c diff -Nru geany-0.18/po/POTFILES.skip geany-0.19/po/POTFILES.skip --- geany-0.18/po/POTFILES.skip 2008-09-27 15:06:57.000000000 +0100 +++ geany-0.19/po/POTFILES.skip 2010-06-12 12:49:36.000000000 +0100 @@ -4,5 +4,6 @@ geany.desktop.in # generated src/interface.c will be translated geany.glade -# no need to translate this file +# no need to translate these files plugins/demoplugin.c +doc/stash-example.c diff -Nru geany-0.18/po/pt_BR.po geany-0.19/po/pt_BR.po --- geany-0.18/po/pt_BR.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/pt_BR.po 2010-06-02 22:14:49.000000000 +0100 @@ -1,15 +1,15 @@ # Portuguese translations for PACKAGE package. -# Copyright (C) 2006-2009 GEANY'S COPYRIGHT HOLDER +# Copyright (C) 2006-2010 GEANY'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Alexandre Moreira , 2006 -# Adrovane Marques Kade , 2007-2009. +# Adrovane Marques Kade , 2007-2010. # msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-03 10:46-0300\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-06-01 19:47-0300\n" "Last-Translator: Adrovane Marques Kade \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -21,7 +21,9 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Um IDE rápido e leve usando GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:281 +#: ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,436 +31,427 @@ msgid "Integrated Development Environment" msgstr "Ambiente de Desenvolvimento Integrado" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Sobre o Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Um IDE rápido e leve" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(construído em %s ou após)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Informações" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Desenvolvedores" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "Mantenedor" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "desenvolvedor" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "mantenedor de traduções" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Tradutores" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Tradutores anteriores" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Alguns dos muitos colaboradores (para uma lista detalhada, veja o arquivo %" -"s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Alguns dos muitos colaboradores (para uma lista detalhada, veja o arquivo %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licença" -#: ../src/about.c:391 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"O texto da licença não foi encontrado. Por favor visite http://www.gnu.org/" -"licenses/gpl-2.0.txt para visualizá-la on-line." +#: ../src/about.c:397 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "O texto da licença não foi encontrado. Por favor visite http://www.gnu.org/licenses/gpl-2.0.txt para visualizá-la on-line." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Não foi possível encontrar terminal '%s' (verifique o caminho para o " -"Terminal nas Preferências)" +msgid "failed to substitute %%p, no project active" +msgstr "falha ao substituir %%p, nenhum projeto ativo" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "O processo falhou; sem diretório de trabalho" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Falha ao executar %s (script de inicialização não pôde ser criado)" +msgid "%s (in directory: %s)" +msgstr "%s (no diretório: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 +#: ../src/build.c:944 +#: ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Processo falhou (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (no diretório: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Falha ao alterar o diretório atual para %s" -#: ../src/build.c:707 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Não é possível executar o arquivo no VTE porque ele provavelmente contém um " -"comando." +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Falha ao executar %s (script de inicialização não pôde ser criado)" -#: ../src/build.c:914 +#: ../src/build.c:873 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Não é possível executar o arquivo no VTE porque ele provavelmente contém um comando." + +#: ../src/build.c:911 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Não foi possível encontrar terminal '%s' (verifique o caminho para o Terminal nas Preferências)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Compilação falhou." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Compilação terminada com sucesso." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compilar" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "C_onstruir" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make All" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make _Destino Personalizado" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make O_bjeto" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Texto Personalizado" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Insira o texto personalizado aqui. Todo o texto digitado será anexado ao comando." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Próximo Erro" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Erro _Anterior" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Definir _Includes e Argumentos" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Visualizar Arquivo DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_isualizar Arquivo PDF" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "Definir Comando_s de Construção" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Definir Argumentos" - -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Definir Argumentos" - -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Define os programas e opções para compilar e exibir arquivos (La)TeX." - -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Criação de DVI:" - -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Criação de PDF:" - -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Visualização de DVI:" - -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Visualização de PDF:" +#: ../src/build.c:1623 +#: ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Constrói o arquivo atual" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f será substituído pelo nome do arquivo atual. Ex.: arq_test.c\n" -"%e será substituído pelo nome do arquivo sem extensão. Ex.: arq_teste" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Constrói o arquivo atual com a ferramenta make e o destino padrão" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Definir Includes e Argumentos" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Constrói o arquivo atual com a ferramenta make e o destino especificado" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Define os comandos para construir e executar programas." +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Compila o arquivo atual com o Make" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1668 #, c-format -msgid "%s commands" -msgstr " %s comandos" +msgid "Process could not be stopped (%s)." +msgstr "O processo não pôde ser parado (%s)." -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compilar:" +#: ../src/build.c:1685 +#: ../src/build.c:1697 +msgid "No more build errors." +msgstr "Não há mais erros de construção." -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Construir:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Definir rótulo de item de menu" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Item" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Executar:" +#: ../src/build.c:1789 +#: ../src/symbols.c:650 +msgid "Label" +msgstr "Rótulo" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Constrói o arquivo atual" +#: ../src/build.c:1790 +#: ../src/symbols.c:645 +msgid "Command" +msgstr "Comando" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make com Destino Personalizado" +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Diretório de trabalho" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Insira aqui as opções personalizadas. Todo o texto digitado será passado " -"para o make." +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Limpar" -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Constrói o arquivo atual com a ferramenta make e o destino padrão" +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Clique para definir o rótulo do item de menu" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "" -"Constrói o arquivo atual com a ferramenta make e o destino especificado" +#: ../src/build.c:1904 +#: ../src/build.c:1906 +#, c-format +msgid "%s Commands" +msgstr " %s Comandos" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compila o arquivo atual com o Make" +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Nenhum Tipo de Arquivo" + +#: ../src/build.c:1914 +#: ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Expressão Regular de Erro:" + +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "Comandos Não Tipo de Arquivo" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Falha ao executar o visualizador" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Nota: o item 2 abre um diálogo e anexa a resposta ao comando." -#: ../src/build.c:2073 +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Executar Comandos" + +#: ../src/build.c:1992 #, c-format -msgid "Process could not be stopped (%s)." -msgstr "O processo não pôde ser parado (%s)." +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p são substituídos nos campos de comando e diretório. Veja o manual para detalhes." -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Não há mais erros de construção." +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "Definir Comandos de Construir" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compilar" + +#. build the code +#: ../src/build.c:2406 +#: ../src/build.c:2669 +#: ../src/interface.c:1075 +msgid "_Build" +msgstr "C_onstruir" + +#: ../src/build.c:2413 +#: ../src/build.c:2443 +#: ../src/build.c:2636 +msgid "_Execute" +msgstr "_Executar" + +#. build the code with make custom +#: ../src/build.c:2458 +#: ../src/build.c:2634 +#: ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make _Destino Personalizado" + +#. build the code with make object +#: ../src/build.c:2460 +#: ../src/build.c:2635 +#: ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make O_bjeto" + +#: ../src/build.c:2462 +#: ../src/build.c:2633 +msgid "_Make" +msgstr "_Make" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make All" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "Definir Comando_s do Menu Construir" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Deseja realmente sair?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d arquivo salvo." +msgstr[1] "%d arquivos salvos." + +#: ../src/callbacks.c:488 +#: ../src/document.c:2895 +#: ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Recarre_gar" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Quaisquer mudanças não salvas serão perdidas." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Tem certeza de que deseja recarregar '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 +#: ../src/keybindings.c:428 msgid "Go to Line" msgstr "Ir para Linha" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Insira a linha para a qual você quer ir:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Por favor, defina o tipo do arquivo atual antes de utilizar esta função." +#: ../src/callbacks.c:1296 +#: ../src/callbacks.c:1321 +msgid "Please set the filetype for the current file before using this function." +msgstr "Por favor, defina o tipo do arquivo atual antes de utilizar esta função." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 +#: ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 +#: ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 +#: ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 +#: ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 +#: ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.aaaa hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 +#: ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 +#: ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Usar Formato de Data Personalizado" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Formato de Data Personalizado" -#: ../src/callbacks.c:1498 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Insira um formato personalizado de data e hora. Você pode utilizar quaisquer " -"especificadores de conversão que podem ser usados com a função strftime do C " -"ANSI." +#: ../src/callbacks.c:1447 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Insira um formato personalizado de data e hora. Você pode utilizar quaisquer especificadores de conversão que podem ser usados com a função strftime do C ANSI." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"String de formato de data não pode ser convertido (possivelmente muito " -"longa)." +msgstr "String de formato de data não pode ser convertido (possivelmente muito longa)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 +#: ../src/callbacks.c:1699 msgid "No more message items." msgstr "Não há mais itens de mensagens." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 +#: ../src/dialogs.c:229 msgid "Open File" msgstr "Abrir Arquivo" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 +#: ../src/interface.c:790 msgid "_View" msgstr "E_xibir" -#: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Abre o arquivo em modo somente leitura. Se você escolher mais de um arquivo, " -"todos serão abertos em modo somente leitura." +#: ../src/dialogs.c:151 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Abre o arquivo em modo somente leitura. Se você escolher mais de um arquivo, todos serão abertos em modo somente leitura." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Detectar a partir da extensão do arquivo" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 +#: ../src/interface.c:3651 +#: ../src/interface.c:5263 msgid "Detect from file" msgstr "Detectar a partir do arquivo" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Mais Opções" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Mostrar arquivos _ocultos" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Definir codificação:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Define explicitamente uma codificação para o arquivo, se ela não puder ser " -"detectada. Isso será útil quando você souber que a codificação de um arquivo " -"não pode ser detectada corretamente pelo Geany.\n" -"Se você escolher múltiplos arquivos, todos eles serão abertos com a " -"codificação escolhida." +"Define explicitamente uma codificação para o arquivo, se ela não puder ser detectada. Isso será útil quando você souber que a codificação de um arquivo não pode ser detectada corretamente pelo Geany.\n" +"Se você escolher múltiplos arquivos, todos eles serão abertos com a codificação escolhida." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Definir tipo de arquivo:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Define explicitamente um tipo para o arquivo, se ele não for detectado pela " -"extensão do nome do arquivo.\n" -"Se você escolher múltiplos arquivos, todos eles serão abertos com o tipo " -"escolhido." +"Define explicitamente um tipo para o arquivo, se ele não for detectado pela extensão do nome do arquivo.\n" +"Se você escolher múltiplos arquivos, todos eles serão abertos com o tipo escolhido." #: ../src/dialogs.c:389 msgid "Overwrite?" @@ -468,224 +461,227 @@ msgid "Filename already exists!" msgstr "Nome de arquivo já existe!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 +#: ../src/dialogs.c:552 msgid "Save File" msgstr "Salvar Arquivo" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "R_enomear" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Salva o arquivo e o renomeia" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Abrir arquivo em uma nova aba" -#: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Mantém o documento atual não-salvo aberto e abre o novo documento salvo em " -"uma nova aba" +#: ../src/dialogs.c:442 +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Mantém o documento atual não-salvo aberto e abre o novo documento salvo em uma nova aba" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 +#: ../src/win32.c:681 msgid "Error" msgstr "Erro" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 +#: ../src/dialogs.c:1443 +#: ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Pergunta" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 +#: ../src/win32.c:693 msgid "Warning" msgstr "Aviso" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 +#: ../src/win32.c:699 msgid "Information" msgstr "Informação" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Não salvar" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "O arquivo '%s' não está salvo." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Você deseja salvá-lo antes de fechar?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Escolher fonte" -#: ../src/dialogs.c:1005 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Ocorreu um erro ou informações do arquivo não puderam ser recuperadas (p." -"ex., de um novo arquivo)." - -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1057 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Ocorreu um erro ou informações do arquivo não puderam ser recuperadas (p.ex., de um novo arquivo)." + +#: ../src/dialogs.c:1076 +#: ../src/dialogs.c:1077 +#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1745 +#: ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "desconhecido" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 +#: ../src/symbols.c:800 msgid "Properties" msgstr "Propriedades" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Tamanho:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Localização:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Somente-leitura:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(apenas dentro do Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Codificação:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 +#: ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(com BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(sem BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modificado:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Alterado:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Acessado:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Permissões:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Leitura:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Escrita:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Executar:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Dono:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grupo:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Outros:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Arquivo %s fechado." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Novo arquivo \"%s\" aberto." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 +#: ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Não foi possível abrir o arquivo %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"O arquivo \"%s\" não pôde ser aberto corretamente e foi truncado. Isso pode " -"acontecer se o arquivo contém um byte NULL. Ao salvá-lo, pode ocorrer perda " -"de dados.\n" +"O arquivo \"%s\" não pôde ser aberto corretamente e foi truncado. Isso pode acontecer se o arquivo contém um byte NULL. Ao salvá-lo, pode ocorrer perda de dados.\n" "O arquivo foi definido como somente-leitura." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "O arquivo \"%s\" não é válido %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"O arquivo \"%s\" não parece ser um arquivo de texto, ou a codificação do " -"arquivo não é suportada" +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "O arquivo \"%s\" não parece ser um arquivo de texto, ou a codificação do arquivo não é suportada" -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Espaços" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabs" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tabs e Espaços" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Definindo %s modo de endentação para %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Nome de arquivo inválido" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Arquivo %s recarregado." @@ -693,29 +689,25 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Arquivo %s aberto (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", somente-leitura" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Erro ao renomear arquivo." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Ocorreu um erro ao converter o arquivo de UTF-8 para \"%s\". O arquivo " -"permanece sem ser salvo." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Ocorreu um erro ao converter o arquivo de UTF-8 para \"%s\". O arquivo permanece sem ser salvo." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -724,52 +716,59 @@ "Mensagem de erro: %s\n" "O erro ocorreu em \"%s\" (linha: %d, coluna %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Mensagem de erro: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 +#: ../src/document.c:1833 msgid "Error saving file." msgstr "Erro ao salvar arquivo." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Erro ao salvar arquivo (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Arquivo %s salvo." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 +#: ../src/document.c:1982 +#: ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" não foi encontrado." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Circular pesquisa e procurar novamente?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 +#: ../src/search.c:1127 +#: ../src/search.c:1171 +#: ../src/search.c:1875 +#: ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Nenhuma combinação encontrada para '%s'." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 +#: ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d ocorrência de \"%s\" substituída por \"%s\"." msgstr[1] "%s: %d ocorrências de \"%s\" substituídas por \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Deseja recarregá-lo?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -778,30 +777,34 @@ "O arquivo '%s' que está no disco é \n" "mais recente do que o buffer atual." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Tentar salvar novamente o arquivo?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Fechar sem salvar (_W)" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "Arquivo \"%s\" não foi encontrado no disco!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "O arquivo \"%s\" não foi encontrado no disco! Tentar novamente salvar o arquivo?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Insira a Largura do Tab:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "" -"Informe o número de espaços que deve ser substituído por um caracter de " -"tabulação" +msgstr "Informe o número de espaços que deve ser substituído por um caracter de tabulação" + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Atenção: largura de tabulação fora do padrão: %d != 8!" #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celta" -#: ../src/encodings.c:77 ../src/encodings.c:78 +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 msgid "Greek" msgstr "Grego" @@ -813,22 +816,31 @@ msgid "South European" msgstr "Europa Meridional" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 #: ../src/encodings.c:84 msgid "Western" msgstr "Ocidental" -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Baltic" msgstr "Báltico" -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 msgid "Central European" msgstr "Europa Central" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 msgid "Cyrillic" msgstr "Cirílico" @@ -844,12 +856,16 @@ msgid "Romanian" msgstr "Romeno" -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 msgid "Arabic" msgstr "Arábico" #. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 msgid "Hebrew" msgstr "Hebreu" @@ -869,36 +885,53 @@ msgid "Thai" msgstr "Tailandês" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Turkish" msgstr "Turco" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 msgid "Vietnamese" msgstr "Vietnamita" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 msgid "Unicode" msgstr "Unicode" #. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" msgstr "Chinês Simplificado" -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 msgid "Chinese Traditional" msgstr "Chinês Tradicional" -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 #: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonês" -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 #: ../src/encodings.c:145 msgid "Korean" msgstr "Coreano" @@ -907,2267 +940,2323 @@ msgid "Without encoding" msgstr "Sem codificação" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Europeu _Ocidental" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "Europeu O_riental" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Asiático Or_iental" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Asiático _SE e SO" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Oriente _Médio" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Arquivo-fonte %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "Arquivo %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Nenhum" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Arquivo script Shell" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Arquivo Make" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Documento XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Arquivo dump SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Arquivo config" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Arquivo de tradução gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "Arquivo script %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Linguagens de _Programação" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Linguagens de _Script" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Linguagens de _Marcação" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "L_inguagens Diversas" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "_Tipos de Arquivos _Customizados" + +#: ../src/filetypes.c:1403 +#: ../src/win32.c:105 msgid "All Source" msgstr "Todos os fontes" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 +#: ../src/project.c:285 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Todos os arquivos" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Regex ruim para o tipo de arquivo %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "sem título" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 +#: ../src/main.c:802 +#: ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Não foi possível procurar o arquivo '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Esquemas de _Cores" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Default" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Arquivo" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "No_vo (com Template)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisível" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 +#: ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "A_brir Arquivo Selecionado" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Arquivos _Recentes" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Sa_lvar Tudo" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "R_ecarregar Como" -#: ../src/interface.c:376 +#: ../src/interface.c:371 +#: ../src/interface.c:553 +#: ../src/interface.c:682 +#: ../src/interface.c:696 +#: ../src/interface.c:950 +#: ../src/interface.c:960 +#: ../src/interface.c:2090 +#: ../src/interface.c:2104 +msgid "invisible" +msgstr "invisível" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Config_urar página" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 +#: ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Fec_har Outros Documentos" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 +#: ../src/notebook.c:219 msgid "C_lose All" msgstr "Fechar T_udo" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 +#: ../src/interface.c:2031 msgid "_Format" msgstr "_Formatar" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 +#: ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Refluir Linhas/Bloco" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "A_lterar maiúsculas/minúsculas da seleção" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 +#: ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Transpor linha atual" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Comentar Linha(s)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Descomentar Linha(s)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "A_lternar Comentário de Linha" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "D_uplicar Linha ou Seleção" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Aumen_tar Endentação" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Dimi_nuir Endentação" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Enviar Seleção para o Terminal" +#: ../src/interface.c:537 +#: ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "Endentação Inteligente de Linha_s" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Enviar Seleção para" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 +#: ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Comandos" + +#: ../src/interface.c:563 +#: ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "Re_cortar Linha(s) Atual(is)" + +#: ../src/interface.c:571 +#: ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copiar Linha(s) Atual(is)" + +#: ../src/interface.c:579 +#: ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Deletar Linha(s) Atual(is)" + +#: ../src/interface.c:583 +#: ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Duplicar Linha ou Seleção" + +#: ../src/interface.c:592 +#: ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Selecionar Linha(s) Atual(is)" + +#: ../src/interface.c:596 +#: ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Selecionar Parágrafo Atual" + +#: ../src/interface.c:605 +#: ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Inserir Espaço em Branco Alternativo" + +#: ../src/interface.c:614 +#: ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Ir Para o _Próximo Marcador" + +#: ../src/interface.c:618 +#: ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Ir para o Marcador _Anterior" + +#: ../src/interface.c:627 +#: ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Enviar Seleção para o Terminal" + +#: ../src/interface.c:636 +#: ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "I_nserir Comentários" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 +#: ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Inserir Entrada de _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 +#: ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Inserir Cabeçal_ho de Arquivo" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 +#: ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Inserir Descrição de _Função" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 +#: ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Inserir Comentário _Multilinha" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 +#: ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Inserir Advertência da _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 +#: ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Inserir Advertência de Licença _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 +#: ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Ins_erir Data" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 +#: ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Inserir \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Preferência_s" -#: ../src/interface.c:621 +#: ../src/interface.c:712 +#: ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Preferências de P_lugins" + +#: ../src/interface.c:720 msgid "_Search" msgstr "Pe_squisar" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Localizar _Próximo" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Localizar em Ar_quivos" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 +#: ../src/search.c:551 msgid "_Replace" msgstr "Substitui_r" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Localizar _Seleção" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Localizar Seleção Pré_via" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Próxima _Mensagem" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "M_ensagem Prévia" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 +#: ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Ir para Linha" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Alterar _Fonte" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Exibir/ocultar Todos os _Painéis Adicionais" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Tela Cheia" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Exibir _Janela de Mensagens" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Exibir _Barra de Ferramentas" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Exibir Barra _Lateral" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 +#: ../src/interface.c:4025 +#: ../src/interface.c:5347 +#: ../src/keybindings.c:260 +#: ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Exibir Margem de _Marcadores" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Exibir _Números de Linhas" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Exibir Espaços em _Branco" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "_Exibir Fim de Linha" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Ex_ibir Guias de Endentação" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Quebrar Linhas" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Que_bra de Linha" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Auto-endentação" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "T_ipo de endentação" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 +#: ../src/interface.c:3633 +#: ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tabs" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 +#: ../src/interface.c:3624 +#: ../src/interface.c:5236 msgid "_Spaces" msgstr "E_spaços" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 +#: ../src/interface.c:3642 +#: ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_abs e Espaços" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Somente _Leitura" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Gravar _Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Definir _Tipo de Arquivo" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Definir _Codificação" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Definir _Fim de Linha" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Converter e Definir para _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Converter e Definir para _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Converter e Definir para CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Remover espaços no final" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Substituir Tabs por Espaços" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Substituir Es_paços por Tabs" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Dobrar Todos" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "D_esdobrar Todos" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Remover _Marcadores" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Remover I_ndicadores de Erro" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projeto" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Novo" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Abrir" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Projetos _Recentes" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Fechar" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Ferramentas" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Recarregar configuração" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Arquivos de C_onfiguração" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Seletor de Cores" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Contar Palavras" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Carregar Ró_tulos" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Recarregar configuração" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 +#: ../src/interface.c:1130 msgid "_Help" msgstr "_Ajuda" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Sítio na _Web" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Atalhos de _Teclado" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Depurar Mensagens" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 +#: ../src/sidebar.c:130 msgid "Symbols" msgstr "Símbolos" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documentos" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Estado" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Mensagens" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Rascunho" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Im_agens e Texto" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Somente _Imagens" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Somente _Texto" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Ícones _Grandes" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Ícone_s Pequenos" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Ícones _Muito Pequenos" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Personalizar Barra de Ferramentas" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Preferências da Barra de Ferramen_tas" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Ocultar Barra de Ferramentas" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Localizar _Uso" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Localizar Uso do _Documento" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Ir para a Definição do Ró_tulo" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Ir p_ara a Declaração do Rótulo" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Ação Conte_xtual" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 +#: ../src/keybindings.c:387 msgid "Preferences" msgstr "Preferências" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Abrir arquivos da última sessão" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Abre os arquivos da última sessão ao iniciar" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Carregar suporte ao terminal virtual" -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"A emulação de terminal virtual (VTE) deve ser carregada ao iniciar? " -"Desabilite-a se você não precisar dela" - #: ../src/interface.c:2712 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "A emulação de terminal virtual (VTE) deve ser carregada ao iniciar? Desabilite-a se você não precisar dela" + +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Habilitar suporte a plugin" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Iniciar" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Salvar a posição e geometria da janela" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Salva a posição e geometria da janela e a restaura ao iniciar" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Confirmar saída" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Exibe um diálogo de confirmação ao sair" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Desligar" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Caminho inicial:" -#: ../src/interface.c:2778 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Caminho inicial para abrir ou salvar arquivos. Deve ser um caminho absoluto. " -"Deixe em branco para usar o diretório de trabalho atual." +#: ../src/interface.c:2780 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Caminho inicial para abrir ou salvar arquivos. Deve ser um caminho absoluto. Deixe em branco para usar o diretório de trabalho atual." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Arquivos de Projeto:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Caminho para iniciar quando estiver abrindo arquivos de projeto" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Caminho extra de plugins:" -#: ../src/interface.c:2828 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Por padrão, Geany pesquisa no caminho de instalação global e no diretório de " -"configuração. O caminho inserido aqui será pesquisado adicionalmente por " -"plugins. Deixe em branco para desabilitar." +#: ../src/interface.c:2830 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Por padrão, Geany pesquisa no caminho de instalação global e no diretório de configuração. O caminho inserido aqui será pesquisado adicionalmente por plugins. Deixe em branco para desabilitar." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Caminhos" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Iniciar" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Alerta sonoro para erros ou para o término da compilação" -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Ativar ou não um alerta sonoro para ocorrência de erros ou término do " -"processo de compilação" +#: ../src/interface.c:2874 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Ativar ou não um alerta sonoro para ocorrência de erros ou término do processo de compilação" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Ir para lista de mensagens de estado quando houver nova mensagem" -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Ir para a aba de mensagens de estado (na janela do bloco de notas ao pé da " -"tela) se uma nova mensagem chegar" +#: ../src/interface.c:2879 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Ir para a aba de mensagens de estado (na janela do bloco de notas ao pé da tela) se uma nova mensagem chegar" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensagens de estado na barra de estado" -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Remove todas as mensagens da barra de estado. As mensagens ainda são " -"mostradas na janela de mensagens de estado." +#: ../src/interface.c:2884 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Remove todas as mensagens da barra de estado. As mensagens ainda são mostradas na janela de mensagens de estado." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Foco automático de painéis (o foco segue o mouse)" -#: ../src/interface.c:2886 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Atribui o foco automaticamente aos painéis que estão sob o cursor do mouse. " -"Funciona para o painel do editor principal, o rascunho, os campos pesquisar " -"e ir para linha da barra de ferramentas e o VTE." - -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2889 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Atribui o foco automaticamente aos painéis que estão sob o cursor do mouse. Funciona para o painel do editor principal, o rascunho, os campos pesquisar e ir para linha da barra de ferramentas e o VTE." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Usar diálogos do Windows para Abrir/Salvar Arquivo" + +#: ../src/interface.c:2894 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Define o uso ou não dos diálogos nativos do Windows para Abrir/Salvar Arquivos em vez de usar os diálogos padrão do GTK" + +#: ../src/interface.c:2896 +#: ../src/interface.c:3275 +#: ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Miscelânea" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Sempre circula a pesquisa pelo documento e oculta o diálogo Localizar após " -"clicar Próximo/Anterior" +#: ../src/interface.c:2918 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Sempre circula a pesquisa pelo documento e oculta o diálogo Localizar após clicar Próximo/Anterior" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usar a palavra sob o cursor para os diálogos Localizar" -#: ../src/interface.c:2916 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Usa a palavra atualmente sob o cursor quando for aberto um diálogo " -"Localizar, Localizar em Arquivos ou Substituir, e não houver nenhuma seleção" +#: ../src/interface.c:2923 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Usa a palavra atualmente sob o cursor quando for aberto um diálogo Localizar, Localizar em Arquivos ou Substituir, e não houver nenhuma seleção" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Usar o diretório do arquivo atual para Localizar em Arquivos" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Pesquisar" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Usar arquivos de sessão baseados em projeto" -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"Salvar ou não os arquivos de sessão de um projeto e abri-los quando o " -"projeto for reaberto" +#: ../src/interface.c:2951 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Salvar ou não os arquivos de sessão de um projeto e abri-los quando o projeto for reaberto" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Armazenar arquivo de projeto dentro do diretório base do projeto" -#: ../src/interface.c:2949 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Quando habilitado, um novo arquivo de projeto será armazenado por padrão " -"dentro do diretório base do projeto ao invés de um diretório acima do " -"diretório base. Você pode ainda alterar o caminho do arquivo de projeto no " -"diálogo Novo Projeto." +#: ../src/interface.c:2956 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Quando habilitado, um novo arquivo de projeto será armazenado por padrão dentro do diretório base do projeto ao invés de um diretório acima do diretório base. Você pode ainda alterar o caminho do arquivo de projeto no diálogo Novo Projeto." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projetos" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Miscelânea" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 +#: ../src/prefs.c:1525 msgid "General" msgstr "Geral" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Exibir lista de símbolos" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Exibe ou esconde a lista de símbolos" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Exibir lista de documentos" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Exibe ou esconde a lista de documentos" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Exibir Barra Lateral" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Posição:" + +#: ../src/interface.c:3026 +#: ../src/interface.c:3149 +#: ../src/interface.c:3210 +#: ../src/interface.c:3228 +#: ../src/interface.c:3246 +msgid "Left" +msgstr "Esquerda" + +#: ../src/interface.c:3033 +#: ../src/interface.c:3157 +#: ../src/interface.c:3211 +#: ../src/interface.c:3229 +#: ../src/interface.c:3247 +msgid "Right" +msgstr "Direita" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Barra Lateral" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Lista de Símbolos:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 +#: ../src/interface.c:3197 msgid "Message window:" msgstr "Janela de Mensagens:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 +#: ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Define a fonte para a janela de mensagens" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Define a fonte para a lista de símbolos" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Define a fonte do editor" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Fontes" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Exibir abas do editor" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Exibir botões de fechar" -#: ../src/interface.c:3084 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Mostra um pequeno botão de cruz na aba de arquivos para fechar arquivos " -"facilmente quando for clicado (exige que o Geany seja reiniciado)" +#: ../src/interface.c:3130 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Mostra um pequeno botão de cruz na aba de arquivos para fechar arquivos facilmente quando for clicado (exige que o Geany seja reiniciado)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Localização das abas de novo arquivo:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Esquerda" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Abas de arquivos serão colocadas à esquerda do bloco de notas" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Direita" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Abas de arquivos serão colocadas à direita do bloco de notas" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Próximo ao anterior " + +#: ../src/interface.c:3169 +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Colocar ou não as tabulações de arquivo próximas da tabulação atual em vez de nas bordas da agenda" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Duplo clique oculta todos os painéis adicionais" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Chama o comando Exibir->Alternar Todos os Painéis Adicionais" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Abas do editor" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 +#: ../src/interface.c:3230 +#: ../src/interface.c:3248 msgid "Top" msgstr "Cima" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 +#: ../src/interface.c:3231 +#: ../src/interface.c:3249 msgid "Bottom" msgstr "Baixo" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Barra Lateral:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Posições das abas" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Exibir barra de estado" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Exibe ou oculta a barra de estado na base da janela principal" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 +#: ../src/prefs.c:1527 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Exibir Barra de Ferramen_tas" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Anexar Barra de Ferramentas ao Menu" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" -"Empacota a barra de ferramentas no menu principal, para economizar espaço " -"vertical" - -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Barra de ferramentas" +msgstr "Empacota a barra de ferramentas no menu principal, para economizar espaço vertical" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Estilo dos ícones:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Tamanho dos ícones:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Aparência" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 +#: ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Personalizar Barra de Ferramentas" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "_Default do Sistema" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Im_agens e Texto" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Somente _Imagens" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Somente _Texto" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Estilo do Ícone" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Default do S_istema" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Ícone_s Pequenos" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Ícones _Muito Pequenos" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Ícones _Grandes" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Tamanho do Ícone" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra de ferramentas" + +#: ../src/interface.c:3455 +#: ../src/prefs.c:1529 msgid "Toolbar" msgstr "Barra de Ferramentas" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Quebrar linhas" -#: ../src/interface.c:3393 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Quebra a linha na borda da janela e a continua na próxima linha. Nota: a " -"quebra de linha possui um custo elevado de desempenho para documentos " -"grandes, e deveria ser desabilitada em máquinas lentas." +#: ../src/interface.c:3485 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Quebra a linha na borda da janela e a continua na próxima linha. Nota: a quebra de linha possui um custo elevado de desempenho para documentos grandes, e deveria ser desabilitada em máquinas lentas." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Habilitar tecla home \"inteligente\"" -#: ../src/interface.c:3398 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Quando o recurso de home \"inteligente\" está habilitado, a tecla HOME move " -"o cursor para o primeiro caracter não-branco da linha. Se o cursor já " -"estiver lá, será movido para o início da linha. Quando este recurso está " -"desabilitado, a tecla HOME sempre move o cursor para o início da linha " -"atual, independente da sua posição." +#: ../src/interface.c:3490 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Quando o recurso de home \"inteligente\" está habilitado, a tecla HOME move o cursor para o primeiro caracter não-branco da linha. Se o cursor já estiver lá, será movido para o início da linha. Quando este recurso está desabilitado, a tecla HOME sempre move o cursor para o início da linha atual, independente da sua posição." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Desabilitar Arrastar e Soltar" -#: ../src/interface.c:3403 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Desabilita totalmente o arrastar-e-soltar na janela do editor, tornando " -"impossível arrastar e soltar qualquer seleção dentro ou fora da janela do " -"editor" +#: ../src/interface.c:3495 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Desabilita totalmente o arrastar-e-soltar na janela do editor, tornando impossível arrastar e soltar qualquer seleção dentro ou fora da janela do editor" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Habilitar dobra" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Habilitar ou desabilitar dobras de código" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Dobrar/Desdobrar todos os filhos de um ponto de dobra" -#: ../src/interface.c:3413 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Dobrar ou desdobrar todos os filhos de um ponto de dobra. Ao pressionar a " -"tecla Shift quando clicar em um símbolo de dobra, o comportamento inverso " -"será utilizado." +#: ../src/interface.c:3505 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Dobrar ou desdobrar todos os filhos de um ponto de dobra. Ao pressionar a tecla Shift quando clicar em um símbolo de dobra, o comportamento inverso será utilizado." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar erros de compilação" -#: ../src/interface.c:3418 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Usar ou não indicadores (um sublinhado irregular) para destacar as linhas " -"onde o compilador encontrou um aviso ou um erro" +#: ../src/interface.c:3510 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Usar ou não indicadores (um sublinhado irregular) para destacar as linhas onde o compilador encontrou um aviso ou um erro" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Nova linha remove espaços no final" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Habilita a nova linha a remover os espaços no final da linha anterior" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Coluna de quebra de linha:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Comentar marcador de alternar:" -#: ../src/interface.c:3450 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Uma string que é adicionada ao alternar um comentário de linha em um arquivo " -"fonte. É usada para marcar o comentário como alternado" +#: ../src/interface.c:3542 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Uma string que é adicionada ao alternar um comentário de linha em um arquivo fonte. É usada para marcar o comentário como alternado" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Características" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Características" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 +#: ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Modo de auto endentação:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 +#: ../src/interface.c:5207 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 +#: ../src/interface.c:5208 msgid "Current chars" msgstr "Caracteres atuais" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 +#: ../src/interface.c:5209 msgid "Match braces" msgstr "Casar delimitadores" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 +#: ../src/interface.c:3925 +#: ../src/interface.c:5211 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 +#: ../src/interface.c:5218 msgid "Width:" msgstr "Largura:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 +#: ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "A largura em caracteres de uma única endentação" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 +#: ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Usar espaços quando inserir endentação" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 +#: ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Usa um tab por endentação" -#: ../src/interface.c:3554 ../src/interface.c:5122 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Usa espaços se a endentação total for menor do que a largura da tabulação, " -"senão usa ambos" - -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Largura do Hard Tab:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"A largura de uma tabulação quando Tabs & Espaços estiver definida para um " -"documento" +#: ../src/interface.c:3647 +#: ../src/interface.c:5259 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Usa espaços se a endentação total for menor do que a largura da tabulação, senão usa ambos" -#: ../src/interface.c:3587 ../src/interface.c:5155 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Detectar ou não o tipo de endentação a partir do conteúdo de um arquivo " -"quando ele for aberto" +#: ../src/interface.c:3656 +#: ../src/interface.c:5268 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Detectar ou não o tipo de endentação a partir do conteúdo de um arquivo quando ele for aberto" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Endentações da tecla Tab" -#: ../src/interface.c:3592 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Pressionar tab/shift-tab endenta/desendenta em vez de inserir um caracter de " -"tabulação" +#: ../src/interface.c:3661 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Pressionar tab/shift-tab endenta/desendenta em vez de inserir um caracter de tabulação" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Endentação" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 +#: ../src/interface.c:5270 msgid "Indentation" msgstr "Endentação" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Completação de fragmento" -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Digite uma dada seqüência curta de caracteres e ela será completada para uma " -"seqüência mais complexa pressionando-se uma única tecla" +#: ../src/interface.c:3694 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Digite uma dada seqüência curta de caracteres e ela será completada para uma seqüência mais complexa pressionando-se uma única tecla" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Auto-completação de tags XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Completação automática e fechamento de tags XML (incluindo tags HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Continuação automática de comentários multi-linha" -#: ../src/interface.c:3635 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Continua automaticamente comentários multi-linha em linguagens como C, C++ e " -"Java quando uma nova linha for inserida dentro de um comentário deste tipo" +#: ../src/interface.c:3704 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Continua automaticamente comentários multi-linha em linguagens como C, C++ e Java quando uma nova linha for inserida dentro de um comentário deste tipo" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Auto-completar símbolos" -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Auto-completar símbolos conhecidos em arquivos abertos (nomes de função, " -"variáveis globais, ...)" +#: ../src/interface.c:3709 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Auto-completar símbolos conhecidos em arquivos abertos (nomes de função, variáveis globais, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Completa automaticamente todas as palavras no documeto" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Perder resto da palavra ao completar" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Máx. sugestões de nomes de símbolos:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Altura da lista de completação:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Caracteres a digitar para completação:" -#: ../src/interface.c:3683 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" -msgstr "" -"A quantidade de caracteres necessários para exibir a lista de auto-" -"completação de símbolos" +#: ../src/interface.c:3752 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" +msgstr "A quantidade de caracteres necessários para exibir a lista de auto-completação de símbolos" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Exibir altura em linhas para a lista de auto-completação" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Número máximo de entradas para exibir na lista de auto-completação" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Completações" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Parênteses ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Fechar parênteses automaticamente quando um for aberto" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Aspas simples ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Fechar aspas simples automaticamente quando um for aberto" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Chaves { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Fechar chaves automaticamente quando uma for aberta" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Colchetes [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Fechar colchetes automaticamente ao digitar um colchete de abertura" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Aspas duplas \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Fechar aspas duplas automaticamente quando uma for aberta" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Fechar automaticamente aspas e delimitadores" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Completações" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Inverter as cores da destacação sintática" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Usar texto brando sobre fundo preto e inverter todas as cores. Esta opção " -"exige que o Geany seja reiniciado" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Inverter todas as cores, por padrão usar texto branco sobre um fundo preto" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Exibir guias de indentação" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Exibir pequenas linhas pontilhadas para ajudar no uso da endentação correta" +msgstr "Exibir pequenas linhas pontilhadas para ajudar no uso da endentação correta" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Exibir espaços em branco" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca espaços com pontos e tabulações com setas" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Exibir final de linha" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Exibe o caracter de fim de linha" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Exibir números de linha" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Exibe ou esconde a margem de Números de Linhas" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Exibir margem de marcadores" -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Exibe ou oculta a pequena margem à direita dos números de linhas, que é " -"usada para marcar linhas" +#: ../src/interface.c:3883 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Exibe ou oculta a pequena margem à direita dos números de linhas, que é usada para marcar linhas" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Parar a rolagem na última linha" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Parar ou não de rolar uma página após a última linha de um documento" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Exibição" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Marcador de linha longa:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Cor do marcador de linha longa:" +#: ../src/interface.c:3911 +#: ../src/interface.c:5302 +msgid "Column:" +msgstr "Coluna:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Cor:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Define a cor do marcador de linha longa" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 +#: ../src/toolbar.c:71 +#: ../src/tools.c:717 +#: ../src/vte.c:765 +#: ../src/vte.c:772 msgid "Color Chooser" msgstr "Seletor de Cores" -#: ../src/interface.c:3878 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"O marcador de linha longa é uma fina linha vertical no editor. Ele ajuda a " -"marcar as linhas longas, ou serve como dica para quebrar a linha. Definir um " -"valor maior do que 0 especifica a coluna onde ela deve aparecer." +#: ../src/interface.c:3946 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "O marcador de linha longa é uma fina linha vertical no editor. Ele ajuda a marcar as linhas longas, ou serve como dica para quebrar a linha. Definir um valor maior do que 0 especifica a coluna onde ela deve aparecer." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Linha" -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Imprime uma linha vertical na janela do editor na posição do cursor " -"informada (ver abaixo)" +#: ../src/interface.c:3959 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Imprime uma linha vertical na janela do editor na posição do cursor informada (ver abaixo)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Fundo" -#: ../src/interface.c:3898 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"A cor de fundo dos caracteres após a posição do cursor informada (ver " -"abaixo) alterada para a cor definida abaixo (isso é recomendado se forem " -"usadas fontes proporcionais)" +#: ../src/interface.c:3966 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "A cor de fundo dos caracteres após a posição do cursor informada (ver abaixo) alterada para a cor definida abaixo (isso é recomendado se forem usadas fontes proporcionais)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Habilitar" -#: ../src/interface.c:3902 +#: ../src/interface.c:3976 +#: ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Marcador de linha longa" + +#: ../src/interface.c:3995 +#: ../src/interface.c:5309 msgid "Disabled" msgstr "Desabilitado" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Marcador de linha longa" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Não exibir espaços virtuais" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Somente para seleções retangulares" + +#: ../src/interface.c:4005 +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Somente exibe espaços virtuais além do fim da linha quando estiver desenhando uma seleção retangular" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Sempre" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Exibir sempre espaços virtuais além do final das linhas" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Espaços virtuais" -#: ../src/interface.c:3913 +#: ../src/interface.c:4021 msgid "Display" msgstr "Exibição" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Abrir novos documentos a partir da linha de comando" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "" -"Iniciar um novo arquivo para cada nome de arquivo na linha de comando que " -"não existe" +msgstr "Iniciar um novo arquivo para cada nome de arquivo na linha de comando que não existe" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Caracteres padrão de fim de linha:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Novo arquivo" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Define a codificação padrão para arquivos novos" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Codificação padrão (arquivos novos):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Codificação padrão (arquivos existentes):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Define a codificação padrão para abrir arquivos existentes" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Define a codificação padrão para arquivos novos" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Usar codificação fixa quando abrir arquivos" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Usar codificação fixa quando abrir arquivos não Unicode" + +#: ../src/interface.c:4116 +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Essa opção desabilita a detecção automática da codificação do arquivo ao abrir arquivos não Unicode e abre o arquivo com a codificação especificada (normalmente não necessário)" -#: ../src/interface.c:4030 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" -msgstr "" -"Essa opção desabilita a detecção automática da codificação do arquivo ao " -"abrir arquivos e abre o arquivo com a codificação especificada (normalmente " -"não necessário)" +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codificação padrão (arquivos não Unicode existentes):" -#: ../src/interface.c:4032 +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Define a codificação padrão para abrir arquivos não Unicode existentes" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Codificações" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Garantir nova linha no final do arquivo" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Garante que o final do arquivo é uma nova linha" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Remover espaços e tabs no final" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Remove espaços e tabulações e finais de linha" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 +#: ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Substituir tabs por espaços" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Substitui todas as tabulações no documento por espaços" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Salvando arquivos" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Tamanho da lista de arquivos recentes:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "" -"Especifica o número de arquivos que são armazenados na lista de arquivos " -"Recentes" +msgstr "Especifica o número de arquivos que são armazenados na lista de arquivos Recentes" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Timeout de verificação de disco:" -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Freqüência de verificação de mudanças em arquivos de documentos no disco, em " -"segundos. Zero desabilita a verificação." - -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4226 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Freqüência de verificação de mudanças em arquivos de documentos no disco, em segundos. Zero desabilita a verificação." + +#: ../src/interface.c:4235 +#: ../src/prefs.c:1533 +#: ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Arquivos" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Caminho e opções para a ferramenta make" - -#: ../src/interface.c:4197 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Um emulador de terminal como xterm, gnome-terminal ou konsole (deve aceitar " -"o argumento -e)" +#: ../src/interface.c:4287 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Um emulador de terminal como xterm, gnome-terminal ou konsole (deve aceitar o argumento -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" -msgstr "" -"Caminho (e possivelmente argumentos adicionais) para o seu navegador favorito" +msgstr "Caminho (e possivelmente argumentos adicionais) para o seu navegador favorito" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Caminhos de ferramentas" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Ação Contextual:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Comando de Ação Contextual. A palavra atualmente selecionada pode ser usada " -"com %s. Ela pode estar em qualquer lugar do comando informado e será " -"substituída antes da execução." +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Comando de Ação Contextual. A palavra atualmente selecionada pode ser usada com %s. Ela pode estar em qualquer lugar do comando informado e será substituída antes da execução." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Comandos" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 +#: ../src/keybindings.c:560 +#: ../src/prefs.c:1535 msgid "Tools" msgstr "Ferramentas" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "Endereço de e-mail do desenvolvedor" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Iniciais do nome do desenvolvedor" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Versão Inicial:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Número de versão que um novo arquivo possui inicialmente" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Nome da empresa" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Desenvolvedor:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Endereço:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Iniciais:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "O nome do desenvolvedor" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Ano:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Data & Hora:" -#: ../src/interface.c:4434 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Especifique um formato para o curinga {datetime}. Você pode usar qualquer " -"especificador de conversão que pode ser usado com a função strftime do C " -"ANSI." +#: ../src/interface.c:4518 +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique um formato para o curinga {datetime}. Você pode usar qualquer especificador de conversão que pode ser usado com a função strftime do C ANSI." -#: ../src/interface.c:4441 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Especifique um formato para o curinga {year}. Você pode usar qualquer " -"especificador de conversão que pode ser usado com a função strftime do C " -"ANSI." +#: ../src/interface.c:4525 +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique um formato para o curinga {year}. Você pode usar qualquer especificador de conversão que pode ser usado com a função strftime do C ANSI." -#: ../src/interface.c:4448 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Especifique um formato para o curinga {date}. Você pode usar qualquer " -"especificador de conversão que pode ser usado com a função strftime do C " -"ANSI." +#: ../src/interface.c:4532 +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique um formato para o curinga {date}. Você pode usar qualquer especificador de conversão que pode ser usado com a função strftime do C ANSI." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Dados de templates" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 +#: ../src/prefs.c:1537 msgid "Templates" msgstr "Templates" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Alterar" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Atalhos de teclado" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 +#: ../src/prefs.c:1539 msgid "Keybindings" msgstr "Ligações de teclas" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" -msgstr "" -"Caminho para o comando de imprimir arquivos (usar %f para o nome do arquivo)" +msgstr "Caminho para o comando de imprimir arquivos (usar %f para o nome do arquivo)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Usar um comando externo para imprimir" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 +#: ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimir números de linhas" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 +#: ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Inclui números de linha à página impressa" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 +#: ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimir o número da página" -#: ../src/interface.c:4570 ../src/printing.c:387 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Incluir números de páginas na base de cada página. Ocupa 2 linhas por página." +#: ../src/interface.c:4665 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Incluir números de páginas na base de cada página. Ocupa 2 linhas por página." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 +#: ../src/printing.c:391 msgid "Print page header" msgstr "Imprimir o cabeçalho da página" -#: ../src/interface.c:4575 ../src/printing.c:392 -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Inclui um cabeçalho em cada página contendo o número da página, o nome do " -"arquivo e a data atual (ver abaixo). Ocupa 3 linhas da página." +#: ../src/interface.c:4670 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Inclui um cabeçalho em cada página contendo o número da página, o nome do arquivo e a data atual (ver abaixo). Ocupa 3 linhas da página." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 +#: ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usar o nome básico do arquivo impresso" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimir apenas o nome básico (sem o caminho) do arquivo impresso" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 +#: ../src/printing.c:417 msgid "Date format:" msgstr "Formato de Data:" -#: ../src/interface.c:4608 ../src/printing.c:422 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Especifique um formato para a etiqueta de data e hora que é incluído no " -"cabeçalho de cada página. Você pode usar qualquer especificador de conversão " -"que pode ser usado com a função strftime do C ANSI." +#: ../src/interface.c:4703 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Especifique um formato para a etiqueta de data e hora que é incluído no cabeçalho de cada página. Você pode usar qualquer especificador de conversão que pode ser usado com a função strftime do C ANSI." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Usar impressão nativa do GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Impressão" + +#: ../src/interface.c:4717 +#: ../src/prefs.c:1541 msgid "Printing" msgstr "Impressão" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Propriedades do Projeto" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Exibir:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Personalizado" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Usar definições globais" + +#: ../src/keybindings.c:227 +#: ../src/plugins.c:1171 msgid "File" msgstr "Arquivo" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nova" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Abrir" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Abrir arquivo selecionado" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Salvar" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Salvar como" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Salvar tudo" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Imprimir" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Fechar" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Fechar tudo" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Recarregar arquivo" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Re-abrir a última aba fechada" + +#: ../src/keybindings.c:255 +#: ../src/project.c:519 msgid "Project" msgstr "Projeto" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Propriedades do projeto" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Desfazer" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Refazer" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplicar linha ou seleção" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Apagar linha(s) atual(is)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Apagar até o fim da linha" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Transportar linha atual" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Rolar para a linha atual" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Rolar a visualização uma linha para cima" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Rolar a visualização uma linha para baixo" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Completar fragmento" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Mover cursor no fragmento" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Suprimir completação de fragmento" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Ação Contextual" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Completar palavra" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Exibir dica" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Exibir lista de macros" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Completação de parte de palavra" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Mover linha(s) para cima" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Mover linha(s) para baixo" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Área de Transferência" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Copiar" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copiar" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Colar" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copiar linha(s) atual(is)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Recortar linha(s) atual(is)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Selecionar" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Selecionar Tudo" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Selecionar palavra atual" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Selecionar linha(s) atual(is)" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Selecionar parágrafo atual" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Selecionar até a parte de palavra anterior" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Selecionar até a próxima parte de palavra" + +#: ../src/keybindings.c:338 msgid "Format" msgstr "Formatar" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Alterar maiúsculas/minúsculas da seleção" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Alternar comentário de linhas" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Comentar linha(s)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Descomentar linha(s)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Aumentar indentação" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Diminuir indentação" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Aumentar endentação em um espaço" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Diminuir endentação em um espaço" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Endentação de linha inteligente" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Enviar para Comando Personalizado 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Enviar para Comando Personalizado 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Enviar para Comando Personalizado 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Enviar Seleção para o Terminal" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "Refluir linhas/bloco" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Inserir" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Inserir data" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Inserir espaço em branco alternativo" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Definições" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 +#: ../src/toolbar.c:381 msgid "Search" msgstr "Pesquisar" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 +#: ../src/search.c:396 msgid "Find" msgstr "Localizar" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Localizar Próxima" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Localizar Anterior" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Localizar Próxima Seleção" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Localizar Seleção Anterior" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 +#: ../src/search.c:541 msgid "Replace" msgstr "Substituir" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 +#: ../src/search.c:715 msgid "Find in Files" msgstr "Pesquisar em Arquivos" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Próxima Mensagem" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Mensagem Prévia" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Encontrar Uso" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Encontrar Uso do Documento" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Marcar Tudo" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Ir Para" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 +#: ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Navega para um local anterior" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 +#: ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Navega para um local adiante" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Ir para delimitador combinante" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Alternar marcador" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Ir para o próximo marcador" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Ir para o marcador anterior" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Ir para a Definição do Rótulo" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Ir para a Declaração do Rótulo" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Ir para o Início da Linha" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Ir para o Fim da Linha" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Ir para o Fim de Exibir Linha" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Ir para a Parte Prévia da Palavra" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Ir para a Próxima Parte da Palavra" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Exibir" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Exibir/esconder todos os painéis adicionais" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Tela Cheia" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Alternar Janela de Mensagens" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Alternar Barra Lateral" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Aumentar Zoom" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Diminuir Zoom" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Redefinir Zoom" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Ir para o Editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Ir para o Rascunho" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Ir para o VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Ir para a Barra de Pesquisa" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Alternar para Barra Lateral" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Alternar para Compilador" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Alternar para Mensagens" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Alternar para Janela de Mensagens" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Alternar para Lista de Documentos da Barra Lateral " + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Alternar para Lista de Símbolos da Barra Lateral" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Aba do Bloco de Notas" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Ir para o documento à esquerda" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Ir para o documento à direita" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Ir para o último documento usado" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Mover documento para a esquerda" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Mover documento para a direita" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Move documento para o início" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Mover documento para o fim" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Alternar Line Wrapping" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Alternar Quebra de Linha" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Substituir espaços por tabs" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Alternar dobra atual" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Dobrar tudo" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Desdobrar tudo" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Recarregar lista de símbolos" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Remover Marcadores" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Remover Indicadores de Erro" + +#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 +#: ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Construir" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 +#: ../src/toolbar.c:69 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make com destino personalizado" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make objeto" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Próximo erro" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Erro Prévio" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Executar" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Executar (comando alternativo)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Opções de construção" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Exibir Seletor de Cores" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Help" msgstr "Ajuda" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Atalhos de Teclado" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Os atalhos de teclado a seguir são configuráveis:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Ir para o Documento " -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Digite aqui o que você quiser; use como uma planilha de notas/rascunho" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Falha ao carregar um ou mais arquivos de sessão." @@ -3175,116 +3264,112 @@ msgid "Debug Messages" msgstr "Mensagens de Depuração" -#: ../src/main.c:124 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"Definir o número da coluna inicial para o primeiro arquivo aberto (útil " -"junto com --line)" +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "L_impar" + +#: ../src/main.c:122 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Definir o número da coluna inicial para o primeiro arquivo aberto (útil junto com --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Usar um diretório de configuração alternativo" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Ser verboso" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Imprimir nomes de tipos de arquivos internos" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Gerar arquivo de rótulos global (ver documentação)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Não pré-processar arquivos C/C++ ao gerar rótulos" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" -"Não abrir arquivos em uma instância em execução, forçar abertura de uma nova " -"instância" +msgstr "Não abrir arquivos em uma instância em execução, forçar abertura de uma nova instância" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Usar este nome de arquivo socket para comunicação com uma instância do Geany em execução" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Retornar uma lista de documentos abertos em uma instância do Geany em execução" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Definir o número de linha inicial para o primeiro arquivo aberto" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Não mostrar a janela de mensagens ao iniciar" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Não carregar os dados de auto-completar (ver documentação)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Não carregar plugins" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Imprimir o prefixo de instalação do Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Não carregar os arquivos da sessão anterior" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Não carregar o suporte a terminal" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Nome de arquivo de libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Ser verboso" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Exibir versão e sair" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[ARQUIVOS...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(construído no %s com GTK %d.%d.%d., GLib %d.%d.%d.)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Mover agora?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." -msgstr "" -"O Geany precisa mover o seu diretório de configurações antigo antes de " -"iniciar." +msgstr "O Geany precisa mover o seu diretório de configurações antigo antes de iniciar." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." -msgstr "" -"O seu diretório de configurações foi movido com sucesso de \"%s\" para \"%s" -"\"." +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." +msgstr "O seu diretório de configurações foi movido com sucesso de \"%s\" para \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"O seu diretório de configurações antigo \"%s\" não pôde ser movido para \"%s" -"\" (%s). Por favor, mova o diretório manualmente para o seu novo local." +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "O seu diretório de configurações antigo \"%s\" não pôde ser movido para \"%s\" (%s). Por favor, mova o diretório manualmente para o seu novo local." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3295,51 +3380,51 @@ "Podem ocorrer problemas no uso do Geany sem um diretório de configuração.\n" "Iniciar o Geany mesmo assim?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Não foi possível procurar o arquivo '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Esse é o Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "O diretório de configuração não pôde ser criado (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Arquivos de configuração recarregados." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Mensagens de estado" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "C_opiar" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Copiar T_udo" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Esconder Janela de Mensagens" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 #, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"O plugin \"%s\" não é um binário compatível com esta versão do Geany. Por " -"favor, recompile-o." +msgid "Could not find file '%s' - trying the current document path." +msgstr "Arquivo '%s' não encontrado - tentando o caminho de documentos atual." -#: ../src/plugins.c:869 +#: ../src/plugins.c:464 +#, c-format +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "O plugin \"%s\" não é um binário compatível com esta versão do Geany. Por favor, recompile-o." + +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Gerenciador de _Plugins" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3350,129 +3435,114 @@ "Descrição: %s\n" "Autor(es): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Ativo" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Nenhum plugin disponível." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Abaixo está uma lista dos plugins disponíveis. Selecione os plugins que " -"devem ser carregados quando o Geany for iniciado." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Escolher quais plugins devem ser carregados na inicialização:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Detalhes do plugin:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configurar Plugins" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Capturar tecla" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Digite a combinação de teclas que você quer usar para \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 +#: ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Expandir Tudo" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 +#: ../src/symbols.c:1871 msgid "_Collapse All" msgstr "_Colapsar Tudo" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Ação" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Atalho" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "Liber_ar" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Sobrepor" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Sobrepor esta ligação de tecla?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "A combinação '%s' já está sendo usada para \"%s\"." +#: ../src/prefs.c:1543 +#: ../src/vte.c:269 +#: ../src/vte.c:723 +#: ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Insira os caminhos das ferramentas abaixo. Ferramentas que você não precisa " -"podem ser deixadas em branco." +msgstr "Insira os caminhos das ferramentas abaixo. Ferramentas que você não precisa podem ser deixadas em branco." #. page Templates -#: ../src/prefs.c:1519 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" -"Define as informações a serem usadas em templates. Veja a documentação para " -"detalhes." - -#: ../src/prefs.c:1523 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany or force the reload of the settings using Tools->Reload Configuration." -"" -msgstr "" -"Atenção: Para que todas as alterações feitas aqui tenham efeito, você " -"deve reiniciar o Geany ou forçar a recarga de todas as configurações usando " -"Ferramentas->Recarregar Configuração." +#: ../src/prefs.c:1624 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Define as informações a serem usadas em templates. Veja a documentação para detalhes." + +#: ../src/prefs.c:1628 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." +msgstr "Atenção: Para que todas as alterações feitas aqui tenham efeito, você deve reiniciar o Geany ou forçar a recarga de todas as configurações usando Ferramentas->Recarregar Configuração." #. page Keybindings -#: ../src/prefs.c:1529 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Aqui, você pode alterar atalhos de teclado para diversas ações. Selecione " -"uma e pressione o botão Alterar para inserir um novo atalho, ou dê um duplo " -"clique sobre uma ação para editar diretamente a representação em string do " -"atalho." +#: ../src/prefs.c:1634 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Aqui, você pode alterar atalhos de teclado para diversas ações. Selecione uma e pressione o botão Alterar para inserir um novo atalho, ou dê um duplo clique sobre uma ação para editar diretamente a representação em string do atalho." #. page Printing -#: ../src/prefs.c:1534 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" -"Atenção: A impressão nativa do GTK somente está disponível se o Geany foi " -"construído com o GTK 2.10 (ou superior) e se o Geany está rodando com " -"o GTK 2.10 (ou superior)." +#: ../src/prefs.c:1639 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Atenção: A impressão nativa do GTK somente está disponível se o Geany foi construído com o GTK 2.10 (ou superior) e se o Geany está rodando com o GTK 2.10 (ou superior)." #. page Editor->Indentation -#: ../src/prefs.c:1540 -msgid "" -"Warning: these settings are overridden by the current project. See " -"Project->Properties." -msgstr "" -"Aviso: estas configurações são sobrescritas pelo projeto atual. Veja " -"Projeto->Propriedades." +#: ../src/prefs.c:1645 +msgid "Warning: these settings are overridden by the current project. See Project->Properties." +msgstr "Aviso: estas configurações são sobrescritas pelo projeto atual. Veja Projeto->Propriedades." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" @@ -3482,45 +3552,44 @@ msgid "Text will be wrongly spaced." msgstr "O texto não será espaçado corretamente." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Configurar Documento" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Imprimir apenas o nome básico (sem o caminho) do arquivo impresso" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Impressão do arquivo %s foi cancelada." +msgid "Did not send document %s to the printing subsystem." +msgstr "Não enviar o documento %s para o subsistema de impressão." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Arquivo %s impresso." +msgid "Document %s was sent to the printing subsystem." +msgstr "O documento %s foi enviado para o subsistema de impressão." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "A impressão de %s falhou (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." -msgstr "" -"Por favor, defina antes um comando de impressão no diálogo de preferências." +msgstr "Por favor, defina antes um comando de impressão no diálogo de preferências." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3531,588 +3600,664 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Impressão de \"%s\" falhou (código de retorno: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Arquivo %s impresso." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projects" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Novo Projeto" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "_Criar" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 +#: ../src/project.c:413 msgid "Name:" msgstr "Nome:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 +#: ../src/project.c:426 msgid "Filename:" msgstr "Nome do Arquivo:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 +#: ../src/project.c:456 msgid "Base path:" msgstr "Caminho base:" -#: ../src/project.c:171 ../src/project.c:438 -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 "" -"Diretório base de todos os arquivos que fazem parte do projeto. Pode ser um " -"novo caminho, ou uma árvore de diretório já existente. Você pode usar " -"caminhos relativos ao nome de arquivo do projeto." +#: ../src/project.c:170 +#: ../src/project.c:465 +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 "Diretório base de todos os arquivos que fazem parte do projeto. Pode ser um novo caminho, ou uma árvore de diretório já existente. Você pode usar caminhos relativos ao nome de arquivo do projeto." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 +#: ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Escolher Caminho Base do Projeto" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 +#: ../src/project.c:263 +#: ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Arquivo de projeto \"%s\" não pôde ser carregado." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 +#: ../src/project.c:269 msgid "Open Project" msgstr "Abrir Projeto" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Arquivos do projeto" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projeto \"%s\" fechado." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Descrição:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Executar make no caminho base" - -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Comando para executar:" - -#: ../src/project.c:461 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" -"Linha de comando para executar no diretório base do projeto. As opções podem " -"ser adicionadas ao comando. Deixe em branco para usar o comando de execução " -"padrão." +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Definir os diretórios de trabalho não tipo de arquivo do Construir para usar o caminho base:" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Definir" + +#: ../src/project.c:486 +msgid "Set the working directories (on the Build tab) for the non-filetype build commands to use the base path" +msgstr "Define os diretórios de trabalho (na aba Construir) para os comandos de construção não tipo de arquivo para usar o caminho base" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Padrões de arquivo:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Você deseja fechar antes de prosseguir?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "O projeto '%s' já está aberto." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "O nome especificado para o projeto é muito curto." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "O nome especificado para o projeto é muito longo (max. %d caracteres)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Você especificou um nome de arquivo inválido para o projeto." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Criar o diretório de caminho base para o projeto?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "O caminho \"%s\" não existe." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "O diretório base do projeto não pôde ser criado (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "O arquivo de projeto não pôde ser gravado (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projeto \"%s\" criado." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projeto \"%s\" salvo." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 +#: ../src/project.c:872 msgid "Choose Project Filename" msgstr "Escolher Nome de Arquivo do Projeto" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Escolher Comando para Executar o Projeto" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projeto \"%s\" aberto." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "_Usar expressões regulares" -#: ../src/search.c:220 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" -"Usar expressões regulares do tipo POSIX. Para informações detalhadas sobre o " -"uso de expressões regulares, por favor leia a documentação." +#: ../src/search.c:237 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Usar expressões regulares do tipo POSIX. Para informações detalhadas sobre o uso de expressões regulares, por favor leia a documentação." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "_Pesquisar para trás" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Usar seqüências de _escape" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" msgstr "" -"Substituir \\\\, \\t, \\n, \\r e \\uXXXX (caracteres Unicode) com os " -"caracteres de controle correspondentes" +"Substituir \\\\, \\t, \\n" +", \\r e \\uXXXX (caracteres Unicode) com os caracteres de controle correspondentes" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 +#: ../src/search.c:810 msgid "C_ase sensitive" msgstr "_Sensível ao caso" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 +#: ../src/search.c:816 msgid "Match only a _whole word" msgstr "Combinar somente uma _palavra inteira" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Combinar a partir do _início da palavra" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Anterior" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Próximo" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 +#: ../src/search.c:562 +#: ../src/search.c:740 msgid "_Search for:" msgstr "P_esquisar por:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Encontrar Todas" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Marcar" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Marcar todas as combinações no documento atual" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 +#: ../src/search.c:622 msgid "In Sessi_on" msgstr "Na _Sessão" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 +#: ../src/search.c:627 msgid "_In Document" msgstr "No _Documento" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 +#: ../src/search.c:640 msgid "Close _dialog" msgstr "_Fechar diálogo" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 +#: ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Desabilite essa opção para manter o diálogo aberto" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "_Substituir & Encontrar" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "S_ubstituir com:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "_Substituir Todos" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Na Se_leção" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" -msgstr "" -"Substituir todas as combinações encontradas no texto atualmente selecionado." +msgstr "Substituir todas as combinações encontradas no texto atualmente selecionado." -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Diretório:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "_Codificação:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Strings _Fixas" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep expressões regulares" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 +#: ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Veja a página do manual do grep para mais informações" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "E_xpressões regulares estendidas" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_Recursivo nas sub-pastas" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Inverter resultados da pesquisa" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" -msgstr "" -"Inverte o sentido da combinação, para selecionar linhas que não combinam" +msgstr "Inverte o sentido da combinação, para selecionar linhas que não combinam" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Opções E_xtra:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Outras opções para passar para o Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 +#: ../src/search.c:1881 +#: ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d combinação encontrada para '%s'." msgstr[1] "%d combinações encontradas para '%s'." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Texto substituído em %u arquivo." -msgstr[1] "Texto substituído em %u arquivos." +msgid "Replaced %u matches in %u documents." +msgstr "%u ocorrências substituídas em %u documentos." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Diretório de pesquisa de arquivos inválido." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Nenhum texto para procurar." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" -"Não foi possível executar a ferramenta de grep '%s'. Verifique a " -"configuração do caminho nas Preferências." +msgstr "Não foi possível executar a ferramenta de grep '%s'. Verifique a configuração do caminho nas Preferências." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Pesquisando..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (no diretório: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Não foi possível abrir diretório (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Busca falhou (ver Ajuda->Mensagens de Depuração para detalhes)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Pesquisa falhou." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Pesquisa completada com %d combinação." msgstr[1] "Pesquisa completada com %d combinações." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Nenhuma combinação encontrada." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Expressão regular ruim: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"O Geany tentou acessar o sockete de Domínio Unix de outra instância executando como outro usuário.\n" +"Isso é um erro fatal e o Geany será agora finalizado." + +#: ../src/symbols.c:611 +#: ../src/symbols.c:651 +#: ../src/symbols.c:718 msgid "Chapter" msgstr "Capítulo" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 +#: ../src/symbols.c:647 +#: ../src/symbols.c:719 msgid "Section" msgstr "Seção" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sec1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sec2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sec3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Apêndice" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 +#: ../src/symbols.c:652 +#: ../src/symbols.c:668 +#: ../src/symbols.c:679 +#: ../src/symbols.c:766 +#: ../src/symbols.c:777 +#: ../src/symbols.c:789 +#: ../src/symbols.c:803 +#: ../src/symbols.c:815 +#: ../src/symbols.c:827 +#: ../src/symbols.c:842 +#: ../src/symbols.c:887 msgid "Other" msgstr "Outro" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 +#: ../src/symbols.c:835 +#: ../src/symbols.c:867 msgid "Module" msgstr "Módulo" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 +#: ../src/symbols.c:762 +#: ../src/symbols.c:813 +#: ../src/symbols.c:825 +#: ../src/symbols.c:840 +#: ../src/symbols.c:852 msgid "Types" msgstr "Tipos" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Construtores de tipos" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 +#: ../src/symbols.c:638 +#: ../src/symbols.c:659 +#: ../src/symbols.c:667 +#: ../src/symbols.c:676 +#: ../src/symbols.c:688 +#: ../src/symbols.c:697 +#: ../src/symbols.c:750 +#: ../src/symbols.c:799 +#: ../src/symbols.c:822 +#: ../src/symbols.c:837 +#: ../src/symbols.c:874 msgid "Functions" msgstr "Funções" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 +#: ../src/symbols.c:637 msgid "Sections" msgstr "Seções" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Chaves" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 +#: ../src/symbols.c:690 +#: ../src/symbols.c:751 +#: ../src/symbols.c:776 +#: ../src/symbols.c:801 +#: ../src/symbols.c:814 +#: ../src/symbols.c:823 +#: ../src/symbols.c:839 +#: ../src/symbols.c:886 msgid "Variables" msgstr "Variáveis" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Comando" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Ambiente" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 +#: ../src/symbols.c:720 msgid "Subsection" msgstr "Subseção" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 +#: ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubseção" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Rótulo" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Estruturas" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 +#: ../src/symbols.c:759 +#: ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Pacote" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Meu" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Nosso" +#: ../src/symbols.c:677 +#: ../src/symbols.c:826 +#: ../src/symbols.c:849 +msgid "Labels" +msgstr "Rótulos" + +#: ../src/symbols.c:678 +#: ../src/symbols.c:689 +#: ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constantes" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 +#: ../src/symbols.c:785 +#: ../src/symbols.c:797 +#: ../src/symbols.c:810 +#: ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 +#: ../src/symbols.c:708 +#: ../src/symbols.c:729 +#: ../src/symbols.c:739 +#: ../src/symbols.c:748 +#: ../src/symbols.c:786 +#: ../src/symbols.c:798 +#: ../src/symbols.c:811 +#: ../src/symbols.c:873 msgid "Classes" msgstr "Classes" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Constantes" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Âncoras" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Cabeçalhos H1" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Cabeçalhos H2" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Cabeçalhos H3" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Seletores ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Seletores de Tipo" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 +#: ../src/symbols.c:774 msgid "Modules" msgstr "Módulos" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 +#: ../src/symbols.c:740 +#: ../src/symbols.c:749 +#: ../src/symbols.c:787 +#: ../src/symbols.c:812 msgid "Methods" msgstr "Métodos" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 +#: ../src/symbols.c:870 msgid "Namespaces" msgstr "Espaços de nomes" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Procedimentos" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Imports" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entidades" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Arquiteturas" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funções / Procedimentos" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variáveis / Sinais" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Processos / Componentes" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Eventos" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funções / Tarefas" + +#: ../src/symbols.c:788 +#: ../src/symbols.c:875 msgid "Members" msgstr "Membros" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Rótulos" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Sub-rotinas" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blocos" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 +#: ../src/symbols.c:859 +#: ../src/symbols.c:883 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Definições" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Destinos" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extensão de tipo de arquivo desconhecida para \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "" -"Falha ao criar arquivo de tags, talvez porque nenhuma tag foi encontrada.\n" +msgstr "Falha ao criar arquivo de tags, talvez porque nenhuma tag foi encontrada.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4121,205 +4266,207 @@ "Uso: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" msgstr "" "Exemplo:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Carregar Tags" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Arquivos de tags do Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Arquivo de tags '%s' carregou %s." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Não foi possível carregar arquivo de tags '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Declaração avançada \"%s()\" não encontrada." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definição de \"%s()\" não encontrada." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Ordenar por _Nome" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Ordenar por _Aparecimento" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Antigo" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Salva o arquivo atual" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Salva todos os arquivos abertos" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Recarrega do disco o arquivo atual" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Fecha o arquivo atual" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Fecha todos os arquivos abertos" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Recortar a seleção atual" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Copiar a seleção atual" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Colar os conteúdos da área de transferência" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Excluir a seleção atual" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Desfaz a última modificação" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Refaz a última modificação" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compila o arquivo atual" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Executa ou visualiza o arquivo atual" -#: ../src/toolbar.c:70 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette" -msgstr "" -"Abre um diálogo de seleção de cores, para escolher cores de uma paleta " -"interativamente" - #: ../src/toolbar.c:71 +msgid "Open a color chooser dialog, to interactively pick colors from a palette" +msgstr "Abre um diálogo de seleção de cores, para escolher cores de uma paleta interativamente" + +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Aumenta o zoom do texto" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Diminui o zoom do texto" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Diminuir endentação" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Aumentar endentação" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 +#: ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Encontra no arquivo atual o texto inserido" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 +#: ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Pula para o número de linha informado" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Exibir o diálogo de preferências" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Sair do Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Imprimir documento" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Substituir texto no documento atual" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Cria um novo arquivo" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Criar um novo arquivo a partir de um modelo" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Abre um arquivo existente" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Abrir um arquivo recente" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Escolher mais ações de construção" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Ir Para" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Separador" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Separador ---" -#: ../src/toolbar.c:897 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"Selecione os items a serem mostrados na barra de ferramentas. Os itens podem " -"ser reordenados por arrastar e soltar." +#: ../src/toolbar.c:946 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Selecione os items a serem mostrados na barra de ferramentas. Os itens podem ser reordenados por arrastar e soltar." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Itens disponíveis" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Itens Exibidos" #: ../src/tools.c:153 #, c-format -msgid "" -"The executed custom command returned an error. Your selection was not " -"changed. Error message: %s" -msgstr "" -"O comando personalizado executado retornou um erro. A sua seleção não foi " -"alterada. Mensagem de erro: %s" +msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" +msgstr "O comando personalizado executado retornou um erro. A sua seleção não foi alterada. Mensagem de erro: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." -msgstr "" -"O comando personalizado executado terminou com um código de saída mal-" -"sucedido." +msgstr "O comando personalizado executado terminou com um código de saída mal-sucedido." #: ../src/tools.c:246 #, c-format @@ -4331,439 +4478,416 @@ msgid "Custom command failed: %s" msgstr "Comando personalizado falhou: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 +#: ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Definir Comandos Personalizados" #: ../src/tools.c:311 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" -"Você pode enviar a seleção atual para qualquer um destes comandos e a saída " -"do comando substitui a seleção atual." +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "Você pode enviar a seleção atual para qualquer um destes comandos e a saída do comando substitui a seleção atual." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Nenhum comando personalizado definido." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Contar Palavras" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "seleção" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "documento inteiro" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Intervalo:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Linhas:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Palavras:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Caracteres:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Nenhuma tag encontrada" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Exibir Lista de _Símbolos" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Exibir Lista de _Documentos" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 +#: ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "_Ocultar Barra Lateral" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Exibir _Caminhos" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "linha: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "linha: %d / %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "SL" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "SOB" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "ESP " -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "modo: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "codificação: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "tipo de arquivo: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "escopo: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Fonte atualizada (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Biblioteca Padrão C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Biblioteca Padrão C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Biblioteca Padrão C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "STL C++" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Definir Formato Personalizado de Data" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Selecionar Pasta" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Selecionar Arquivo" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Arquivos de C_onfiguração" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Salvar Tudo" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Fechar Tudo" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Definir _Caminho a Partir do Documento" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Reiniciar Terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Métodos de _Entrada" -#: ../src/vte.c:670 -msgid "" -"Could not change the directory in the VTE because it probably contains a " -"command." -msgstr "" -"Não é possível trocar o diretório no VTE porque ele provavelmente contém um " -"comando." - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Plugin do Terminal" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Essas configurações para o emulador de terminal virtual (VTE) somente são " -"aplicáveis se a biblioteca VTE puder ser carregada." +#: ../src/vte.c:638 +msgid "Could not change the directory in the VTE because it probably contains a command." +msgstr "Não é possível trocar o diretório no VTE porque ele provavelmente contém um comando." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Fonte:" -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Fonte do terminal" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Define a fonte do terminal" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Cor do texto:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Cor do fundo:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Define a cor do texto do terminal" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Define a cor do fundo do texto do terminal" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Linhas que podem ser roladas para trás:" -#: ../src/vte.c:790 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget" -msgstr "" -"Especifica o histórico em linhas que você pode rolar para trás no terminal" +#: ../src/vte.c:786 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget" +msgstr "Especifica o histórico em linhas que você pode rolar para trás no terminal" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation" -msgstr "" -"Define o caminho para o shell que será iniciado dentro da emulação de " -"terminal" +#: ../src/vte.c:798 +msgid "Sets the path to the shell which should be started inside the terminal emulation" +msgstr "Define o caminho para o shell que será iniciado dentro da emulação de terminal" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Rolar ao pressionar tecla" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Habilita/desabilita a rolagem para a base se uma tecla foi pressionada" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Rolar quando saída for gerada" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Habilita/desabilita a rolagem para a base quando uma saída é gerada" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Piscar o cursor" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Habilita ou desabilita cursor piscante" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Sobrepor as ligações de tecla do Geany" -#: ../src/vte.c:833 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" -"Permite que o VTE receba atalhos de teclado (além dos comandos de foco)" +#: ../src/vte.c:829 +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "Permite que o VTE receba atalhos de teclado (além dos comandos de foco)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Desabilita a tecla de atalho do menu (F10 por padrão)" -#: ../src/vte.c:837 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" -"Esta opção desabilita a ligação de tecla para que a barra de menu apareça (o " -"padrão é F10). Isto pode ser útil se você usar, por exemplo, o Midnight " -"Commander dentro do VTE." +#: ../src/vte.c:833 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Esta opção desabilita a ligação de tecla para que a barra de menu apareça (o padrão é F10). Isto pode ser útil se você usar, por exemplo, o Midnight Commander dentro do VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 +#: ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Seguir o caminho do arquivo padrão" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" -msgstr "" -"Habilita/desabilita a execução de \"cd $caminho\" quando você alternar entre " -"arquivos abertos" +msgstr "Habilita/desabilita a execução de \"cd $caminho\" quando você alternar entre arquivos abertos" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Não usar o script de execução" -#: ../src/vte.c:847 -msgid "" -"Don't use the simple run script which is usually used to display the exit " -"status of the executed program" -msgstr "" -"Não usa o script de execução simples que normalmente é usado para exibir o " -"estado de saída do programa executado" +#: ../src/vte.c:843 +msgid "Don't use the simple run script which is usually used to display the exit status of the executed program" +msgstr "Não usa o script de execução simples que normalmente é usado para exibir o estado de saída do programa executado" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Executar programas em VTE" -#: ../src/vte.c:851 -msgid "" -"Run programs in VTE instead of opening a terminal emulation window. Please " -"note, programs executed in VTE cannot be stopped" -msgstr "" -"Executa programas em VTE ao invés de abrir uma janela de emulação de " -"terminal. Lembre-se que programas executados em VTE não podem ser " -"interrompidos" +#: ../src/vte.c:847 +msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped" +msgstr "Executa programas em VTE ao invés de abrir uma janela de emulação de terminal. Lembre-se que programas executados em VTE não podem ser interrompidos" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Arquivos de projeto Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Executáveis" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Construtor de Classe" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Cria arquivos-fonte para novos tipos de classe." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Criar Classe" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Espaço de nomes" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Espaço de nomes" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nome da classe:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Arquivo de cabeçalho:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Arquivo-fonte:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Herança" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Classe base:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Fonte base:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Cabeçalho base:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "GType base:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementa:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Opções" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Criar construtor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Criar destrutor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "É abstrato" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "É singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Tipo de construtor GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "_Criar Classe" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Classe _GTK+" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "Classe _PHP" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caracteres HTML" @@ -4772,94 +4896,98 @@ msgid "Inserts HTML character entities like '&'." msgstr "Insere entidades de caracter HTML, como '&'" -#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/htmlchars.c:39 +#: ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 +#: ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "A equipe de desenvolvimento do Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Caracteres HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Caracteres ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Caracteres gregos" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Caracteres matemáticos" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Caracteres técnicos" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Caracteres de seta" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Caracteres de pontuação" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Miscelânea de caracteres" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 +#: ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "O diretório de configuração de plugins não pôde ser criado." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Caracteres Especiais" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Inserir" -#: ../plugins/htmlchars.c:458 -msgid "" -"Choose a special character from the list below and double click on it or use " -"the button to insert it at the current cursor position." -msgstr "" -"Escolha um caracter especial da lista abaixo e dê um duplo clique sobre ele " -"ou use o botão para inseri-lo na posição atual do cursor." +#: ../plugins/htmlchars.c:493 +msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." +msgstr "Escolha um caracter especial da lista abaixo e dê um duplo clique sobre ele ou use o botão para inseri-lo na posição atual do cursor." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Caracter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (nome)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Inserir Caracteres Especiais de HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Substituição HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTMLToggle" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Substituição em massa de caracteres especiais" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Inserir Caracteres Especiais HTML" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Substituir caracteres especiais" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Alternar estado do plugin" @@ -4880,146 +5008,136 @@ msgstr "_Usar nível atual de zoom" #: ../plugins/export.c:185 -msgid "" -"Renders the font size of the document together with the current zoom level" +msgid "Renders the font size of the document together with the current zoom level" msgstr "Ajusta o tamanho da fonte do documento junto com o nível atual de zoom" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documento exportado com sucesso como '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "O arquivo '%s' não pôde ser gravado (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "O arquivo '%s' já existe. Deseja sobrescrevê-lo?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exportar" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Como _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Como _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Navegador de Arquivos" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Inclui uma aba de navegação de arquivos na barra lateral." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Excesso de itens selecionados!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Não foi possível executar o comando externo configurado '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Abrir _externamente" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Pesquisar em Arquivos" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Exibir Arquivos _Ocultos" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Cima" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Atualizar" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Definir caminho a partir do documento" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Limpar o filtro" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtrar os seus arquivos com coringas usuais" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Focar Lista de Arquivos" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Focar Entrada de Caminho" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "O diretório de configuração de plugins não pôde ser criado." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Comando para abrir externo:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, 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 "" -"Comando a ser executado quando usar \"Abrir com\". Você pode usar as " -"máscaras %f e %d.\n" +"Comando a ser executado quando usar \"Abrir com\". Você pode usar as máscaras %f e %d.\n" "%f será substituído pelo nome do arquivo, incluindo o caminho completo\n" -"%d será substituído pelo nome do caminho do arquivo selecionado, sem o nome " -"do arquivo" +"%d será substituído pelo nome do caminho do arquivo selecionado, sem o nome do arquivo" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Exibir Arquivos _Ocultos" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Ocultar arquivos objeto" -#: ../plugins/filebrowser.c:1117 -msgid "" -"Don't show generated object files in the file browser, this includes *.o, *." -"obj. *.so, *.dll, *.a, *.lib" -msgstr "" -"Não mostra no navegador os arquivos-objeto gerados. Isso inclui *.o, *.obj. " -"*.so, *.dll, *.a, *.lib" +#: ../plugins/filebrowser.c:1212 +msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +msgstr "Não mostra no navegador os arquivos-objeto gerados. Isso inclui *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Usar o diretório base do projeto" -#: ../plugins/filebrowser.c:1132 -msgid "" -"Change the directory to the base directory of the currently opened project" +#: ../plugins/filebrowser.c:1227 +msgid "Change the directory to the base directory of the currently opened project" msgstr "Trocar o diretório para o diretório base do projeto aberto atualmente" #: ../plugins/saveactions.c:39 @@ -5028,8 +5146,7 @@ #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." -msgstr "" -"Este plugin fornece diferentes ações relacionadas ao salvamento de arquivos." +msgstr "Este plugin fornece diferentes ações relacionadas ao salvamento de arquivos." #: ../plugins/saveactions.c:169 #, c-format @@ -5067,7 +5184,8 @@ msgid "Auto Save" msgstr "Auto-Salvar" -#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:545 +#: ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Habilitar" @@ -5082,9 +5200,7 @@ #: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" -msgstr "" -"Im_primir mensagem de estado se os arquivos tiverem sido salvos " -"automaticamente" +msgstr "Im_primir mensagem de estado se os arquivos tiverem sido salvos automaticamente" #: ../plugins/saveactions.c:578 msgid "Save only current open _file" @@ -5112,9 +5228,7 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "" -"Formato de Da_ta/Hora para arquivos de backup (\"man strftime\" para " -"detalhes):" +msgstr "Formato de Da_ta/Hora para arquivos de backup (\"man strftime\" para detalhes):" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" @@ -5128,50 +5242,164 @@ msgid "Splits the editor view into two windows." msgstr "Divide a janela do editor em duas janelas." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Exibir o documento atual" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 +#: ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Anular divisão" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Dividir Janela" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Horizontalmente" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Verticalmente" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Dividir Horizontalmente" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Dividir Verticalmente" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Anular divisão" - +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Definir _Includes e Argumentos" +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" +#~ msgid "_View DVI File" +#~ msgstr "_Visualizar Arquivo DVI" +#~ msgid "V_iew PDF File" +#~ msgstr "V_isualizar Arquivo PDF" +#~ msgid "_Set Arguments" +#~ msgstr "_Definir Argumentos" +#~ msgid "Set Arguments" +#~ msgstr "Definir Argumentos" +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Define os programas e opções para compilar e exibir arquivos (La)TeX." +#~ msgid "DVI creation:" +#~ msgstr "Criação de DVI:" +#~ msgid "PDF creation:" +#~ msgstr "Criação de PDF:" +#~ msgid "DVI preview:" +#~ msgstr "Visualização de DVI:" +#~ msgid "PDF preview:" +#~ msgstr "Visualização de PDF:" +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f será substituído pelo nome do arquivo atual. Ex.: arq_test.c\n" +#~ "%e será substituído pelo nome do arquivo sem extensão. Ex.: arq_teste" +#~ msgid "Set Includes and Arguments" +#~ msgstr "Definir Includes e Argumentos" +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Define os comandos para construir e executar programas." +#~ msgid "Compile:" +#~ msgstr "Compilar:" +#~ msgid "Build:" +#~ msgstr "Construir:" +#~ msgid "Failed to execute the view program" +#~ msgstr "Falha ao executar o visualizador" +#~ msgid "Try to resave the file?" +#~ msgstr "Tentar salvar novamente o arquivo?" +#~ msgid "_Customize Toolbar" +#~ msgstr "_Personalizar Barra de Ferramentas" +#~ msgid "Icon style:" +#~ msgstr "Estilo dos ícones:" +#~ msgid "Icon size:" +#~ msgstr "Tamanho dos ícones:" +#~ msgid "Appearance" +#~ msgstr "Aparência" +#~ msgid "Hard tab width:" +#~ msgstr "Largura do Hard Tab:" +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "A largura de uma tabulação quando Tabs & Espaços estiver definida para um " +#~ "documento" +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Usar texto brando sobre fundo preto e inverter todas as cores. Esta opção " +#~ "exige que o Geany seja reiniciado" +#~ msgid "Long line marker:" +#~ msgstr "Marcador de linha longa:" +#~ msgid "Long line marker color:" +#~ msgstr "Cor do marcador de linha longa:" +#~ msgid "Path and options for the make tool" +#~ msgstr "Caminho e opções para a ferramenta make" +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplicar linha ou seleção" +#~ msgid "Send Selection to Terminal" +#~ msgstr "Enviar Seleção para o Terminal" +#~ msgid "Run (alternative command)" +#~ msgstr "Executar (comando alternativo)" +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Abaixo está uma lista dos plugins disponíveis. Selecione os plugins que " +#~ "devem ser carregados quando o Geany for iniciado." +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Impressão do arquivo %s foi cancelada." +#~ msgid "Make in base path" +#~ msgstr "Executar make no caminho base" +#~ msgid "Run command:" +#~ msgstr "Comando para executar:" +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Linha de comando para executar no diretório base do projeto. As opções " +#~ "podem ser adicionadas ao comando. Deixe em branco para usar o comando de " +#~ "execução padrão." +#~ msgid "Choose Project Run Command" +#~ msgstr "Escolher Comando para Executar o Projeto" +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Texto substituído em %u arquivo." +#~ msgstr[1] "Texto substituído em %u arquivos." +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Busca falhou (ver Ajuda->Mensagens de Depuração para detalhes)." +#~ msgid "My" +#~ msgstr "Meu" +#~ msgid "Local" +#~ msgstr "Local" +#~ msgid "Our" +#~ msgstr "Nosso" +#~ msgid "Terminal plugin" +#~ msgstr "Plugin do Terminal" +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Essas configurações para o emulador de terminal virtual (VTE) somente são " +#~ "aplicáveis se a biblioteca VTE puder ser carregada." +#~ msgid "Terminal font:" +#~ msgstr "Fonte do terminal" +#~ msgid "Unsplit" +#~ msgstr "Anular divisão" #~ msgid "Diff file" #~ msgstr "Arquivo diff" - #~ msgid "reStructuredText file" #~ msgstr "Arquivo reStructuredText" - #~ msgid "Select _All" #~ msgstr "Selecion_ar Tudo" - #~ msgid "Automatic symbol completion" #~ msgstr "Auto-completar símbolos" - #~ msgid "" #~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." #~ "xml'. Please see the documentation for details." @@ -5179,285 +5407,194 @@ #~ "Aviso: Para personalizar os elementos da barra de ferramentas, edite o " #~ "arquivo 'ui_toolbar.xml'. Por favor, veja a documentação para detalhes." - #~ msgid "" #~ "For all changes you make in this file to take effect, you need to restart " #~ "Geany." #~ msgstr "" #~ "Para que todas as mudanças que você fez neste arquivo tenham efeito, você " #~ "deve reiniciar o Geany." - #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Falha ao exibir %s (certifique-se de que ele esteja compilado)" - #~ msgid "" #~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" #~ msgstr "" #~ "Incluir números de páginas na base de cada página. Ocupa 2 linhas por " #~ "página" - #~ msgid "Jump to the entered line number." #~ msgstr "Pula para o número de linha inserido" - #~ msgid "Version Diff" #~ msgstr "Versão Diff" - #~ msgid "Creates a patch of a file against version control." #~ msgstr "Cria um patch de um arquivo contra o controle de versões." - #~ msgid "Input conversion of the diff output failed." #~ msgstr "Conversão de entrada da saída do diff falhou." - #~ msgid "" #~ "%s exited with an error: \n" #~ "%s." #~ msgstr "" #~ "%s encerrou com um erro: \n" #~ "%s" - #~ msgid "No changes were made." #~ msgstr "Nenhuma alteração foi feita." - #~ msgid "unknown error while trying to spawn a process for %s" #~ msgstr "erro desconhecido ao tentar gerar um processo para %s" - #~ msgid "An error occurred (%s)." #~ msgstr "Ocorreu um erro (%s)." - #~ msgid "_Version Diff" #~ msgstr "_Versão Diff" - #~ msgid "From Current _File" #~ msgstr "Do Arquivo _Atual" - #~ msgid "Make a diff from the current active file" #~ msgstr "Cria um diff do arquivo atualmente ativo" - #~ msgid "From Current _Directory" #~ msgstr "Do _Diretório Atual" - #~ msgid "Make a diff from the directory of the current active file" #~ msgstr "Cria um diff do diretório do arquivo atualmente ativo" - #~ msgid "From Current _Project" #~ msgstr "Do _Projeto Atual" - #~ msgid "Make a diff from the current project's base path" #~ msgstr "Cria um diff do caminho base do projeto atual" - #~ msgid "Command stopped because the current file has no extension." #~ msgstr "O comando foi encerrado porque o arquivo atual não possui extensão" - #~ msgid "Failed to execute \"%s\" (make sure it is already built)" #~ msgstr "Falha ao executar %s (certifique-se de que está construído)" - #~ msgid "Compiles the current file" #~ msgstr "Compila o arquivo atual" - #~ msgid "Builds the current file (generate an executable file)" #~ msgstr "Constrói o arquivo atual (gera um arquivo executável)" - #~ msgid "Compiles the current file using the make tool" #~ msgstr "Compila o arquivo atual usando a ferramenta make" - #~ msgid "" #~ "Sets the includes and library paths for the compiler and the program " #~ "arguments for execution" #~ msgstr "" #~ "Define os includes e caminhos de biblioteca para o compilador e os " #~ "argumentos para execução do programa" - #~ msgid "Compiles the current file into a DVI file" #~ msgstr "Compila o arquivo atual para um arquivo DVI" - #~ msgid "Compiles the current file into a PDF file" #~ msgstr "Compila o arquivo atual para um arquivo PDF" - #~ msgid "Compile and view the current file" #~ msgstr "Compila e visualiza o arquivo atual" - #~ msgid "Sets the program paths and arguments" #~ msgstr "Define os caminhos e argumentos do programa" - #~ msgid "Saves all open files" #~ msgstr "Salva todos os arquivos abertos" - #~ msgid "Prints the current file" #~ msgstr "Imprime o arquivo atual" - #~ msgid "Inserts a typical ChangeLog entry in the current file" #~ msgstr "Insere uma entrada de ChangeLog típica no arquivo atual" - #~ msgid "Inserts a file header at the beginning of the file" #~ msgstr "Insere um cabeçalho no início do arquivo" - #~ msgid "Inserts a description before the current function" #~ msgstr "Insere uma descrição antes da função atual" - #~ msgid "Inserts a multiline comment" #~ msgstr "Insere um comentário multi-linha" - #~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" #~ msgstr "Insere uma advertência da GPL (deve ser feito no início do arquivo)" - #~ msgid "" #~ "Inserts a BSD license notice (should be done at the beginning of the file)" #~ msgstr "" #~ "Insere uma advertência de licença BSD (deve ser feito no início do " #~ "arquivo)" - #~ msgid "Change the default font" #~ msgstr "Altera a fonte padrão" - #~ msgid "Toggle the window with status and compiler messages on and off" #~ msgstr "Exibe ou esconde a janela com status e mensagens do compilador" - #~ msgid "Toggle the toolbar on and off" #~ msgstr "Exibe ou esconde a barra de ferramentas" - #~ msgid "Treat this file as read-only. No changes can be made." #~ msgstr "" #~ "Trata este arquivo como somente-leitura. Nenhuma alteração poderá ser " #~ "feita." - #~ msgid "Replaces all spaces in the document by tab characters." #~ msgstr "Substitui todos os espaços no documento por tabs." - #~ msgid "Folds all contractible code blocks" #~ msgstr "Dobra todos os blocos de código contráteis" - #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Desdobra todos os blocos de código contraídos" - -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Remove todos os indicadores de erro no documento atual." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" #~ msgstr "" #~ "Conta as palavras e caracteres da seleção atual ou de todo o documento" - #~ msgid "Load global tags file" #~ msgstr "Carrega arquivo de rótulos global" - #~ msgid "" #~ "Reload configuration data like snippets, templates and filetype " #~ "extensions." #~ msgstr "" #~ "Recarrega dados de configuração como fragmentos, modelos e extensões de " #~ "tipos de arquivos." - #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Mostra uma lista de todos os atalhos de teclado do Geany." - -#~ msgid "Color" -#~ msgstr "Cores" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Insere um número de linha e pula para ela." - #~ msgid "Go to the entered line" #~ msgstr "Vai para a linha informada" - #~ msgid "Show full path name in documents list" #~ msgstr "Exibe o nome completo do caminho na lista de documentos" - #~ msgid "Show file operation buttons" #~ msgstr "Exibir botões de operações de arquivo" - #~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" #~ msgstr "" #~ "Mostra os botões Novo, Abrir, Fechar, Salvar e Recarregar na barra de " #~ "ferramentas" - #~ msgid "Show Redo and Undo buttons" #~ msgstr "Exibir botões de Refazer e Desfazer" - #~ msgid "Display the Redo and Undo buttons in the toolbar" #~ msgstr "Mostra os botões de Refazer e Desfazer na barra de ferramentas" - #~ msgid "Show Back and Forward buttons" #~ msgstr "Exibir botões de Voltar e Avançar" - #~ msgid "" #~ "Display the Back and Forward buttons in the toolbar used for code " #~ "navigation" #~ msgstr "Mostra os botões de Voltar e Avançar na barra de ferramentas" - #~ msgid "Show Compile and Run buttons" #~ msgstr "Exibir os botões Compilar e Executar" - #~ msgid "Display the Compile and Run buttons in the toolbar" #~ msgstr "Mostra os botões Compilar e Executar na barra de ferramentas" - #~ msgid "Show Color Chooser button" #~ msgstr "Exibir botão do Seletor de Cores" - #~ msgid "Display the Color Chooser button in the toolbar" #~ msgstr "Mostra o botão do Seletor de Cores na barra de ferramentas" - #~ msgid "Show Zoom In and Zoom Out buttons" #~ msgstr "Exibir os botões Aumentar Zoom e Diminuir Zoom" - #~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" #~ msgstr "" #~ "Mostra os botões de Aumentar Zoom e Diminuir Zoom na barra de ferramentas" - #~ msgid "Show Increase and Decrease Indentation buttons" #~ msgstr "Exibir botões de Aumentar e Diminuir Endentação" - #~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" #~ msgstr "Mostra os botões de Aumentar e Diminuir na barra de ferramentas" - #~ msgid "Show Search field" #~ msgstr "Exibir o campo Pesquisar" - #~ msgid "Display the search field and button in the toolbar" #~ msgstr "Mostrar o campo e o botão de pesquisar na barra de ferramentas" - #~ msgid "Show Go to Line field" #~ msgstr "Exibir o campo Ir para Linha" - #~ msgid "Display the line number field and button in the toolbar" #~ msgstr "Mostrar o campo e botão de número de linha na barra de ferramentas" - #~ msgid "Show Quit button" #~ msgstr "Exibir o botão Sair" - #~ msgid "Display the quit button in the toolbar" #~ msgstr "Mostra o botão Sair na barra de ferramentas" - #~ msgid "Items" #~ msgstr "Itens" - -#~ msgid "Use white text on a black background." -#~ msgstr "Usar texto branco sobre um fundo preto." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Executa em modo de depuração (significa ser verboso)" - -#~ msgid "Search failed." -#~ msgstr "Pesquisa falhou." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Não foi possível encontrar arquivo pixmap: %s" - #~ msgid "JavaScript functions" #~ msgstr "Funções JavaScript" - #~ msgid "Heading (H2)" #~ msgstr "Cabeçalho (H2)" - #~ msgid "Heading (H3)" #~ msgstr "Cabeçalho (H3)" - #~ msgid "Structs / Typedefs" #~ msgstr "Stucts / Typedefs" - #~ msgid "Terminal emulation:" #~ msgstr "Emulação de terminal:" - #~ msgid "" #~ "Controls how the terminal emulator should behave. Do not change this " #~ "value unless you know exactly what you are doing." @@ -5470,199 +5607,140 @@ #~ msgid_plural "Found %d matches for \"%s\"." #~ msgstr[0] "%d combinações encontradas para '%s'." #~ msgstr[1] "%d combinações encontradas para '%s'." - #~ msgid "Failed to execute the terminal program" #~ msgstr "Falha ao executar o terminal" - #~ msgid "Save automatically all open files in a given time interval." #~ msgstr "" #~ "Salva automaticamente todos os arquivos abertos, em um intervalo de tempo " #~ "informado." - #~ msgid "Whether to use tabs or spaces when indentation is inserted." #~ msgstr "" #~ "Habilita/desabilita o uso de tabs ou espaços quando a endentação for " #~ "inserida." - #~ msgid "Rows of symbol completion list:" #~ msgstr "Linhas da lista de completação de símbolos:" - #~ msgid "Could not parse the output of the diff" #~ msgstr "Não foi possível analisar a saída do diff" - #~ msgid "Something very strange is occurred, could not stat %s (%s)." #~ msgstr "Aconteceu algo muito estranho. Não foi possível avaliar %s (%s)." - #~ msgid "Insert Comments" #~ msgstr "Inserir Comentários" - #~ msgid "Insert \"include <...>\"" #~ msgstr "Inserir \"include <...>\"" - #~ msgid "File menu" #~ msgstr "Menu Arquivo" - #~ msgid "Edit menu" #~ msgstr "Menu Editar" - #~ msgid "Search menu" #~ msgstr "Menu Pesquisar" - #~ msgid "View menu" #~ msgstr "Menu Visualizar" - #~ msgid "Document menu" #~ msgstr "Menu Documento" - #~ msgid "Build menu" #~ msgstr "Menu Construir" - #~ msgid "Tools menu" #~ msgstr "Menu Ferramentas" - #~ msgid "Help menu" #~ msgstr "Menu de Ajuda" - #~ msgid "Focus commands" #~ msgstr "Comandos de foco" - #~ msgid "Editing commands" #~ msgstr "Comandos de Edição" - #~ msgid "Tag commands" #~ msgstr " Comandos de rótulo" - #~ msgid "Other commands" #~ msgstr "Outros comandos" - #~ msgid "Something went really wrong." #~ msgstr "Ocorreu um erro grave." - #~ msgid "_VCdiff" #~ msgstr "_VCdiff" - #~ msgid "Mixins" #~ msgstr "Mixins" #, fuzzy #~ msgid "C source file" #~ msgstr "Arquivo-fonte C#" - #~ msgid "C++ source file" #~ msgstr "Arquivo-fonte C++" - #~ msgid "C# source file" #~ msgstr "Arquivo-fonte C#" - #~ msgid "D source file" #~ msgstr "Arquivo-fonte D" - #~ msgid "Java source file" #~ msgstr "Arquivo-fonte Java" - #~ msgid "Pascal source file" #~ msgstr "Arquivo-fonte Pascal" - #~ msgid "Assembler source file" #~ msgstr "Arquivo-fonte Assembler" - #~ msgid "FreeBasic source file" #~ msgstr "Arquivo-fonte FreeBasic" - #~ msgid "Fortran source file (F77)" #~ msgstr "Arquivo-fonte Fortran (F77)" - #~ msgid "(O)Caml source file" #~ msgstr "Arquivo-fonte (O)Caml" - #~ msgid "Perl source file" #~ msgstr "Arquivo-fonte Perl" - #~ msgid "PHP source file" #~ msgstr "Arquivo-fonte PHP" - #~ msgid "Python source file" #~ msgstr "Arquivo-fonte Python" - #~ msgid "Ruby source file" #~ msgstr "Arquivo-fonte Ruby" - #~ msgid "Tcl source file" #~ msgstr "Arquivo-fonte Tcl" - #~ msgid "Lua source file" #~ msgstr "Arquivo-fonte Lua" - #~ msgid "Ferite source file" #~ msgstr "Arquivo-fonte Ferite" - -#~ msgid "Haskell source file" -#~ msgstr "Arquivo-fonte Haskell" - #~ msgid "Docbook source file" #~ msgstr "Arquivo-fonte Docbook" - #~ msgid "HTML source file" #~ msgstr "Arquivo-fonte HTML" - #~ msgid "LaTeX source file" #~ msgstr "Arquivo-fonte LaTeX" - #~ msgid "O-Matrix source file" #~ msgstr "Arquivo-fonte O-Matrix" - #~ msgid "VHDL source file" #~ msgstr "Arquivo-fonte VHDL" - #~ msgid "Haxe source file" #~ msgstr "Arquivo-fonte Haxe" - #~ msgid "Open files" #~ msgstr "Arquivos abertos" #, fuzzy #~ msgid "Show open files list" #~ msgstr "Exibir lista de arquivos abertos" - #~ msgid "" #~ "Whenever some whitespace is inserted by Geany it will use tabs when " #~ "enabled otherwise Geany will use just spaces." #~ msgstr "" #~ "Caso essa opção for habilitada, o Geany usará tabulações sempre que um " #~ "espaço em branco for inserido; senão, o Geany usará apenas espaços." - #~ msgid "Unfold all children of a fold point when unfolding it." #~ msgstr "Desdobra todos os filhos de um ponto de dobra quando desdobrá-lo." - #~ msgid "Construct autocompletion" #~ msgstr "Auto-completar construções" - #~ msgid "Automatic completion of often used constructs like if and for" #~ msgstr "Auto-completar construções usadas freqüentemente, como if e for" #, fuzzy #~ msgid "Symbol autocompletion" #~ msgstr "Auto-completar construções" - #~ msgid "Print:" #~ msgstr "Imprimir:" - #~ msgid "Find in files" #~ msgstr "Encontrar em arquivos" - #~ msgid "Go to line" #~ msgstr "Ir para a linha" #, fuzzy #~ msgid "Complete construct" #~ msgstr "Criar construtor" - #~ msgid "Go to tag definition" #~ msgstr "Ir para a definição de tags" - #~ msgid "Go to tag declaration" #~ msgstr "Ir para declaração de tags" - #~ msgid "" #~ "Directory to run Make All from. Leave blank to use the default command." #~ msgstr "" @@ -5672,10 +5750,8 @@ #, fuzzy #~ msgid "Hide" #~ msgstr "Esconder" - #~ msgid "Reload" #~ msgstr "Recarregar" - #~ msgid "" #~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " #~ "%s filetype: %s scope: %s" @@ -5690,23 +5766,14 @@ #, fuzzy #~ msgid "Do you want to save all opened files before processing?" #~ msgstr "Você deseja salvá-lo antes de fechar?" - -#, fuzzy -#~ msgid "From _directory" -#~ msgstr "_Diretório:" - #~ msgid "Convert Selection to _Lower-case" #~ msgstr "Converter Seleção para _Minúsculas" - #~ msgid "Convert Selection to _Upper-case" #~ msgstr "Converter Seleção para M_aiúsculas" - #~ msgid "Convert Selection to lower-case" #~ msgstr "Converter seleção para minúsculas" - #~ msgid "Convert Selection to upper-case" #~ msgstr "Converter seleção para maiúsculas" - #~ msgid "Advanced" #~ msgstr "Avançado" @@ -5715,22 +5782,16 @@ #~ msgstr "" #~ "\n" #~ "Menu Editar\n" - #~ msgid "Behaviour" #~ msgstr "Comportamento" - #~ msgid "Misc." #~ msgstr "Misc." - #~ msgid "language" #~ msgstr "idioma" - #~ msgid "XML source file" #~ msgstr "Arquivo-fonte XML" - #~ msgid "Insert BSD license Notice" #~ msgstr "Inserir Advertência de Licença BSD" - #~ msgid "" #~ "Selects the indentation mode. Use None to disable auto indentation " #~ "completely. Basic indents new lines with the same indentation as the " @@ -5739,22 +5800,18 @@ #~ "Seleciona o modo de indentação. Use Nenhum para desabilitar totalmente a " #~ "auto indentação. Básico indenta novas linhas com a mesma indentação que a " #~ "linha anterior. Avançado faz o mesmo e indenta também chaves." - #~ msgid "Print command:" #~ msgstr "Comando para impressão:" - #~ msgid "" #~ "\n" #~ "Focus commands\n" #~ msgstr "" #~ "\n" #~ "Comandos de Foco\n" - #~ msgid "Keyboard shortcuts" #~ msgstr "Atalhos de teclado" - #~ msgid " - A fast and lightweight IDE" #~ msgstr "- Um IDE rápido e leve" - #~ msgid "Function" #~ msgstr "Função" + diff -Nru geany-0.18/po/pt.po geany-0.19/po/pt.po --- geany-0.18/po/pt.po 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/po/pt.po 2010-06-01 20:09:55.000000000 +0100 @@ -0,0 +1,5603 @@ +# Portuguese translation for geany +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the geany package. +# +msgid "" +msgstr "" +"Project-Id-Version: Geany 0.19\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-01 21:05+0200\n" +"PO-Revision-Date: 2010-05-31 17:36+0100\n" +"Last-Translator: André Glória \n" +"Language-Team: \n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Launchpad-Export-Date: 2010-03-08 13:33+0000\n" +"X-Generator: Launchpad (build Unknown)\n" +"X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: PORTUGAL\n" + +#: ../geany.desktop.in.h:1 +msgid "A fast and lightweight IDE using GTK2" +msgstr "Um IDE rápido e leve, escrito em GTK2" + +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 +msgid "Geany" +msgstr "Geany" + +#: ../geany.desktop.in.h:3 +msgid "Integrated Development Environment" +msgstr "Ambiente Integrado para Desenvolvimento" + +#: ../src/about.c:146 +msgid "About Geany" +msgstr "Sobre o Geany" + +#: ../src/about.c:196 +msgid "A fast and lightweight IDE" +msgstr "Um IDE rápido e leve" + +#: ../src/about.c:217 +#, c-format +msgid "(built on or after %s)" +msgstr "(gerado em %s ou após)" + +#. gtk_container_add(GTK_CONTAINER(info_box), cop_label); +#: ../src/about.c:248 +msgid "Info" +msgstr "Informação" + +#: ../src/about.c:264 +msgid "Developers" +msgstr "Responsáveis" + +#: ../src/about.c:273 +msgid "maintainer" +msgstr "responsável" + +#: ../src/about.c:281 +msgid "developer" +msgstr "responsável" + +#: ../src/about.c:289 +msgid "translation maintainer" +msgstr "responsável pela tradução" + +#: ../src/about.c:298 +msgid "Translators" +msgstr "Tradutores" + +#: ../src/about.c:318 +msgid "Previous Translators" +msgstr "Tradutores Anteriores" + +#: ../src/about.c:339 +msgid "Contributors" +msgstr "Contribuidores" + +#: ../src/about.c:349 +#, c-format +msgid "" +"Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "" +"Alguns dos muitos contribuidores (para uma lista detalhada, consultar o " +"ficheiro %s):" + +#: ../src/about.c:375 +msgid "Credits" +msgstr "Créditos" + +#: ../src/about.c:389 +msgid "License" +msgstr "Licença" + +#: ../src/about.c:398 +msgid "" +"License text could not be found, please visit http://www.gnu.org/licenses/" +"gpl-2.0.txt to view it online." +msgstr "" +"A Licença não foi encontrada, por favor visite http://www.gnu.org/licenses/" +"gpl-2.0.txt para a ler na internet." + +#. fall back to %d +#: ../src/build.c:635 +#, c-format +msgid "failed to substitute %%p, no project active" +msgstr "falha ao substituir %%p, nenhum projecto activo" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Processo falhou, directoria de trabalho inexistente" + +#: ../src/build.c:699 +#, c-format +msgid "%s (in directory: %s)" +msgstr "%s (na directoria: %s)" + +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 +#, c-format +msgid "Process failed (%s)" +msgstr "Falha no processo (%s)" + +#: ../src/build.c:790 +#, c-format +msgid "Failed to change the working directory to \"%s\"" +msgstr "Erro ao mudar a directoria de trabalho para \"%s\"" + +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Falha ao executar \"%s\" (o script de arranque não pode ser criado)" + +#: ../src/build.c:873 +msgid "" +"Could not execute the file in the VTE because it probably contains a command." +msgstr "" +"Falha ao executar o ficheiro no VTE porque provavelmente este contém um " +"comando." + +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Terminal \"%s\" não encontrado (verifique o caminho para o executável do " +"Terminal, nas preferências)" + +#: ../src/build.c:1083 +msgid "Compilation failed." +msgstr "A compilação falhou." + +#: ../src/build.c:1097 +msgid "Compilation finished successfully." +msgstr "Compilação concluída com sucesso." + +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "Texto Personalizado" + +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Introduza as opções aqui, todo o texto introduzido será passado ao comando." + +#: ../src/build.c:1333 +msgid "_Next Error" +msgstr "_Próximo Erro" + +#: ../src/build.c:1335 +msgid "_Previous Error" +msgstr "Erro _Anterior" + +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "Per_sonalizar Comandos " + +#: ../src/build.c:1625 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Gerar a partir do ficheiro seleccionado" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the default target" +msgstr "" +"Gerar a partir do ficheiro seleccionado, com o comando make e opções padrão" + +#: ../src/build.c:1641 +msgid "Build the current file with Make and the specified target" +msgstr "" +"Gerar a partir do ficheiro seleccionado, com o comando make e opções " +"personalizadas" + +#: ../src/build.c:1643 +msgid "Compile the current file with Make" +msgstr "Compila o ficheiro seleccionado com o comando make" + +#: ../src/build.c:1670 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "O processo não pôde ser parado (%s)." + +#: ../src/build.c:1687 ../src/build.c:1699 +msgid "No more build errors." +msgstr "Sem mais erros de compilação." + +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "Definir legenda de item do menu" + +#: ../src/build.c:1790 +msgid "Item" +msgstr "Item" + +#: ../src/build.c:1791 ../src/symbols.c:650 +msgid "Label" +msgstr "Rótulo" + +#: ../src/build.c:1792 ../src/symbols.c:645 +msgid "Command" +msgstr "Comando" + +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "Directoria de trabalho" + +#: ../src/build.c:1794 +msgid "Clear" +msgstr "Limpar" + +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "Clicar para definir legenda de item do menu " + +#: ../src/build.c:1906 ../src/build.c:1908 +#, c-format +msgid "%s Commands" +msgstr "Comandos %s" + +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "Nenhum Tipo de Ficheiro" + +#: ../src/build.c:1916 ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "Erro Expressão Regular:" + +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "Comandos Independentes do Tipo de Ficheiro" + +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" +"Nota: Item 2 abre uma janela de diálogo e acrescenta a resposta ao comando." + +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "Comandos para Execução" + +#: ../src/build.c:1994 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" +"%d, %e, %f, %p são substituídos em campos de comandos e directórios, " +"consulte o manual para detalhes." + +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "Personalizar Comandos" + +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "_Compilar" + +#. build the code +#: ../src/build.c:2408 ../src/build.c:2671 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Gerar" + +#: ../src/build.c:2415 ../src/build.c:2445 ../src/build.c:2638 +msgid "_Execute" +msgstr "_Executar" + +#. build the code with make custom +#: ../src/build.c:2460 ../src/build.c:2636 ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "Gerar _Personalizado" + +#. build the code with make object +#: ../src/build.c:2462 ../src/build.c:2637 ../src/build.c:2699 +msgid "Make _Object" +msgstr "Gerar _Objecto" + +#: ../src/build.c:2464 ../src/build.c:2635 +msgid "_Make" +msgstr "_Make" + +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "Gerar _todos" + +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "_Definir Comandos Personalizados do Menu" + +#: ../src/callbacks.c:150 +msgid "Do you really want to quit?" +msgstr "Tem a certeza que quer sair?" + +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] " %d ficheiro guardado." +msgstr[1] "%d ficheiros guardados." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 +msgid "_Reload" +msgstr "_Reler" + +#: ../src/callbacks.c:489 +msgid "Any unsaved changes will be lost." +msgstr "Quaisquer alterações não salvas serão perdidas." + +#: ../src/callbacks.c:490 +#, c-format +msgid "Are you sure you want to reload '%s'?" +msgstr "Tem a certeza que quer recarregar '%s'?" + +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 +msgid "Go to Line" +msgstr "Ir para a Linha" + +#: ../src/callbacks.c:1202 +msgid "Enter the line you want to go to:" +msgstr "Introduza a linha para onde quer ir:" + +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 +msgid "" +"Please set the filetype for the current file before using this function." +msgstr "" +"Por favor, defina o tipo do ficheiro seleccionado antes de usar esta função." + +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 +msgid "dd.mm.yyyy" +msgstr "dd.mm.aaaa" + +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 +msgid "mm.dd.yyyy" +msgstr "mm.dd.aaaa" + +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 +msgid "yyyy/mm/dd" +msgstr "aaaa/mm/dd" + +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.aaaa hh:mm:ss" + +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.aaaa hh:mm:ss" + +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "aaaa/mm/dd hh:mm:ss" + +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 +msgid "_Use Custom Date Format" +msgstr "_Usar um formato de data personalizado" + +#: ../src/callbacks.c:1446 +msgid "Custom Date Format" +msgstr "Formato de data personalizado" + +#: ../src/callbacks.c:1447 +msgid "" +"Enter here a custom date and time format. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Introduza aqui o formato de data e hora personalizado. Pode usar qualquer " +"tipo de descritor dos permitidos na versão ANSI C da função strftime." + +#: ../src/callbacks.c:1466 +msgid "Date format string could not be converted (possibly too long)." +msgstr "" +"O formato para a data não pode ser convertido (provavelmente é muito longo)." + +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 +msgid "No more message items." +msgstr "Sem mais mensagens." + +#: ../src/dialogs.c:144 ../src/dialogs.c:229 +msgid "Open File" +msgstr "Abrir Ficheiro" + +#: ../src/dialogs.c:148 ../src/interface.c:790 +msgid "_View" +msgstr "_Ver" + +#: ../src/dialogs.c:151 +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Abre o ficheiro em, apenas, modo de leitura. Se escolher mais do que um " +"ficheiro, todos serão abertos, exclusivamente, em modo de leitura." + +#: ../src/dialogs.c:173 +msgid "Detect by file extension" +msgstr "Detectar através da extensão do ficheiro" + +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 +msgid "Detect from file" +msgstr "Detectar a partir do ficheiro" + +#: ../src/dialogs.c:262 +msgid "_More Options" +msgstr "_Mais Opções" + +#. line 1 with checkbox and encoding combo +#: ../src/dialogs.c:269 +msgid "Show _hidden files" +msgstr "Mostrar ficheiros _ocultos" + +#: ../src/dialogs.c:280 +msgid "Set encoding:" +msgstr "Definir a codificação:" + +#: ../src/dialogs.c:290 +msgid "" +"Explicitly defines an encoding for the file, if it would not be detected. " +"This is useful when you know that the encoding of a file cannot be detected " +"correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"encoding." +msgstr "" +"Define, explicitamente, a codificação para o ficheiro se esta não for " +"detectável. Esta opção é útil quando sabe à partida que o Geany não será " +"capaz de detectar automaticamente a codificação do ficheiro.\n" +"Note que se escolher múltiplos ficheiros, todos serão abertos com a " +"codificação escolhida." + +#. line 2 with filetype combo +#: ../src/dialogs.c:297 +msgid "Set filetype:" +msgstr "Define o tipo de ficheiro:" + +#: ../src/dialogs.c:307 +msgid "" +"Explicitly defines a filetype for the file, if it would not be detected by " +"filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"filetype." +msgstr "" +"Define, explicitamente, o tipo ficheiro se este não for detectado através da " +"extensão.\n" +"Note que se escolher múltiplos ficheiros, todos serão abertos segundo o tipo " +"de ficheiro escolhido." + +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Sobrepor?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Nome de ficheiro já existente!" + +#: ../src/dialogs.c:422 ../src/dialogs.c:552 +msgid "Save File" +msgstr "Guardar Ficheiro" + +#: ../src/dialogs.c:430 +msgid "R_ename" +msgstr "R_enomear" + +#: ../src/dialogs.c:432 +msgid "Save the file and rename it" +msgstr "Guardar o ficheiro e renomeá-lo" + +#: ../src/dialogs.c:440 +msgid "_Open file in a new tab" +msgstr "_Abrir ficheiro numa nova aba" + +#: ../src/dialogs.c:442 +msgid "" +"Keep the current unsaved document open and open the newly saved file in a " +"new tab" +msgstr "" +"Manter o ficheiro actual, não salvo, aberto e abrir o ficheiro acabado de " +"guardar numa nova aba" + +#: ../src/dialogs.c:570 ../src/win32.c:681 +msgid "Error" +msgstr "Erro" + +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 +msgid "Question" +msgstr "Questão" + +#: ../src/dialogs.c:576 ../src/win32.c:693 +msgid "Warning" +msgstr "Aviso" + +#: ../src/dialogs.c:579 ../src/win32.c:699 +msgid "Information" +msgstr "Informação" + +#: ../src/dialogs.c:660 +msgid "_Don't save" +msgstr "_Não guardar" + +#: ../src/dialogs.c:691 +#, c-format +msgid "The file '%s' is not saved." +msgstr "O ficheiro '%s' não está guardado." + +#: ../src/dialogs.c:693 +msgid "Do you want to save it before closing?" +msgstr "Quer guardar o ficheiro antes de fechar?" + +#: ../src/dialogs.c:768 +msgid "Choose font" +msgstr "Escolha o tipo de letra" + +#: ../src/dialogs.c:1057 +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"Ocorreu um erro ou informação sobre o ficheiro não pode ser obtida (e.x. um " +"novo ficheiro)." + +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 +msgid "unknown" +msgstr "desconhecido" + +#: ../src/dialogs.c:1091 ../src/symbols.c:800 +msgid "Properties" +msgstr "Propriedades" + +#: ../src/dialogs.c:1120 +msgid "Type:" +msgstr "Tipo:" + +#: ../src/dialogs.c:1134 +msgid "Size:" +msgstr "Tamanho:" + +#: ../src/dialogs.c:1150 +msgid "Location:" +msgstr "Localização:" + +#: ../src/dialogs.c:1164 +msgid "Read-only:" +msgstr "Só de Leitura:" + +#: ../src/dialogs.c:1171 +msgid "(only inside Geany)" +msgstr "(apenas dentro do Geany)" + +#: ../src/dialogs.c:1180 +msgid "Encoding:" +msgstr "Codificação:" + +#. BOM = byte order mark +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 +msgid "(with BOM)" +msgstr "(com BOM)" + +#: ../src/dialogs.c:1190 +msgid "(without BOM)" +msgstr "(sem BOM)" + +#: ../src/dialogs.c:1201 +msgid "Modified:" +msgstr "Modificado:" + +#: ../src/dialogs.c:1215 +msgid "Changed:" +msgstr "Alterado:" + +#: ../src/dialogs.c:1229 +msgid "Accessed:" +msgstr "Acedido:" + +#: ../src/dialogs.c:1251 +msgid "Permissions:" +msgstr "Permissões:" + +#. Header +#: ../src/dialogs.c:1259 +msgid "Read:" +msgstr "Leitura:" + +#: ../src/dialogs.c:1266 +msgid "Write:" +msgstr "Escrita:" + +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Executar:" + +#. Owner +#: ../src/dialogs.c:1281 +msgid "Owner:" +msgstr "Dono:" + +#. Group +#: ../src/dialogs.c:1317 +msgid "Group:" +msgstr "Grupo:" + +#. Other +#: ../src/dialogs.c:1353 +msgid "Other:" +msgstr "Outros:" + +#: ../src/document.c:648 +#, c-format +msgid "File %s closed." +msgstr "Ficheiro %s fechado." + +#: ../src/document.c:775 +#, c-format +msgid "New file \"%s\" opened." +msgstr "Novo ficheiro, \\\"%s\\\" aberto." + +#: ../src/document.c:948 ../src/document.c:1464 +#, c-format +msgid "Could not open file %s (%s)" +msgstr "Impossível abrir o ficheiro %s (%s)" + +#: ../src/document.c:978 +#, c-format +msgid "" +"The file \"%s\" could not be opened properly and has been truncated. This " +"can occur if the file contains a NULL byte. Be aware that saving it can " +"cause data loss.\n" +"The file was set to read-only." +msgstr "" +"O ficheiro \"%s\" não pode ser aberto correctamente e foi truncado (há " +"partes omitidas). Isto pode ocorrer caso o ficheiro contenha o byte NULL. " +"Muita atenção que se o salvar, informação deste poderá perder-se.\n" +"O ficheiro foi definido como apenas de leitura." + +#. For translators: the second wildcard is an encoding name, e.g. +#. * The file \"test.txt\" is not valid UTF-8. +#: ../src/document.c:1004 +#, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "O ficheiro \\\"%s\\\" não é válido %s." + +#: ../src/document.c:1014 +#, c-format +msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"O ficheiro \\\"%s\\\" não parece ser um ficheiro de texto ou a sua " +"codificação não é suportada." + +#: ../src/document.c:1163 +msgid "Spaces" +msgstr "Espaços" + +#: ../src/document.c:1166 +msgid "Tabs" +msgstr "Tabulações" + +#: ../src/document.c:1169 +msgid "Tabs and Spaces" +msgstr "Tabulações e Espaços" + +#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs +#. * and Spaces), the second one is the filename +#: ../src/document.c:1174 +#, c-format +msgid "Setting %s indentation mode for %s." +msgstr "Definindo modo de indentação com %s para o ficheiro %s." + +#: ../src/document.c:1227 +msgid "Invalid filename" +msgstr "Nome de ficheiro inválido" + +#: ../src/document.c:1342 +#, c-format +msgid "File %s reloaded." +msgstr "Ficheiro %s recarregado." + +#. For translators: this is the status window message for opening a file. %d is the number +#. * of the newly opened file, %s indicates whether the file is opened read-only +#. * (it is replaced with the string ", read-only"). +#: ../src/document.c:1347 +#, c-format +msgid "File %s opened(%d%s)." +msgstr "Ficheiro %s aberto(%d%s)." + +#: ../src/document.c:1349 +msgid ", read-only" +msgstr ", só de leitura" + +#: ../src/document.c:1558 +msgid "Error renaming file." +msgstr "Erro ao renomear o ficheiro." + +#: ../src/document.c:1643 +#, c-format +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved." +msgstr "" +"Ocorreu um erro ao converter o ficheiro de UTF-8 para %s. O ficheiro não se " +"encontra guardado." + +#: ../src/document.c:1665 +#, c-format +msgid "" +"Error message: %s\n" +"The error occurred at \"%s\" (line: %d, column: %d)." +msgstr "" +"Mensagem de erro: %s\n" +"O erro ocorreu em \\\"%s\\\" (linha: %d, coluna: %d)." + +#: ../src/document.c:1670 +#, c-format +msgid "Error message: %s." +msgstr "Mensagem de erro: %s." + +#: ../src/document.c:1770 ../src/document.c:1833 +msgid "Error saving file." +msgstr "Erro ao guardar ficheiro." + +#: ../src/document.c:1832 +#, c-format +msgid "Error saving file (%s)." +msgstr "Erro ao guardar o ficheiro (%s)." + +#: ../src/document.c:1857 +#, c-format +msgid "File %s saved." +msgstr "Ficheiro %s guardado." + +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 +#, c-format +msgid "\"%s\" was not found." +msgstr "\\\"%s\\\" não foi encontrado." + +#: ../src/document.c:1990 +msgid "Wrap search and find again?" +msgstr "Terminar esta pesquisa e procurar outra vez do início?" + +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 +#, c-format +msgid "No matches found for \"%s\"." +msgstr "Ocorrências de \\\"%s\\\" não encontradas." + +#: ../src/document.c:2080 ../src/document.c:2089 +#, c-format +msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." +msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." +msgstr[0] "%s: substituída %d ocorrência de \\\"%s\\\" por \\\"%s\\\"." +msgstr[1] "%s: substituídas %d ocorrências de \\\"%s\\\" por \\\"%s\\\"." + +#: ../src/document.c:2896 +msgid "Do you want to reload it?" +msgstr "Pretende recarregá-lo?" + +#: ../src/document.c:2897 +#, c-format +msgid "" +"The file '%s' on the disk is more recent than\n" +"the current buffer." +msgstr "" +"O ficheiro '%s' em disco é mais recente do\n" +"que o actualmente em memória." + +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Fechar _sem guardar" + +#: ../src/document.c:2919 +#, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "Ficheiro \"%s\" não encontrado em disco! Voltar a guardar o ficheiro?" + +#: ../src/editor.c:4425 +msgid "Enter Tab Width" +msgstr "Introduza a largura da tabulação" + +#: ../src/editor.c:4426 +msgid "Enter the amount of spaces which should be replaced by a tab character." +msgstr "Introduza o número de espaços a serem substituídos por uma tabulação." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Aviso: Largura de tabulação não padrão: %d != 8!" + +#: ../src/encodings.c:76 +msgid "Celtic" +msgstr "Céltico" + +#: ../src/encodings.c:77 ../src/encodings.c:78 +msgid "Greek" +msgstr "Grego" + +#: ../src/encodings.c:79 +msgid "Nordic" +msgstr "Nórdico" + +#: ../src/encodings.c:80 +msgid "South European" +msgstr "Europeu do Sul" + +#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:84 +msgid "Western" +msgstr "Ocidental" + +#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +msgid "Baltic" +msgstr "Báltico" + +#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +msgid "Central European" +msgstr "Europeu Central" + +#. ISO-IR-111 not available on Windows +#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 +#: ../src/encodings.c:96 ../src/encodings.c:97 +msgid "Cyrillic" +msgstr "Cirílico" + +#: ../src/encodings.c:98 +msgid "Cyrillic/Russian" +msgstr "Cirílico/Russo" + +#: ../src/encodings.c:99 +msgid "Cyrillic/Ukrainian" +msgstr "Cirílico/Ucraniano" + +#: ../src/encodings.c:100 +msgid "Romanian" +msgstr "Romeno" + +#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +msgid "Arabic" +msgstr "Árabe" + +#. not available at all, ? +#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +msgid "Hebrew" +msgstr "Hebreu" + +#: ../src/encodings.c:109 +msgid "Hebrew Visual" +msgstr "Hebraico Visual" + +#: ../src/encodings.c:111 +msgid "Armenian" +msgstr "Arménio" + +#: ../src/encodings.c:112 +msgid "Georgian" +msgstr "Geórgio" + +#: ../src/encodings.c:113 +msgid "Thai" +msgstr "Tailandês" + +#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +msgid "Turkish" +msgstr "Turco" + +#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +msgid "Vietnamese" +msgstr "Vietnamita" + +#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 +#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 +#: ../src/encodings.c:127 ../src/encodings.c:128 +msgid "Unicode" +msgstr "Unicode" + +#. maybe not available on Linux +#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:134 +msgid "Chinese Simplified" +msgstr "Chinês Simplificado" + +#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +msgid "Chinese Traditional" +msgstr "Chinês Tradicional" + +#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 +msgid "Japanese" +msgstr "Japonês" + +#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:145 +msgid "Korean" +msgstr "Coreano" + +#: ../src/encodings.c:147 +msgid "Without encoding" +msgstr "Sem codificação" + +#: ../src/encodings.c:375 +msgid "_West European" +msgstr "Europeu do _Ocidente" + +#: ../src/encodings.c:381 +msgid "_East European" +msgstr "Europeu do L_este" + +#: ../src/encodings.c:387 +msgid "East _Asian" +msgstr "_Asiático do Leste" + +#: ../src/encodings.c:393 +msgid "_SE & SW Asian" +msgstr "_SE & SO Asiáticos" + +#: ../src/encodings.c:399 +msgid "_Middle Eastern" +msgstr "_Médio Oriente" + +#: ../src/encodings.c:405 +msgid "_Unicode" +msgstr "_Unicode" + +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 +#, c-format +msgid "%s source file" +msgstr "Ficheiro de código %s" + +#: ../src/filetypes.c:102 +#, c-format +msgid "%s file" +msgstr "Ficheiro %s" + +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 +msgid "None" +msgstr "Nenhum(a)" + +#: ../src/filetypes.c:409 +msgid "Shell script file" +msgstr "Script de Consola" + +#: ../src/filetypes.c:421 +msgid "Makefile" +msgstr "Makefile" + +#: ../src/filetypes.c:433 +msgid "XML document" +msgstr "documento XML" + +#: ../src/filetypes.c:468 +msgid "Cascading StyleSheet" +msgstr "Folha de Estilo em Cascata" + +#: ../src/filetypes.c:479 +msgid "SQL Dump file" +msgstr "Ficheiro de despejo, SQL" + +#: ../src/filetypes.c:534 +msgid "Config file" +msgstr "Ficheiro de configuração" + +#: ../src/filetypes.c:546 +msgid "Gettext translation file" +msgstr "Ficheiro de tradução Gettext" + +#: ../src/filetypes.c:579 +#, c-format +msgid "%s script file" +msgstr "script %s" + +#: ../src/filetypes.c:826 +msgid "_Programming Languages" +msgstr "Linguagens de _Programação" + +#: ../src/filetypes.c:827 +msgid "_Scripting Languages" +msgstr "Linguagens de _Script" + +#: ../src/filetypes.c:828 +msgid "_Markup Languages" +msgstr "Linguagens de _Marcação" + +#: ../src/filetypes.c:829 +msgid "M_iscellaneous Languages" +msgstr "Linguagens Var_iadas" + +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Definir _Tipos de Ficheiro" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 +msgid "All Source" +msgstr "Todo o Código" + +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 +msgid "All files" +msgstr "Todos os ficheiros" + +#: ../src/filetypes.c:1487 +#, c-format +msgid "Bad regex for filetype %s: %s" +msgstr "Má expressão regular para ficheiros do tipo %s: %s" + +#: ../src/geany.h:52 +msgid "untitled" +msgstr "sem título" + +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Não foi possível encontrar o ficheiro '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "_Esquemas de Cor" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Omissão" + +#: ../src/interface.c:295 +msgid "_File" +msgstr "_Ficheiro" + +#: ../src/interface.c:306 +msgid "New (with _Template)" +msgstr "Novo (com _Modelo)" + +#: ../src/interface.c:323 ../src/interface.c:2022 +msgid "Open Selected F_ile" +msgstr "Abrir _Ficheiro Seleccionado" + +#: ../src/interface.c:327 +msgid "Recent _Files" +msgstr "_Ficheiros Recentes" + +#: ../src/interface.c:344 +msgid "Save A_ll" +msgstr "Sa_lvar tudo" + +#: ../src/interface.c:360 +msgid "R_eload As" +msgstr "R_eler como" + +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "invisível" + +#: ../src/interface.c:388 +msgid "Page Set_up" +msgstr "Config_uração de Página" + +#: ../src/interface.c:405 ../src/notebook.c:214 +msgid "Close Ot_her Documents" +msgstr "Fec_har os outros Documentos" + +#: ../src/interface.c:413 ../src/notebook.c:219 +msgid "C_lose All" +msgstr "F_echar Tudo" + +#: ../src/interface.c:430 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/interface.c:480 ../src/interface.c:2031 +msgid "_Format" +msgstr "_Formatar" + +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "_Reformatar linhas/bloco" + +#: ../src/interface.c:491 +msgid "T_oggle Case of Selection" +msgstr "C_omuta, a selecção, entre maiúsculas/minúsculas" + +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "_Transpor a linha actual" + +#: ../src/interface.c:504 +msgid "_Comment Line(s)" +msgstr "_Comentar Linha(s)" + +#: ../src/interface.c:508 +msgid "U_ncomment Line(s)" +msgstr "Descome_ntar Linhas(s)" + +#: ../src/interface.c:512 +msgid "_Toggle Line Commentation" +msgstr "Comu_ta entre comentar e não comentar, a linha" + +#: ../src/interface.c:521 +msgid "_Increase Indent" +msgstr "Aumentar a _indentação" + +#: ../src/interface.c:529 +msgid "_Decrease Indent" +msgstr "_Diminuir a indentação" + +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Indentar a linha de forma inteligente" + +#: ../src/interface.c:546 +msgid "_Send Selection to" +msgstr "Enviar a _selecção para" + +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Comandos" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Cortar a linha ou linhas actuais" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Copiar a linha ou linhas actuais" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Apagar a linha ou linhas actuais" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Duplica a linha ou a selecção" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "_Seleccionar a linha ou linhas actuais" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "_Seleccionar o parágrafo actual" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "_Inserir espaço em branco alternativo" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "_Ir para a próxima marca" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "_Ir para a marca anterior" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Enviar o _Seleccionado para o Terminal" + +#: ../src/interface.c:636 ../src/interface.c:2044 +msgid "I_nsert Comments" +msgstr "I_nserir Comentários" + +#: ../src/interface.c:647 ../src/interface.c:2055 +msgid "Insert _ChangeLog Entry" +msgstr "Adicionar entrada ao registo de alterações (_changelog)" + +#: ../src/interface.c:651 ../src/interface.c:2059 +msgid "Insert File _Header" +msgstr "Inserir Ficheiro de Ca_beçalho" + +#: ../src/interface.c:655 ../src/interface.c:2063 +msgid "Insert _Function Description" +msgstr "Inserir Descrição de _Função" + +#: ../src/interface.c:659 ../src/interface.c:2067 +msgid "Insert _Multiline Comment" +msgstr "Insere Comentário _Multi-linha" + +#: ../src/interface.c:663 ../src/interface.c:2071 +msgid "Insert _GPL Notice" +msgstr "Insere a licença _GPL" + +#: ../src/interface.c:667 ../src/interface.c:2075 +msgid "Insert _BSD License Notice" +msgstr "Insere a licença _BSD" + +#: ../src/interface.c:671 ../src/interface.c:2079 +msgid "Insert Dat_e" +msgstr "Ins_erir Data" + +#: ../src/interface.c:685 ../src/interface.c:2093 +msgid "_Insert \"include <...>\"" +msgstr "_Inserir \"include <...>\"" + +#: ../src/interface.c:704 +msgid "Preference_s" +msgstr "Preferência_s" + +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Preferências de P_lugin" + +#: ../src/interface.c:720 +msgid "_Search" +msgstr "Pe_squisar" + +#: ../src/interface.c:731 +msgid "Find _Next" +msgstr "Procurar o Pró_ximo" + +#: ../src/interface.c:735 +msgid "Find _Previous" +msgstr "Procurar o _Anterior" + +#: ../src/interface.c:739 +msgid "Find in F_iles" +msgstr "Pesquisar em F_icheiros" + +#: ../src/interface.c:743 ../src/search.c:551 +msgid "_Replace" +msgstr "_Substituir" + +#: ../src/interface.c:756 +msgid "Find _Selected" +msgstr "Procurar a _selecção" + +#: ../src/interface.c:760 +msgid "Find Pre_vious Selected" +msgstr "Procurar, para _trás, a selecção" + +#: ../src/interface.c:769 +msgid "Next _Message" +msgstr "Próxima _Mensagem" + +#: ../src/interface.c:773 +msgid "Pr_evious Message" +msgstr "Mensagem Ant_erior" + +#: ../src/interface.c:782 ../src/interface.c:2145 +msgid "_Go to Line" +msgstr "_Ir Para a Linha" + +#: ../src/interface.c:797 +msgid "Change _Font" +msgstr "Alterar tipo de _Letra" + +#: ../src/interface.c:810 +msgid "To_ggle All Additional Widgets" +msgstr "Activar todos os Wid_gets adicionais" + +#: ../src/interface.c:814 +msgid "Full_screen" +msgstr "Ecrã _Completo" + +#: ../src/interface.c:818 +msgid "Show Message _Window" +msgstr "Mostrar _Janela de Mensagens" + +#: ../src/interface.c:823 +msgid "Show _Toolbar" +msgstr "Mostrar Barra de Ferramen_tas" + +#: ../src/interface.c:828 +msgid "Show Side_bar" +msgstr "Mostrar _Barra Lateral" + +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 +msgid "Editor" +msgstr "Editor" + +#: ../src/interface.c:840 +msgid "Show _Markers Margin" +msgstr "Mostrar _Marcadores de Margens" + +#: ../src/interface.c:845 +msgid "Show _Line Numbers" +msgstr "Mostrar Números de _Linha" + +#: ../src/interface.c:850 +msgid "Show _White Space" +msgstr "Mostrar Espaços em _Branco" + +#: ../src/interface.c:854 +msgid "Show Line _Endings" +msgstr "Mostrar T_erminação de Linha" + +#: ../src/interface.c:858 +msgid "Show _Indentation Guides" +msgstr "Mostrar as Guias de _Indentação" + +#: ../src/interface.c:879 +msgid "_Document" +msgstr "_Documento" + +#: ../src/interface.c:886 +msgid "_Line Wrapping" +msgstr "Mudança de _Linha" + +#: ../src/interface.c:891 +msgid "Line _Breaking" +msgstr "Que_bra de Linha" + +#: ../src/interface.c:895 +msgid "_Auto-indentation" +msgstr "Indentação _Automática" + +#: ../src/interface.c:900 +msgid "In_dent Type" +msgstr "Tipo de In_dentação" + +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 +msgid "_Tabs" +msgstr "_Tabulações" + +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 +msgid "_Spaces" +msgstr "E_spaços" + +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 +msgid "T_abs and Spaces" +msgstr "T_abulações e Espaços" + +#: ../src/interface.c:930 +msgid "Read _Only" +msgstr "Leitura _Apenas" + +#: ../src/interface.c:934 +msgid "_Write Unicode BOM" +msgstr "_Escrever o caractere unicode de BOM" + +#: ../src/interface.c:943 +msgid "Set File_type" +msgstr "Definir _Tipo de Ficheiro" + +#: ../src/interface.c:953 +msgid "Set _Encoding" +msgstr "Definir _Codificação" + +#: ../src/interface.c:963 +msgid "Set Line E_ndings" +msgstr "Definir o Terminador de Li_nha" + +#: ../src/interface.c:970 +msgid "Convert and Set to _CR/LF (Win)" +msgstr "Converter e definir para _CR/LF (Win)" + +#: ../src/interface.c:976 +msgid "Convert and Set to _LF (Unix)" +msgstr "Converter e definir para _LF (Unix)" + +#: ../src/interface.c:982 +msgid "Convert and Set to CR (_Mac)" +msgstr "Converter e definir para CR (_Mac)" + +#: ../src/interface.c:993 +msgid "_Strip Trailing Spaces" +msgstr "Remover E_spaços do Final da Linha" + +#: ../src/interface.c:997 +msgid "_Replace Tabs by Spaces" +msgstr "Substitui_r Tabulações por Espaços" + +#: ../src/interface.c:1001 +msgid "Replace Spaces b_y Tabs" +msgstr "Substituir Espaços _por Tabulações" + +#: ../src/interface.c:1010 +msgid "_Fold All" +msgstr "_Agregar Tudo" + +#: ../src/interface.c:1014 +msgid "_Unfold All" +msgstr "Desa_gregar Tudo" + +#: ../src/interface.c:1023 +msgid "Remove _Markers" +msgstr "Remover _Marcadores" + +#: ../src/interface.c:1027 +msgid "Remove Error _Indicators" +msgstr "Remover _Indicadores de Erro" + +#: ../src/interface.c:1031 +msgid "_Project" +msgstr "_Projecto" + +#: ../src/interface.c:1038 +msgid "_New" +msgstr "_Novo" + +#: ../src/interface.c:1046 +msgid "_Open" +msgstr "_Abrir" + +#: ../src/interface.c:1054 +msgid "_Recent Projects" +msgstr "Projectos _Recentes" + +#: ../src/interface.c:1058 +msgid "_Close" +msgstr "Fe_char" + +#: ../src/interface.c:1079 +msgid "_Tools" +msgstr "Ferramen_tas" + +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Recarregar a Configuração" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Ficheiros de C_onfiguração" + +#: ../src/interface.c:1107 +msgid "_Color Chooser" +msgstr "Escolher _Cores" + +#: ../src/interface.c:1115 +msgid "_Word Count" +msgstr "Contar _Palavras" + +#: ../src/interface.c:1119 +msgid "Load Ta_gs" +msgstr "Carre_gar Etiquetas (Tags)" + +#: ../src/interface.c:1123 ../src/interface.c:1130 +msgid "_Help" +msgstr "_Ajuda" + +#: ../src/interface.c:1138 +msgid "_Website" +msgstr "Página _Web" + +#: ../src/interface.c:1142 +msgid "_Keyboard Shortcuts" +msgstr "_Atalhos de Teclado" + +#: ../src/interface.c:1146 +msgid "_Debug Messages" +msgstr "Mensagens de _Depuração (debug)" + +#: ../src/interface.c:1185 ../src/sidebar.c:130 +msgid "Symbols" +msgstr "Símbolos" + +#: ../src/interface.c:1199 +msgid "Documents" +msgstr "Documentos" + +#: ../src/interface.c:1235 +msgid "Status" +msgstr "Estado" + +#: ../src/interface.c:1249 +msgid "Compiler" +msgstr "Compilador" + +#: ../src/interface.c:1264 +msgid "Messages" +msgstr "Mensagens" + +#: ../src/interface.c:1277 +msgid "Scribble" +msgstr "Rabiscar" + +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Preferências da Barra de _Ferramentas" + +#: ../src/interface.c:1900 +msgid "_Hide Toolbar" +msgstr "_Ocultar a Barra de Ferramentas" + +#: ../src/interface.c:2112 +msgid "Find _Usage" +msgstr "Procurar _Uso" + +#: ../src/interface.c:2120 +msgid "Find _Document Usage" +msgstr "Descobrir utilização do _Documento" + +#: ../src/interface.c:2128 +msgid "Go to _Tag Definition" +msgstr "Ir para a definição da Etiqueta (_Tag)" + +#: ../src/interface.c:2132 +msgid "Go to T_ag Declaration" +msgstr "Ir para a declaração da Etiqueta (T_ag)" + +#: ../src/interface.c:2136 +msgid "Conte_xt Action" +msgstr "Conte_xto da Acção" + +#: ../src/interface.c:2669 ../src/keybindings.c:387 +msgid "Preferences" +msgstr "Preferências" + +#: ../src/interface.c:2705 +msgid "Load files from the last session" +msgstr "Carregar ficheiros da última sessão" + +#: ../src/interface.c:2708 +msgid "Opens at startup the files from the last session" +msgstr "Abre ao iniciar os ficheiros da última sessão" + +#: ../src/interface.c:2710 +msgid "Load virtual terminal support" +msgstr "Carregar suporte para terminal virtual" + +#: ../src/interface.c:2712 +msgid "" +"Whether the virtual terminal emulation (VTE) should be loaded at startup, " +"disable it if you do not need it" +msgstr "" +"Se a emulação virtual do terminal (VTE) deverá ser carregada no arranque, " +"desactive-a caso não precise" + +#: ../src/interface.c:2714 +msgid "Enable plugin support" +msgstr "Activar o suporte de Plugins" + +#: ../src/interface.c:2718 +msgid "Startup" +msgstr "Início" + +#: ../src/interface.c:2737 +msgid "Save window position and geometry" +msgstr "Salvar posição e geometria da janela" + +#: ../src/interface.c:2740 +msgid "Saves the window position and geometry and restores it at the start" +msgstr "Salva a posição e geometria da janela e restaura-as no arranque" + +#: ../src/interface.c:2742 +msgid "Confirm exit" +msgstr "Confirmar saída" + +#: ../src/interface.c:2745 +msgid "Shows a confirmation dialog on exit" +msgstr "Mostrar janela de confirmação ao sair" + +#: ../src/interface.c:2747 +msgid "Shutdown" +msgstr "Desligar" + +#: ../src/interface.c:2768 +msgid "Startup path:" +msgstr "Caminho Inicial:" + +#: ../src/interface.c:2780 +msgid "" +"Path to start in when opening or saving files. Must be an absolute path. " +"Leave blank to use the current working directory." +msgstr "" +"Caminho onde começar quando abrir ou salvar ficheiros. Tem de ser um caminho " +"absoluto. Deixe em branco para usar a directoria, de trabalho, actual." + +#: ../src/interface.c:2793 +msgid "Project files:" +msgstr "Ficheiros de projecto:" + +#: ../src/interface.c:2805 +msgid "Path to start in when opening project files" +msgstr "Caminho onde começar quando abrir ficheiros de projecto" + +#: ../src/interface.c:2818 +msgid "Extra plugin path:" +msgstr "Directório para plugins extra:" + +#: ../src/interface.c:2830 +msgid "" +"Geany looks by default in the global installation path and in the " +"configuration directory. The path entered here will be searched additionally " +"for plugins. Leave blank to disable." +msgstr "" +"Por norma o Geany procura no directório de instalação e na directoria de " +"configurações. O directório aqui introduzido será usado para procurar mais " +"plugins. Deixe o campo em branco para desactivar." + +#: ../src/interface.c:2843 +msgid "Paths" +msgstr "Caminhos" + +#: ../src/interface.c:2848 +msgid "Startup" +msgstr "Iniciar" + +#: ../src/interface.c:2871 +msgid "Beep on errors or when compilation has finished" +msgstr "Apitar quando ocorrerem erros ou compilações terminarem" + +#: ../src/interface.c:2874 +msgid "" +"Whether to beep if an error occurred or when the compilation process has " +"finished" +msgstr "" +"Se um som deve ser produzido quando um erro ocorre ou um compilação termina" + +#: ../src/interface.c:2876 +msgid "Switch to status message list at new message" +msgstr "Mudar para lista de mensagem de estado quando existir nova mensagem" + +#: ../src/interface.c:2879 +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives" +msgstr "" +"Mudar para a aba de mensagens de estado (na janela principal, em baixo) caso " +"uma nova mensagem apareça" + +#: ../src/interface.c:2881 +msgid "Suppress status messages in the status bar" +msgstr "Suprimir mensagens de estado na barra de estado" + +#: ../src/interface.c:2884 +msgid "" +"Removes all messages from the status bar. The messages are still displayed " +"in the status messages window." +msgstr "" +"Remove todas as mensagens da barra de estado. As mensagens são à mesma " +"mostradas na janela de mensagens de estado." + +#: ../src/interface.c:2886 +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "Auto-Focar widgets (o foco segue o rato)" + +#: ../src/interface.c:2889 +msgid "" +"Gives the focus automatically to widgets below the mouse cursor. Works for " +"the main editor widget, the scribble, the toolbar search and goto line " +"fields and the VTE." +msgstr "" +"Foca/Realça automaticamente os widgets que se encontram debaixo do cursor do " +"rato. Funciona na principal janela de edição, no widget \"Rabiscar\", na " +"barra de procura, nos campos de \"Ir para linha\" e no VTE." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Usar diálogos de Abrir/Guardar ficheiros, do Windows" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Define se se devem utilizar os diálogos de Abrir/Guardar nativos do Windows " +"ou os do GTK" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 +msgid "Miscellaneous" +msgstr "Vários" + +#: ../src/interface.c:2915 +msgid "Always wrap search and hide the Find dialog" +msgstr "Pesquisar sempre em todo o documento e esconder a janela de procura" + +#: ../src/interface.c:2918 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Pesquisar sempre em todo o documento (não termina nem no fim, nem no início " +"deste) e esconde a janela de procura após seleccionar Procura Seguinte/" +"Anterior" + +#: ../src/interface.c:2920 +msgid "Use the current word under the cursor for Find dialogs" +msgstr "Usar a palavra onde se encontra o cursor, nos campos de Procura" + +#: ../src/interface.c:2923 +msgid "" +"Use current word under the cursor when opening the Find, Find in Files or " +"Replace dialog and there is no selection" +msgstr "" +"Usar a palavra onde se encontra o cursor quando realizar uma Procura, uma " +"Procura em Ficheiros ou uma Substituição, no caso de não haver uma palavra " +"seleccionada" + +#: ../src/interface.c:2925 +msgid "Use the current file's directory for Find in Files" +msgstr "Usar a directoria actual quando executar a \"Procura em Ficheiros\"" + +#: ../src/interface.c:2929 +msgid "Search" +msgstr "Procurar" + +#: ../src/interface.c:2948 +msgid "Use project-based session files" +msgstr "Usar ficheiros de sessão, por projecto" + +#: ../src/interface.c:2951 +msgid "" +"Whether to store a project's session files and open them when re-opening the " +"project" +msgstr "" +"Se os ficheiros de sessão do projecto devem ser guardados e abertos aquando " +"da reabertura do projecto" + +#: ../src/interface.c:2953 +msgid "Store project file inside the project base directory" +msgstr "Guardar o ficheiro de projecto na directoria base do projecto" + +#: ../src/interface.c:2956 +msgid "" +"When enabled, a project file is stored by default inside the project base " +"directory when creating new projects instead of one directory above the base " +"directory. You can still change the path of the project file in the New " +"Project dialog." +msgstr "" +"Quando activo, o ficheiro de projecto é guardado, por norma, dentro da " +"directoria base do projecto (ao criar um novo), ao invés de ser guardado um " +"nível a cima desta. Pode, no entanto, alterar o directório do ficheiro de " +"projecto na janela de Novo Projecto." + +#: ../src/interface.c:2958 +msgid "Projects" +msgstr "Projectos" + +#: ../src/interface.c:2963 +msgid "Miscellaneous" +msgstr "Vários" + +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 +msgid "General" +msgstr "Geral" + +#: ../src/interface.c:3004 +msgid "Show symbol list" +msgstr "Mostra a lista de símbolos" + +#: ../src/interface.c:3007 +msgid "Toggle the symbol list on and off" +msgstr "Mostra/Oculta a lista de símbolos" + +#: ../src/interface.c:3009 +msgid "Show documents list" +msgstr "Mostrar lista de documentos" + +#: ../src/interface.c:3012 +msgid "Toggle the documents list on and off" +msgstr "Mostra/Oculta a lista de documentos" + +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Mostrar Barra Lateral" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Posição:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Esquerda" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Direita" + +#: ../src/interface.c:3039 +msgid "Sidebar" +msgstr "Barra Lateral" + +#: ../src/interface.c:3060 +msgid "Symbol list:" +msgstr "Lista Símbolos:" + +#: ../src/interface.c:3067 ../src/interface.c:3197 +msgid "Message window:" +msgstr "Janela de Mensagens:" + +#: ../src/interface.c:3074 ../src/interface.c:3233 +msgid "Editor:" +msgstr "Editor:" + +#: ../src/interface.c:3086 +msgid "Sets the font for the message window" +msgstr "Define o tipo de letra para a janela de mensagens" + +#: ../src/interface.c:3094 +msgid "Sets the font for the symbol list" +msgstr "Define o tipo de letra para a lista de símbolos" + +#: ../src/interface.c:3102 +msgid "Sets the editor font" +msgstr "Define o tipo de letra do editor" + +#: ../src/interface.c:3104 +msgid "Fonts" +msgstr "Tipos de Letra" + +#: ../src/interface.c:3123 +msgid "Show editor tabs" +msgstr "Mostrar separadores de ficheiro no editor" + +#: ../src/interface.c:3127 +msgid "Show close buttons" +msgstr "Mostrar botões para fechar" + +#: ../src/interface.c:3130 +msgid "" +"Shows a small cross button in the file tabs to easily close files when " +"clicking on it (requires restart of Geany)" +msgstr "" +"Mostra uma pequena cruz no separador do ficheiro, para o fechar ao clicar " +"nesta (será necessário reiniciar o Geany)" + +#: ../src/interface.c:3136 +msgid "Placement of new file tabs:" +msgstr "Localização do separador para um novo ficheiro:" + +#: ../src/interface.c:3152 +msgid "File tabs will be placed on the left of the notebook" +msgstr "Separadores de ficheiros serão colocados à esquerda dos já existentes" + +#: ../src/interface.c:3160 +msgid "File tabs will be placed on the right of the notebook" +msgstr "Separadores de ficheiros serão colocados à direita dos já existentes" + +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "A seguir ao activo" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"Se se devem colocar abas a seguir à aba actual, ao invés, de na extremidade " +"do bloco" + +#: ../src/interface.c:3171 +msgid "Double-clicking hides all additional widgets" +msgstr "Fazer um clique duplo esconde todos os widgets adicionais" + +#: ../src/interface.c:3174 +msgid "Calls the View->Toggle All Additional Widgets command" +msgstr "" +"Executa o comando em Ver -> Activa/Desactiva todos os widgets adicionais" + +#: ../src/interface.c:3176 +msgid "Editor tabs" +msgstr "Separadores do Editor" + +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 +msgid "Top" +msgstr "Topo" + +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 +msgid "Bottom" +msgstr "Fundo" + +#: ../src/interface.c:3215 +msgid "Sidebar:" +msgstr "Barra Lateral:" + +#: ../src/interface.c:3251 +msgid "Tab positions" +msgstr "Posição dos Separadores" + +#: ../src/interface.c:3270 +msgid "Show status bar" +msgstr "Apresentar barra de estados" + +#: ../src/interface.c:3273 +msgid "Whether to show the status bar at the bottom of the main window" +msgstr "" +"Se a barra de estado deve aparecer, no fundo da janela principal do programa" + +#: ../src/interface.c:3280 ../src/prefs.c:1527 +msgid "Interface" +msgstr "Interface" + +#: ../src/interface.c:3311 +msgid "Show T_oolbar" +msgstr "M_ostrar a Barra de Ferramentas" + +#: ../src/interface.c:3315 +msgid "_Append Toolbar to the Menu" +msgstr "_Acrescentar a Barra de Ferramentas ao Menu" + +#: ../src/interface.c:3318 +msgid "Pack the toolbar to the main menu to save vertical space" +msgstr "" +"Acondiciona a Barra de Ferramentas no menu principal de modo a poupar espaço " +"vertical no editor" + +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Personalizar a Barra de Ferramentas" + +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Omissão _do Sistema" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Im_agens e Texto" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Apenas _Imagens" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Apenas _Texto" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Estilo dos Ícones" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "_Omissão do Sistema" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Ícones _Pequenos" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Ícones _Muito Pequenos" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Ícones _Grandes" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Tamanho dos Ícones:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Barra de Ferramentas" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 +msgid "Toolbar" +msgstr "Barra de Ferramentas" + +#: ../src/interface.c:3482 +msgid "Line wrapping" +msgstr "Translinear" + +#: ../src/interface.c:3485 +msgid "" +"Wrap the line at the window border and continue it on the next line. Note: " +"line wrapping has a high performance cost for large documents so should be " +"disabled on slow machines." +msgstr "" +"Mudar de linha ao atingir o fim da janela, continuando a escrita na linha " +"seguinte. Note: mudar de linha ao escrever tem um enorme custo de computação " +"em ficheiros grandes e como tal deve ser desactivada em computadores fracos." + +#: ../src/interface.c:3487 +msgid "Enable \"smart\" home key" +msgstr "Activar tecla \"Home\" inteligente" + +#: ../src/interface.c:3490 +msgid "" +"When \"smart\" home is enabled, the HOME key will move the caret to the " +"first non-blank character of the line, unless it is already there, it moves " +"to the very beginning of the line. When this feature is disabled, the HOME " +"key always moves the caret to the start of the current line, regardless of " +"its current position." +msgstr "" +"Quando a função tecla \"Home\" inteligente está activada, o pressionar desta " +"tecla move o cursor para o primeiro caractere não branco da linha, excepto " +"se já estiver nessa posição, caso em que este será movido mesmo para o " +"início da linha. Se esta funcionalidade estiver desactivada, a tecla \"Home" +"\" moverá sempre o cursor para o inicio da linha actual, independentemente " +"da sua posição." + +#: ../src/interface.c:3492 +msgid "Disable Drag and Drop" +msgstr "Desactivar Arrastar e Largar" + +#: ../src/interface.c:3495 +msgid "" +"Disable drag and drop completely in the editor window so you can't drag and " +"drop any selections within or outside of the editor window" +msgstr "" +"Desactiva o arrastar e largar em toda a janela do editor, assim não será " +"possível arrastar e largar quaisquer selecções nem dentro nem fora da janela " +"do editor" + +#: ../src/interface.c:3497 +msgid "Enable folding" +msgstr "Activar agregação de código" + +#: ../src/interface.c:3500 +msgid "Whether to enable folding the code" +msgstr "" +"Se activa a possibilidade de agregar código, compactando a visualização deste" + +#: ../src/interface.c:3502 +msgid "Fold/unfold all children of a fold point" +msgstr "Agregar/desagregar todos os \"filhos\" de um ponto de agregação" + +#: ../src/interface.c:3505 +msgid "" +"Fold or unfold all children of a fold point. By pressing the Shift key while " +"clicking on a fold symbol the contrary behavior is used." +msgstr "" +"Compacta ou expande todos os filhos de um ponto de compactação. Ao " +"pressionar a tecla Shift em simultâneo com o clicar no símbolo de " +"compactação, obtém-se o comportamento contrário." + +#: ../src/interface.c:3507 +msgid "Use indicators to show compile errors" +msgstr "Usar indicadores para mostrar erros de compilação" + +#: ../src/interface.c:3510 +msgid "" +"Whether to use indicators (a squiggly underline) to highlight the lines " +"where the compiler found a warning or an error" +msgstr "" +"Se se devem usar indicadores (um sublinhado irregular em forma de ondas) " +"para destacar as linhas onde o compilador encontrou um erro ou um aviso" + +#: ../src/interface.c:3512 +msgid "Newline strips trailing spaces" +msgstr "Mudança de linha remove espaços do final da linha" + +#: ../src/interface.c:3515 +msgid "Enable newline to strip the trailing spaces on the previous line" +msgstr "" +"Activa a funcionalidade da mudança de linha (enter) remover todos os espaços " +"no final da linha anterior" + +#: ../src/interface.c:3521 +msgid "Line breaking column:" +msgstr "Número da coluna para a quebra de linhas:" + +#: ../src/interface.c:3535 +msgid "Comment toggle marker:" +msgstr "Marcador do alternar de um comentário:" + +#: ../src/interface.c:3542 +msgid "" +"A string which is added when toggling a line comment in a source file, it is " +"used to mark the comment as toggled." +msgstr "" +"Uma expressão que é adicionada quando se comuta uma linha de comentário num " +"ficheiro, a expressão indica que o comentário foi comutado." + +#: ../src/interface.c:3544 +msgid "Features" +msgstr "Funcionalidades" + +#: ../src/interface.c:3549 +msgid "Features" +msgstr "Funcionalidades" + +#: ../src/interface.c:3582 ../src/interface.c:5194 +msgid "Auto-indent mode:" +msgstr "Modo de auto indentação:" + +#: ../src/interface.c:3595 ../src/interface.c:5207 +msgid "Basic" +msgstr "Simples" + +#: ../src/interface.c:3596 ../src/interface.c:5208 +msgid "Current chars" +msgstr "Caracteres actuais" + +#: ../src/interface.c:3597 ../src/interface.c:5209 +msgid "Match braces" +msgstr "Corresponder chavetas" + +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 +msgid "Type:" +msgstr "Tipo:" + +#: ../src/interface.c:3606 ../src/interface.c:5218 +msgid "Width:" +msgstr "Largura:" + +#: ../src/interface.c:3619 ../src/interface.c:5231 +msgid "The width in chars of a single indent" +msgstr "A largura em caracteres de uma única indentação" + +#: ../src/interface.c:3629 ../src/interface.c:5241 +msgid "Use spaces when inserting indentation" +msgstr "Usar espaços na indentação" + +#: ../src/interface.c:3638 ../src/interface.c:5250 +msgid "Use one tab per indent" +msgstr "Usar uma tabulação por indentação" + +#: ../src/interface.c:3647 ../src/interface.c:5259 +msgid "" +"Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "" +"Usar espaços se o total da indentação for menos do que a largura de uma " +"tabulação, caso contrário usar os dois" + +#: ../src/interface.c:3656 ../src/interface.c:5268 +msgid "" +"Whether to detect the indentation type from file contents when a file is " +"opened" +msgstr "" +"Se o tipo de indentação deverá ser detectado através do conteúdo do " +"ficheiro, quando este é aberto" + +#: ../src/interface.c:3658 +msgid "Tab key indents" +msgstr "Tecla \"Tab\" indenta" + +#: ../src/interface.c:3661 +msgid "" +"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "" +"Pressionando a tecla \"Tab\" indenta ao invés de inserir um caractere de " +"tabulação. Pressionar as teclas \"Shift\"+\"Tab\" remove a indentação" + +#: ../src/interface.c:3663 +msgid "Indentation" +msgstr "Indentação" + +#: ../src/interface.c:3668 ../src/interface.c:5270 +msgid "Indentation" +msgstr "Indentação" + +#: ../src/interface.c:3691 +msgid "Snippet completion" +msgstr "Completar excertos de código" + +#: ../src/interface.c:3694 +msgid "" +"Type a defined short character sequence and complete it to a more complex " +"string using a single keypress" +msgstr "" +"Escreva uma pequena expressão previamente definida e complete-a, criando uma " +"expressão mais complexa, pressionando apenas uma tecla" + +#: ../src/interface.c:3696 +msgid "XML tag autocompletion" +msgstr "Auto-Completar etiquetas (tags) XML" + +#: ../src/interface.c:3699 +msgid "Automatic completion and closing of XML tags (includes HTML tags)" +msgstr "" +"Completação automática (e fecho) de etiquetas XML (inclui etiquetas HTML)" + +#: ../src/interface.c:3701 +msgid "Automatic continuation of multi-line comments" +msgstr "Continuação automática de comentários multi-linha" + +#: ../src/interface.c:3704 +msgid "" +"Continue automatically multi-line comments in languages like C, C++ and Java " +"when a new line is entered inside such a comment" +msgstr "" +"Continuar automaticamente um comentário que ocupa mais do que uma linha em " +"linguagens como o C, C++ e Java, quando uma mudança de linha (tecla enter) é " +"inserida dentro desse comentário" + +#: ../src/interface.c:3706 +msgid "Autocomplete symbols" +msgstr "Auto-Completar símbolos" + +#: ../src/interface.c:3709 +msgid "" +"Automatic completion of known symbols in open files (function names, global " +"variables, ...)" +msgstr "" +"Completa automaticamente símbolos conhecidos em ficheiros abertos (nomes de " +"funções, variáveis globais, ...)" + +#: ../src/interface.c:3711 +msgid "Autocomplete all words in document" +msgstr "Auto-Completar todas as palavras do documento" + +#: ../src/interface.c:3715 +msgid "Drop rest of word on completion" +msgstr "Descartar o resto da palavra ao completar" + +#: ../src/interface.c:3725 +msgid "Max. symbol name suggestions:" +msgstr "Máx de sugestões para símbolos:" + +#: ../src/interface.c:3732 +msgid "Completion list height:" +msgstr "Altura da lista de sugestões:" + +#: ../src/interface.c:3739 +msgid "Characters to type for autocompletion:" +msgstr "Caracteres necessários para auto-completar:" + +#: ../src/interface.c:3752 +msgid "" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" +msgstr "" +"Define a quantidade de caracteres que são necessários introduzir até que " +"seja apresentada a lista de auto-completação de símbolos" + +#: ../src/interface.c:3761 +msgid "Display height in rows for the autocompletion list" +msgstr "Altura, em linhas, com que a lista de auto-completação é apresentada" + +#: ../src/interface.c:3770 +msgid "Maximum number of entries to display in the autocompletion list" +msgstr "" +"Número máximo de entradas a serem apresentadas na lista de auto-completação" + +#: ../src/interface.c:3773 +msgid "Completions" +msgstr "Automatismos" + +#: ../src/interface.c:3792 +msgid "Parenthesis ( )" +msgstr "Parêntesis ()" + +#: ../src/interface.c:3797 +msgid "Auto-close parenthesis when typing an opening one" +msgstr "Automaticamente fechar um parêntesis ao escrever um aberto" + +#: ../src/interface.c:3799 +msgid "Single quotes ' '" +msgstr "Plicas ' '" + +#: ../src/interface.c:3804 +msgid "Auto-close simple quote when typing an opening one" +msgstr "Automaticamente fechar uma plica ao escrever a primeira" + +#: ../src/interface.c:3806 +msgid "Curly brackets { }" +msgstr "Chavetas { }" + +#: ../src/interface.c:3811 +msgid "Auto-close curly bracket when typing an opening one" +msgstr "Automaticamente fechar uma chaveta ao escrever uma aberta" + +#: ../src/interface.c:3813 +msgid "Square brackets [ ]" +msgstr "Parêntesis Rectos [ ]" + +#: ../src/interface.c:3818 +msgid "Auto-close square-bracket when typing an opening one" +msgstr "Automaticamente fechar um parêntesis recto ao escrever um aberto" + +#: ../src/interface.c:3820 +msgid "Double quotes \" \"" +msgstr "Aspas \" \"" + +#: ../src/interface.c:3825 +msgid "Auto-close double quote when typing an opening one" +msgstr "Automaticamente fechar aspas ao escrever a primeira" + +#: ../src/interface.c:3827 +msgid "Auto-close quotes and brackets" +msgstr "Fecho automático de plicas, aspas e parêntesis" + +#: ../src/interface.c:3832 +msgid "Completions" +msgstr "Automatismos" + +#: ../src/interface.c:3855 +msgid "Invert syntax highlighting colors" +msgstr "Inverter as cores do realce da sintaxe" + +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "" +"Inverter todas as cores, por omissão usar texto branco sobre fundo preto" + +#: ../src/interface.c:3860 +msgid "Show indentation guides" +msgstr "Mostrar guias de indentação" + +#: ../src/interface.c:3863 +msgid "Shows small dotted lines to help you to use the right indentation" +msgstr "Mostra linhas de pequenos pontos para o ajudar na indentação" + +#: ../src/interface.c:3865 +msgid "Show white space" +msgstr "Mostrar espaços em branco" + +#: ../src/interface.c:3868 +msgid "Marks spaces with dots and tabs with arrows" +msgstr "Marca espaços com pontos e tabulações com setas" + +#: ../src/interface.c:3870 +msgid "Show line endings" +msgstr "Mostrar terminadores de linha" + +#: ../src/interface.c:3873 +msgid "Shows the line ending character" +msgstr "Mostrar o caractere terminador de linha" + +#: ../src/interface.c:3875 +msgid "Show line numbers" +msgstr "Mostrar o número das linhas" + +#: ../src/interface.c:3878 +msgid "Shows or hides the Line Number margin" +msgstr "Mostra ou oculta a coluna com os números de cada linha" + +#: ../src/interface.c:3880 +msgid "Show markers margin" +msgstr "Mostra margem para marcadores" + +#: ../src/interface.c:3883 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines" +msgstr "" +"Mostra ou oculta uma pequena coluna ao lado direito dos números de linha, a " +"qual pode ser usada para marcar linhas" + +#: ../src/interface.c:3885 +msgid "Stop scrolling at last line" +msgstr "Parar deslocamento na última linha" + +#: ../src/interface.c:3888 +msgid "Whether to stop scrolling one page past the last line of a document" +msgstr "" +"Se o deslocamento (scroll) de uma página deve terminar após a última linha " +"do documento" + +#: ../src/interface.c:3890 +msgid "Display" +msgstr "Visualização" + +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Coluna:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Cor:" + +#: ../src/interface.c:3937 +msgid "Sets the color of the long line marker" +msgstr "Define a cor da marca de linha longa" + +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 +msgid "Color Chooser" +msgstr "Selector de Cores" + +#: ../src/interface.c:3946 +msgid "" +"The long line marker is a thin vertical line in the editor, it helps to mark " +"long lines, or as a hint to break the line. Set this value to a value " +"greater than 0 to specify the column where it should appear." +msgstr "" +"A marca de linha longa é uma fina linha vertical que aparece no editor. Esta " +"ajuda a identificar linhas longas ou avisa que uma quebra de linha deve ser " +"inserida. Defina este valor para algo maior do que zero a fim de especificar " +"a coluna onde a marca deve aparecer" + +#: ../src/interface.c:3956 +msgid "Line" +msgstr "Linha" + +#: ../src/interface.c:3959 +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)" +msgstr "" +"Desenha uma linha vertical na janela de edição na posição indicada (ver em " +"baixo)" + +#: ../src/interface.c:3963 +msgid "Background" +msgstr "Fundo" + +#: ../src/interface.c:3966 +msgid "" +"The background color of characters after the given cursor position (see " +"below) changed to the color set below, (this is recommended if you use " +"proportional fonts)" +msgstr "" +"A cor de fundo dos caracteres após a posição indicada (ver em baixo) muda " +"para a cor definida em baixo (recomendado caso esteja a usar tipos de letra " +"proporcionais)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Activado" + +#: ../src/interface.c:3976 ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Marca de linha longa" + +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Desabilitado" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Não mostrar espaçamentos virtuais" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Apenas para selecções rectangulares" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Mostrar os espaçamentos virtuais para além do final das linhas, apenas " +"quando a desenhar uma selecção rectagular" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Sempre" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Mostrar sempre espaçamentos virtuais, para além do final das linhas" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Espaçamentos Virtuais" + +#: ../src/interface.c:4021 +msgid "Display" +msgstr "Visualização" + +#: ../src/interface.c:4052 +msgid "Open new documents from the command-line" +msgstr "Abre um novo documento a partir da linha de comandos" + +#: ../src/interface.c:4055 +msgid "Start a new file for each command-line filename that doesn't exist" +msgstr "" +"Cria um novo documento por cada nome de ficheiro na linha de comandos que " +"não exista" + +#: ../src/interface.c:4069 +msgid "Default end of line characters:" +msgstr "Pré-definição do terminador de linha:" + +#: ../src/interface.c:4076 +msgid "New files" +msgstr "Novos Ficheiros" + +#: ../src/interface.c:4099 +msgid "Default encoding (new files):" +msgstr "Codificação pré-definida (novos ficheiros):" + +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Define a codificação, por omissão, para novos ficheiros" + +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Usar codificação fixa ao abrir ficheiros \"não Unicode\"" + +#: ../src/interface.c:4116 +msgid "" +"This option disables the automatic detection of the file encoding when " +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" +msgstr "" +"Esta opção desactiva a detecção automática da codificação ao abrir ficheiros " +"\"não Unicode\" e abre-os com a codificação especificada (normalmente não é " +"necessário)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codificação pré-definida (ficheiros \"não Unicode\" já existentes)" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Define a codificação, por omissão, ao abrir ficheiros \"não Unicode\" " +"existentes" + +#: ../src/interface.c:4136 +msgid "Encodings" +msgstr "Codificações" + +#: ../src/interface.c:4155 +msgid "Ensure new line at file end" +msgstr "Garantir mudança de linha no fim do ficheiro" + +#: ../src/interface.c:4158 +msgid "Ensures that at the end of the file is a new line" +msgstr "Garante que existe uma mudança de linha no fim do ficheiro" + +#: ../src/interface.c:4160 +msgid "Strip trailing spaces and tabs" +msgstr "Remover espaços e tabulações finais" + +#: ../src/interface.c:4163 +msgid "Removes trailing spaces and tabs and the end of lines" +msgstr "Remove espaços, tabulações e terminadores de linha" + +#: ../src/interface.c:4165 ../src/keybindings.c:522 +msgid "Replace tabs by space" +msgstr "Substitui tabulações por espaços" + +#: ../src/interface.c:4168 +msgid "Replaces all tabs in document by spaces" +msgstr "Substitui todas as tabulações no ficheiro por espaços" + +#: ../src/interface.c:4170 +msgid "Saving files" +msgstr "Ao Guardar Ficheiros" + +#: ../src/interface.c:4195 +msgid "Recent files list length:" +msgstr "Comprimento da lista de ficheiros recentes:" + +#: ../src/interface.c:4209 +msgid "Specifies the number of files which are stored in the Recent files list" +msgstr "" +"Especifica o número de ficheiros a guardar na lista de ficheiros Recentes" + +#: ../src/interface.c:4213 +msgid "Disk check timeout:" +msgstr "Tempo entre verificações no disco:" + +#: ../src/interface.c:4226 +msgid "" +"How often to check for changes to document files on disk, in seconds. Zero " +"disables checking." +msgstr "" +"Cadencia para a verificação de alterações dos documentos no disco, em " +"segundos. O zero desactiva a verificação." + +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 +msgid "Files" +msgstr "Ficheiros" + +#: ../src/interface.c:4268 +msgid "Terminal:" +msgstr "Terminal:" + +#: ../src/interface.c:4275 +msgid "Browser:" +msgstr "Navegador Web:" + +#: ../src/interface.c:4287 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Um emulador de terminal como o xterm, gnome-terminal ou o konsole (deve " +"aceitar o argumento -e)" + +#: ../src/interface.c:4294 +msgid "Path (and possibly additional arguments) to your favorite browser" +msgstr "" +"Caminho (e possivelmente argumentos adicionais) para o seu navegador web " +"favorito" + +#: ../src/interface.c:4316 +msgid "Grep:" +msgstr "Comando Grep:" + +#: ../src/interface.c:4339 +msgid "Tool paths" +msgstr "Caminho para comandos" + +#: ../src/interface.c:4360 +msgid "Context action:" +msgstr "Acção contextual:" + +#: ../src/interface.c:4371 +#, c-format +msgid "" +"Context action command. The currently selected word can be used with %s. It " +"can appear anywhere in the given command and will be replaced before " +"execution." +msgstr "" +"Comando de acção contextual. A palavra actualmente seleccionada pode ser " +"usada com o descritor %s. Este descritor pode aparecer em qualquer ponto do " +"comando e será substituído antes da execução." + +#: ../src/interface.c:4384 +msgid "Commands" +msgstr "Comandos" + +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 +msgid "Tools" +msgstr "Ferramentas" + +#: ../src/interface.c:4427 +msgid "email address of the developer" +msgstr "endereço de email do responsável" + +#: ../src/interface.c:4434 +msgid "Initials of the developer name" +msgstr "Iniciais do nome do responsável" + +#: ../src/interface.c:4436 +msgid "Initial version:" +msgstr "Versão inicial:" + +#: ../src/interface.c:4448 +msgid "Version number, which a new file initially has" +msgstr "Número de versão que o novo ficheiro tem inicialmente" + +#: ../src/interface.c:4455 +msgid "Company name" +msgstr "Nome da Empresa" + +#: ../src/interface.c:4457 +msgid "Developer:" +msgstr "Responsável:" + +#: ../src/interface.c:4464 +msgid "Company:" +msgstr "Empresa:" + +#: ../src/interface.c:4471 +msgid "Mail address:" +msgstr "Endereço de EMail" + +#: ../src/interface.c:4478 +msgid "Initials:" +msgstr "Iniciais:" + +#: ../src/interface.c:4490 +msgid "The name of the developer" +msgstr "O nome do responsável" + +#: ../src/interface.c:4492 +msgid "Year:" +msgstr "Ano:" + +#: ../src/interface.c:4499 +msgid "Date:" +msgstr "Data:" + +#: ../src/interface.c:4506 +msgid "Date & Time:" +msgstr "Data & Hora:" + +#: ../src/interface.c:4518 +msgid "" +"Specify a format for the the {datetime} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Especifica o formato da expressão especial {datetime}. Pode usar qualquer " +"descritor de formato dos suportados pela função strftime em ANSI C." + +#: ../src/interface.c:4525 +msgid "" +"Specify a format for the the {year} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Especifica o formato da expressão especial {year}. Pode usar qualquer " +"descritor de formato dos suportados pela função strftime em ANSI C." + +#: ../src/interface.c:4532 +msgid "" +"Specify a format for the the {date} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Especifica o formato da expressão especial {date}. Pode usar qualquer " +"descritor de formato dos suportados pela função strftime em ANSI C." + +#: ../src/interface.c:4534 +msgid "Template data" +msgstr "Dados para Modelo" + +#: ../src/interface.c:4539 ../src/prefs.c:1537 +msgid "Templates" +msgstr "Modelos" + +#: ../src/interface.c:4577 +msgid "C_hange" +msgstr "_Modificar" + +#: ../src/interface.c:4581 +msgid "Keyboard shortcuts" +msgstr "Atalhos de Teclado" + +#: ../src/interface.c:4586 ../src/prefs.c:1539 +msgid "Keybindings" +msgstr "Atalhos de Teclado" + +#: ../src/interface.c:4620 +msgid "Command:" +msgstr "Comando:" + +#: ../src/interface.c:4627 +#, c-format +msgid "Path to the command for printing files (use %f for the filename)" +msgstr "" +"Caminho para o comando que imprime ficheiros (use %f onde quer o nome do " +"ficheiro)" + +#: ../src/interface.c:4637 +msgid "Use an external command for printing" +msgstr "Usar um comando externo para imprimir" + +#: ../src/interface.c:4657 ../src/printing.c:381 +msgid "Print line numbers" +msgstr "Imprimir os números das linhas" + +#: ../src/interface.c:4660 ../src/printing.c:383 +msgid "Add line numbers to the printed page" +msgstr "Adiciona os números das linhas à página impressa" + +#: ../src/interface.c:4662 ../src/printing.c:386 +msgid "Print page numbers" +msgstr "Imprimir o número das páginas" + +#: ../src/interface.c:4665 ../src/printing.c:388 +msgid "" +"Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "" +"Adiciona numeração de página ao final de cada página. Isto consome 2 linhas " +"em cada página." + +#: ../src/interface.c:4667 ../src/printing.c:391 +msgid "Print page header" +msgstr "Imprimir o cabeçalho de página" + +#: ../src/interface.c:4670 ../src/printing.c:393 +msgid "" +"Add a little header to every page containing the page number, the filename " +"and the current date (see below). It takes 3 lines of the page." +msgstr "" +"Adiciona um pequeno cabeçalho a todas as páginas, com o número da página, o " +"nome do ficheiro e a data actual (ver em baixo). Isto consome 3 linhas de " +"cada página." + +#: ../src/interface.c:4687 ../src/printing.c:409 +msgid "Use the basename of the printed file" +msgstr "Usar apenas o nome do ficheiro a imprimir" + +#: ../src/interface.c:4690 +msgid "Print only the basename (without the path) of the printed file" +msgstr "Imprimir apenas o nome do ficheiro (sem o seu directório)" + +#: ../src/interface.c:4696 ../src/printing.c:417 +msgid "Date format:" +msgstr "Formato da Data:" + +#: ../src/interface.c:4703 ../src/printing.c:423 +msgid "" +"Specify a format for the date and time stamp which is added to the page " +"header on each page. You can use any conversion specifiers which can be used " +"with the ANSI C strftime function." +msgstr "" +"Especifique o formato da data e da hora que serão adicionados ao cabeçalho " +"de cada página. Pode usar qualquer descritor de formato dos suportados pela " +"função strftime em ANSI C." + +#: ../src/interface.c:4706 +msgid "Use native GTK printing" +msgstr "Usar o sistema de impressão nativo do GTK" + +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Impressão" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 +msgid "Printing" +msgstr "Imprimir" + +#: ../src/interface.c:5177 +msgid "Project Properties" +msgstr "Propriedades do Projecto" + +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Visualização:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Personalizar" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Usar definições globais" + +#: ../src/keybindings.c:227 ../src/plugins.c:1174 +msgid "File" +msgstr "Ficheiro" + +#: ../src/keybindings.c:230 +msgid "New" +msgstr "Novo" + +#: ../src/keybindings.c:232 +msgid "Open" +msgstr "Abrir" + +#: ../src/keybindings.c:235 +msgid "Open selected file" +msgstr "Abrir ficheiro seleccionado" + +#: ../src/keybindings.c:237 +msgid "Save" +msgstr "Guardar" + +#: ../src/keybindings.c:239 +msgid "Save as" +msgstr "Guardar como" + +#: ../src/keybindings.c:241 +msgid "Save all" +msgstr "Guardar todos" + +#: ../src/keybindings.c:244 +msgid "Print" +msgstr "Imprimir" + +#: ../src/keybindings.c:246 +msgid "Close" +msgstr "Fechar" + +#: ../src/keybindings.c:248 +msgid "Close all" +msgstr "Fechar todos" + +#: ../src/keybindings.c:251 +msgid "Reload file" +msgstr "Reler ficheiro" + +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Reabrir a última aba que fechou " + +#: ../src/keybindings.c:255 ../src/project.c:519 +msgid "Project" +msgstr "Projecto" + +#: ../src/keybindings.c:258 +msgid "Project properties" +msgstr "Propriedades do Projecto" + +#: ../src/keybindings.c:263 +msgid "Undo" +msgstr "Anular" + +#: ../src/keybindings.c:265 +msgid "Redo" +msgstr "Refazer" + +#: ../src/keybindings.c:274 +msgid "Delete to line end" +msgstr "Apagar até ao final da linha" + +#: ../src/keybindings.c:280 +msgid "Scroll to current line" +msgstr "Deslocar até à linha actual" + +#: ../src/keybindings.c:282 +msgid "Scroll up the view by one line" +msgstr "Deslocar a vista uma linha para cima" + +#: ../src/keybindings.c:284 +msgid "Scroll down the view by one line" +msgstr "Deslocar a vista uma linha para baixo" + +#: ../src/keybindings.c:286 +msgid "Complete snippet" +msgstr "Completar excerto de código" + +#: ../src/keybindings.c:288 +msgid "Move cursor in snippet" +msgstr "Mover o cursor dentro do excerto de código" + +#: ../src/keybindings.c:290 +msgid "Suppress snippet completion" +msgstr "Suprimir o completar de excertos de código" + +#: ../src/keybindings.c:292 +msgid "Context Action" +msgstr "Acção contextual" + +#: ../src/keybindings.c:294 +msgid "Complete word" +msgstr "Completar palavra" + +#: ../src/keybindings.c:296 +msgid "Show calltip" +msgstr "Mostrar dica" + +#: ../src/keybindings.c:298 +msgid "Show macro list" +msgstr "Mostrar lista de macros" + +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Auto-completar palavras " + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Mover a(s) linha(s) para cima" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Mover a(s) linha(s) para baixo" + +#: ../src/keybindings.c:306 +msgid "Clipboard" +msgstr "Área de transferência" + +#: ../src/keybindings.c:309 +msgid "Cut" +msgstr "Cortar" + +#: ../src/keybindings.c:311 +msgid "Copy" +msgstr "Copiar" + +#: ../src/keybindings.c:313 +msgid "Paste" +msgstr "Colar" + +#: ../src/keybindings.c:321 +msgid "Select" +msgstr "Seleccionar" + +#: ../src/keybindings.c:324 +msgid "Select All" +msgstr "Seleccionar Tudo" + +#: ../src/keybindings.c:326 +msgid "Select current word" +msgstr "Seleccionar a palavra actual" + +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Seleccionar a parte anterior da palavra" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Seleccionar a parte posterior da palavra" + +#: ../src/keybindings.c:338 +msgid "Format" +msgstr "Formatar" + +#: ../src/keybindings.c:342 +msgid "Toggle Case of Selection" +msgstr "Converter a selecção entre maiúsculas e minúsculas" + +#: ../src/keybindings.c:344 +msgid "Toggle line commentation" +msgstr "Comutar o comentar da linha" + +#: ../src/keybindings.c:347 +msgid "Comment line(s)" +msgstr "Comentar a(s) linha(s)" + +#: ../src/keybindings.c:349 +msgid "Uncomment line(s)" +msgstr "Descomentar a(s) linha(s)" + +#: ../src/keybindings.c:351 +msgid "Increase indent" +msgstr "Aumentar a indentação" + +#: ../src/keybindings.c:354 +msgid "Decrease indent" +msgstr "Diminuir a indentação" + +#: ../src/keybindings.c:357 +msgid "Increase indent by one space" +msgstr "Aumentar a indentação por um espaço" + +#: ../src/keybindings.c:359 +msgid "Decrease indent by one space" +msgstr "Diminuir a indentação por um espaço" + +#: ../src/keybindings.c:363 +msgid "Send to Custom Command 1" +msgstr "Enviar comando personalizado 1" + +#: ../src/keybindings.c:365 +msgid "Send to Custom Command 2" +msgstr "Enviar comando personalizado 2" + +#: ../src/keybindings.c:367 +msgid "Send to Custom Command 3" +msgstr "Enviar comando personalizado 3" + +#: ../src/keybindings.c:375 +msgid "Insert" +msgstr "Inserir" + +#: ../src/keybindings.c:378 +msgid "Insert date" +msgstr "Inserir data" + +#: ../src/keybindings.c:384 +msgid "Settings" +msgstr "Preferências" + +#: ../src/keybindings.c:392 ../src/toolbar.c:381 +msgid "Search" +msgstr "Pesquisar" + +#: ../src/keybindings.c:395 ../src/search.c:396 +msgid "Find" +msgstr "Procurar" + +#: ../src/keybindings.c:397 +msgid "Find Next" +msgstr "Procurar para a frente" + +#: ../src/keybindings.c:399 +msgid "Find Previous" +msgstr "Procurar para trás" + +#: ../src/keybindings.c:402 +msgid "Find Next Selection" +msgstr "Procurar, a selecção, para a frente" + +#: ../src/keybindings.c:404 +msgid "Find Previous Selection" +msgstr "Procurar, a selecção, para trás " + +#: ../src/keybindings.c:406 ../src/search.c:541 +msgid "Replace" +msgstr "Substituir" + +#: ../src/keybindings.c:408 ../src/search.c:715 +msgid "Find in Files" +msgstr "Procurar em Ficheiros" + +#: ../src/keybindings.c:411 +msgid "Next Message" +msgstr "Próxima Mensagem" + +#: ../src/keybindings.c:413 +msgid "Previous Message" +msgstr "Mensagem anterior" + +#: ../src/keybindings.c:415 +msgid "Find Usage" +msgstr "Procurar ocorrências" + +#: ../src/keybindings.c:417 +msgid "Find Document Usage" +msgstr "Procurar ocorrências no documento actual" + +#: ../src/keybindings.c:419 +msgid "Mark All" +msgstr "Marcar Tudo" + +#: ../src/keybindings.c:421 +msgid "Go to" +msgstr "Ir para" + +#: ../src/keybindings.c:424 ../src/toolbar.c:67 +msgid "Navigate back a location" +msgstr "Navegar uma localização para trás" + +#: ../src/keybindings.c:426 ../src/toolbar.c:68 +msgid "Navigate forward a location" +msgstr "Navegar uma localização para a frente" + +#: ../src/keybindings.c:431 +msgid "Go to matching brace" +msgstr "Ir para a chaveta correspondente" + +#: ../src/keybindings.c:434 +msgid "Toggle marker" +msgstr "Alternar marcador" + +#: ../src/keybindings.c:442 +msgid "Go to Tag Definition" +msgstr "Ir para a definição da etiqueta (tag)" + +#: ../src/keybindings.c:444 +msgid "Go to Tag Declaration" +msgstr "Ir para a declaração da etiqueta (tag)" + +#: ../src/keybindings.c:446 +msgid "Go to Start of Line" +msgstr "Ir para o início da linha" + +#: ../src/keybindings.c:448 +msgid "Go to End of Line" +msgstr "Ir para o fim da linha" + +#: ../src/keybindings.c:450 +msgid "Go to End of Display Line" +msgstr "Ir para o fim da linha actual" + +#: ../src/keybindings.c:452 +msgid "Go to Previous Word Part" +msgstr "Ir para a parte anterior da palavra actual" + +#: ../src/keybindings.c:454 +msgid "Go to Next Word Part" +msgstr "Ir para a parte seguinte da palavra actual" + +#: ../src/keybindings.c:456 +msgid "View" +msgstr "Ver" + +#: ../src/keybindings.c:459 +msgid "Toggle All Additional Widgets" +msgstr "Activa/Desactiva todos os widgets adicionais" + +#: ../src/keybindings.c:462 +msgid "Fullscreen" +msgstr "Ecrã Completo" + +#: ../src/keybindings.c:464 +msgid "Toggle Messages Window" +msgstr "Activar/Desactivar a janela de mensagens" + +#: ../src/keybindings.c:467 +msgid "Toggle Sidebar" +msgstr "Activar/Desactivar a barra lateral" + +#: ../src/keybindings.c:469 +msgid "Zoom In" +msgstr "Aumentar (zoom)" + +#: ../src/keybindings.c:471 +msgid "Zoom Out" +msgstr "Reduzir (Zoom)" + +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Repor o Zoom" + +#: ../src/keybindings.c:475 +msgid "Focus" +msgstr "Foco" + +#: ../src/keybindings.c:478 +msgid "Switch to Editor" +msgstr "Mudar para o Editor" + +#: ../src/keybindings.c:480 +msgid "Switch to Scribble" +msgstr "Mudar para \"Rabiscar\"" + +#: ../src/keybindings.c:482 +msgid "Switch to VTE" +msgstr "Mudar para o Terminal" + +#: ../src/keybindings.c:484 +msgid "Switch to Search Bar" +msgstr "Mudar para a Barra de Pesquisa" + +#: ../src/keybindings.c:486 +msgid "Switch to Sidebar" +msgstr "Mudar para a Barra Lateral" + +#: ../src/keybindings.c:488 +msgid "Switch to Compiler" +msgstr "Mudar para o Compilador" + +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Mudar para Mensagens" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Mudar para Janela de Mensagens" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Mudar para Barra Lateral com Lista de Documentos" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Mudar para a Barra Lateral com Lista de Símbolos" + +#: ../src/keybindings.c:498 +msgid "Notebook tab" +msgstr "Separador de Anotações" + +#: ../src/keybindings.c:501 +msgid "Switch to left document" +msgstr "Mudar para o documento à esquerda" + +#: ../src/keybindings.c:503 +msgid "Switch to right document" +msgstr "Mudar para o documento à direita" + +#: ../src/keybindings.c:505 +msgid "Switch to last used document" +msgstr "Mudar para o último documento usado" + +#: ../src/keybindings.c:507 +msgid "Move document left" +msgstr "Mover o documento para a esquerda" + +#: ../src/keybindings.c:509 +msgid "Move document right" +msgstr "Mover o documento para a direita" + +#: ../src/keybindings.c:511 +msgid "Move document first" +msgstr "Mover o documento para primeiro" + +#: ../src/keybindings.c:513 +msgid "Move document last" +msgstr "Mover o documento para último" + +#: ../src/keybindings.c:515 +msgid "Document" +msgstr "Documento" + +#: ../src/keybindings.c:518 +msgid "Toggle Line wrapping" +msgstr "Comutar a Translineação" + +#: ../src/keybindings.c:520 +msgid "Toggle Line breaking" +msgstr "Comutar o \"Quebrar de Linha\"" + +#: ../src/keybindings.c:524 +msgid "Replace spaces by tabs" +msgstr "Substituir espaços por tabulações" + +#: ../src/keybindings.c:526 +msgid "Toggle current fold" +msgstr "Alternar a agregação de código actual" + +#: ../src/keybindings.c:528 +msgid "Fold all" +msgstr "Agregar tudo" + +#: ../src/keybindings.c:530 +msgid "Unfold all" +msgstr "Desagregar tudo" + +#: ../src/keybindings.c:532 +msgid "Reload symbol list" +msgstr "Recarregar a lista de símbolos" + +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Remover Marcadores" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Remover Indicadores de Erro" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 +msgid "Build" +msgstr "Gerar" + +#: ../src/keybindings.c:541 ../src/toolbar.c:69 +msgid "Compile" +msgstr "Compilar" + +#: ../src/keybindings.c:545 +msgid "Make all" +msgstr "Gerar tudo" + +#: ../src/keybindings.c:548 +msgid "Make custom target" +msgstr "Gerar resultado personalizado" + +#: ../src/keybindings.c:550 +msgid "Make object" +msgstr "Gerar objecto" + +#: ../src/keybindings.c:552 +msgid "Next error" +msgstr "Erro seguinte" + +#: ../src/keybindings.c:554 +msgid "Previous error" +msgstr "Erro anterior" + +#: ../src/keybindings.c:556 +msgid "Run" +msgstr "Executar" + +#: ../src/keybindings.c:558 +msgid "Build options" +msgstr "Opções de geração/compilação" + +#: ../src/keybindings.c:563 +msgid "Show Color Chooser" +msgstr "Mostrar o Selector de Cores" + +#: ../src/keybindings.c:565 ../src/keybindings.c:568 +msgid "Help" +msgstr "Ajuda" + +#: ../src/keybindings.c:856 +msgid "Keyboard Shortcuts" +msgstr "Atalhos de Teclado" + +#: ../src/keybindings.c:868 +msgid "The following keyboard shortcuts are configurable:" +msgstr "Os seguintes atalhos de teclado são configuráveis:" + +#: ../src/keybindings.c:1791 +msgid "Switch to Document" +msgstr "Mudar para documento" + +#: ../src/keyfile.c:852 +msgid "Type here what you want, use it as a notice/scratch board" +msgstr "Escreva aqui o que quer, use isto como um caderno de rascunhos" + +#: ../src/keyfile.c:1056 +msgid "Failed to load one or more session files." +msgstr "Falha ao carregar um ou mais ficheiros de sessão." + +#: ../src/log.c:181 +msgid "Debug Messages" +msgstr "Mensagens de depuração (debug)" + +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "_Limpar" + +#: ../src/main.c:122 +msgid "" +"Set initial column number for the first opened file (useful in conjunction " +"with --line)" +msgstr "" +"Definir o número da coluna onde colocar o cursor para o primeiro ficheiro " +"aberto (útil em conjunto com --line)" + +#: ../src/main.c:123 +msgid "Use an alternate configuration directory" +msgstr "Usar uma directoria de configurações alternativa" + +#: ../src/main.c:124 +msgid "Print internal filetype names" +msgstr "Imprimir os nomes dos tipos de ficheiro internos" + +#: ../src/main.c:125 +msgid "Generate global tags file (see documentation)" +msgstr "Gerar ficheiro de etiquetas (tags) globais (ver documentação)" + +#: ../src/main.c:126 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "Não pré-processar ficheiros de C/C++ ao gerar etiquetas (tags)" + +#: ../src/main.c:128 +msgid "Don't open files in a running instance, force opening a new instance" +msgstr "" +"Não abrir ficheiros na instanciação actual do programa, forçar a abertura de " +"uma nova instância" + +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" +"Usar o nome deste ficheiro para o socket de comunicação com uma instância " +"activa do Geany" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Devolve a lista de ficheiros abertos numa instância activa do Geany" + +#: ../src/main.c:132 +msgid "Set initial line number for the first opened file" +msgstr "" +"Definir o número da linha onde colocar o cursor para o primeiro ficheiro " +"aberto" + +#: ../src/main.c:133 +msgid "Don't show message window at startup" +msgstr "Não mostrar janela de mensagens no arranque" + +#: ../src/main.c:134 +msgid "Don't load auto completion data (see documentation)" +msgstr "Não carregar os dados para sugestões automáticas (ver documentação)" + +#: ../src/main.c:136 +msgid "Don't load plugins" +msgstr "Não carregar plugins" + +#: ../src/main.c:138 +msgid "Print Geany's installation prefix" +msgstr "Imprimir o prefixo de instalação do Geany" + +#: ../src/main.c:139 +msgid "Don't load the previous session's files" +msgstr "Não carregar os ficheiros da sessão anterior" + +#: ../src/main.c:141 +msgid "Don't load terminal support" +msgstr "Não carregar o suporte para o terminal" + +#: ../src/main.c:142 +msgid "Filename of libvte.so" +msgstr "Nome de ficheiro de libvte.so" + +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Ser Detalhado" + +#: ../src/main.c:145 +msgid "Show version and exit" +msgstr "Mostrar a versão e sair" + +#: ../src/main.c:498 +msgid "[FILES...]" +msgstr "[FICHEIROS...]" + +#: ../src/main.c:515 +#, c-format +msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" +msgstr "(compilado em %s com GTK %d.%d.%d, Glib %d.%d.%d)" + +#: ../src/main.c:614 +msgid "Move it now?" +msgstr "Mover agora?" + +#: ../src/main.c:616 +msgid "Geany needs to move your old configuration directory before starting." +msgstr "" +"O Geany precisa mover a directoria de configurações antiga antes de iniciar." + +#: ../src/main.c:625 +#, c-format +msgid "" +"Your configuration directory has been successfully moved from \"%s\" to \"%s" +"\"." +msgstr "" +"A directoria de configurações foi movida com sucesso de \"%s\" para \"%s\"." + +#. for translators: the third %s in brackets is the error message which +#. * describes why moving the dir didn't work +#: ../src/main.c:635 +#, c-format +msgid "" +"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " +"Please move manually the directory to the new location." +msgstr "" +"A directoria de configurações antiga \"%s\" não pode ser movida para \"%s" +"\" (Erro: %s). Por favor, mova manualmente a directoria para a nova " +"localização." + +#: ../src/main.c:716 +#, c-format +msgid "" +"Configuration directory could not be created (%s).\n" +"There could be some problems using Geany without a configuration directory.\n" +"Start Geany anyway?" +msgstr "" +"A directoria de configurações não pode ser criada (%s).\n" +"Podem ocorrer problemas ao usar o Geany sem directoria de configurações.\n" +"Iniciar o Geany mesmo assim?" + +#: ../src/main.c:1044 +#, c-format +msgid "This is Geany %s." +msgstr "Este é o Geany %s." + +#: ../src/main.c:1046 +#, c-format +msgid "Configuration directory could not be created (%s)." +msgstr "A directoria de configurações não pôde ser criada (%s)." + +#: ../src/main.c:1257 +msgid "Configuration files reloaded." +msgstr "Ficheiros de configuração relidos." + +#: ../src/msgwindow.c:147 +msgid "Status messages" +msgstr "Mensagens de estado" + +#: ../src/msgwindow.c:542 +msgid "C_opy" +msgstr "C_opiar" + +#: ../src/msgwindow.c:551 +msgid "Copy _All" +msgstr "Copi_ar Tudo" + +#: ../src/msgwindow.c:581 +msgid "_Hide Message Window" +msgstr "_Ocultar Janela de Mensagens" + +#: ../src/msgwindow.c:637 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" +"Falha a encontrar o ficheiro '%s' - a tentar no directório do ficheiro " +"activo." + +#: ../src/plugins.c:464 +#, c-format +msgid "" +"The plugin \"%s\" is not binary compatible with this release of Geany - " +"please recompile it." +msgstr "" +"O plugin \"%s\" não é compatível com esta versão do Geany - por favor, " +"recompile-o." + +#: ../src/plugins.c:909 +msgid "_Plugin Manager" +msgstr "Gestor de _Plugins" + +#: ../src/plugins.c:1086 +#, c-format +msgid "" +"Plugin: %s %s\n" +"Description: %s\n" +"Author(s): %s" +msgstr "" +"Plugin: %s %s\n" +"Descrição: %s\n" +"Autor(es): %s" + +#: ../src/plugins.c:1162 +msgid "Active" +msgstr "Activo" + +#: ../src/plugins.c:1168 +msgid "Plugin" +msgstr "Plugin" + +#: ../src/plugins.c:1192 +msgid "No plugins available." +msgstr "Não existem plugins." + +#: ../src/plugins.c:1272 +msgid "Plugins" +msgstr "Plugins" + +#: ../src/plugins.c:1292 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Escolha quais os plugins que devem ser carregados ao iniciar:" + +#: ../src/plugins.c:1304 +msgid "Plugin details:" +msgstr "Detalhes do Plugin:" + +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Configurar Plugins" + +#: ../src/prefs.c:165 +msgid "Grab Key" +msgstr "Capturar Tecla" + +#: ../src/prefs.c:171 +#, c-format +msgid "Press the combination of the keys you want to use for \"%s\"." +msgstr "Pressione a combinação de teclas que pretende usar para \"%s\"." + +#: ../src/prefs.c:214 ../src/symbols.c:1866 +msgid "_Expand All" +msgstr "_Expandir Tudo" + +#: ../src/prefs.c:219 ../src/symbols.c:1871 +msgid "_Collapse All" +msgstr "_Compactar Tudo" + +#: ../src/prefs.c:278 +msgid "Action" +msgstr "Acção" + +#: ../src/prefs.c:283 +msgid "Shortcut" +msgstr "Atalho" + +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Permitir" + +#: ../src/prefs.c:1410 +msgid "_Override" +msgstr "_Substituir" + +#: ../src/prefs.c:1411 +msgid "Override that keybinding?" +msgstr "Substituir este atalho?" + +#: ../src/prefs.c:1412 +#, c-format +msgid "The combination '%s' is already used for \"%s\"." +msgstr "A combinação \"%s\" já se encontra a ser usada para \"%s\"." + +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + +#. add manually GeanyWrapLabels because they can't be added with Glade +#. page Tools +#: ../src/prefs.c:1619 +msgid "Enter tool paths below. Tools you do not need can be left blank." +msgstr "" +"Introduza os caminhos para os comandos, em baixo. Comandos que não precisa " +"podem ser deixados em branco." + +#. page Templates +#: ../src/prefs.c:1624 +msgid "" +"Set the information to be used in templates. See the documentation for " +"details." +msgstr "" +"Defina informação a ser usada em modelos de documentos. Para mais detalhes " +"consulte a documentação." + +#: ../src/prefs.c:1628 +msgid "" +"Notice: For all changes you make here to take effect, you need to restart " +"Geany or force the reload of the settings using Tools->Reload Configuration." +"" +msgstr "" +"Aviso: Para que qualquer alteração que aqui faça surta efeito, o Geany " +"tem de ser reiniciado ou force o recarregar das definições com Ferramentas-" +">Recarregar a Configuração." + +#. page Keybindings +#: ../src/prefs.c:1634 +msgid "" +"Here you can change keyboard shortcuts for various actions. Select one and " +"press the Change button to enter a new shortcut, or double click on an " +"action to edit the string representation of the shortcut directly." +msgstr "" +"Aqui pode alterar os atalhos de teclado de várias funcionalidades. " +"Seleccione uma e carregue no botão Mudar para introduzir o novo atalho, ou " +"faça duplo clique sobre a funcionalidade para editar o atalho directamente." + +#. page Printing +#: ../src/prefs.c:1639 +msgid "" +"Notice: Native GTK printing is only available if Geany was built against " +"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "" +"Aviso: A funcionalidade de impressão nativa do GTK apenas se encontra " +"disponível se o Geany foi compilado com GTK 2.10 (ou superior) e o " +"Geany está a usar o GTK 2.10 (ou superior)." + +#. page Editor->Indentation +#: ../src/prefs.c:1645 +msgid "" +"Warning: these settings are overridden by the current project. See " +"Project->Properties." +msgstr "" +"Atenção: Estas definições podem ser sobrepostas pelas do projecto actual. " +"Consulte Projecto-> Propriedades." + +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "O tipo de letra do editor não é um tipo mono-espaço!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "O texto ficará incorrectamente espaçado." + +#: ../src/printing.c:306 +#, c-format +msgid "Page %d of %d" +msgstr "Página %d de %d" + +#: ../src/printing.c:376 +msgid "Document Setup" +msgstr "Configuração de Documento" + +#: ../src/printing.c:411 +msgid "Print only the basename(without the path) of the printed file" +msgstr "Imprime apenas o nome do ficheiro, sem o caminho para este" + +#: ../src/printing.c:527 +#, c-format +msgid "Page %d of %d" +msgstr "Página %d de %d" + +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "Documento %s não enviado para o subsistema de impressão." + +#: ../src/printing.c:783 +#, c-format +msgid "Document %s was sent to the printing subsystem." +msgstr "Documento %s foi enviado para o subsistema de impressão." + +#: ../src/printing.c:835 +#, c-format +msgid "Printing of %s failed (%s)." +msgstr "A impressão do ficheiro %s falhou (%s)." + +#: ../src/printing.c:875 +msgid "Please set a print command in the preferences dialog first." +msgstr "" +"Primeiro, introduza um comando de impressão nas preferências, se faz favor." + +#: ../src/printing.c:883 +#, c-format +msgid "" +"The file \"%s\" will be printed with the following command:\n" +"\n" +"%s" +msgstr "" +"O ficheiro \"%s\" será impresso com o comando:\n" +"\n" +"%s" + +#: ../src/printing.c:899 +#, c-format +msgid "Printing of \"%s\" failed (return code: %s)." +msgstr "A impressão de \"%s\" falhou (código de erro devolvido: %s)." + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "O ficheiro %s foi impresso." + +#. "projects" is part of the default project base path so be careful when translating +#. * please avoid special characters and spaces, look at the source for details or ask Frank +#: ../src/project.c:98 +msgid "projects" +msgstr "projectos" + +#: ../src/project.c:117 +msgid "New Project" +msgstr "Novo Projecto" + +#: ../src/project.c:125 +msgid "C_reate" +msgstr "C_riar" + +#: ../src/project.c:139 ../src/project.c:413 +msgid "Name:" +msgstr "Nome:" + +#: ../src/project.c:148 ../src/project.c:426 +msgid "Filename:" +msgstr "Nome do ficheiro:" + +#: ../src/project.c:164 ../src/project.c:456 +msgid "Base path:" +msgstr "Directório base:" + +#: ../src/project.c:170 ../src/project.c:465 +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 "" +"Directório base para todos os ficheiros que constituem o projecto. Pode ser " +"um novo directório ou um já existente. Pode usar ficheiros relativos ao nome " +"do ficheiro de projecto." + +#: ../src/project.c:173 ../src/project.c:468 +msgid "Choose Project Base Path" +msgstr "Escolha o directório base para o projecto" + +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 +#, c-format +msgid "Project file \"%s\" could not be loaded." +msgstr "O ficheiro de projecto \"%s\" não pôde ser lido." + +#: ../src/project.c:257 ../src/project.c:269 +msgid "Open Project" +msgstr "Abrir Projecto" + +#: ../src/project.c:289 +msgid "Project files" +msgstr "Ficheiros de Projecto" + +#: ../src/project.c:339 +#, c-format +msgid "Project \"%s\" closed." +msgstr "Projecto \"%s\" fechado." + +#: ../src/project.c:439 +msgid "Description:" +msgstr "Descrição:" + +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" +"Pôr os Comandos Independentes do Tipo de Ficheiro a usar o directório base:" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Definir" + +#: ../src/project.c:486 +msgid "" +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" +msgstr "" +"Define o directório de execução, (no separador Gerar) para os Comandos " +"Independentes do Tipo de Ficheiro, usarem o directório base" + +#: ../src/project.c:501 +msgid "File patterns:" +msgstr "Padrões de ficheiros:" + +#: ../src/project.c:610 +msgid "Do you want to close it before proceeding?" +msgstr "Quer fechá-lo antes de prosseguir?" + +#: ../src/project.c:611 +#, c-format +msgid "The '%s' project is already open." +msgstr "O projecto '%s' já está aberto." + +#: ../src/project.c:658 +msgid "The specified project name is too short." +msgstr "O nome de projecto fornecido é demasiado curto." + +#: ../src/project.c:664 +#, c-format +msgid "The specified project name is too long (max. %d characters)." +msgstr "" +"O nome de projecto fornecido é demasiado longo (no máximo %d carácteres)." + +#: ../src/project.c:672 +msgid "You have specified an invalid project filename." +msgstr "Forneceu um nome de projecto inválido." + +#: ../src/project.c:695 +msgid "Create the project's base path directory?" +msgstr "Criar o directório base do projecto?" + +#: ../src/project.c:696 +#, c-format +msgid "The path \"%s\" does not exist." +msgstr "O caminho \"%s\" não existe." + +#: ../src/project.c:705 +#, c-format +msgid "Project base directory could not be created (%s)." +msgstr "O directório base do projecto não pôde ser criado (%s)." + +#: ../src/project.c:717 +#, c-format +msgid "Project file could not be written (%s)." +msgstr "O ficheiro de projecto não pôde ser escrito (%s)." + +#: ../src/project.c:794 +#, c-format +msgid "Project \"%s\" created." +msgstr "Projecto \"%s\" criado." + +#: ../src/project.c:796 +#, c-format +msgid "Project \"%s\" saved." +msgstr "Projecto \"%s\" guardado." + +#. initialise the dialog +#: ../src/project.c:861 ../src/project.c:872 +msgid "Choose Project Filename" +msgstr "Escolha o nome do ficheiro de projecto" + +#: ../src/project.c:947 +#, c-format +msgid "Project \"%s\" opened." +msgstr "Projecto \"%s\" aberto." + +#: ../src/search.c:233 +msgid "_Use regular expressions" +msgstr "_Usar expressões regulares" + +#: ../src/search.c:237 +msgid "" +"Use POSIX-like regular expressions. For detailed information about using " +"regular expressions, please read the documentation." +msgstr "" +"Use expressões regular do tipo POSIX. Para informação detalhada sobre " +"expressões regulares, por favor, consulte a documentação." + +#: ../src/search.c:244 +msgid "Search _backwards" +msgstr "Procurar para _trás" + +#: ../src/search.c:258 +msgid "Use _escape sequences" +msgstr "Usar sequências de _escape" + +#: ../src/search.c:263 +msgid "" +"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " +"corresponding control characters" +msgstr "" +"Substituir \\\\, \\t, \\n, \\r e \\uXXX (caracteres Unicode) pela sua função " +"correspondente, como caracteres de controlo" + +#: ../src/search.c:272 ../src/search.c:810 +msgid "C_ase sensitive" +msgstr "Distinguir m_aiúsculas/minúsculas" + +#: ../src/search.c:277 ../src/search.c:816 +msgid "Match only a _whole word" +msgstr "Apenas palavra _completa" + +#: ../src/search.c:282 +msgid "Match from s_tart of word" +msgstr "Apenas _início de palavra" + +#: ../src/search.c:403 +msgid "_Previous" +msgstr "_Anterior" + +#: ../src/search.c:409 +msgid "_Next" +msgstr "Segui_nte" + +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 +msgid "_Search for:" +msgstr "_Procurar por:" + +#. Now add the multiple match options +#: ../src/search.c:441 +msgid "_Find All" +msgstr "Procurar _Tudo" + +#: ../src/search.c:448 +msgid "_Mark" +msgstr "_Realçar" + +#: ../src/search.c:450 +msgid "Mark all matches in the current document" +msgstr "Realçar todas as ocorrências no ficheiro actual" + +#: ../src/search.c:455 ../src/search.c:622 +msgid "In Sessi_on" +msgstr "Na Sessã_o" + +#: ../src/search.c:460 ../src/search.c:627 +msgid "_In Document" +msgstr "No _Documento" + +#. close window checkbox +#: ../src/search.c:466 ../src/search.c:640 +msgid "Close _dialog" +msgstr "Fechar a _Janela" + +#: ../src/search.c:471 ../src/search.c:645 +msgid "Disable this option to keep the dialog open" +msgstr "Desactive esta opção para manter a janela de procura aberta" + +#: ../src/search.c:556 +msgid "Replace & Fi_nd" +msgstr "Substituir & Proc_urar" + +#: ../src/search.c:565 +msgid "Replace wit_h:" +msgstr "Substituir po_r:" + +#. Now add the multiple replace options +#: ../src/search.c:615 +msgid "Re_place All" +msgstr "Su_bstituir Tudo" + +#: ../src/search.c:632 +msgid "In Se_lection" +msgstr "No se_leccionado" + +#: ../src/search.c:634 +msgid "Replace all matches found in the currently selected text" +msgstr "Substitui todas as ocorrências no texto que se encontra seleccionado" + +#: ../src/search.c:725 +msgid "_Directory:" +msgstr "_Directório:" + +#: ../src/search.c:756 +msgid "E_ncoding:" +msgstr "Codi_ficação:" + +#: ../src/search.c:781 +msgid "Fixed s_trings" +msgstr "Expressões _Fixas (sem wildcards)" + +#: ../src/search.c:790 +msgid "_Grep regular expressions" +msgstr "Expressões regulares do _Grep" + +#: ../src/search.c:793 ../src/search.c:801 +msgid "See grep's manual page for more information" +msgstr "Consulte o manual do grep para mais informações" + +#: ../src/search.c:798 +msgid "_Extended regular expressions" +msgstr "Expressões regulares _extendidas" + +#: ../src/search.c:805 +msgid "_Recurse in subfolders" +msgstr "_Recursivo nos sub-directórios" + +#: ../src/search.c:821 +msgid "_Invert search results" +msgstr "_Inverter o resultado da procura" + +#: ../src/search.c:826 +msgid "Invert the sense of matching, to select non-matching lines" +msgstr "Inverte a comparação, para seleccionar linhas diferentes da expressão" + +#: ../src/search.c:843 +msgid "E_xtra options:" +msgstr "Opções e_xtra:" + +#: ../src/search.c:851 +msgid "Other options to pass to Grep" +msgstr "Opções adicionais a passar ao Grep" + +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 +#, c-format +msgid "Found %d match for \"%s\"." +msgid_plural "Found %d matches for \"%s\"." +msgstr[0] "Encontrada %d ocorrência de \"%s\"." +msgstr[1] "Encontradas %d ocorrências de \"%s\"." + +#: ../src/search.c:1177 +#, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Substituídas %u ocorrências em %u documentos." + +#: ../src/search.c:1368 +msgid "Invalid directory for find in files." +msgstr "Directório inválido para a procura em ficheiros." + +#: ../src/search.c:1388 +msgid "No text to find." +msgstr "Nenhuma expressão para procurar." + +#: ../src/search.c:1415 +#, c-format +msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." +msgstr "" +"Falha ao executar o comando grep '%s'; verifique o directório deste nas " +"Preferências." + +#: ../src/search.c:1483 +msgid "Searching..." +msgstr "A procurar..." + +#: ../src/search.c:1495 +#, c-format +msgid "%s %s -- %s (in directory: %s)" +msgstr "%s %s -- %s (na directoria: %s)" + +#: ../src/search.c:1523 +#, c-format +msgid "Could not open directory (%s)" +msgstr "Falha ao abrir a directoria (%s)" + +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Procura falhou." + +#: ../src/search.c:1621 +#, c-format +msgid "Search completed with %d match." +msgid_plural "Search completed with %d matches." +msgstr[0] "Procura completa com %d ocorrência." +msgstr[1] "Procura completa com %d ocorrências." + +#: ../src/search.c:1629 +msgid "No matches found." +msgstr "Nenhuma ocorrência encontrada." + +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Má expressão regular: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"O Geany tentou aceder a um Unix Domain socket de outra instância a ser " +"executada por outro utilizador.\n" +"Isto origina um erro falta e o Geany será agora encerrado." + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 +msgid "Chapter" +msgstr "Capítulo" + +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 +msgid "Section" +msgstr "Secção" + +#: ../src/symbols.c:613 +msgid "Sect1" +msgstr "Sec1" + +#: ../src/symbols.c:614 +msgid "Sect2" +msgstr "Sec2" + +#: ../src/symbols.c:615 +msgid "Sect3" +msgstr "Sec3" + +#: ../src/symbols.c:616 +msgid "Appendix" +msgstr "Apêndice" + +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 +msgid "Other" +msgstr "Outro" + +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 +msgid "Module" +msgstr "Módulo" + +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 +msgid "Types" +msgstr "Tipos" + +#: ../src/symbols.c:625 +msgid "Type constructors" +msgstr "Construtores de Tipo" + +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 +msgid "Functions" +msgstr "Funções" + +#: ../src/symbols.c:631 ../src/symbols.c:637 +msgid "Sections" +msgstr "Secções" + +#: ../src/symbols.c:632 +msgid "Keys" +msgstr "Chaves" + +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 +msgid "Variables" +msgstr "Variáveis" + +#: ../src/symbols.c:646 +msgid "Environment" +msgstr "Ambiente" + +#: ../src/symbols.c:648 ../src/symbols.c:720 +msgid "Subsection" +msgstr "Subsecção" + +#: ../src/symbols.c:649 ../src/symbols.c:721 +msgid "Subsubsection" +msgstr "Subsubsecção" + +#: ../src/symbols.c:660 +msgid "Structures" +msgstr "Estruturas" + +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 +msgid "Package" +msgstr "Pacote" + +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Rótulos" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constantes" + +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 +msgid "Interfaces" +msgstr "Interfaces" + +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 +msgid "Classes" +msgstr "Classes" + +#: ../src/symbols.c:698 +msgid "Anchors" +msgstr "Âncoras" + +#: ../src/symbols.c:699 +msgid "H1 Headings" +msgstr "Cabeçalhos H1" + +#: ../src/symbols.c:700 +msgid "H2 Headings" +msgstr "Cabeçalhos H2" + +#: ../src/symbols.c:701 +msgid "H3 Headings" +msgstr "Cabeçalhos H3" + +#: ../src/symbols.c:709 +msgid "ID Selectors" +msgstr "Selectores de ID" + +#: ../src/symbols.c:710 +msgid "Type Selectors" +msgstr "Selectores de Tipo" + +#: ../src/symbols.c:728 ../src/symbols.c:774 +msgid "Modules" +msgstr "Módulos" + +#: ../src/symbols.c:730 +msgid "Singletons" +msgstr "Singletons" + +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 +msgid "Methods" +msgstr "Métodos" + +#: ../src/symbols.c:738 ../src/symbols.c:870 +msgid "Namespaces" +msgstr "Conjuntos de Nomes" + +#: ../src/symbols.c:741 +msgid "Procedures" +msgstr "Procedimentos" + +#: ../src/symbols.c:752 +msgid "Imports" +msgstr "Importações" + +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entidades" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Implementações" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funções / Procedimentos" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variáveis / Sinais" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Processos / Componentes" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Eventos" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funções / Tarefas" + +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "Membros" + +#: ../src/symbols.c:838 +msgid "Subroutines" +msgstr "Sub-rotinas" + +#: ../src/symbols.c:841 +msgid "Blocks" +msgstr "Blocos" + +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 +msgid "Macros" +msgstr "Macros" + +#: ../src/symbols.c:851 +msgid "Defines" +msgstr "Definições" + +#: ../src/symbols.c:858 +msgid "Targets" +msgstr "Alvos" + +#: ../src/symbols.c:876 +msgid "Structs" +msgstr "Estruturas" + +#: ../src/symbols.c:877 +msgid "Typedefs / Enums" +msgstr "Typedefs / Enums" + +#: ../src/symbols.c:1365 +#, c-format +msgid "Unknown filetype extension for \"%s\".\n" +msgstr "Extensão do ficheiro \"%s\" desconhecida.\n" + +#: ../src/symbols.c:1389 +#, c-format +msgid "Failed to create tags file, perhaps because no tags were found.\n" +msgstr "" +"Falha ao criar o ficheiro de etiquetas, talvez porque nenhuma etiqueta foi " +"encontrada.\n" + +#: ../src/symbols.c:1396 +#, c-format +msgid "" +"Usage: %s -g \n" +"\n" +msgstr "" +"Forma de Usar: %s -g \n" +"\n" + +#: ../src/symbols.c:1397 +#, c-format +msgid "" +"Example:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" +msgstr "" +"Exemplo:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" + +#: ../src/symbols.c:1411 +msgid "Load Tags" +msgstr "Carregar Etiquetas" + +#: ../src/symbols.c:1418 +msgid "Geany tag files (*.tags)" +msgstr "Ficheiros de Etiquetas do Geany (*.tags)" + +#. For translators: the first wildcard is the filetype, the second the filename +#: ../src/symbols.c:1438 +#, c-format +msgid "Loaded %s tags file '%s'." +msgstr "Carregadas etiquetas %s do ficheiro '%s'." + +#: ../src/symbols.c:1440 +#, c-format +msgid "Could not load tags file '%s'." +msgstr "Falha ao carregar o ficheiro de etiquetas '%s'." + +#: ../src/symbols.c:1573 +#, c-format +msgid "Forward declaration \"%s\" not found." +msgstr "Declaração \"%s\" não encontrada à frente." + +#: ../src/symbols.c:1575 +#, c-format +msgid "Definition of \"%s\" not found." +msgstr "Definição de \"%s\" não encontrada." + +#: ../src/symbols.c:1881 +msgid "Sort by _Name" +msgstr "Ordenar por _Nome" + +#: ../src/symbols.c:1888 +msgid "Sort by _Appearance" +msgstr "Ordenar por Ocorrênci_a" + +#: ../src/templates.c:278 +msgid "Old" +msgstr "Antigo" + +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:56 +msgid "Save the current file" +msgstr "Gravar o ficheiro actual" + +#: ../src/toolbar.c:57 +msgid "Save all open files" +msgstr "Guardar todos os ficheiros abertos" + +#: ../src/toolbar.c:58 +msgid "Reload the current file from disk" +msgstr "Reler o ficheiro actual, a partir do disco" + +#: ../src/toolbar.c:59 +msgid "Close the current file" +msgstr "Fechar o ficheiro actual" + +#: ../src/toolbar.c:60 +msgid "Close all open files" +msgstr "Fechar todos os ficheiros abertos" + +#: ../src/toolbar.c:61 +msgid "Cut the current selection" +msgstr "Cortar a selecção actual" + +#: ../src/toolbar.c:62 +msgid "Copy the current selection" +msgstr "Copiar a selecção actual" + +#: ../src/toolbar.c:63 +msgid "Paste the contents of the clipboard" +msgstr "Colar o conteúdo da área de transferência" + +#: ../src/toolbar.c:64 +msgid "Delete the current selection" +msgstr "Apagar a selecção actual" + +#: ../src/toolbar.c:65 +msgid "Undo the last modification" +msgstr "Anular a última modificação" + +#: ../src/toolbar.c:66 +msgid "Redo the last modification" +msgstr "Refazer a última modificação" + +#: ../src/toolbar.c:69 +msgid "Compile the current file" +msgstr "Compilar o ficheiro actual" + +#: ../src/toolbar.c:70 +msgid "Run or view the current file" +msgstr "Executar ou Ver o ficheiro actual" + +#: ../src/toolbar.c:71 +msgid "" +"Open a color chooser dialog, to interactively pick colors from a palette" +msgstr "" +"Abre a janela do selector de cores, para interactivamente escolher uma cor" + +#: ../src/toolbar.c:72 +msgid "Zoom in the text" +msgstr "Ampliar o texto" + +#: ../src/toolbar.c:73 +msgid "Zoom out the text" +msgstr "Diminuir o texto" + +#: ../src/toolbar.c:74 +msgid "Decrease indentation" +msgstr "Diminuir indentação" + +#: ../src/toolbar.c:75 +msgid "Increase indentation" +msgstr "Aumentar indentação" + +#: ../src/toolbar.c:76 ../src/toolbar.c:381 +msgid "Find the entered text in the current file" +msgstr "Procurar o texto introduzido (no ficheiro actual)" + +#: ../src/toolbar.c:77 ../src/toolbar.c:389 +msgid "Jump to the entered line number" +msgstr "Saltar para a linha indicada" + +#: ../src/toolbar.c:78 +msgid "Show the preferences dialog" +msgstr "Mostrar a janela de preferências" + +#: ../src/toolbar.c:79 +msgid "Quit Geany" +msgstr "Sair Geany" + +#: ../src/toolbar.c:80 +msgid "Print document" +msgstr "Imprimir documento" + +#: ../src/toolbar.c:81 +msgid "Replace text in the current document" +msgstr "Substitui tecto no documento actual" + +#: ../src/toolbar.c:357 +msgid "Create a new file" +msgstr "Criar um ficheiro novo" + +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Criar um ficheiro novo a partir de um modelo (template)" + +#: ../src/toolbar.c:365 +msgid "Open an existing file" +msgstr "Abrir um ficheiro existente" + +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Abrir um ficheiro recente" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Escolher mais acções de compilação" + +#: ../src/toolbar.c:389 +msgid "Goto" +msgstr "Ir Para" + +#: ../src/toolbar.c:578 +msgid "Separator" +msgstr "Separador" + +#: ../src/toolbar.c:579 +msgid "--- Separator ---" +msgstr "--- Separador ---" + +#: ../src/toolbar.c:946 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Seleccione itens para serem apresentados na barra de ferramentas. Itens " +"podem ser reordenados com \"arrastar e largar\"." + +#: ../src/toolbar.c:962 +msgid "Available Items" +msgstr "Itens Disponíveis" + +#: ../src/toolbar.c:983 +msgid "Displayed Items" +msgstr "Itens Apresentados" + +#: ../src/tools.c:153 +#, c-format +msgid "" +"The executed custom command returned an error. Your selection was not " +"changed. Error message: %s" +msgstr "" +"O comando, personalizado, executado retornou um erro. A sua selecção não foi " +"modificada. Mensagem de erro: %s." + +#: ../src/tools.c:219 +msgid "The executed custom command exited with an unsuccessful exit code." +msgstr "" +"O comando, personalizado, executado terminou com um código de insucesso." + +#: ../src/tools.c:246 +#, c-format +msgid "Passing data and executing custom command: %s" +msgstr "A passar os dados e a executar o comando personalizado: %s" + +#: ../src/tools.c:290 +#, c-format +msgid "Custom command failed: %s" +msgstr "Comando personalizado falhou: %s" + +#: ../src/tools.c:304 ../src/tools.c:511 +msgid "Set Custom Commands" +msgstr "Definir Pomandos Personalizados" + +#: ../src/tools.c:311 +msgid "" +"You can send the current selection to any of these commands and the output " +"of the command replaces the current selection." +msgstr "" +"Pode enviar a selecção actual para qualquer um destes comandos e o seu " +"resultado substituirá a referida selecção." + +#: ../src/tools.c:486 +msgid "No custom commands defined." +msgstr "Nenhum comando personalizado definido." + +#: ../src/tools.c:586 +msgid "Word Count" +msgstr "Contar Palavras" + +#: ../src/tools.c:596 +msgid "selection" +msgstr "selecção" + +#: ../src/tools.c:602 +msgid "whole document" +msgstr "documento inteiro" + +#: ../src/tools.c:611 +msgid "Range:" +msgstr "Alcance:" + +#: ../src/tools.c:623 +msgid "Lines:" +msgstr "Linhas:" + +#: ../src/tools.c:637 +msgid "Words:" +msgstr "Palavras:" + +#: ../src/tools.c:651 +msgid "Characters:" +msgstr "Caracteres:" + +#: ../src/sidebar.c:186 +msgid "No tags found" +msgstr "Nenhuma etiqueta encontrada" + +#: ../src/sidebar.c:546 +msgid "Show S_ymbol List" +msgstr "Mostrar a Lista de Sí_mbolos" + +#: ../src/sidebar.c:554 +msgid "Show _Document List" +msgstr "Mostrar a Lista de _Documentos" + +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 +msgid "H_ide Sidebar" +msgstr "_Ocultar a Barra Lateral" + +#: ../src/sidebar.c:631 +msgid "Show _Paths" +msgstr "Mostrar Direc_tórios" + +#. Status bar statistics: col = column, sel = selection. +#: ../src/ui_utils.c:194 +#, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "linha: %d / %d\t col: %d\t sel: %d\t " + +#. RO = read-only +#: ../src/ui_utils.c:200 +msgid "RO " +msgstr "RO " + +#. OVR = overwrite/overtype, INS = insert +#: ../src/ui_utils.c:202 +msgid "OVR" +msgstr "SOBR" + +#: ../src/ui_utils.c:202 +msgid "INS" +msgstr "INS" + +#: ../src/ui_utils.c:208 +msgid "TAB" +msgstr "TAB" + +#: ../src/ui_utils.c:211 +msgid "SP" +msgstr "SP" + +#: ../src/ui_utils.c:214 +msgid "T/S" +msgstr "T/S" + +#: ../src/ui_utils.c:218 +#, c-format +msgid "mode: %s" +msgstr "modo: %s" + +#: ../src/ui_utils.c:221 +#, c-format +msgid "encoding: %s %s" +msgstr "codificação: %s %s" + +#: ../src/ui_utils.c:227 +#, c-format +msgid "filetype: %s" +msgstr "tipo de ficheiro: %s" + +#: ../src/ui_utils.c:231 +msgid "MOD" +msgstr "MOD" + +#: ../src/ui_utils.c:236 +#, c-format +msgid "scope: %s" +msgstr "âmbito: %s" + +#: ../src/ui_utils.c:321 +#, c-format +msgid "Font updated (%s)." +msgstr "Tipo de letra actualizado (%s)." + +#: ../src/ui_utils.c:517 +msgid "C Standard Library" +msgstr "Biblioteca Padrão de C" + +#: ../src/ui_utils.c:518 +msgid "ISO C99" +msgstr "ISO C99" + +#: ../src/ui_utils.c:519 +msgid "C++ (C Standard Library)" +msgstr "C++ (Biblioteca Padrão de C)" + +#: ../src/ui_utils.c:520 +msgid "C++ Standard Library" +msgstr "Biblioteca Padrão de C++" + +#: ../src/ui_utils.c:521 +msgid "C++ STL" +msgstr "C++ STL" + +#: ../src/ui_utils.c:585 +msgid "_Set Custom Date Format" +msgstr "Definir formato de data per_sonalizado" + +#: ../src/ui_utils.c:1659 +msgid "Select Folder" +msgstr "Seleccionar Pasta" + +#: ../src/ui_utils.c:1659 +msgid "Select File" +msgstr "Seleccionar Ficheiro" + +#: ../src/ui_utils.c:1813 +msgid "Save All" +msgstr "Guardar Tudo" + +#: ../src/ui_utils.c:1814 +msgid "Close All" +msgstr "Fechar Tudo" + +#: ../src/utils.c:338 +msgid "Win (CRLF)" +msgstr "Win (CRLF)" + +#: ../src/utils.c:339 +msgid "Mac (CR)" +msgstr "Mac (CR)" + +#: ../src/utils.c:340 +msgid "Unix (LF)" +msgstr "Unix (LF)" + +#: ../src/vte.c:516 +msgid "_Set Path From Document" +msgstr "_Mudar para o directório do documento" + +#: ../src/vte.c:521 +msgid "_Restart Terminal" +msgstr "_Reiniciar o Terminal" + +#: ../src/vte.c:544 +msgid "_Input Methods" +msgstr "Modos de _Inserção" + +#: ../src/vte.c:638 +msgid "" +"Could not change the directory in the VTE because it probably contains a " +"command." +msgstr "" +"Falha ao mudar de directoria no terminal (VTE), provavelmente porque esta " +"contém um comando." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Tipo de Letra:" + +#: ../src/vte.c:746 +msgid "Sets the font for the terminal widget" +msgstr "Define o tipo de letra para o terminal" + +#: ../src/vte.c:748 +msgid "Foreground color:" +msgstr "Cor Principal:" + +#: ../src/vte.c:754 +msgid "Background color:" +msgstr "Cor de Fundo:" + +#: ../src/vte.c:764 +msgid "Sets the foreground color of the text in the terminal widget" +msgstr "Define a cor principal do texto no widget que emula o terminal" + +#: ../src/vte.c:771 +msgid "Sets the background color of the text in the terminal widget" +msgstr "Define a cor de fundo do texto no widget que emula o terminal" + +#: ../src/vte.c:774 +msgid "Scrollback lines:" +msgstr "Linhas de deslocamento:" + +#: ../src/vte.c:786 +msgid "" +"Specifies the history in lines, which you can scroll back in the terminal " +"widget" +msgstr "" +"Especifica a história, em número de linhas, que é possível recuar no widget " +"do terminal" + +#: ../src/vte.c:790 +msgid "Shell:" +msgstr "Linha de Comandos:" + +#: ../src/vte.c:798 +msgid "" +"Sets the path to the shell which should be started inside the terminal " +"emulation" +msgstr "" +"Define o directório do executável da linha de comandos a usar dentro do " +"emulador de terminal" + +#: ../src/vte.c:815 +msgid "Scroll on keystroke" +msgstr "Deslocar ao premir uma tecla" + +#: ../src/vte.c:816 +msgid "Whether to scroll to the bottom if a key was pressed" +msgstr "Se se desloca o texto até ao fim caso uma tecla seja pressionada" + +#: ../src/vte.c:819 +msgid "Scroll on output" +msgstr "Deslocar ao receber texto" + +#: ../src/vte.c:820 +msgid "Whether to scroll to the bottom when output is generated" +msgstr "" +"Se se desloca o texto até ao fim sempre que algum texto é gerado por um " +"comando" + +#: ../src/vte.c:823 +msgid "Cursor blinks" +msgstr "Cursor a piscar" + +#: ../src/vte.c:824 +msgid "Whether to blink the cursor" +msgstr "Se o cursor deve ou não piscar" + +#: ../src/vte.c:827 +msgid "Override Geany keybindings" +msgstr "Sobrepor os atalhos do Geany" + +#: ../src/vte.c:829 +msgid "" +"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "" +"Permite que o emulador de terminal receba atalhos do teclado (sem serem os " +"comandos de foco)" + +#: ../src/vte.c:832 +msgid "Disable menu shortcut key (F10 by default)" +msgstr "Desactivar a tecla do atalho do menu (F10, por defeito)" + +#: ../src/vte.c:833 +msgid "" +"This option disables the keybinding to popup the menu bar (default is F10). " +"Disabling it can be useful if you use, for example, Midnight Commander " +"within the VTE." +msgstr "" +"Esta opção desactiva o atalho de teclado que activa o menu da barra de menus " +"(F10 por defeito). Isto pode ser útil se, por exemplo, pretender correr o " +"Midnight Commander dentro do VTE." + +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 +msgid "Follow the path of the current file" +msgstr "Seguir o directório do ficheiro actual" + +#: ../src/vte.c:837 +msgid "Whether to execute \"cd $path\" when you switch between opened files" +msgstr "" +"Se o VTE deve executar \"cd $path\" quando se muda entre ficheiros abertos, " +"fazendo com que o terminal se encontre sempre no directório do actual " +"ficheiro" + +#. create check_skip_script checkbox before the check_skip_script checkbox to be able to +#. * use the object for the toggled handler of check_skip_script checkbox +#: ../src/vte.c:842 +msgid "Don't use run script" +msgstr "Não usar o script de execução" + +#: ../src/vte.c:843 +msgid "" +"Don't use the simple run script which is usually used to display the exit " +"status of the executed program" +msgstr "" +"Não usa o simples script de execução que normalmente é usado para mostrar o " +"código de terminação de um programa executado" + +#: ../src/vte.c:846 +msgid "Execute programs in VTE" +msgstr "Executar programas no VTE" + +#: ../src/vte.c:847 +msgid "" +"Run programs in VTE instead of opening a terminal emulation window. Please " +"note, programs executed in VTE cannot be stopped" +msgstr "" +"Executar programas no VTE ao invés de abrir uma janela com o terminal. Note " +"que programas executados no VTE não podem ser parados." + +#: ../src/win32.c:161 +msgid "Geany project files" +msgstr "Ficheiros de Projecto do Geany" + +#: ../src/win32.c:167 +msgid "Executables" +msgstr "Executáveis" + +#: ../plugins/classbuilder.c:36 +msgid "Class Builder" +msgstr "Construtor de Classe" + +#: ../plugins/classbuilder.c:36 +msgid "Creates source files for new class types." +msgstr "Cria ficheiros para cada novo tipo de classe." + +#: ../plugins/classbuilder.c:372 +msgid "Create Class" +msgstr "Criar Classe" + +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Conjunto de Nomes" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Conjunto de Nomes:" + +#: ../plugins/classbuilder.c:402 +msgid "Class" +msgstr "Classe" + +#: ../plugins/classbuilder.c:411 +msgid "Class name:" +msgstr "Nome da Classe:" + +#: ../plugins/classbuilder.c:424 +msgid "Header file:" +msgstr "Ficheiro de Cabeçalhos:" + +#: ../plugins/classbuilder.c:434 +msgid "Source file:" +msgstr "Ficheiro de Código:" + +#: ../plugins/classbuilder.c:440 +msgid "Inheritance" +msgstr "Herança" + +#: ../plugins/classbuilder.c:449 +msgid "Base class:" +msgstr "Classe Base:" + +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Código base:" + +#: ../plugins/classbuilder.c:465 +msgid "Base header:" +msgstr "Cabeçalho Base:" + +#: ../plugins/classbuilder.c:475 +msgid "Global" +msgstr "Global" + +#: ../plugins/classbuilder.c:485 +msgid "Base GType:" +msgstr "GType Base:" + +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementa:" + +#: ../plugins/classbuilder.c:505 +msgid "Options" +msgstr "Opções" + +#: ../plugins/classbuilder.c:514 +msgid "Create constructor" +msgstr "Criar construtor" + +#: ../plugins/classbuilder.c:518 +msgid "Create destructor" +msgstr "Criar destrutor" + +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "É abstracto" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "É Singleton" + +#: ../plugins/classbuilder.c:540 +msgid "GTK+ constructor type" +msgstr "Construtor do tipo GTK+" + +#: ../plugins/classbuilder.c:1040 +msgid "Create Cla_ss" +msgstr "Criar Cla_sse" + +#: ../plugins/classbuilder.c:1046 +msgid "_C++ Class" +msgstr "Classe _C++" + +#: ../plugins/classbuilder.c:1049 +msgid "_GTK+ Class" +msgstr "Classe _GTK+" + +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "Classe _PHP" + +#: ../plugins/htmlchars.c:38 +msgid "HTML Characters" +msgstr "Caracteres HTML" + +#: ../plugins/htmlchars.c:38 +msgid "Inserts HTML character entities like '&'." +msgstr "Insere caracteres HTML como o '&'." + +#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 +msgid "The Geany developer team" +msgstr "A equipa responsável pelo Geany" + +#: ../plugins/htmlchars.c:75 +msgid "HTML characters" +msgstr "Caracteres HTML" + +#: ../plugins/htmlchars.c:81 +msgid "ISO 8859-1 characters" +msgstr "Caracteres ISO 8859-1" + +#: ../plugins/htmlchars.c:179 +msgid "Greek characters" +msgstr "Caracteres Gregos" + +#: ../plugins/htmlchars.c:234 +msgid "Mathematical characters" +msgstr "Caracteres Matemáticos" + +#: ../plugins/htmlchars.c:275 +msgid "Technical characters" +msgstr "Caracteres Técnicos" + +#: ../plugins/htmlchars.c:283 +msgid "Arrow characters" +msgstr "Caracteres de Setas" + +#: ../plugins/htmlchars.c:296 +msgid "Punctuation characters" +msgstr "Caracteres de Pontuação" + +#: ../plugins/htmlchars.c:312 +msgid "Miscellaneous characters" +msgstr "Vários Caracteres" + +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "A directoria de configuração dos plugins não pôde ser criada." + +#: ../plugins/htmlchars.c:482 +msgid "Special Characters" +msgstr "Caracteres Especiais" + +#: ../plugins/htmlchars.c:484 +msgid "_Insert" +msgstr "_Inserir" + +#: ../plugins/htmlchars.c:493 +msgid "" +"Choose a special character from the list below and double click on it or use " +"the button to insert it at the current cursor position." +msgstr "" +"Escolha um caractere, da lista apresentada em baixo e faça duplo clique " +"sobre o mesmo, ou use o botão, para o inserir na posição actual do cursor." + +#: ../plugins/htmlchars.c:507 +msgid "Character" +msgstr "Caractere" + +#: ../plugins/htmlchars.c:513 +msgid "HTML (name)" +msgstr "HTML (nome)" + +#: ../plugins/htmlchars.c:731 +msgid "_Insert Special HTML Characters" +msgstr "_Inserir caracteres HTML especiais" + +#. Add menuitem for html replacement functions +#: ../plugins/htmlchars.c:746 +msgid "HTML Replacement" +msgstr "Substituição de HTML" + +#: ../plugins/htmlchars.c:753 +msgid "_HTMLToggle" +msgstr "Alternar _HTML" + +#: ../plugins/htmlchars.c:762 +msgid "Bulk replacement of special chars" +msgstr "Substituição, em massa, de caracteres especiais" + +#: ../plugins/htmlchars.c:777 +msgid "Insert Special HTML Characters" +msgstr "Inserir caracteres HTML especiais" + +#: ../plugins/htmlchars.c:780 +msgid "Replace special characters" +msgstr "Substituir caracteres especiais" + +#: ../plugins/htmlchars.c:783 +msgid "Toggle plugin status" +msgstr "Alternar estado do plugin" + +#: ../plugins/export.c:37 +msgid "Export" +msgstr "Exportar" + +#: ../plugins/export.c:37 +msgid "Exports the current file into different formats." +msgstr "Exporta o ficheiro actual para diferentes formatos." + +#: ../plugins/export.c:166 +msgid "Export File" +msgstr "Exportar Ficheiro" + +#: ../plugins/export.c:183 +msgid "_Use current zoom level" +msgstr "_Usar o nível de Zoom actual" + +#: ../plugins/export.c:185 +msgid "" +"Renders the font size of the document together with the current zoom level" +msgstr "" +"Desenha o tipo de letra do documento conjuntamente com o actual nível de " +"ampliação (zoom)" + +#: ../plugins/export.c:268 +#, c-format +msgid "Document successfully exported as '%s'." +msgstr "Documento exportado com sucesso como '%s'." + +#: ../plugins/export.c:270 +#, c-format +msgid "File '%s' could not be written (%s)." +msgstr "O ficheiro '%s' não pode ser escrito (%s)." + +#: ../plugins/export.c:317 +#, c-format +msgid "The file '%s' already exists. Do you want to overwrite it?" +msgstr "O ficheiro '%s' já existe. Pretende substituí-lo?" + +#: ../plugins/export.c:704 +msgid "_Export" +msgstr "_Exportar" + +#. HTML +#: ../plugins/export.c:711 +msgid "As _HTML" +msgstr "Como _HTML" + +#. LaTeX +#: ../plugins/export.c:717 +msgid "As _LaTeX" +msgstr "Como _LaTeX" + +#: ../plugins/filebrowser.c:43 +msgid "File Browser" +msgstr "Navegador de Ficheiros" + +#: ../plugins/filebrowser.c:43 +msgid "Adds a file browser tab to the sidebar." +msgstr "Adiciona um separador para o navegador de ficheiros na barra lateral." + +#: ../plugins/filebrowser.c:360 +msgid "Too many items selected!" +msgstr "Demasiados itens seleccionados!" + +#: ../plugins/filebrowser.c:436 +#, c-format +msgid "Could not execute configured external command '%s' (%s)." +msgstr "" +"Falha ao executar o comando externo '%s' (%s). Este comando foi definido por " +"si." + +#: ../plugins/filebrowser.c:603 +msgid "Open _externally" +msgstr "Abrir _externamente" + +#: ../plugins/filebrowser.c:618 +msgid "_Find in Files" +msgstr "Procurar em _Ficheiros" + +#: ../plugins/filebrowser.c:628 +msgid "Show _Hidden Files" +msgstr "Mostrar Fic_heiros Ocultos" + +#: ../plugins/filebrowser.c:841 +msgid "Up" +msgstr "Para Cima" + +#: ../plugins/filebrowser.c:846 +msgid "Refresh" +msgstr "Actualizar" + +#: ../plugins/filebrowser.c:851 +msgid "Home" +msgstr "Pasta Pessoal" + +#: ../plugins/filebrowser.c:856 +msgid "Set path from document" +msgstr "Mudar para o directório do documento" + +#: ../plugins/filebrowser.c:866 +msgid "Clear the filter" +msgstr "Limpar o filtro" + +#: ../plugins/filebrowser.c:880 +msgid "Filter:" +msgstr "Filtro:" + +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtre os seus ficheiros com caracteres universais (wildcards) usuais" + +#: ../plugins/filebrowser.c:1107 +msgid "Focus File List" +msgstr "Focar a Lista de Ficheiros" + +#: ../plugins/filebrowser.c:1109 +msgid "Focus Path Entry" +msgstr "Focar Campo de Directório" + +#: ../plugins/filebrowser.c:1185 +msgid "External open command:" +msgstr "Comando Externo para a função Abrir:" + +#: ../plugins/filebrowser.c:1194 +#, 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 "" +"O comando a executar ao usar o \"Abrir com\". Pode usar os descritores %f e " +"%d.\n" +"%f será substituído pelo nome do ficheiro incluindo o caminho para o seu " +"directório\n" +"%d será substituído pelo caminho até ao directório do ficheiro seleccionado, " +"sem o nome deste" + +#: ../plugins/filebrowser.c:1202 +msgid "Show hidden files" +msgstr "Mostrar ficheiros ocultos" + +#: ../plugins/filebrowser.c:1208 +msgid "Hide object files" +msgstr "Ocultar ficheiros objecto" + +#: ../plugins/filebrowser.c:1212 +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" +msgstr "" +"Oculta, no navegador de ficheiros, ficheiros objecto gerados, inclui os " +"ficheiros *.o, *.obj, *.so, *.dll, *.a, *.lib" + +#: ../plugins/filebrowser.c:1223 +msgid "Use the project's base directory" +msgstr "Usar o directório base do projecto" + +#: ../plugins/filebrowser.c:1227 +msgid "" +"Change the directory to the base directory of the currently opened project" +msgstr "" +"Muda o directório para o directório base do projecto que se encontra aberto" + +#: ../plugins/saveactions.c:39 +msgid "Save Actions" +msgstr "Acções de Guardar" + +#: ../plugins/saveactions.c:39 +msgid "This plugin provides different actions related to saving of files." +msgstr "" +"Este plugin fornece diferentes acções relativas ao guardar de ficheiros." + +#: ../plugins/saveactions.c:169 +#, c-format +msgid "Backup Copy: Directory could not be created (%s)." +msgstr "Cópia de Segurança: Falha ao criar a directoria (%s)." + +#. it's unlikely that this happens +#: ../plugins/saveactions.c:201 +#, c-format +msgid "Backup Copy: File could not be read (%s)." +msgstr "Cópia de Segurança: O ficheiro não pôde ser lido (%s)." + +#: ../plugins/saveactions.c:219 +#, c-format +msgid "Backup Copy: File could not be saved (%s)." +msgstr "Cópia de Segurança: O ficheiro não pôde ser guardado (%s)." + +#: ../plugins/saveactions.c:311 +#, c-format +msgid "Autosave: Saved %d file automatically." +msgid_plural "Autosave: Saved %d files automatically." +msgstr[0] "Auto-Guardar: %d ficheiro guardado automaticamente." +msgstr[1] "Auto-Guardar: %d ficheiros guardados automaticamente." + +#. initialize the dialog +#: ../plugins/saveactions.c:380 +msgid "Select Directory" +msgstr "Seleccione um directório" + +#: ../plugins/saveactions.c:463 +msgid "Backup directory does not exist or is not writable." +msgstr "" +"Directório para a cópia de segurança não existe ou não tem permissões para " +"escrita." + +#: ../plugins/saveactions.c:543 +msgid "Auto Save" +msgstr "Auto-Gravar" + +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 +msgid "_Enable" +msgstr "_Activar" + +#: ../plugins/saveactions.c:553 +msgid "Auto save _interval:" +msgstr "Frequênc_ia do Auto-Guardar:" + +#: ../plugins/saveactions.c:561 +msgid "seconds" +msgstr "segundos" + +#: ../plugins/saveactions.c:570 +msgid "_Print status message if files have been automatically saved" +msgstr "" +"Im_primir mensagens de estado se os ficheiros forem guardados automaticamente" + +#: ../plugins/saveactions.c:578 +msgid "Save only current open _file" +msgstr "Guardar apenas o actual _ficheiro aberto" + +#: ../plugins/saveactions.c:585 +msgid "Sa_ve all open files" +msgstr "Guar_dar todos os ficheiros abertos" + +#: ../plugins/saveactions.c:605 +msgid "Instant Save" +msgstr "Guardar Instantâneo" + +#: ../plugins/saveactions.c:615 +msgid "_Filetype to use for newly opened files:" +msgstr "Tipo de _Ficheiro a usar ao abrir novos ficheiros:" + +#: ../plugins/saveactions.c:646 +msgid "Backup Copy" +msgstr "Cópia de Segurança" + +#: ../plugins/saveactions.c:656 +msgid "_Directory to save backup files in:" +msgstr "_Directoria onde guardar cópias de segurança:" + +#: ../plugins/saveactions.c:679 +msgid "Date/_Time format for backup files (\"man strftime\" for details):" +msgstr "" +"Forma_to da Data/Hora para cópias de segurança (para detalhes executar \"man " +"strftime\")" + +#: ../plugins/saveactions.c:692 +msgid "Directory _levels to include in the backup destination:" +msgstr "Número de _níveis de directório a incluir na cópia de segurança:" + +#: ../plugins/splitwindow.c:36 +msgid "Split Window" +msgstr "Dividir Janela" + +#: ../plugins/splitwindow.c:36 +msgid "Splits the editor view into two windows." +msgstr "Divide a janela do editor em 2 janelas." + +#: ../plugins/splitwindow.c:244 +msgid "Show the current document" +msgstr "Mostra o documento actual" + +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 +msgid "_Unsplit" +msgstr "J_untar Janelas" + +#: ../plugins/splitwindow.c:371 +msgid "_Split Window" +msgstr "Dividir Janela_s" + +#: ../plugins/splitwindow.c:379 +msgid "_Horizontally" +msgstr "_Horizontalmente" + +#: ../plugins/splitwindow.c:384 +msgid "_Vertically" +msgstr "_Verticalmente" + +#: ../plugins/splitwindow.c:400 +msgid "Split Horizontally" +msgstr "Divide Horizontalmente" + +#: ../plugins/splitwindow.c:402 +msgid "Split Vertically" +msgstr "Divide Verticalmente" + +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Definir ficheiros de \"include\" e argumentos" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_Ver o ficheiro DVIao de" + +#~ msgid "V_iew PDF File" +#~ msgstr "V_er o ficheiro PDF" + +#~ msgid "_Set Arguments" +#~ msgstr "_Definir Argumentos" + +#~ msgid "Set Arguments" +#~ msgstr "Defina Argumentos" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Definir programas e opções para a compilação e visualização dos ficheiros " +#~ "(La)TeX." + +#~ msgid "DVI creation:" +#~ msgstr "Geração de DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Geração de PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Visualização de DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Visualização de PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f será substituído pelo nome do ficheiro seleccionado, e.x. teste.c\n" +#~ "%e será substituído pelo nome do ficheiro sem extensão, e.x. teste" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Defina ficheiros de include e argumentos" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Defina os comandos para geração e execução de programas." + +#~ msgid "Compile:" +#~ msgstr "Compilar:" + +#~ msgid "Build:" +#~ msgstr "Gerar:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Erro ao executar o programa para visualização" + +#~ msgid "Try to resave the file?" +#~ msgstr "Tentar guardar novamente o ficheiro?" + +#~ msgid "_Customize Toolbar" +#~ msgstr "_Personalizar a Barra de Ferramentas" + +#~ msgid "Icon style:" +#~ msgstr "Estilo dos ícones:" + +#~ msgid "Icon size:" +#~ msgstr "Tamanho dos ícones:" + +#~ msgid "Appearance" +#~ msgstr "Aparência" + +#~ msgid "Hard tab width:" +#~ msgstr "Largura de tabulação persistente:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "A largura de uma tabulação quando Tabulações & Espaços estão definidos " +#~ "para o documento" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Usar texto branco sobre fundo preto e inverter todas as outras cores, " +#~ "esta opção requer que o Geany seja reiniciado" + +#~ msgid "Long line marker:" +#~ msgstr "Marca de linha longa:" + +#~ msgid "Long line marker color:" +#~ msgstr "Cor da marca de linha longa:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Caminho e opções para a ferramenta \"make\"" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplicar linha ou selecção" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Enviar o seleccionado para o Terminal" + +#~ msgid "Run (alternative command)" +#~ msgstr "Executar (comando alternativo)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Em baixo encontra-se uma lista dos plugins disponíveis. Seleccione os " +#~ "plugins que o Geany deve carregar ao iniciar." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "A impressão do ficheiro %s foi cancelada." + +#~ msgid "Make in base path" +#~ msgstr "\"Make\" no directório base" + +#~ msgid "Run command:" +#~ msgstr "Executar o comando:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Comando a executar na directoria base do projecto. Opção podem ser " +#~ "adicionadas ao comando. Deixe em branco para que seja usado o comando " +#~ "definido por defeito." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Escolha o comando para executar o projecto" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Texto substituído no ficheiro %u." +#~ msgstr[1] "Texto substituído nos ficheiros %u." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "Procura falhou (consulte Ajuda->Mensagens de depuração (debug) para " +#~ "detalhes)." + +#~ msgid "My" +#~ msgstr "Meu" + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Our" +#~ msgstr "Nosso" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminal (widget)" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Estas definições do emulador virtual do terminal (VTE) apenas têm efeito " +#~ "se a biblioteca do VTE foi carregada com sucesso." + +#~ msgid "Terminal font:" +#~ msgstr "Tipo de Letra:" + +#~ msgid "Unsplit" +#~ msgstr "Juntar Janelas" + +#~ msgid "Select _All" +#~ msgstr "Seleccionar _Tudo" + +#~ msgid "Diff file" +#~ msgstr "Dif de ficheiro" + +#~ msgid "Failed to view %s (make sure it is already compiled)" +#~ msgstr "Falha ao visualizar %s (verifique que já está compilado)" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Completar automaticamente símbolos" + +#~ msgid "" +#~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" +#~ msgstr "" +#~ "Adiciona a numeração de página ao fundo de cada uma, ocupa 2 linhas da " +#~ "página" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Aviso: Para personalizar os elementos da barra de ferramentas, edite o " +#~ "ficheiro 'ui_toolbar.xml'. Por favor consulte a documentação para " +#~ "detalhes." diff -Nru geany-0.18/po/pt_PT.po geany-0.19/po/pt_PT.po --- geany-0.18/po/pt_PT.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/pt_PT.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,5159 +0,0 @@ -# Portuguese translation for geany -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the geany package. -# -msgid "" -msgstr "" -"Project-Id-Version: Geany 0.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-12 00:29+0000\n" -"Last-Translator: DarkVenger\n" -"Language-Team: Portuguese \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-Launchpad-Export-Date: 2009-08-12 16:28+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#: ../geany.desktop.in.h:1 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Um IDE rápido e leve, escrito em GTK2" - -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 -msgid "Geany" -msgstr "Geany" - -#: ../geany.desktop.in.h:3 -msgid "Integrated Development Environment" -msgstr "Ambiente Integrado, para Desenvolvimento" - -#: ../src/about.c:139 -msgid "About Geany" -msgstr "Sobre o Geany" - -#: ../src/about.c:189 -msgid "A fast and lightweight IDE" -msgstr "Um IDE rápido e leve" - -#: ../src/about.c:210 -#, c-format -msgid "(built on or after %s)" -msgstr "(gerado em %s ou após)" - -#. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 -msgid "Info" -msgstr "Informação" - -#: ../src/about.c:257 -msgid "Developers" -msgstr "Programadores" - -#: ../src/about.c:266 -msgid "maintainer" -msgstr "responsável" - -#: ../src/about.c:274 -msgid "developer" -msgstr "programador" - -#: ../src/about.c:282 -msgid "translation maintainer" -msgstr "responsável pela tradução" - -#: ../src/about.c:291 -msgid "Translators" -msgstr "Tradutores" - -#: ../src/about.c:311 -msgid "Previous Translators" -msgstr "Tradutores Anteriores" - -#: ../src/about.c:332 -msgid "Contributors" -msgstr "Contribuidores" - -#: ../src/about.c:342 -#, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Alguns dos muitos contribuidores (para uma lista detalhada, consultar o " -"ficheiro %s):" - -#: ../src/about.c:368 -msgid "Credits" -msgstr "Créditos" - -#: ../src/about.c:382 -msgid "License" -msgstr "Licença" - -#: ../src/about.c:391 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"A Licença não foi encontrada, por favor visite http://www.gnu.org/licenses/" -"gpl-2.0.txt para a ler na internet." - -#: ../src/build.c:221 ../src/build.c:745 -#, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Terminal \"%s\" não encontrado (verifique o caminho para o executável do " -"Terminal, nas preferências)" - -#: ../src/build.c:236 ../src/build.c:650 -#, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Falha ao executar \"%s\" (o script de arranque não pode ser criado)" - -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 -#, c-format -msgid "Process failed (%s)" -msgstr "Falha no processo (%s)" - -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (na directoria: %s)" - -#: ../src/build.c:613 -#, c-format -msgid "Failed to change the working directory to \"%s\"" -msgstr "Erro ao mudar a directoria de trabalho para \"%s\"" - -#: ../src/build.c:707 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Falha ao executar o ficheiro no VTE porque provavelmente este contém um " -"comando." - -#: ../src/build.c:914 -msgid "Compilation failed." -msgstr "A compilação falhou." - -#: ../src/build.c:928 -msgid "Compilation finished successfully." -msgstr "Compilação concluída com sucesso." - -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compilar" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Gerar" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Gerar _todos" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Gerar resultado _personalizado" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Gerar _Objecto" - -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 -msgid "_Next Error" -msgstr "_Próximo Erro" - -#: ../src/build.c:1097 ../src/build.c:1194 -msgid "_Previous Error" -msgstr "Erro _Anterior" - -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Definir ficheiros de \"include\" e argumentos" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Ver o ficheiro DVIao de" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_er o ficheiro PDF" - -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Definir Argumentos" - -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Defina Argumentos" - -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Definir programas e opções para a compilação e visualização dos ficheiros " -"(La)TeX." - -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Geração de DVI:" - -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Geração de PDF:" - -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Visualização de DVI:" - -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Visualização de PDF:" - -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f será substituído pelo nome do ficheiro seleccionado, e.x. teste.c\n" -"%e será substituído pelo nome do ficheiro sem extensão, e.x. teste" - -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Defina ficheiros de include e argumentos" - -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Defina os comandos para geração e execução de programas." - -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "comandos %s" - -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compilar:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Gerar:" - -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Executar:" - -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Gerar a partir do ficheiro seleccionado" - -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Gerar resultado personalizado" - -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Introduza as opções aqui, todo o texto introduzido será passado ao comando " -"make." - -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "" -"Gerar a partir do ficheiro seleccionado, com o comando make e opções padrão" - -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "" -"Gerar a partir do ficheiro seleccionado, com o comando make e opções " -"personalizadas" - -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Compila o ficheiro seleccionado com o comando make" - -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Erro ao executar o programa para visualização" - -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "O processo não pôde ser parado (%s)." - -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Sem mais erros de compilação." - -#: ../src/callbacks.c:152 -msgid "Do you really want to quit?" -msgstr "Tem a certeza que quer sair?" - -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 -msgid "_Reload" -msgstr "_Reler" - -#: ../src/callbacks.c:470 -msgid "Any unsaved changes will be lost." -msgstr "Quaisquer alterações não salvas serão perdidas." - -#: ../src/callbacks.c:471 -#, c-format -msgid "Are you sure you want to reload '%s'?" -msgstr "Tem a certeza que quer recarregar '%s'?" - -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 -msgid "Go to Line" -msgstr "Ir para a Linha" - -#: ../src/callbacks.c:1249 -msgid "Enter the line you want to go to:" -msgstr "Introduza a linha para onde quer ir:" - -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Por favor, defina o tipo do ficheiro seleccionado antes de usar esta função." - -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 -msgid "dd.mm.yyyy" -msgstr "dd.mm.aaaa" - -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 -msgid "mm.dd.yyyy" -msgstr "mm.dd.aaaa" - -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 -msgid "yyyy/mm/dd" -msgstr "aaaa/mm/dd" - -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 -msgid "dd.mm.yyyy hh:mm:ss" -msgstr "dd.mm.aaaa hh:mm:ss" - -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 -msgid "mm.dd.yyyy hh:mm:ss" -msgstr "mm.dd.aaaa hh:mm:ss" - -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 -msgid "yyyy/mm/dd hh:mm:ss" -msgstr "aaaa/mm/dd hh:mm:ss" - -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 -msgid "_Use Custom Date Format" -msgstr "_Usar um formato de data personalizado" - -#: ../src/callbacks.c:1497 -msgid "Custom Date Format" -msgstr "Formato de data personalizado" - -#: ../src/callbacks.c:1498 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Introduza aqui o formato de data e hora personalizado. Pode usar qualquer " -"tipo de descritor dos permitidos na versão ANSI C da função strftime." - -#: ../src/callbacks.c:1516 -msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"O formato para a data não pode ser convertido (provavelmente é muito longo)." - -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 -msgid "No more message items." -msgstr "Sem mais mensagens." - -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 -msgid "Open File" -msgstr "Abrir Ficheiro" - -#: ../src/dialogs.c:144 ../src/interface.c:691 -msgid "_View" -msgstr "_Ver" - -#: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Abre o ficheiro em, apenas, modo de leitura. Se escolher mais do que um " -"ficheiro, todos serão abertos, exclusivamente, em modo de leitura." - -#: ../src/dialogs.c:169 -msgid "Detect by file extension" -msgstr "Detectar através da extensão do ficheiro" - -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 -msgid "Detect from file" -msgstr "Detectar a partir do ficheiro" - -#: ../src/dialogs.c:258 -msgid "_More Options" -msgstr "" - -#. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 -msgid "Show _hidden files" -msgstr "Mostrar ficheiros _ocultos" - -#: ../src/dialogs.c:276 -msgid "Set encoding:" -msgstr "Definir a codificação:" - -#: ../src/dialogs.c:286 -msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." -msgstr "" -"Define, explicitamente, a codificação para o ficheiro se esta não for " -"detectável. Esta opção é útil quando sabe à partida que o Geany não será " -"capaz de detectar automaticamente a codificação do ficheiro.\n" -"Note que se escolher múltiplos ficheiros, todos serão abertos com a " -"codificação escolhida." - -#. line 2 with filetype combo -#: ../src/dialogs.c:293 -msgid "Set filetype:" -msgstr "Define o tipo de ficheiro:" - -#: ../src/dialogs.c:303 -msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." -msgstr "" -"Define, explicitamente, o tipo ficheiro se este não for detectado através da " -"extensão.\n" -"Note que se escolher múltiplos ficheiros, todos serão abertos segundo o tipo " -"de ficheiro escolhido." - -#: ../src/dialogs.c:389 -#, fuzzy -msgid "Overwrite?" -msgstr "_Substituir" - -#: ../src/dialogs.c:390 -msgid "Filename already exists!" -msgstr "" - -#: ../src/dialogs.c:424 -msgid "Save File" -msgstr "Guardar Ficheiro" - -#: ../src/dialogs.c:432 -msgid "R_ename" -msgstr "R_enomear" - -#: ../src/dialogs.c:434 -msgid "Save the file and rename it" -msgstr "Guardar o ficheiro e renomeá-lo" - -#: ../src/dialogs.c:442 -msgid "_Open file in a new tab" -msgstr "_Abrir ficheiro numa nova aba" - -#: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Manter o ficheiro actual, não salvo, aberto e abrir o ficheiro acabado de " -"guardar numa nova aba" - -#: ../src/dialogs.c:567 ../src/win32.c:562 -msgid "Error" -msgstr "" - -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 -msgid "Question" -msgstr "" - -#: ../src/dialogs.c:573 ../src/win32.c:574 -msgid "Warning" -msgstr "" - -#: ../src/dialogs.c:576 ../src/win32.c:580 -msgid "Information" -msgstr "" - -#: ../src/dialogs.c:656 -msgid "_Don't save" -msgstr "_Não guardar" - -#: ../src/dialogs.c:687 -#, c-format -msgid "The file '%s' is not saved." -msgstr "O ficheiro '%s' não está guardado." - -#: ../src/dialogs.c:689 -msgid "Do you want to save it before closing?" -msgstr "Quer guardar o ficheiro antes de fechar?" - -#: ../src/dialogs.c:764 -msgid "Choose font" -msgstr "Escolha o tipo de letra" - -#: ../src/dialogs.c:1005 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Ocorreu um erro ou informação sobre o ficheiro não pode ser obtida (e.x. um " -"novo ficheiro)." - -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 -msgid "unknown" -msgstr "desconhecido" - -#: ../src/dialogs.c:1039 ../src/symbols.c:780 -msgid "Properties" -msgstr "Propriedades" - -#: ../src/dialogs.c:1070 -msgid "Type:" -msgstr "Tipo:" - -#: ../src/dialogs.c:1084 -msgid "Size:" -msgstr "Tamanho:" - -#: ../src/dialogs.c:1100 -msgid "Location:" -msgstr "Localização:" - -#: ../src/dialogs.c:1114 -msgid "Read-only:" -msgstr "Só de Leitura:" - -#: ../src/dialogs.c:1121 -msgid "(only inside Geany)" -msgstr "(apenas dentro do Geany)" - -#: ../src/dialogs.c:1130 -msgid "Encoding:" -msgstr "Codificação:" - -#. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 -msgid "(with BOM)" -msgstr "(com BOM)" - -#: ../src/dialogs.c:1140 -msgid "(without BOM)" -msgstr "(sem BOM)" - -#: ../src/dialogs.c:1151 -msgid "Modified:" -msgstr "Modificado:" - -#: ../src/dialogs.c:1165 -msgid "Changed:" -msgstr "Alterado:" - -#: ../src/dialogs.c:1179 -msgid "Accessed:" -msgstr "Acedido:" - -#: ../src/dialogs.c:1201 -msgid "Permissions:" -msgstr "Permissões:" - -#. Header -#: ../src/dialogs.c:1209 -msgid "Read:" -msgstr "Leitura:" - -#: ../src/dialogs.c:1216 -msgid "Write:" -msgstr "Escrita:" - -#. Owner -#: ../src/dialogs.c:1231 -msgid "Owner:" -msgstr "Dono:" - -#. Group -#: ../src/dialogs.c:1267 -msgid "Group:" -msgstr "Grupo:" - -#. Other -#: ../src/dialogs.c:1303 -msgid "Other:" -msgstr "Outros:" - -#: ../src/document.c:622 -#, c-format -msgid "File %s closed." -msgstr "Ficheiro %s fechado." - -#: ../src/document.c:745 -#, c-format -msgid "New file \"%s\" opened." -msgstr "Novo ficheiro, \\\"%s\\\" aberto." - -#: ../src/document.c:918 ../src/document.c:1421 -#, c-format -msgid "Could not open file %s (%s)" -msgstr "Impossível abrir o ficheiro %s (%s)" - -#: ../src/document.c:948 -#, c-format -msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" -"The file was set to read-only." -msgstr "" -"O ficheiro \"%s\" não pode ser aberto correctamente e foi truncado (há " -"partes omitidas). Isto pode ocorrer caso o ficheiro contenha o byte NULL. " -"Muita atenção que se o salvar, informação deste poderá perder-se.\n" -"O ficheiro foi definido como apenas de leitura." - -#. For translators: the second wildcard is an encoding name, e.g. -#. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 -#, c-format -msgid "The file \"%s\" is not valid %s." -msgstr "O ficheiro \\\"%s\\\" não é válido %s." - -#: ../src/document.c:984 -#, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"O ficheiro \\\"%s\\\" não parece ser um ficheiro de texto ou a sua " -"codificação não é suportada." - -#: ../src/document.c:1122 -msgid "Spaces" -msgstr "Espaços" - -#: ../src/document.c:1125 -msgid "Tabs" -msgstr "Tabulações" - -#: ../src/document.c:1128 -msgid "Tabs and Spaces" -msgstr "Tabulações e Espaços" - -#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs -#. * and Spaces), the second one is the filename -#: ../src/document.c:1133 -#, c-format -msgid "Setting %s indentation mode for %s." -msgstr "Definindo modo de indentação com %s para o ficheiro %s." - -#: ../src/document.c:1186 -msgid "Invalid filename" -msgstr "Nome de ficheiro inválido" - -#: ../src/document.c:1309 -#, c-format -msgid "File %s reloaded." -msgstr "Ficheiro %s recarregado." - -#. For translators: this is the status window message for opening a file. %d is the number -#. * of the newly opened file, %s indicates whether the file is opened read-only -#. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 -#, c-format -msgid "File %s opened(%d%s)." -msgstr "Ficheiro %s aberto(%d%s)." - -#: ../src/document.c:1316 -msgid ", read-only" -msgstr ", só de leitura" - -#: ../src/document.c:1512 -#, fuzzy -msgid "Error renaming file." -msgstr "Erro ao guardar ficheiro." - -#: ../src/document.c:1587 -#, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Ocorreu um erro ao converter o ficheiro de UTF-8 para %s. O ficheiro não se " -"encontra guardado." - -#: ../src/document.c:1609 -#, c-format -msgid "" -"Error message: %s\n" -"The error occurred at \"%s\" (line: %d, column: %d)." -msgstr "" -"Mensagem de erro: %s\n" -"O erro ocorreu em \\\"%s\\\" (linha: %d, coluna: %d)." - -#: ../src/document.c:1614 -#, c-format -msgid "Error message: %s." -msgstr "Mensagem de erro: %s." - -#: ../src/document.c:1715 ../src/document.c:1775 -msgid "Error saving file." -msgstr "Erro ao guardar ficheiro." - -#: ../src/document.c:1774 -#, c-format -msgid "Error saving file (%s)." -msgstr "Erro ao guardar o ficheiro (%s)." - -#: ../src/document.c:1799 -#, c-format -msgid "File %s saved." -msgstr "Ficheiro %s guardado." - -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 -#, c-format -msgid "\"%s\" was not found." -msgstr "\\\"%s\\\" não foi encontrado." - -#: ../src/document.c:1932 -msgid "Wrap search and find again?" -msgstr "Terminar esta pesquisa e procurar outra vez do início?" - -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 -#, c-format -msgid "No matches found for \"%s\"." -msgstr "Ocorrências de \\\"%s\\\" não encontradas." - -#: ../src/document.c:2022 ../src/document.c:2031 -#, c-format -msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." -msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "%s: substituída %d ocorrência de \\\"%s\\\" por \\\"%s\\\"." -msgstr[1] "%s: substituídas %d ocorrências de \\\"%s\\\" por \\\"%s\\\"." - -#: ../src/document.c:2868 -msgid "Do you want to reload it?" -msgstr "Pretende recarregá-lo?" - -#: ../src/document.c:2869 -#, c-format -msgid "" -"The file '%s' on the disk is more recent than\n" -"the current buffer." -msgstr "" -"O ficheiro '%s' em disco é mais recente do\n" -"que o actualmente em memória." - -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Tentar guardar novamente o ficheiro?" - -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "Ficheiro \\\"%s\\\" não encontrado em disco!" - -#: ../src/editor.c:4288 -msgid "Enter Tab Width" -msgstr "Introduza a largura da tabulação" - -#: ../src/editor.c:4289 -msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "Introduza o número de espaços a serem substituídos por uma tabulação." - -#: ../src/encodings.c:76 -msgid "Celtic" -msgstr "Céltico" - -#: ../src/encodings.c:77 ../src/encodings.c:78 -msgid "Greek" -msgstr "Grego" - -#: ../src/encodings.c:79 -msgid "Nordic" -msgstr "Nórdico" - -#: ../src/encodings.c:80 -msgid "South European" -msgstr "Europeu do Sul" - -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 -#: ../src/encodings.c:84 -msgid "Western" -msgstr "Ocidental" - -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 -msgid "Baltic" -msgstr "Báltico" - -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 -msgid "Central European" -msgstr "Europeu Central" - -#. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 -msgid "Cyrillic" -msgstr "Cirílico" - -#: ../src/encodings.c:98 -msgid "Cyrillic/Russian" -msgstr "Cirílico/Russo" - -#: ../src/encodings.c:99 -msgid "Cyrillic/Ukrainian" -msgstr "Cirílico/Ucraniano" - -#: ../src/encodings.c:100 -msgid "Romanian" -msgstr "Romeno" - -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 -msgid "Arabic" -msgstr "Árabe" - -#. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 -msgid "Hebrew" -msgstr "Hebreu" - -#: ../src/encodings.c:109 -msgid "Hebrew Visual" -msgstr "Hebraico Visual" - -#: ../src/encodings.c:111 -msgid "Armenian" -msgstr "Arménio" - -#: ../src/encodings.c:112 -msgid "Georgian" -msgstr "Geórgio" - -#: ../src/encodings.c:113 -msgid "Thai" -msgstr "Tailandês" - -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 -msgid "Turkish" -msgstr "Turco" - -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 -msgid "Vietnamese" -msgstr "Vietnamita" - -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 -msgid "Unicode" -msgstr "Unicode" - -#. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 -#: ../src/encodings.c:134 -msgid "Chinese Simplified" -msgstr "Chinês Simplificado" - -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 -msgid "Chinese Traditional" -msgstr "Chinês Tradicional" - -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 -#: ../src/encodings.c:141 -msgid "Japanese" -msgstr "Japonês" - -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 -#: ../src/encodings.c:145 -msgid "Korean" -msgstr "Coreano" - -#: ../src/encodings.c:147 -msgid "Without encoding" -msgstr "Sem codificação" - -#: ../src/encodings.c:374 -msgid "_West European" -msgstr "Europeu do _Ocidente" - -#: ../src/encodings.c:380 -msgid "_East European" -msgstr "Europeu do L_este" - -#: ../src/encodings.c:386 -msgid "East _Asian" -msgstr "_Asiático do Leste" - -#: ../src/encodings.c:392 -msgid "_SE & SW Asian" -msgstr "_SE & SO Asiáticos" - -#: ../src/encodings.c:398 -msgid "_Middle Eastern" -msgstr "_Médio Oriente" - -#: ../src/encodings.c:404 -msgid "_Unicode" -msgstr "_Unicode" - -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 -#, c-format -msgid "%s source file" -msgstr "Ficheiro de código %s" - -#: ../src/filetypes.c:97 -#, fuzzy, c-format -msgid "%s file" -msgstr "Ficheiro de código %s" - -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 -msgid "None" -msgstr "Nenhum(a)" - -#: ../src/filetypes.c:382 -msgid "Shell script file" -msgstr "Script de consola" - -#: ../src/filetypes.c:394 -msgid "Makefile" -msgstr "Makefile" - -#: ../src/filetypes.c:406 -msgid "XML document" -msgstr "documento XML" - -#: ../src/filetypes.c:441 -msgid "Cascading StyleSheet" -msgstr "Folha de Estilo em Cascata" - -#: ../src/filetypes.c:452 -msgid "SQL Dump file" -msgstr "Ficheiro de despejo, SQL" - -#: ../src/filetypes.c:496 -msgid "Config file" -msgstr "Ficheiro de configuração" - -#: ../src/filetypes.c:508 -msgid "Gettext translation file" -msgstr "Ficheiro de tradução Gettext" - -#: ../src/filetypes.c:541 -#, c-format -msgid "%s script file" -msgstr "script %s" - -#: ../src/filetypes.c:738 -msgid "_Programming Languages" -msgstr "Linguagens de _Programação" - -#: ../src/filetypes.c:739 -msgid "_Scripting Languages" -msgstr "Linguagens de Script" - -#: ../src/filetypes.c:740 -msgid "_Markup Languages" -msgstr "Linguagens de Marcação" - -#: ../src/filetypes.c:741 -msgid "M_iscellaneous Languages" -msgstr "Linguagens variadas" - -#: ../src/filetypes.c:1331 ../src/win32.c:107 -msgid "All Source" -msgstr "Todo o Código" - -#: ../src/filetypes.c:1356 ../src/project.c:292 -msgid "All files" -msgstr "Todos os ficheiros" - -#: ../src/filetypes.c:1414 -#, c-format -msgid "Bad regex for filetype %s: %s" -msgstr "Má expressão regular para ficheiros do tipo %s: %s" - -#: ../src/geany.h:53 -msgid "untitled" -msgstr "sem título" - -#: ../src/interface.c:276 -msgid "_File" -msgstr "_Ficheiro" - -#: ../src/interface.c:287 -msgid "New (with _Template)" -msgstr "Novo (com _Modelo)" - -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invisível" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 -msgid "Open Selected F_ile" -msgstr "Abrir _Ficheiro Seleccionado" - -#: ../src/interface.c:315 -msgid "Recent _Files" -msgstr "_Ficheiros Recentes" - -#: ../src/interface.c:332 -msgid "Save A_ll" -msgstr "Sa_lvar tudo" - -#: ../src/interface.c:348 -msgid "R_eload As" -msgstr "Recarregado como" - -#: ../src/interface.c:376 -msgid "Page Set_up" -msgstr "Config_uração de Página" - -#: ../src/interface.c:393 ../src/notebook.c:240 -msgid "Close Ot_her Documents" -msgstr "Fec_har os outros Documentos" - -#: ../src/interface.c:401 ../src/notebook.c:245 -msgid "C_lose All" -msgstr "F_echar Tudo" - -#: ../src/interface.c:418 -msgid "_Edit" -msgstr "_Editar" - -#: ../src/interface.c:468 ../src/interface.c:1949 -msgid "_Format" -msgstr "_Formatar" - -#: ../src/interface.c:475 ../src/interface.c:1956 -msgid "T_oggle Case of Selection" -msgstr "C_omuta, o seleccionado, entre maiúsculas/minúsculas" - -#: ../src/interface.c:484 ../src/interface.c:1965 -msgid "_Comment Line(s)" -msgstr "_Comentar Linha(s)" - -#: ../src/interface.c:488 ../src/interface.c:1969 -msgid "U_ncomment Line(s)" -msgstr "Descomentar Linhas(s)" - -#: ../src/interface.c:492 ../src/interface.c:1973 -msgid "_Toggle Line Commentation" -msgstr "Comu_ta entre comentar e não comentar, a linha" - -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_plica a linha ou o seleccionado" - -#: ../src/interface.c:505 ../src/interface.c:1986 -msgid "_Increase Indent" -msgstr "Aumentar a _indentação" - -#: ../src/interface.c:513 ../src/interface.c:1994 -msgid "_Decrease Indent" -msgstr "_Diminuir a indentação" - -#: ../src/interface.c:526 ../src/interface.c:2007 -#, fuzzy -msgid "_Send Selection to Terminal" -msgstr "Enviar a _selecção para" - -#: ../src/interface.c:530 ../src/interface.c:2011 -msgid "_Send Selection to" -msgstr "Enviar a _selecção para" - -#: ../src/interface.c:545 ../src/interface.c:2026 -msgid "I_nsert Comments" -msgstr "I_nserir Comentários" - -#: ../src/interface.c:556 ../src/interface.c:2037 -msgid "Insert _ChangeLog Entry" -msgstr "Adicionar entrada ao registo de alterações (_changelog)" - -#: ../src/interface.c:560 ../src/interface.c:2041 -msgid "Insert File _Header" -msgstr "Inserir Ficheiro de Ca_beçalho" - -#: ../src/interface.c:564 ../src/interface.c:2045 -msgid "Insert _Function Description" -msgstr "Inserir Descrição de _Função" - -#: ../src/interface.c:568 ../src/interface.c:2049 -msgid "Insert _Multiline Comment" -msgstr "Insere Comentário _Multi-linha" - -#: ../src/interface.c:572 ../src/interface.c:2053 -msgid "Insert _GPL Notice" -msgstr "Insere a licença _GPL" - -#: ../src/interface.c:576 ../src/interface.c:2057 -msgid "Insert _BSD License Notice" -msgstr "Insere a licença _BSD" - -#: ../src/interface.c:580 ../src/interface.c:2061 -msgid "Insert Dat_e" -msgstr "Ins_erir Data" - -#: ../src/interface.c:594 ../src/interface.c:2075 -msgid "_Insert \"include <...>\"" -msgstr "_Inserir \"include <...>\"" - -#: ../src/interface.c:613 -#, fuzzy -msgid "Preference_s" -msgstr "Preferências" - -#: ../src/interface.c:621 -msgid "_Search" -msgstr "Pe_squisar" - -#: ../src/interface.c:632 -msgid "Find _Next" -msgstr "Procurar o Pró_ximo" - -#: ../src/interface.c:636 -msgid "Find _Previous" -msgstr "Procurar o _Anterior" - -#: ../src/interface.c:640 -msgid "Find in F_iles" -msgstr "Pesquisar em Ficheiros" - -#: ../src/interface.c:644 ../src/search.c:524 -msgid "_Replace" -msgstr "_Substituir" - -#: ../src/interface.c:657 -msgid "Find _Selected" -msgstr "Procurar o _Seleccionado" - -#: ../src/interface.c:661 -msgid "Find Pre_vious Selected" -msgstr "Procurar, para trás, o seleccionado" - -#: ../src/interface.c:670 -msgid "Next _Message" -msgstr "Próxima _Mensagem" - -#: ../src/interface.c:674 -msgid "Pr_evious Message" -msgstr "Mensagem Ant_erior" - -#: ../src/interface.c:683 ../src/interface.c:2127 -msgid "_Go to Line" -msgstr "_Ir Para a Linha" - -#: ../src/interface.c:698 -msgid "Change _Font" -msgstr "Alterar tipo de _Letra" - -#: ../src/interface.c:711 -msgid "To_ggle All Additional Widgets" -msgstr "Activar todos os Wid_gets adicionais" - -#: ../src/interface.c:715 -msgid "Full_screen" -msgstr "Ecrã _Completo" - -#: ../src/interface.c:719 -msgid "Show Message _Window" -msgstr "Mostrar _Janela de Mensagens" - -#: ../src/interface.c:724 -msgid "Show _Toolbar" -msgstr "Mostrar Barra de Ferramen_tas" - -#: ../src/interface.c:729 -msgid "Show Side_bar" -msgstr "Mostrar _Barra Lateral" - -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 -msgid "Editor" -msgstr "Editor" - -#: ../src/interface.c:741 -msgid "Show _Markers Margin" -msgstr "Mostrar _Marcadores de Margens" - -#: ../src/interface.c:746 -msgid "Show _Line Numbers" -msgstr "Mostrar Números de _Linha" - -#: ../src/interface.c:751 -msgid "Show _White Space" -msgstr "Mostrar Espaços em _Branco" - -#: ../src/interface.c:755 -msgid "Show Line _Endings" -msgstr "Mostrar Terminação de Linha" - -#: ../src/interface.c:759 -msgid "Show _Indentation Guides" -msgstr "Mostrar as guias de Indentação" - -#: ../src/interface.c:780 -msgid "_Document" -msgstr "_Documento" - -#: ../src/interface.c:787 -msgid "_Line Wrapping" -msgstr "Mudança de _Linha" - -#: ../src/interface.c:792 -msgid "Line _Breaking" -msgstr "Que_bra de Linha" - -#: ../src/interface.c:796 -msgid "_Auto-indentation" -msgstr "Indentação _Automática" - -#: ../src/interface.c:801 -msgid "In_dent Type" -msgstr "Tipo de In_dentação" - -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 -msgid "_Tabs" -msgstr "_Tabulações" - -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 -msgid "_Spaces" -msgstr "E_spaços" - -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 -msgid "T_abs and Spaces" -msgstr "T_abulações e espaços" - -#: ../src/interface.c:831 -msgid "Read _Only" -msgstr "Leitura Apenas" - -#: ../src/interface.c:835 -msgid "_Write Unicode BOM" -msgstr "" - -#: ../src/interface.c:844 -msgid "Set File_type" -msgstr "Definir _Tipo de Ficheiro" - -#: ../src/interface.c:854 -msgid "Set _Encoding" -msgstr "Definir _Codificação" - -#: ../src/interface.c:864 -msgid "Set Line E_ndings" -msgstr "Definir o Terminador de Li_nha" - -#: ../src/interface.c:871 -msgid "Convert and Set to _CR/LF (Win)" -msgstr "Converter e definir para _CR/LF (Win)" - -#: ../src/interface.c:877 -msgid "Convert and Set to _LF (Unix)" -msgstr "Converter e definir para _LF (Unix)" - -#: ../src/interface.c:883 -msgid "Convert and Set to CR (_Mac)" -msgstr "Converter e definir para CR (_Mac)" - -#: ../src/interface.c:894 -msgid "_Strip Trailing Spaces" -msgstr "Remover e_spaços do final da linha" - -#: ../src/interface.c:898 -msgid "_Replace Tabs by Spaces" -msgstr "Substitui_r Tab por Espaços" - -#: ../src/interface.c:902 -msgid "Replace Spaces b_y Tabs" -msgstr "Substituir Espaços _por Tabulações" - -#: ../src/interface.c:911 -msgid "_Fold All" -msgstr "_Agregar Tudo" - -#: ../src/interface.c:915 -msgid "_Unfold All" -msgstr "Desa_gregar Tudo" - -#: ../src/interface.c:924 -msgid "Remove _Markers" -msgstr "Remover _Marcadores" - -#: ../src/interface.c:928 -msgid "Remove Error _Indicators" -msgstr "Remover _Indicadores de Erro" - -#: ../src/interface.c:932 -msgid "_Project" -msgstr "_Projecto" - -#: ../src/interface.c:939 -msgid "_New" -msgstr "_Novo" - -#: ../src/interface.c:947 -msgid "_Open" -msgstr "_Abrir" - -#: ../src/interface.c:955 -#, fuzzy -msgid "_Recent Projects" -msgstr "_Projecto" - -#: ../src/interface.c:959 -msgid "_Close" -msgstr "Fe_char" - -#: ../src/interface.c:980 -msgid "_Tools" -msgstr "Ferramen_tas" - -#: ../src/interface.c:987 -msgid "_Color Chooser" -msgstr "Escolher _Cores" - -#: ../src/interface.c:995 -msgid "_Word Count" -msgstr "Contar _Palavras" - -#: ../src/interface.c:999 -msgid "Load Ta_gs" -msgstr "Carre_gar Etiquetas (Tags)" - -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Recarregar a Configuração" - -#: ../src/interface.c:1011 ../src/interface.c:1018 -msgid "_Help" -msgstr "_Ajuda" - -#: ../src/interface.c:1026 -msgid "_Website" -msgstr "Página _Web" - -#: ../src/interface.c:1030 -msgid "_Keyboard Shortcuts" -msgstr "_Atalhos de Teclado" - -#: ../src/interface.c:1034 -msgid "_Debug Messages" -msgstr "Mensagens de _Depuração (debug)" - -#: ../src/interface.c:1073 ../src/treeviews.c:119 -msgid "Symbols" -msgstr "Símbolos" - -#: ../src/interface.c:1087 -msgid "Documents" -msgstr "Documentos" - -#: ../src/interface.c:1123 -msgid "Status" -msgstr "Estado" - -#: ../src/interface.c:1137 -msgid "Compiler" -msgstr "Compilador" - -#: ../src/interface.c:1152 -msgid "Messages" -msgstr "Mensagens" - -#: ../src/interface.c:1165 -msgid "Scribble" -msgstr "Rabiscar" - -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Im_agens e Texto" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Apenas _Imagens" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Apenas _Texto" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Ícones _Grandes" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Ícones _Pequenos" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Ícones _Pequenos" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "_Esconder a Barra de Ferramentas" - -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "_Esconder a Barra de Ferramentas" - -#: ../src/interface.c:2094 -msgid "Find _Usage" -msgstr "Procurar _Uso" - -#: ../src/interface.c:2102 -msgid "Find _Document Usage" -msgstr "Descobrir utilização do _Documento" - -#: ../src/interface.c:2110 -msgid "Go to _Tag Definition" -msgstr "Ir para a definição da Etiqueta (_Tag)" - -#: ../src/interface.c:2114 -msgid "Go to T_ag Declaration" -msgstr "Ir para a declaração da Etiqueta (T_ag)" - -#: ../src/interface.c:2118 -msgid "Conte_xt Action" -msgstr "Conte_xto da Acção" - -#: ../src/interface.c:2667 ../src/keybindings.c:337 -msgid "Preferences" -msgstr "Preferências" - -#: ../src/interface.c:2703 -msgid "Load files from the last session" -msgstr "Carregar ficheiros da última sessão" - -#: ../src/interface.c:2706 -msgid "Opens at startup the files from the last session" -msgstr "Abre ao iniciar os ficheiros da última sessão" - -#: ../src/interface.c:2708 -msgid "Load virtual terminal support" -msgstr "Carregar suporte para terminal virtual" - -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Se a emulação virtual do terminal (VTE) deverá ser carregada no arranque, " -"desactive-a caso não precise" - -#: ../src/interface.c:2712 -msgid "Enable plugin support" -msgstr "Activar o suporte de Plugins" - -#: ../src/interface.c:2716 -msgid "Startup" -msgstr "Início" - -#: ../src/interface.c:2735 -msgid "Save window position and geometry" -msgstr "Salvar posição e geometria da janela" - -#: ../src/interface.c:2738 -msgid "Saves the window position and geometry and restores it at the start" -msgstr "Salva a posição e geometria da janela e restaura-as no arranque" - -#: ../src/interface.c:2740 -msgid "Confirm exit" -msgstr "Confirmar saída" - -#: ../src/interface.c:2743 -msgid "Shows a confirmation dialog on exit" -msgstr "Mostrar janela de confirmação ao sair" - -#: ../src/interface.c:2745 -msgid "Shutdown" -msgstr "Desligar" - -#: ../src/interface.c:2766 -msgid "Startup path:" -msgstr "Caminho Inicial:" - -#: ../src/interface.c:2778 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Caminho onde começar quando abrir ou salvar ficheiros. Tem de ser um caminho " -"absoluto. Deixe em branco para usar a directoria, de trabalho, actual." - -#: ../src/interface.c:2791 -msgid "Project files:" -msgstr "Ficheiros de projecto:" - -#: ../src/interface.c:2803 -msgid "Path to start in when opening project files" -msgstr "Caminho onde começar quando abrir ficheiros de projecto" - -#: ../src/interface.c:2816 -#, fuzzy -msgid "Extra plugin path:" -msgstr "Activar o suporte de Plugins" - -#: ../src/interface.c:2828 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" - -#: ../src/interface.c:2841 -msgid "Paths" -msgstr "Caminhos" - -#: ../src/interface.c:2846 -msgid "Startup" -msgstr "Iniciar" - -#: ../src/interface.c:2868 -msgid "Beep on errors or when compilation has finished" -msgstr "Apitar quando ocorrerem erros ou compilações terminarem" - -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Se um som deve ser produzido quando um erro ocorre ou um compilação termina" - -#: ../src/interface.c:2873 -msgid "Switch to status message list at new message" -msgstr "Mudar para lista de mensagem de estado quando existir nova mensagem" - -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Mudar para a aba de mensagens de estado (na janela principal, em baixo) caso " -"uma nova mensagem apareça" - -#: ../src/interface.c:2878 -msgid "Suppress status messages in the status bar" -msgstr "Suprimir mensagens de estado na barra de estado" - -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Remove todas as mensagens da barra de estado. As mensagens são à mesma " -"mostradas na janela de mensagens de estado." - -#: ../src/interface.c:2883 -#, fuzzy -msgid "Auto-focus widgets (focus follows mouse)" -msgstr "Focar/Realçar widgets automaticamente (o foco segue o cursor do rato)" - -#: ../src/interface.c:2886 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Foca/Realça automaticamente os widgets que se encontram debaixo do cursor do " -"rato. Funciona na principal janela de edição, no widget \"Rabiscar\", na " -"barra de procura, nos campos de \"Ir para linha\" e no VTE." - -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 -msgid "Miscellaneous" -msgstr "Vários" - -#: ../src/interface.c:2908 -msgid "Always wrap search and hide the Find dialog" -msgstr "Pesquisar sempre em todo o documento e esconder a janela de procura" - -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Pesquisar sempre em todo o documento (não termina nem no fim, nem no início " -"deste) e esconde a janela de procura após seleccionar Procura Seguinte/" -"Anterior" - -#: ../src/interface.c:2913 -msgid "Use the current word under the cursor for Find dialogs" -msgstr "Usar a palavra onde se encontra o cursor, nos campos de Procura" - -#: ../src/interface.c:2916 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Usar a palavra onde se encontra o cursor quando realizar uma Procura, uma " -"Procura em Ficheiros ou uma Substituição, no caso de não haver uma palavra " -"seleccionada" - -#: ../src/interface.c:2918 -msgid "Use the current file's directory for Find in Files" -msgstr "Usar a directoria actual quando executar a \"Procura em Ficheiros\"" - -#: ../src/interface.c:2922 -msgid "Search" -msgstr "Procurar" - -#: ../src/interface.c:2941 -msgid "Use project-based session files" -msgstr "Usar ficheiros de sessão, por projecto" - -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"Se os ficheiros de sessão do projecto devem ser guardados e abertos aquando " -"da reabertura do projecto" - -#: ../src/interface.c:2946 -msgid "Store project file inside the project base directory" -msgstr "Guardar o ficheiro de projecto na directoria base do projecto" - -#: ../src/interface.c:2949 -#, fuzzy -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Quando activo, ao criar um novo projecto, o ficheiro de projecto será sempre " -"guardado na directoria base deste e não numa directoria de um nível acima. " -"Pode alterar a directoria para o ficheiro de projecto na janela \"Novo " -"Projecto\"" - -#: ../src/interface.c:2951 -msgid "Projects" -msgstr "Projectos" - -#: ../src/interface.c:2956 -msgid "Miscellaneous" -msgstr "Vários" - -#: ../src/interface.c:2960 -msgid "General" -msgstr "Geral" - -#: ../src/interface.c:2983 -msgid "Show symbol list" -msgstr "Mostra a lista de símbolos" - -#: ../src/interface.c:2986 -msgid "Toggle the symbol list on and off" -msgstr "Mostra/Oculta a lista de símbolos" - -#: ../src/interface.c:2988 -msgid "Show documents list" -msgstr "Mostrar lista de documentos" - -#: ../src/interface.c:2991 -msgid "Toggle the documents list on and off" -msgstr "Mostra/Oculta a lista de documentos" - -#: ../src/interface.c:2993 -msgid "Sidebar" -msgstr "Barra Lateral" - -#: ../src/interface.c:3014 -msgid "Symbol list:" -msgstr "Lista Símbolos:" - -#: ../src/interface.c:3021 ../src/interface.c:3136 -msgid "Message window:" -msgstr "Janela de Mensagens:" - -#: ../src/interface.c:3028 ../src/interface.c:3172 -msgid "Editor:" -msgstr "Editor:" - -#: ../src/interface.c:3040 -msgid "Sets the font for the message window" -msgstr "Define o tipo de letra para a janela de mensagens" - -#: ../src/interface.c:3048 -msgid "Sets the font for the symbol list" -msgstr "Define o tipo de letra para a lista de símbolos" - -#: ../src/interface.c:3056 -msgid "Sets the editor font" -msgstr "Define o tipo de letra do editor" - -#: ../src/interface.c:3058 -msgid "Fonts" -msgstr "Tipos de Letra" - -#: ../src/interface.c:3077 -msgid "Show editor tabs" -msgstr "Mostrar separadores de ficheiro no editor" - -#: ../src/interface.c:3081 -msgid "Show close buttons" -msgstr "Mostrar botões para fechar" - -#: ../src/interface.c:3084 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Mostra uma pequena cruz no separador do ficheiro, para o fechar ao clicar " -"nesta (será necessário reiniciar o Geany)" - -#: ../src/interface.c:3090 -msgid "Placement of new file tabs:" -msgstr "Localização do separador para um novo ficheiro:" - -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Esquerda" - -#: ../src/interface.c:3098 -msgid "File tabs will be placed on the left of the notebook" -msgstr "Separadores de ficheiros serão colocados à esquerda dos já existentes" - -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Direita" - -#: ../src/interface.c:3106 -msgid "File tabs will be placed on the right of the notebook" -msgstr "Separadores de ficheiros serão colocados à direita dos já existentes" - -#: ../src/interface.c:3110 -msgid "Double-clicking hides all additional widgets" -msgstr "Fazer um clique duplo esconde todos os widgets adicionais" - -#: ../src/interface.c:3113 -msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "" -"Executa o comando em Ver -> Activa/Desactiva todos os widgets adicionais" - -#: ../src/interface.c:3115 -msgid "Editor tabs" -msgstr "Separadores do Editor" - -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 -msgid "Top" -msgstr "Topo" - -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 -msgid "Bottom" -msgstr "Fundo" - -#: ../src/interface.c:3154 -msgid "Sidebar:" -msgstr "Barra Lateral:" - -#: ../src/interface.c:3190 -msgid "Tab positions" -msgstr "Posição dos Separadores" - -#: ../src/interface.c:3209 -msgid "Show status bar" -msgstr "Apresentar barra de estados" - -#: ../src/interface.c:3212 -msgid "Whether to show the status bar at the bottom of the main window" -msgstr "" -"Se a barra de estado deve aparecer, no fundo da janela principal do programa" - -#: ../src/interface.c:3219 -msgid "Interface" -msgstr "Interface" - -#: ../src/interface.c:3242 -#, fuzzy -msgid "Show T_oolbar" -msgstr "Mostrar Barra de Ferramentas" - -#: ../src/interface.c:3246 -msgid "_Append Toolbar to the Menu" -msgstr "" - -#: ../src/interface.c:3249 -msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" - -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Barra de Ferramentas" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Estilo dos ícones:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Tamanho dos ícones:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Aparência" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 -#, fuzzy -msgid "Customize Toolbar" -msgstr "Mostrar Barra de Ferramentas" - -#: ../src/interface.c:3363 -msgid "Toolbar" -msgstr "Barra de Ferramentas" - -#: ../src/interface.c:3390 -msgid "Line wrapping" -msgstr "Translinear" - -#: ../src/interface.c:3393 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Mudar de linha ao atingir o fim da janela, continuando a escrita na linha " -"seguinte. Note: mudar de linha ao escrever tem um enorme custo de computação " -"em ficheiros grandes e como tal deve ser desactivada em computadores fracos." - -#: ../src/interface.c:3395 -msgid "Enable \"smart\" home key" -msgstr "Activar tecla \"Home\" inteligente" - -#: ../src/interface.c:3398 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Quando a função tecla \"Home\" inteligente está activada, o pressionar desta " -"tecla move o cursor para o primeiro caractere não branco da linha, excepto " -"se já estiver nessa posição, caso em que este será movido mesmo para o " -"início da linha. Se esta funcionalidade estiver desactivada, a tecla \"Home" -"\" moverá sempre o cursor para o inicio da linha actual, independentemente " -"da sua posição." - -#: ../src/interface.c:3400 -msgid "Disable Drag and Drop" -msgstr "Desactivar Arrastar e Largar" - -#: ../src/interface.c:3403 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Desactiva o arrastar e largar em toda a janela do editor, assim não será " -"possível arrastar e largar quaisquer selecções nem dentro nem fora da janela " -"do editor" - -#: ../src/interface.c:3405 -msgid "Enable folding" -msgstr "Activar agregação de código" - -#: ../src/interface.c:3408 -msgid "Whether to enable folding the code" -msgstr "" -"Se activa a possibilidade de agregar código, compactando a visualização deste" - -#: ../src/interface.c:3410 -msgid "Fold/unfold all children of a fold point" -msgstr "Agregar/desagregar todos os \"filhos\" de um ponto de agregação" - -#: ../src/interface.c:3413 -#, fuzzy -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Agregar ou desagregar todos os \"filhos\" (toda a descendência) de um ponto " -"de agregação. Ao pressionar a tecla \"Shift\" em simultâneo com o clicar num " -"símbolo de agregação, o comportamento oposto é obtido" - -#: ../src/interface.c:3415 -msgid "Use indicators to show compile errors" -msgstr "Usar indicadores para mostrar erros de compilação" - -#: ../src/interface.c:3418 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Se se devem usar indicadores (um sublinhado irregular em forma de ondas) " -"para destacar as linhas onde o compilador encontrou um erro ou um aviso" - -#: ../src/interface.c:3420 -msgid "Newline strips trailing spaces" -msgstr "Mudança de linha remove espaços do final da linha" - -#: ../src/interface.c:3423 -msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "" -"Activa a funcionalidade da mudança de linha (enter) remover todos os espaços " -"no final da linha anterior" - -#: ../src/interface.c:3429 -msgid "Line breaking column:" -msgstr "Número da coluna para a quebra de linhas:" - -#: ../src/interface.c:3443 -msgid "Comment toggle marker:" -msgstr "Marcador do alternar de um comentário:" - -#: ../src/interface.c:3450 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Uma expressão que é adicionada quando se comuta uma linha de comentário num " -"ficheiro, a expressão indica que o comentário foi comutado." - -#: ../src/interface.c:3452 -msgid "Features" -msgstr "Funcionalidades" - -#: ../src/interface.c:3457 -msgid "Features" -msgstr "Funcionalidades" - -#: ../src/interface.c:3489 ../src/interface.c:5057 -msgid "Auto-indent mode:" -msgstr "Modo de auto indentação:" - -#: ../src/interface.c:3502 ../src/interface.c:5070 -msgid "Basic" -msgstr "Simples" - -#: ../src/interface.c:3503 ../src/interface.c:5071 -msgid "Current chars" -msgstr "Caracteres actuais" - -#: ../src/interface.c:3504 ../src/interface.c:5072 -msgid "Match braces" -msgstr "Corresponder chavetas" - -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 -msgid "Type:" -msgstr "Tipo:" - -#: ../src/interface.c:3513 ../src/interface.c:5081 -msgid "Width:" -msgstr "Largura:" - -#: ../src/interface.c:3526 ../src/interface.c:5094 -msgid "The width in chars of a single indent" -msgstr "A largura em caracteres de uma única indentação" - -#: ../src/interface.c:3536 ../src/interface.c:5104 -msgid "Use spaces when inserting indentation" -msgstr "Usar espaços na indentação" - -#: ../src/interface.c:3545 ../src/interface.c:5113 -msgid "Use one tab per indent" -msgstr "Usar uma tabulação por indentação" - -#: ../src/interface.c:3554 ../src/interface.c:5122 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Usar espaços se o total da indentação for menos do que a largura de uma " -"tabulação, caso contrário usar os dois" - -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Largura de tabulação persistente:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"A largura de uma tabulação quando Tabulações & Espaços estão definidos para " -"o documento" - -#: ../src/interface.c:3587 ../src/interface.c:5155 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Se o tipo de indentação deverá ser detectado através do conteúdo do " -"ficheiro, quando este é aberto" - -#: ../src/interface.c:3589 -msgid "Tab key indents" -msgstr "Tecla \"Tab\" indenta" - -#: ../src/interface.c:3592 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Pressionando a tecla \"Tab\" indenta ao invés de inserir um caractere de " -"tabulação. Pressionar as teclas \"Shift\"+\"Tab\" remove a indentação" - -#: ../src/interface.c:3594 -msgid "Indentation" -msgstr "Indentação" - -#: ../src/interface.c:3599 ../src/interface.c:5157 -msgid "Indentation" -msgstr "Indentação" - -#: ../src/interface.c:3622 -msgid "Snippet completion" -msgstr "Completar excertos de código" - -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Escreva uma pequena expressão previamente definida e complete-a, criando uma " -"expressão mais complexa, pressionando apenas uma tecla" - -#: ../src/interface.c:3627 -#, fuzzy -msgid "XML tag autocompletion" -msgstr "Completar automaticamente etiquetas XML" - -#: ../src/interface.c:3630 -msgid "Automatic completion and closing of XML tags (includes HTML tags)" -msgstr "" -"Completação automática (e fecho) de etiquetas XML (inclui etiquetas HTML)" - -#: ../src/interface.c:3632 -msgid "Automatic continuation of multi-line comments" -msgstr "Continuação automática de comentários multi-linha" - -#: ../src/interface.c:3635 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Continuar automaticamente um comentário que ocupa mais do que uma linha em " -"linguagens como o C, C++ e Java, quando uma mudança de linha (tecla enter) é " -"inserida dentro desse comentário" - -#: ../src/interface.c:3637 -msgid "Autocomplete symbols" -msgstr "" - -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Completa automaticamente símbolos conhecidos em ficheiros abertos (nomes de " -"funções, variáveis globais, ...)" - -#: ../src/interface.c:3642 -msgid "Autocomplete all words in document" -msgstr "" - -#: ../src/interface.c:3646 -msgid "Drop rest of word on completion" -msgstr "" - -#: ../src/interface.c:3656 -msgid "Max. symbol name suggestions:" -msgstr "Máx de sugestões para símbolos:" - -#: ../src/interface.c:3663 -msgid "Completion list height:" -msgstr "" - -#: ../src/interface.c:3670 -msgid "Characters to type for autocompletion:" -msgstr "" - -#: ../src/interface.c:3683 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" -msgstr "" - -#: ../src/interface.c:3692 -#, fuzzy -msgid "Display height in rows for the autocompletion list" -msgstr "Altura, em linhas, da lista de sugestões apresentada" - -#: ../src/interface.c:3701 -#, fuzzy -msgid "Maximum number of entries to display in the autocompletion list" -msgstr "Número máximo de entradas a mostrar na lista de sugestões" - -#: ../src/interface.c:3704 -msgid "Completions" -msgstr "" - -#: ../src/interface.c:3724 -msgid "Parenthesis ( )" -msgstr "Parêntesis ()" - -#: ../src/interface.c:3729 -msgid "Auto-close parenthesis when typing an opening one" -msgstr "Automaticamente fechar um parêntesis ao escrever um aberto" - -#: ../src/interface.c:3731 -msgid "Single quotes ' '" -msgstr "Plicas ' '" - -#: ../src/interface.c:3736 -msgid "Auto-close simple quote when typing an opening one" -msgstr "Automaticamente fechar uma plica ao escrever a primeira" - -#: ../src/interface.c:3738 -msgid "Curly brackets { }" -msgstr "Chavetas { }" - -#: ../src/interface.c:3743 -msgid "Auto-close curly bracket when typing an opening one" -msgstr "Automaticamente fechar uma chaveta ao escrever uma aberta" - -#: ../src/interface.c:3745 -msgid "Square brackets [ ]" -msgstr "Parêntesis Rectos [ ]" - -#: ../src/interface.c:3750 -#, fuzzy -msgid "Auto-close square-bracket when typing an opening one" -msgstr "Automaticamente fechar um parêntesis recto ao escrever um aberto" - -#: ../src/interface.c:3752 -msgid "Double quotes \" \"" -msgstr "Aspas \" \"" - -#: ../src/interface.c:3757 -msgid "Auto-close double quote when typing an opening one" -msgstr "Automaticamente fechar aspas ao escrever a primeira" - -#: ../src/interface.c:3759 -msgid "Auto-close quotes and brackets" -msgstr "Fecho automático de plicas, aspas e parêntesis" - -#: ../src/interface.c:3764 -msgid "Completions" -msgstr "" - -#: ../src/interface.c:3787 -msgid "Invert syntax highlighting colors" -msgstr "Inverter as cores do realce da sintaxe" - -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Usar texto branco sobre fundo preto e inverter todas as outras cores, esta " -"opção requer que o Geany seja reiniciado" - -#: ../src/interface.c:3792 -msgid "Show indentation guides" -msgstr "Mostrar guias de indentação" - -#: ../src/interface.c:3795 -msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "Mostra linhas de pequenos pontos para o ajudar na indentação" - -#: ../src/interface.c:3797 -msgid "Show white space" -msgstr "Mostrar espaços em branco" - -#: ../src/interface.c:3800 -msgid "Marks spaces with dots and tabs with arrows" -msgstr "Marca espaços com pontos e tabulações com setas" - -#: ../src/interface.c:3802 -msgid "Show line endings" -msgstr "Mostrar terminadores de linha" - -#: ../src/interface.c:3805 -#, fuzzy -msgid "Shows the line ending character" -msgstr "Mostra o caractere que termina uma linha" - -#: ../src/interface.c:3807 -msgid "Show line numbers" -msgstr "Mostrar o número das linhas" - -#: ../src/interface.c:3810 -msgid "Shows or hides the Line Number margin" -msgstr "Mostra ou oculta a coluna com os números de cada linha" - -#: ../src/interface.c:3812 -msgid "Show markers margin" -msgstr "Mostra margem para marcadores" - -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Mostra ou oculta uma pequena coluna ao lado direito dos números de linha, a " -"qual pode ser usada para marcar linhas" - -#: ../src/interface.c:3817 -msgid "Stop scrolling at last line" -msgstr "Parar deslocamento na última linha" - -#: ../src/interface.c:3820 -msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "" -"Se o deslocamento (scroll) de uma página deve terminar após a última linha " -"do documento" - -#: ../src/interface.c:3822 -msgid "Display" -msgstr "Visualização" - -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Marca de linha longa:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Cor da marca de linha longa:" - -#: ../src/interface.c:3869 -msgid "Sets the color of the long line marker" -msgstr "Define a cor da marca de linha longa" - -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 -msgid "Color Chooser" -msgstr "Selector de Cores" - -#: ../src/interface.c:3878 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"A marca de linha longa é uma fina linha vertical que aparece no editor. Esta " -"ajuda a identificar linhas longas ou avisa que uma quebra de linha deve ser " -"inserida. Defina este valor para algo maior do que zero a fim de especificar " -"a coluna onde a marca deve aparecer" - -#: ../src/interface.c:3888 -msgid "Line" -msgstr "Linha" - -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Desenha uma linha vertical na janela de edição na posição indicada (ver em " -"baixo)" - -#: ../src/interface.c:3895 -msgid "Background" -msgstr "Fundo" - -#: ../src/interface.c:3898 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"A cor de fundo dos caracteres após a posição indicada (ver em baixo) muda " -"para a cor definida em baixo (recomendado caso esteja a usar tipos de letra " -"proporcionais)" - -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Desabilitado" - -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Marca de linha longa" - -#: ../src/interface.c:3913 -msgid "Display" -msgstr "Visualização" - -#: ../src/interface.c:3944 -msgid "Open new documents from the command-line" -msgstr "Abre um novo documento a partir da linha de comandos" - -#: ../src/interface.c:3947 -msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "" -"Cria um novo documento por cada nome de ficheiro na linha de comandos que " -"não exista" - -#: ../src/interface.c:3961 -msgid "Default end of line characters:" -msgstr "Pré-definição do terminador de linha:" - -#: ../src/interface.c:3968 -msgid "New files" -msgstr "Novos Ficheiros" - -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Define a codificação, por omissão, para novos ficheiros" - -#: ../src/interface.c:4000 -msgid "Default encoding (new files):" -msgstr "Codificação pré-definida (novos ficheiros):" - -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Codificação pré-definida (ficheiros já existentes)" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Define a codificação, por omissão, ao abrir ficheiros existentes" - -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Usar codificação fixa ao abrir ficheiros" - -#: ../src/interface.c:4030 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" -msgstr "" -"Esta opção desactiva a detecção automática da codificação ao abrir ficheiros " -"e abre-os com a codificação especificada (normalmente não é necessário)" - -#: ../src/interface.c:4032 -msgid "Encodings" -msgstr "Codificações" - -#: ../src/interface.c:4051 -msgid "Ensure new line at file end" -msgstr "Garantir mudança de linha no fim do ficheiro" - -#: ../src/interface.c:4054 -msgid "Ensures that at the end of the file is a new line" -msgstr "Garante que existe uma mudança de linha no fim do ficheiro" - -#: ../src/interface.c:4056 -msgid "Strip trailing spaces and tabs" -msgstr "Remover espaços e tabulações finais" - -#: ../src/interface.c:4059 -msgid "Removes trailing spaces and tabs and the end of lines" -msgstr "Remove espaços, tabulações e terminadores de linha" - -#: ../src/interface.c:4061 ../src/keybindings.c:460 -msgid "Replace tabs by space" -msgstr "Substitui tabulações por espaços" - -#: ../src/interface.c:4064 -msgid "Replaces all tabs in document by spaces" -msgstr "Substitui todas as tabulações no ficheiro por espaços" - -#: ../src/interface.c:4066 -msgid "Saving files" -msgstr "Ao Guardar Ficheiros" - -#: ../src/interface.c:4091 -msgid "Recent files list length:" -msgstr "Comprimento da lista de ficheiros recentes:" - -#: ../src/interface.c:4105 -msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "" -"Especifica o número de ficheiros a guardar na lista de ficheiros Recentes" - -#: ../src/interface.c:4109 -msgid "Disk check timeout:" -msgstr "Tempo entre verificações no disco:" - -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Cadencia para a verificação de alterações dos documentos no disco, em " -"segundos. O zero desactiva a verificação." - -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 -msgid "Files" -msgstr "Ficheiros" - -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "" - -#: ../src/interface.c:4171 -msgid "Terminal:" -msgstr "Terminal:" - -#: ../src/interface.c:4178 -msgid "Browser:" -msgstr "Navegador Web:" - -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Caminho e opções para a ferramenta \"make\"" - -#: ../src/interface.c:4197 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Um emulador de terminal como o xterm, gnome-terminal ou o konsole (deve " -"aceitar o argumento -e)" - -#: ../src/interface.c:4204 -msgid "Path (and possibly additional arguments) to your favorite browser" -msgstr "" -"Caminho (e possivelmente argumentos adicionais) para o seu navegador web " -"favorito" - -#: ../src/interface.c:4236 -msgid "Grep:" -msgstr "" - -#: ../src/interface.c:4259 -msgid "Tool paths" -msgstr "Caminho para comandos" - -#: ../src/interface.c:4280 -msgid "Context action:" -msgstr "Acção contextual:" - -#: ../src/interface.c:4291 -#, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Comando de acção contextual. A palavra actualmente seleccionada pode ser " -"usada com o descritor %s. Este descritor pode aparecer em qualquer ponto do " -"comando e será substituído antes da execução." - -#: ../src/interface.c:4304 -msgid "Commands" -msgstr "Comandos" - -#: ../src/interface.c:4309 ../src/keybindings.c:496 -msgid "Tools" -msgstr "Ferramentas" - -#: ../src/interface.c:4343 -msgid "email address of the developer" -msgstr "endereço de email do responsável" - -#: ../src/interface.c:4350 -msgid "Initials of the developer name" -msgstr "Iniciais do nome do responsável" - -#: ../src/interface.c:4352 -msgid "Initial version:" -msgstr "Versão inicial:" - -#: ../src/interface.c:4364 -msgid "Version number, which a new file initially has" -msgstr "Número de versão que o novo ficheiro tem inicialmente" - -#: ../src/interface.c:4371 -msgid "Company name" -msgstr "Nome da Empresa" - -#: ../src/interface.c:4373 -msgid "Developer:" -msgstr "Responsável:" - -#: ../src/interface.c:4380 -msgid "Company:" -msgstr "Empresa:" - -#: ../src/interface.c:4387 -msgid "Mail address:" -msgstr "Endereço de EMail" - -#: ../src/interface.c:4394 -msgid "Initials:" -msgstr "Iniciais:" - -#: ../src/interface.c:4406 -msgid "The name of the developer" -msgstr "O nome do responsável" - -#: ../src/interface.c:4408 -msgid "Year:" -msgstr "Ano:" - -#: ../src/interface.c:4415 -msgid "Date:" -msgstr "Data:" - -#: ../src/interface.c:4422 -msgid "Date & Time:" -msgstr "Data & Hora:" - -#: ../src/interface.c:4434 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Especifica o formato da expressão especial {datetime}. Pode usar qualquer " -"descritor de formato dos suportados pela função strftime em ANSI C." - -#: ../src/interface.c:4441 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Especifica o formato da expressão especial {year}. Pode usar qualquer " -"descritor de formato dos suportados pela função strftime em ANSI C." - -#: ../src/interface.c:4448 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Especifica o formato da expressão especial {date}. Pode usar qualquer " -"descritor de formato dos suportados pela função strftime em ANSI C." - -#: ../src/interface.c:4450 -msgid "Template data" -msgstr "Dados para Modelo" - -#: ../src/interface.c:4455 -msgid "Templates" -msgstr "Modelos" - -#: ../src/interface.c:4493 -msgid "C_hange" -msgstr "_Modificar" - -#: ../src/interface.c:4497 -msgid "Keyboard shortcuts" -msgstr "Atalhos de Teclado" - -#: ../src/interface.c:4502 -msgid "Keybindings" -msgstr "Atalhos de Teclado" - -#: ../src/interface.c:4525 -msgid "Command:" -msgstr "Comando:" - -#: ../src/interface.c:4532 -#, c-format -msgid "Path to the command for printing files (use %f for the filename)" -msgstr "" -"Caminho para o comando que imprime ficheiros (use %f onde quer o nome do " -"ficheiro)" - -#: ../src/interface.c:4542 -msgid "Use an external command for printing" -msgstr "Usar um comando externo para imprimir" - -#: ../src/interface.c:4562 ../src/printing.c:380 -msgid "Print line numbers" -msgstr "Imprimir os números das linhas" - -#: ../src/interface.c:4565 ../src/printing.c:382 -msgid "Add line numbers to the printed page" -msgstr "Adiciona os números das linhas à página impressa" - -#: ../src/interface.c:4567 ../src/printing.c:385 -msgid "Print page numbers" -msgstr "Imprimir o número das páginas" - -#: ../src/interface.c:4570 ../src/printing.c:387 -#, fuzzy -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Adiciona a numeração de página ao fundo de cada uma, ocupa 2 linhas da página" - -#: ../src/interface.c:4572 ../src/printing.c:390 -msgid "Print page header" -msgstr "Imprimir o cabeçalho de página" - -#: ../src/interface.c:4575 ../src/printing.c:392 -#, fuzzy -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Adiciona um pequeno cabeçalho, a todas as páginas, que contém o número da " -"página, o nome do ficheiro e a data actual (ver em baixo). Ocupa 3 linhas da " -"página." - -#: ../src/interface.c:4592 ../src/printing.c:408 -msgid "Use the basename of the printed file" -msgstr "Usar apenas o nome do ficheiro a imprimir" - -#: ../src/interface.c:4595 -#, fuzzy -msgid "Print only the basename (without the path) of the printed file" -msgstr "Imprime apenas o nome do ficheiro, sem o caminho para este" - -#: ../src/interface.c:4601 ../src/printing.c:416 -msgid "Date format:" -msgstr "Formato da Data:" - -#: ../src/interface.c:4608 ../src/printing.c:422 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Especifique o formato da data e da hora que serão adicionados ao cabeçalho " -"de cada página. Pode usar qualquer descritor de formato dos suportados pela " -"função strftime em ANSI C." - -#: ../src/interface.c:4611 -msgid "Use native GTK printing" -msgstr "" - -#: ../src/interface.c:4617 -msgid "Printing" -msgstr "" - -#: ../src/interface.c:5040 -msgid "Project Properties" -msgstr "Propriedades do Projecto" - -#: ../src/keybindings.c:198 ../src/plugins.c:1099 -msgid "File" -msgstr "Ficheiro" - -#: ../src/keybindings.c:201 -msgid "New" -msgstr "Novo" - -#: ../src/keybindings.c:203 -msgid "Open" -msgstr "Abrir" - -#: ../src/keybindings.c:206 -msgid "Open selected file" -msgstr "Abrir ficheiro seleccionado" - -#: ../src/keybindings.c:208 -msgid "Save" -msgstr "Guardar" - -#: ../src/keybindings.c:210 -msgid "Save as" -msgstr "Guardar como" - -#: ../src/keybindings.c:212 -msgid "Save all" -msgstr "Guardar todos" - -#: ../src/keybindings.c:215 -msgid "Print" -msgstr "Imprimir" - -#: ../src/keybindings.c:217 -msgid "Close" -msgstr "Fechar" - -#: ../src/keybindings.c:219 -msgid "Close all" -msgstr "Fechar todos" - -#: ../src/keybindings.c:222 -msgid "Reload file" -msgstr "" - -#: ../src/keybindings.c:224 ../src/project.c:495 -msgid "Project" -msgstr "Projecto" - -#: ../src/keybindings.c:227 -msgid "Project properties" -msgstr "Propriedades do Projecto" - -#: ../src/keybindings.c:232 -msgid "Undo" -msgstr "Anular" - -#: ../src/keybindings.c:234 -msgid "Redo" -msgstr "Refazer" - -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplicar linha ou selecção" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Apagar a linha ou linhas actuais" - -#: ../src/keybindings.c:242 -#, fuzzy -msgid "Delete to line end" -msgstr "Apagar a linha ou linhas actuais" - -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "" - -#: ../src/keybindings.c:246 -msgid "Scroll to current line" -msgstr "Deslocar até à linha actual" - -#: ../src/keybindings.c:248 -msgid "Scroll up the view by one line" -msgstr "Deslocar a vista uma linha para cima" - -#: ../src/keybindings.c:250 -msgid "Scroll down the view by one line" -msgstr "Deslocar a vista uma linha para baixo" - -#: ../src/keybindings.c:253 -msgid "Complete snippet" -msgstr "Completar excerto de código" - -#: ../src/keybindings.c:255 -msgid "Move cursor in snippet" -msgstr "Mover o cursor dentro do excerto de código" - -#: ../src/keybindings.c:257 -msgid "Suppress snippet completion" -msgstr "Suprimir o completar de excertos de código" - -#: ../src/keybindings.c:259 -msgid "Context Action" -msgstr "Acção contextual" - -#: ../src/keybindings.c:261 -msgid "Complete word" -msgstr "Completar palavra" - -#: ../src/keybindings.c:263 -msgid "Show calltip" -msgstr "" - -#: ../src/keybindings.c:265 -msgid "Show macro list" -msgstr "Mostrar lista de macros" - -#: ../src/keybindings.c:267 -msgid "Clipboard" -msgstr "Área de transferência" - -#: ../src/keybindings.c:270 -msgid "Cut" -msgstr "Cortar" - -#: ../src/keybindings.c:272 -msgid "Copy" -msgstr "Copiar" - -#: ../src/keybindings.c:274 -msgid "Paste" -msgstr "Colar" - -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copiar a linha ou linhas actuais" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Cortar a linha ou linhas actuais" - -#: ../src/keybindings.c:280 -msgid "Select" -msgstr "Seleccionar" - -#: ../src/keybindings.c:283 -msgid "Select All" -msgstr "Seleccionar Tudo" - -#: ../src/keybindings.c:285 -msgid "Select current word" -msgstr "Seleccionar a palavra actual" - -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Seleccionar a linha ou linhas actuais" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Seleccionar o parágrafo actual" - -#: ../src/keybindings.c:291 -msgid "Format" -msgstr "Formatar" - -#: ../src/keybindings.c:295 -msgid "Toggle Case of Selection" -msgstr "Converter o seleccionado entre maiúsculas e minúsculas" - -#: ../src/keybindings.c:297 -msgid "Toggle line commentation" -msgstr "" - -#: ../src/keybindings.c:300 -msgid "Comment line(s)" -msgstr "Comentar a(s) linha(s)" - -#: ../src/keybindings.c:302 -msgid "Uncomment line(s)" -msgstr "Descomentar a(s) linha(s)" - -#: ../src/keybindings.c:304 -msgid "Increase indent" -msgstr "Aumentar a indentação" - -#: ../src/keybindings.c:307 -msgid "Decrease indent" -msgstr "Diminuir a indentação" - -#: ../src/keybindings.c:310 -msgid "Increase indent by one space" -msgstr "Aumentar a indentação por um espaço" - -#: ../src/keybindings.c:312 -msgid "Decrease indent by one space" -msgstr "Diminuir a indentação por um espaço" - -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Indentar a linha de forma inteligente" - -#: ../src/keybindings.c:316 -msgid "Send to Custom Command 1" -msgstr "Enviar comando personalizado 1" - -#: ../src/keybindings.c:318 -msgid "Send to Custom Command 2" -msgstr "Enviar comando personalizado 2" - -#: ../src/keybindings.c:320 -msgid "Send to Custom Command 3" -msgstr "Enviar comando personalizado 3" - -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "Enviar a _selecção para" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 -msgid "Insert" -msgstr "Inserir" - -#: ../src/keybindings.c:329 -msgid "Insert date" -msgstr "Inserir data" - -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Inserir espaço em branco alternativo" - -#: ../src/keybindings.c:334 -msgid "Settings" -msgstr "Preferências" - -#: ../src/keybindings.c:340 ../src/toolbar.c:350 -msgid "Search" -msgstr "Pesquisar" - -#: ../src/keybindings.c:343 ../src/search.c:379 -msgid "Find" -msgstr "Procurar" - -#: ../src/keybindings.c:345 -msgid "Find Next" -msgstr "Procurar para a frente" - -#: ../src/keybindings.c:347 -msgid "Find Previous" -msgstr "Procurar para trás" - -#: ../src/keybindings.c:350 -msgid "Find Next Selection" -msgstr "Procurar para a frente o seleccionado" - -#: ../src/keybindings.c:352 -msgid "Find Previous Selection" -msgstr "Procurar para trás o seleccionado" - -#: ../src/keybindings.c:354 ../src/search.c:514 -msgid "Replace" -msgstr "Substituir" - -#: ../src/keybindings.c:356 ../src/search.c:686 -msgid "Find in Files" -msgstr "Procurar em Ficheiros" - -#: ../src/keybindings.c:359 -msgid "Next Message" -msgstr "Próxima Mensagem" - -#: ../src/keybindings.c:361 -msgid "Previous Message" -msgstr "Mensagem anterior" - -#: ../src/keybindings.c:363 -msgid "Find Usage" -msgstr "Procurar ocorrências" - -#: ../src/keybindings.c:365 -msgid "Find Document Usage" -msgstr "Procurar ocorrências no documento actual" - -#: ../src/keybindings.c:367 -#, fuzzy -msgid "Mark All" -msgstr "Gerar _todos" - -#: ../src/keybindings.c:369 -msgid "Go to" -msgstr "Ir para" - -#: ../src/keybindings.c:372 ../src/toolbar.c:66 -msgid "Navigate back a location" -msgstr "" - -#: ../src/keybindings.c:374 ../src/toolbar.c:67 -msgid "Navigate forward a location" -msgstr "" - -#: ../src/keybindings.c:379 -msgid "Go to matching brace" -msgstr "Ir para a chaveta correspondente" - -#: ../src/keybindings.c:382 -msgid "Toggle marker" -msgstr "Alternar marcador" - -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Ir para a próxima marca" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Ir para a marca anterior" - -#: ../src/keybindings.c:390 -msgid "Go to Tag Definition" -msgstr "Ir para a definição da etiqueta (tag)" - -#: ../src/keybindings.c:392 -msgid "Go to Tag Declaration" -msgstr "Ir para a declaração da etiqueta (tag)" - -#: ../src/keybindings.c:394 -msgid "Go to Start of Line" -msgstr "Ir para o início da linha" - -#: ../src/keybindings.c:396 -msgid "Go to End of Line" -msgstr "Ir para o fim da linha" - -#: ../src/keybindings.c:398 -#, fuzzy -msgid "Go to End of Display Line" -msgstr "Ir para o fim da linha" - -#: ../src/keybindings.c:400 -msgid "Go to Previous Word Part" -msgstr "Ir para a parte anterior da palavra actual" - -#: ../src/keybindings.c:402 -msgid "Go to Next Word Part" -msgstr "Ir para a parte seguinte da palavra actual" - -#: ../src/keybindings.c:404 -msgid "View" -msgstr "Ver" - -#: ../src/keybindings.c:407 -msgid "Toggle All Additional Widgets" -msgstr "Activa/Desactiva todos os widgets adicionais" - -#: ../src/keybindings.c:410 -msgid "Fullscreen" -msgstr "Ecrã Completo" - -#: ../src/keybindings.c:412 -msgid "Toggle Messages Window" -msgstr "Activar/Desactivar a janela de mensagens" - -#: ../src/keybindings.c:415 -msgid "Toggle Sidebar" -msgstr "Activar/Desactivar a barra lateral" - -#: ../src/keybindings.c:417 -msgid "Zoom In" -msgstr "Aumentar (zoom)" - -#: ../src/keybindings.c:419 -msgid "Zoom Out" -msgstr "Reduzir (Zoom)" - -#: ../src/keybindings.c:421 -msgid "Focus" -msgstr "Foco" - -#: ../src/keybindings.c:424 -msgid "Switch to Editor" -msgstr "Mudar para o Editor" - -#: ../src/keybindings.c:426 -msgid "Switch to Scribble" -msgstr "Mudar para \"Rabiscar\"" - -#: ../src/keybindings.c:428 -msgid "Switch to VTE" -msgstr "Mudar para o Terminal" - -#: ../src/keybindings.c:430 -msgid "Switch to Search Bar" -msgstr "Mudar para a Barra de Pesquisa" - -#: ../src/keybindings.c:432 -msgid "Switch to Sidebar" -msgstr "Mudar para a Barra Lateral" - -#: ../src/keybindings.c:434 -msgid "Switch to Compiler" -msgstr "Mudar para o Compilador" - -#: ../src/keybindings.c:436 -msgid "Notebook tab" -msgstr "Separador de Anotações" - -#: ../src/keybindings.c:439 -msgid "Switch to left document" -msgstr "Mudar para o documento à esquerda" - -#: ../src/keybindings.c:441 -msgid "Switch to right document" -msgstr "Mudar para o documento à direita" - -#: ../src/keybindings.c:443 -msgid "Switch to last used document" -msgstr "Mudar para o último documento usado" - -#: ../src/keybindings.c:445 -msgid "Move document left" -msgstr "Mover o documento para a esquerda" - -#: ../src/keybindings.c:447 -msgid "Move document right" -msgstr "Mover o documento para a direita" - -#: ../src/keybindings.c:449 -msgid "Move document first" -msgstr "Mover o documento para primeiro" - -#: ../src/keybindings.c:451 -msgid "Move document last" -msgstr "Mover o documento para último" - -#: ../src/keybindings.c:453 -msgid "Document" -msgstr "Documento" - -#: ../src/keybindings.c:456 -msgid "Toggle Line wrapping" -msgstr "Comutar a Translineação" - -#: ../src/keybindings.c:458 -msgid "Toggle Line breaking" -msgstr "Comutar o \"Quebrar de Linha\"" - -#: ../src/keybindings.c:462 -msgid "Replace spaces by tabs" -msgstr "Substituir espaços por tabulações" - -#: ../src/keybindings.c:464 -msgid "Toggle current fold" -msgstr "Alternar a agregação de código actual" - -#: ../src/keybindings.c:466 -msgid "Fold all" -msgstr "Agregar tudo" - -#: ../src/keybindings.c:468 -msgid "Unfold all" -msgstr "Desagregar tudo" - -#: ../src/keybindings.c:470 -msgid "Reload symbol list" -msgstr "Recarregar a lista de símbolos" - -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 -msgid "Build" -msgstr "Gerar" - -#: ../src/keybindings.c:475 ../src/toolbar.c:68 -msgid "Compile" -msgstr "Compilar" - -#: ../src/keybindings.c:479 -msgid "Make all" -msgstr "" - -#: ../src/keybindings.c:482 -msgid "Make custom target" -msgstr "Gerar resultado personalizado" - -#: ../src/keybindings.c:484 -msgid "Make object" -msgstr "Gerar objecto" - -#: ../src/keybindings.c:486 -msgid "Next error" -msgstr "Erro seguinte" - -#: ../src/keybindings.c:488 -msgid "Previous error" -msgstr "Erro anterior" - -#: ../src/keybindings.c:490 -msgid "Run" -msgstr "Executar" - -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Executar (comando alternativo)" - -#: ../src/keybindings.c:494 -msgid "Build options" -msgstr "Opções de geração/compilação" - -#: ../src/keybindings.c:499 -msgid "Show Color Chooser" -msgstr "Mostrar o Selector de Cores" - -#: ../src/keybindings.c:501 ../src/keybindings.c:504 -msgid "Help" -msgstr "Ajuda" - -#: ../src/keybindings.c:799 -msgid "Keyboard Shortcuts" -msgstr "Atalhos de Teclado" - -#: ../src/keybindings.c:812 -msgid "The following keyboard shortcuts are configurable:" -msgstr "Os seguintes atalhos de teclado são configuráveis:" - -#: ../src/keybindings.c:1583 -msgid "Switch to Document" -msgstr "Mudar para documento" - -#: ../src/keyfile.c:811 -msgid "Type here what you want, use it as a notice/scratch board" -msgstr "Escreva aqui o que quer, use isto como um caderno de rascunhos" - -#: ../src/keyfile.c:1015 -msgid "Failed to load one or more session files." -msgstr "Falha ao carregar um ou mais ficheiros de sessão." - -#: ../src/log.c:181 -msgid "Debug Messages" -msgstr "Mensagens de depuração (debug)" - -#: ../src/main.c:124 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" - -#: ../src/main.c:125 -msgid "Use an alternate configuration directory" -msgstr "Usar uma directoria de configurações alternativa" - -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 -msgid "Print internal filetype names" -msgstr "Imprimir os nomes dos tipos de ficheiro internos" - -#: ../src/main.c:128 -msgid "Generate global tags file (see documentation)" -msgstr "Gerar ficheiro de etiquetas (tags) globais (ver documentação)" - -#: ../src/main.c:129 -msgid "Don't preprocess C/C++ files when generating tags" -msgstr "Não pré-processar ficheiros de C/C++ ao gerar etiquetas (tags)" - -#: ../src/main.c:132 -msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" -"Não abrir ficheiros na instanciação actual do programa, forçar a abertura de " -"uma nova instância" - -#: ../src/main.c:134 -msgid "Set initial line number for the first opened file" -msgstr "" - -#: ../src/main.c:135 -msgid "Don't show message window at startup" -msgstr "Não mostrar janela de mensagens no arranque" - -#: ../src/main.c:136 -msgid "Don't load auto completion data (see documentation)" -msgstr "Não carregar os dados para sugestões automáticas (ver documentação)" - -#: ../src/main.c:138 -msgid "Don't load plugins" -msgstr "Não carregar plugins" - -#: ../src/main.c:140 -msgid "Print Geany's installation prefix" -msgstr "" - -#: ../src/main.c:141 -msgid "Don't load the previous session's files" -msgstr "Não carregar os ficheiros da sessão anterior" - -#: ../src/main.c:143 -msgid "Don't load terminal support" -msgstr "Não carregar o suporte para o terminal" - -#: ../src/main.c:144 -msgid "Filename of libvte.so" -msgstr "" - -#: ../src/main.c:147 -msgid "Show version and exit" -msgstr "Mostrar a versão e sair" - -#: ../src/main.c:470 -msgid "[FILES...]" -msgstr "[FICHEIROS...]" - -#: ../src/main.c:487 -#, c-format -msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" -msgstr "(compilado em %s com GTK %d.%d.%d, Glib %d.%d.%d)" - -#: ../src/main.c:592 -msgid "Move it now?" -msgstr "Mover agora?" - -#: ../src/main.c:594 -msgid "Geany needs to move your old configuration directory before starting." -msgstr "" -"O Geany precisa mover a directoria de configurações antiga antes de iniciar." - -#: ../src/main.c:603 -#, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." -msgstr "" -"A directoria de configurações foi movida com sucesso de \"%s\" para \"%s\"." - -#. for translators: the third %s in brackets is the error message which -#. * describes why moving the dir didn't work -#: ../src/main.c:613 -#, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"A directoria de configurações antiga \"%s\" não pode ser movida para \"%s" -"\" (Erro: %s). Por favor, mova manualmente a directoria para a nova " -"localização." - -#: ../src/main.c:694 -#, c-format -msgid "" -"Configuration directory could not be created (%s).\n" -"There could be some problems using Geany without a configuration directory.\n" -"Start Geany anyway?" -msgstr "" -"A directoria de configurações não pode ser criada (%s).\n" -"Podem ocorrer problemas ao usar o Geany sem directoria de configurações.\n" -"Iniciar o Geany mesmo assim?" - -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Não foi possível encontrar o ficheiro '%s'." - -#: ../src/main.c:990 -#, c-format -msgid "This is Geany %s." -msgstr "Este é o Geany %s." - -#: ../src/main.c:992 -#, c-format -msgid "Configuration directory could not be created (%s)." -msgstr "A directoria de configurações não pôde ser criada (%s)." - -#: ../src/main.c:1224 -msgid "Configuration files reloaded." -msgstr "Ficheiros de configuração relidos." - -#: ../src/msgwindow.c:135 -msgid "Status messages" -msgstr "Mensagens de estado" - -#: ../src/msgwindow.c:515 -msgid "Copy _All" -msgstr "Copi_ar Tudo" - -#: ../src/msgwindow.c:545 -msgid "_Hide Message Window" -msgstr "_Ocultar Janela de Mensagens" - -#: ../src/plugins.c:425 -#, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"O plugin \"%s\" não é compatível com esta versão do Geany - por favor, " -"recompile-o." - -#: ../src/plugins.c:869 -msgid "_Plugin Manager" -msgstr "Gestor de _Plugins" - -#: ../src/plugins.c:1017 -#, c-format -msgid "" -"Plugin: %s %s\n" -"Description: %s\n" -"Author(s): %s" -msgstr "" -"Plugin: %s %s\n" -"Descrição: %s\n" -"Autor(es): %s" - -#: ../src/plugins.c:1087 -msgid "Active" -msgstr "Activo" - -#: ../src/plugins.c:1093 -msgid "Plugin" -msgstr "Plugin" - -#: ../src/plugins.c:1117 -msgid "No plugins available." -msgstr "Não existem plugins." - -#: ../src/plugins.c:1230 -msgid "Plugins" -msgstr "Plugins" - -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Em baixo encontra-se uma lista dos plugins disponíveis. Seleccione os " -"plugins que o Geany deve carregar ao iniciar." - -#: ../src/plugins.c:1263 -msgid "Plugin details:" -msgstr "Detalhes do Plugin:" - -#: ../src/prefs.c:160 -msgid "Grab Key" -msgstr "Capturar Tecla" - -#: ../src/prefs.c:166 -#, c-format -msgid "Press the combination of the keys you want to use for \"%s\"." -msgstr "Pressione a combinação de teclas que pretende usar para \"%s\"." - -#: ../src/prefs.c:209 ../src/symbols.c:1848 -msgid "_Expand All" -msgstr "" - -#: ../src/prefs.c:214 ../src/symbols.c:1853 -msgid "_Collapse All" -msgstr "" - -#: ../src/prefs.c:273 -msgid "Action" -msgstr "Acção" - -#: ../src/prefs.c:278 -msgid "Shortcut" -msgstr "Atalho" - -#: ../src/prefs.c:1398 -msgid "_Override" -msgstr "_Substituir" - -#: ../src/prefs.c:1399 -msgid "Override that keybinding?" -msgstr "Substituir este atalho?" - -#: ../src/prefs.c:1400 -#, c-format -msgid "The combination '%s' is already used for \"%s\"." -msgstr "A combinação \"%s\" já se encontra a ser usada para \"%s\"." - -#. add manually GeanyWrapLabels because they can't be added with Glade -#. page Tools -#: ../src/prefs.c:1514 -msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Introduza os caminhos para os comandos, em baixo. Comandos que não precisa " -"podem ser deixados em branco." - -#. page Templates -#: ../src/prefs.c:1519 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" -"Defina informação a ser usada em modelos de documentos. Para mais detalhes " -"consulte a documentação." - -#: ../src/prefs.c:1523 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany or force the reload of the settings using Tools->Reload Configuration." -"" -msgstr "" -"Aviso: Para que qualquer alteração que aqui faça surta efeito, o Geany " -"tem de ser reiniciado ou force o recarregar das definições com Ferramentas-" -">Recarregar a Configuração." - -#. page Keybindings -#: ../src/prefs.c:1529 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Aqui pode alterar os atalhos de teclado de várias funcionalidades. " -"Seleccione uma e carregue no botão Mudar para introduzir o novo atalho, ou " -"faça duplo clique sobre a funcionalidade para editar o atalho directamente." - -#. page Printing -#: ../src/prefs.c:1534 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" -"Aviso: A funcionalidade de impressão nativa do GTK apenas se encontra " -"disponível se o Geany foi compilado com GTK 2.10 (ou superior) e o " -"Geany está a usar o GTK 2.10 (ou superior)." - -#. page Editor->Indentation -#: ../src/prefs.c:1540 -msgid "" -"Warning: these settings are overridden by the current project. See " -"Project->Properties." -msgstr "" -"Atenção: Estas definições podem ser sobrepostas pelas do projecto actual. " -"Consulte Projecto-> Propriedades." - -#: ../src/printing.c:188 -msgid "The editor font is not a monospaced font!" -msgstr "" - -#: ../src/printing.c:189 -msgid "Text will be wrongly spaced." -msgstr "" - -#: ../src/printing.c:305 -#, c-format -msgid "Page %d of %d" -msgstr "Página %d de %d" - -#: ../src/printing.c:375 -msgid "Document Setup" -msgstr "Configuração de Documento" - -#: ../src/printing.c:410 -msgid "Print only the basename(without the path) of the printed file" -msgstr "Imprime apenas o nome do ficheiro, sem o caminho para este" - -#: ../src/printing.c:526 -#, c-format -msgid "Page %d of %d" -msgstr "Página %d de %d" - -#: ../src/printing.c:776 -#, c-format -msgid "Printing of file %s was cancelled." -msgstr "A impressão do ficheiro %s foi cancelada." - -#: ../src/printing.c:778 ../src/printing.c:897 -#, c-format -msgid "File %s printed." -msgstr "O ficheiro %s foi impresso." - -#: ../src/printing.c:827 -#, c-format -msgid "Printing of %s failed (%s)." -msgstr "A impressão do ficheiro %s falhou (%s)." - -#: ../src/printing.c:867 -#, fuzzy -msgid "Please set a print command in the preferences dialog first." -msgstr "" -"Por favor, primeiro defina um comando para impressão, na janela das " -"preferências." - -#: ../src/printing.c:875 -#, c-format -msgid "" -"The file \"%s\" will be printed with the following command:\n" -"\n" -"%s" -msgstr "" -"O ficheiro \"%s\" será impresso com o comando:\n" -"\n" -"%s" - -#: ../src/printing.c:891 -#, c-format -msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "A impressão de \"%s\" falhou (código de erro devolvido: %s)." - -#. "projects" is part of the default project base path so be careful when translating -#. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 -msgid "projects" -msgstr "projectos" - -#: ../src/project.c:118 -msgid "New Project" -msgstr "Novo Projecto" - -#: ../src/project.c:126 -msgid "C_reate" -msgstr "" - -#: ../src/project.c:140 ../src/project.c:386 -msgid "Name:" -msgstr "" - -#: ../src/project.c:149 ../src/project.c:399 -msgid "Filename:" -msgstr "" - -#: ../src/project.c:165 ../src/project.c:429 -msgid "Base path:" -msgstr "" - -#: ../src/project.c:171 ../src/project.c:438 -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 "" - -#: ../src/project.c:174 ../src/project.c:441 -msgid "Choose Project Base Path" -msgstr "" - -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 -#, c-format -msgid "Project file \"%s\" could not be loaded." -msgstr "" - -#: ../src/project.c:264 ../src/project.c:276 -msgid "Open Project" -msgstr "" - -#: ../src/project.c:296 -msgid "Project files" -msgstr "" - -#: ../src/project.c:330 -#, c-format -msgid "Project \"%s\" closed." -msgstr "" - -#: ../src/project.c:412 -msgid "Description:" -msgstr "" - -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "" - -#: ../src/project.c:452 -msgid "Run command:" -msgstr "" - -#: ../src/project.c:461 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" - -#: ../src/project.c:476 -msgid "File patterns:" -msgstr "" - -#: ../src/project.c:578 -msgid "Do you want to close it before proceeding?" -msgstr "" - -#: ../src/project.c:579 -#, c-format -msgid "The '%s' project is already open." -msgstr "" - -#: ../src/project.c:623 -msgid "The specified project name is too short." -msgstr "" - -#: ../src/project.c:629 -#, c-format -msgid "The specified project name is too long (max. %d characters)." -msgstr "" - -#: ../src/project.c:637 -msgid "You have specified an invalid project filename." -msgstr "" - -#: ../src/project.c:660 -msgid "Create the project's base path directory?" -msgstr "" - -#: ../src/project.c:661 -#, c-format -msgid "The path \"%s\" does not exist." -msgstr "" - -#: ../src/project.c:670 -#, c-format -msgid "Project base directory could not be created (%s)." -msgstr "" - -#: ../src/project.c:682 -#, c-format -msgid "Project file could not be written (%s)." -msgstr "" - -#: ../src/project.c:730 -#, c-format -msgid "Project \"%s\" created." -msgstr "" - -#: ../src/project.c:732 -#, c-format -msgid "Project \"%s\" saved." -msgstr "" - -#. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 -msgid "Choose Project Filename" -msgstr "" - -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "" - -#: ../src/project.c:907 -#, c-format -msgid "Project \"%s\" opened." -msgstr "" - -#: ../src/search.c:216 -msgid "_Use regular expressions" -msgstr "" - -#: ../src/search.c:220 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" - -#: ../src/search.c:227 -msgid "Search _backwards" -msgstr "" - -#: ../src/search.c:241 -msgid "Use _escape sequences" -msgstr "" - -#: ../src/search.c:246 -msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters" -msgstr "" - -#: ../src/search.c:255 ../src/search.c:781 -msgid "C_ase sensitive" -msgstr "" - -#: ../src/search.c:260 ../src/search.c:787 -msgid "Match only a _whole word" -msgstr "" - -#: ../src/search.c:265 -msgid "Match from s_tart of word" -msgstr "" - -#: ../src/search.c:386 -msgid "_Previous" -msgstr "" - -#: ../src/search.c:392 -msgid "_Next" -msgstr "" - -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 -msgid "_Search for:" -msgstr "" - -#. Now add the multiple match options -#: ../src/search.c:424 -msgid "_Find All" -msgstr "" - -#: ../src/search.c:431 -msgid "_Mark" -msgstr "" - -#: ../src/search.c:433 -msgid "Mark all matches in the current document" -msgstr "" - -#: ../src/search.c:438 ../src/search.c:595 -msgid "In Sessi_on" -msgstr "" - -#: ../src/search.c:443 ../src/search.c:600 -msgid "_In Document" -msgstr "" - -#. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 -msgid "Close _dialog" -msgstr "" - -#: ../src/search.c:454 ../src/search.c:618 -msgid "Disable this option to keep the dialog open" -msgstr "" - -#: ../src/search.c:529 -msgid "Replace & Fi_nd" -msgstr "" - -#: ../src/search.c:538 -msgid "Replace wit_h:" -msgstr "" - -#. Now add the multiple replace options -#: ../src/search.c:588 -msgid "Re_place All" -msgstr "" - -#: ../src/search.c:605 -msgid "In Se_lection" -msgstr "" - -#: ../src/search.c:607 -msgid "Replace all matches found in the currently selected text" -msgstr "" - -#: ../src/search.c:696 -msgid "_Directory:" -msgstr "" - -#: ../src/search.c:727 -msgid "E_ncoding:" -msgstr "" - -#: ../src/search.c:752 -msgid "Fixed s_trings" -msgstr "" - -#: ../src/search.c:761 -msgid "_Grep regular expressions" -msgstr "" - -#: ../src/search.c:764 ../src/search.c:772 -msgid "See grep's manual page for more information" -msgstr "" - -#: ../src/search.c:769 -msgid "_Extended regular expressions" -msgstr "" - -#: ../src/search.c:776 -msgid "_Recurse in subfolders" -msgstr "" - -#: ../src/search.c:792 -msgid "_Invert search results" -msgstr "" - -#: ../src/search.c:797 -msgid "Invert the sense of matching, to select non-matching lines" -msgstr "" - -#: ../src/search.c:814 -msgid "E_xtra options:" -msgstr "" - -#: ../src/search.c:822 -msgid "Other options to pass to Grep" -msgstr "" - -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 -#, c-format -msgid "Found %d match for \"%s\"." -msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "" -msgstr[1] "" - -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "" -msgstr[1] "" - -#: ../src/search.c:1304 -msgid "Invalid directory for find in files." -msgstr "" - -#: ../src/search.c:1324 -msgid "No text to find." -msgstr "" - -#: ../src/search.c:1351 -#, c-format -msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" - -#: ../src/search.c:1419 -msgid "Searching..." -msgstr "" - -#: ../src/search.c:1431 -#, c-format -msgid "%s %s -- %s (in directory: %s)" -msgstr "" - -#: ../src/search.c:1459 -#, c-format -msgid "Could not open directory (%s)" -msgstr "" - -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" - -#: ../src/search.c:1586 -#, c-format -msgid "Search completed with %d match." -msgid_plural "Search completed with %d matches." -msgstr[0] "" -msgstr[1] "" - -#: ../src/search.c:1594 -msgid "No matches found." -msgstr "" - -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 -msgid "Chapter" -msgstr "" - -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 -msgid "Section" -msgstr "" - -#: ../src/symbols.c:598 -msgid "Sect1" -msgstr "" - -#: ../src/symbols.c:599 -msgid "Sect2" -msgstr "" - -#: ../src/symbols.c:600 -msgid "Sect3" -msgstr "" - -#: ../src/symbols.c:601 -msgid "Appendix" -msgstr "" - -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 -msgid "Other" -msgstr "" - -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 -msgid "Module" -msgstr "" - -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 -msgid "Types" -msgstr "" - -#: ../src/symbols.c:611 -msgid "Type constructors" -msgstr "" - -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 -msgid "Functions" -msgstr "" - -#: ../src/symbols.c:617 ../src/symbols.c:623 -msgid "Sections" -msgstr "" - -#: ../src/symbols.c:618 -msgid "Keys" -msgstr "" - -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 -msgid "Variables" -msgstr "" - -#: ../src/symbols.c:631 -msgid "Command" -msgstr "" - -#: ../src/symbols.c:632 -msgid "Environment" -msgstr "" - -#: ../src/symbols.c:634 ../src/symbols.c:702 -msgid "Subsection" -msgstr "" - -#: ../src/symbols.c:635 ../src/symbols.c:703 -msgid "Subsubsection" -msgstr "" - -#: ../src/symbols.c:636 -msgid "Label" -msgstr "" - -#: ../src/symbols.c:646 -msgid "Structures" -msgstr "" - -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 -msgid "Package" -msgstr "" - -#: ../src/symbols.c:655 -msgid "My" -msgstr "" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "" - -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 -msgid "Interfaces" -msgstr "" - -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 -msgid "Classes" -msgstr "" - -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "" - -#: ../src/symbols.c:682 -msgid "Anchors" -msgstr "" - -#: ../src/symbols.c:683 -msgid "H1 Headings" -msgstr "" - -#: ../src/symbols.c:684 -msgid "H2 Headings" -msgstr "" - -#: ../src/symbols.c:685 -msgid "H3 Headings" -msgstr "" - -#: ../src/symbols.c:693 -msgid "ID Selectors" -msgstr "" - -#: ../src/symbols.c:694 -msgid "Type Selectors" -msgstr "" - -#: ../src/symbols.c:710 -msgid "Modules" -msgstr "" - -#: ../src/symbols.c:712 -msgid "Singletons" -msgstr "" - -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 -msgid "Methods" -msgstr "" - -#: ../src/symbols.c:722 ../src/symbols.c:850 -msgid "Namespaces" -msgstr "" - -#: ../src/symbols.c:725 -#, fuzzy -msgid "Procedures" -msgstr "Propriedades" - -#: ../src/symbols.c:736 -msgid "Imports" -msgstr "" - -#: ../src/symbols.c:766 ../src/symbols.c:855 -msgid "Members" -msgstr "" - -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "" - -#: ../src/symbols.c:818 -msgid "Subroutines" -msgstr "" - -#: ../src/symbols.c:821 -msgid "Blocks" -msgstr "" - -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 -msgid "Macros" -msgstr "" - -#: ../src/symbols.c:831 -msgid "Defines" -msgstr "" - -#: ../src/symbols.c:838 -msgid "Targets" -msgstr "" - -#: ../src/symbols.c:856 -msgid "Structs" -msgstr "" - -#: ../src/symbols.c:857 -msgid "Typedefs / Enums" -msgstr "" - -#: ../src/symbols.c:1337 -#, c-format -msgid "Unknown filetype extension for \"%s\".\n" -msgstr "" - -#: ../src/symbols.c:1358 -#, c-format -msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "" - -#: ../src/symbols.c:1365 -#, c-format -msgid "" -"Usage: %s -g \n" -"\n" -msgstr "" - -#: ../src/symbols.c:1366 -#, c-format -msgid "" -"Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" -msgstr "" - -#: ../src/symbols.c:1380 -msgid "Load Tags" -msgstr "" - -#: ../src/symbols.c:1387 -msgid "Geany tag files (*.tags)" -msgstr "" - -#. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 -#, c-format -msgid "Loaded %s tags file '%s'." -msgstr "" - -#: ../src/symbols.c:1409 -#, c-format -msgid "Could not load tags file '%s'." -msgstr "" - -#: ../src/symbols.c:1555 -#, c-format -msgid "Forward declaration \"%s\" not found." -msgstr "" - -#: ../src/symbols.c:1557 -#, c-format -msgid "Definition of \"%s\" not found." -msgstr "" - -#: ../src/symbols.c:1863 -msgid "Sort by _Name" -msgstr "" - -#: ../src/symbols.c:1870 -msgid "Sort by _Appearance" -msgstr "" - -#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 -msgid "Save the current file" -msgstr "" - -#: ../src/toolbar.c:56 -msgid "Save all open files" -msgstr "" - -#: ../src/toolbar.c:57 -msgid "Reload the current file from disk" -msgstr "" - -#: ../src/toolbar.c:58 -msgid "Close the current file" -msgstr "" - -#: ../src/toolbar.c:59 -msgid "Close all open files" -msgstr "" - -#: ../src/toolbar.c:60 -msgid "Cut the current selection" -msgstr "" - -#: ../src/toolbar.c:61 -msgid "Copy the current selection" -msgstr "" - -#: ../src/toolbar.c:62 -msgid "Paste the contents of the clipboard" -msgstr "" - -#: ../src/toolbar.c:63 -msgid "Delete the current selection" -msgstr "" - -#: ../src/toolbar.c:64 -msgid "Undo the last modification" -msgstr "" - -#: ../src/toolbar.c:65 -msgid "Redo the last modification" -msgstr "" - -#: ../src/toolbar.c:68 -msgid "Compile the current file" -msgstr "" - -#: ../src/toolbar.c:69 -msgid "Run or view the current file" -msgstr "" - -#: ../src/toolbar.c:70 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette" -msgstr "" - -#: ../src/toolbar.c:71 -msgid "Zoom in the text" -msgstr "" - -#: ../src/toolbar.c:72 -msgid "Zoom out the text" -msgstr "" - -#: ../src/toolbar.c:73 -msgid "Decrease indentation" -msgstr "" - -#: ../src/toolbar.c:74 -msgid "Increase indentation" -msgstr "" - -#: ../src/toolbar.c:75 ../src/toolbar.c:350 -msgid "Find the entered text in the current file" -msgstr "" - -#: ../src/toolbar.c:76 ../src/toolbar.c:358 -msgid "Jump to the entered line number" -msgstr "" - -#: ../src/toolbar.c:77 -msgid "Show the preferences dialog" -msgstr "" - -#: ../src/toolbar.c:78 -msgid "Quit Geany" -msgstr "" - -#: ../src/toolbar.c:79 -#, fuzzy -msgid "Print document" -msgstr "documento XML" - -#: ../src/toolbar.c:80 -msgid "Replace text in the current document" -msgstr "" - -#. Create our custom actions -#: ../src/toolbar.c:334 -msgid "Create a new file" -msgstr "" - -#: ../src/toolbar.c:339 -msgid "Open an existing file" -msgstr "" - -#: ../src/toolbar.c:358 -msgid "Goto" -msgstr "" - -#: ../src/toolbar.c:533 -msgid "Separator" -msgstr "" - -#: ../src/toolbar.c:534 -msgid "--- Separator ---" -msgstr "" - -#: ../src/toolbar.c:897 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" - -#: ../src/toolbar.c:913 -msgid "Available Items" -msgstr "" - -#: ../src/toolbar.c:934 -#, fuzzy -msgid "Displayed Items" -msgstr "Visualização" - -#: ../src/tools.c:153 -#, c-format -msgid "" -"The executed custom command returned an error. Your selection was not " -"changed. Error message: %s" -msgstr "" - -#: ../src/tools.c:219 -msgid "The executed custom command exited with an unsuccessful exit code." -msgstr "" - -#: ../src/tools.c:246 -#, c-format -msgid "Passing data and executing custom command: %s" -msgstr "" - -#: ../src/tools.c:290 -#, c-format -msgid "Custom command failed: %s" -msgstr "" - -#: ../src/tools.c:304 ../src/tools.c:538 -msgid "Set Custom Commands" -msgstr "" - -#: ../src/tools.c:311 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" - -#: ../src/tools.c:506 ../src/tools.c:510 -msgid "No custom commands defined." -msgstr "" - -#: ../src/tools.c:615 -msgid "Word Count" -msgstr "" - -#: ../src/tools.c:625 -msgid "selection" -msgstr "" - -#: ../src/tools.c:631 -msgid "whole document" -msgstr "" - -#: ../src/tools.c:640 -msgid "Range:" -msgstr "" - -#: ../src/tools.c:652 -msgid "Lines:" -msgstr "" - -#: ../src/tools.c:666 -msgid "Words:" -msgstr "" - -#: ../src/tools.c:680 -msgid "Characters:" -msgstr "" - -#: ../src/treeviews.c:177 -msgid "No tags found" -msgstr "" - -#: ../src/treeviews.c:508 -msgid "Show S_ymbol List" -msgstr "" - -#: ../src/treeviews.c:516 -msgid "Show _Document List" -msgstr "" - -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 -msgid "H_ide Sidebar" -msgstr "" - -#: ../src/treeviews.c:591 -#, fuzzy -msgid "Show _Paths" -msgstr "Apresentar barra de estados" - -#. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "" - -#. RO = read-only -#: ../src/ui_utils.c:194 -msgid "RO " -msgstr "" - -#. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 -msgid "OVR" -msgstr "" - -#: ../src/ui_utils.c:196 -msgid "INS" -msgstr "" - -#: ../src/ui_utils.c:202 -msgid "TAB" -msgstr "" - -#: ../src/ui_utils.c:205 -msgid "SP" -msgstr "" - -#: ../src/ui_utils.c:208 -msgid "T/S" -msgstr "" - -#: ../src/ui_utils.c:212 -#, c-format -msgid "mode: %s" -msgstr "" - -#: ../src/ui_utils.c:215 -#, c-format -msgid "encoding: %s %s" -msgstr "" - -#: ../src/ui_utils.c:221 -#, c-format -msgid "filetype: %s" -msgstr "" - -#: ../src/ui_utils.c:225 -msgid "MOD" -msgstr "" - -#: ../src/ui_utils.c:230 -#, c-format -msgid "scope: %s" -msgstr "" - -#: ../src/ui_utils.c:315 -#, c-format -msgid "Font updated (%s)." -msgstr "" - -#: ../src/ui_utils.c:511 -msgid "C Standard Library" -msgstr "" - -#: ../src/ui_utils.c:512 -msgid "ISO C99" -msgstr "" - -#: ../src/ui_utils.c:513 -msgid "C++ (C Standard Library)" -msgstr "" - -#: ../src/ui_utils.c:514 -msgid "C++ Standard Library" -msgstr "" - -#: ../src/ui_utils.c:515 -msgid "C++ STL" -msgstr "" - -#: ../src/ui_utils.c:579 -msgid "_Set Custom Date Format" -msgstr "" - -#: ../src/ui_utils.c:1644 -msgid "Select Folder" -msgstr "" - -#: ../src/ui_utils.c:1644 -msgid "Select File" -msgstr "" - -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "" - -#: ../src/ui_utils.c:1785 -msgid "Save All" -msgstr "" - -#: ../src/ui_utils.c:1786 -msgid "Close All" -msgstr "" - -#: ../src/utils.c:324 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/utils.c:325 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/utils.c:326 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "" - -#: ../src/vte.c:548 -msgid "_Set Path From Document" -msgstr "" - -#: ../src/vte.c:553 -msgid "_Restart Terminal" -msgstr "" - -#: ../src/vte.c:576 -msgid "_Input Methods" -msgstr "" - -#: ../src/vte.c:670 -msgid "" -"Could not change the directory in the VTE because it probably contains a " -"command." -msgstr "" - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "" - -#: ../src/vte.c:750 -msgid "Sets the font for the terminal widget" -msgstr "" - -#: ../src/vte.c:752 -msgid "Foreground color:" -msgstr "" - -#: ../src/vte.c:758 -msgid "Background color:" -msgstr "" - -#: ../src/vte.c:768 -msgid "Sets the foreground color of the text in the terminal widget" -msgstr "" - -#: ../src/vte.c:775 -msgid "Sets the background color of the text in the terminal widget" -msgstr "" - -#: ../src/vte.c:778 -msgid "Scrollback lines:" -msgstr "" - -#: ../src/vte.c:790 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget" -msgstr "" - -#: ../src/vte.c:794 -msgid "Shell:" -msgstr "" - -#: ../src/vte.c:802 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation" -msgstr "" - -#: ../src/vte.c:819 -msgid "Scroll on keystroke" -msgstr "" - -#: ../src/vte.c:820 -msgid "Whether to scroll to the bottom if a key was pressed" -msgstr "" - -#: ../src/vte.c:823 -msgid "Scroll on output" -msgstr "" - -#: ../src/vte.c:824 -msgid "Whether to scroll to the bottom when output is generated" -msgstr "" - -#: ../src/vte.c:827 -msgid "Cursor blinks" -msgstr "" - -#: ../src/vte.c:828 -msgid "Whether to blink the cursor" -msgstr "" - -#: ../src/vte.c:831 -msgid "Override Geany keybindings" -msgstr "" - -#: ../src/vte.c:833 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" - -#: ../src/vte.c:836 -msgid "Disable menu shortcut key (F10 by default)" -msgstr "" - -#: ../src/vte.c:837 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" - -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 -msgid "Follow the path of the current file" -msgstr "" - -#: ../src/vte.c:841 -msgid "Whether to execute \"cd $path\" when you switch between opened files" -msgstr "" - -#. create check_skip_script checkbox before the check_skip_script checkbox to be able to -#. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 -msgid "Don't use run script" -msgstr "" - -#: ../src/vte.c:847 -msgid "" -"Don't use the simple run script which is usually used to display the exit " -"status of the executed program" -msgstr "" - -#: ../src/vte.c:850 -msgid "Execute programs in VTE" -msgstr "" - -#: ../src/vte.c:851 -msgid "" -"Run programs in VTE instead of opening a terminal emulation window. Please " -"note, programs executed in VTE cannot be stopped" -msgstr "" - -#: ../src/win32.c:135 -msgid "Geany project files" -msgstr "" - -#: ../src/win32.c:141 -msgid "Executables" -msgstr "" - -#: ../plugins/classbuilder.c:37 -msgid "Class Builder" -msgstr "" - -#: ../plugins/classbuilder.c:37 -msgid "Creates source files for new class types." -msgstr "" - -#: ../plugins/classbuilder.c:322 -msgid "Create Class" -msgstr "" - -#: ../plugins/classbuilder.c:332 -msgid "Class" -msgstr "" - -#: ../plugins/classbuilder.c:341 -msgid "Class name:" -msgstr "" - -#: ../plugins/classbuilder.c:352 -msgid "Header file:" -msgstr "" - -#: ../plugins/classbuilder.c:361 -msgid "Source file:" -msgstr "" - -#: ../plugins/classbuilder.c:367 -msgid "Inheritance" -msgstr "" - -#: ../plugins/classbuilder.c:376 -msgid "Base class:" -msgstr "" - -#: ../plugins/classbuilder.c:389 -msgid "Base header:" -msgstr "" - -#: ../plugins/classbuilder.c:397 -msgid "Global" -msgstr "" - -#: ../plugins/classbuilder.c:406 -msgid "Base GType:" -msgstr "" - -#: ../plugins/classbuilder.c:414 -msgid "Options" -msgstr "" - -#: ../plugins/classbuilder.c:423 -msgid "Create constructor" -msgstr "" - -#: ../plugins/classbuilder.c:427 -msgid "Create destructor" -msgstr "" - -#: ../plugins/classbuilder.c:437 -msgid "GTK+ constructor type" -msgstr "" - -#: ../plugins/classbuilder.c:744 -msgid "Create Cla_ss" -msgstr "" - -#: ../plugins/classbuilder.c:750 -msgid "_C++ Class" -msgstr "" - -#: ../plugins/classbuilder.c:753 -msgid "_GTK+ Class" -msgstr "" - -#: ../plugins/htmlchars.c:38 -msgid "HTML Characters" -msgstr "" - -#: ../plugins/htmlchars.c:38 -msgid "Inserts HTML character entities like '&'." -msgstr "" - -#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 -#: ../plugins/splitwindow.c:37 -msgid "The Geany developer team" -msgstr "" - -#: ../plugins/htmlchars.c:72 -msgid "HTML characters" -msgstr "" - -#: ../plugins/htmlchars.c:78 -msgid "ISO 8859-1 characters" -msgstr "" - -#: ../plugins/htmlchars.c:176 -msgid "Greek characters" -msgstr "" - -#: ../plugins/htmlchars.c:231 -msgid "Mathematical characters" -msgstr "" - -#: ../plugins/htmlchars.c:272 -msgid "Technical characters" -msgstr "" - -#: ../plugins/htmlchars.c:280 -msgid "Arrow characters" -msgstr "" - -#: ../plugins/htmlchars.c:293 -msgid "Punctuation characters" -msgstr "" - -#: ../plugins/htmlchars.c:309 -msgid "Miscellaneous characters" -msgstr "" - -#: ../plugins/htmlchars.c:447 -msgid "Special Characters" -msgstr "" - -#: ../plugins/htmlchars.c:449 -msgid "_Insert" -msgstr "" - -#: ../plugins/htmlchars.c:458 -msgid "" -"Choose a special character from the list below and double click on it or use " -"the button to insert it at the current cursor position." -msgstr "" - -#: ../plugins/htmlchars.c:472 -msgid "Character" -msgstr "" - -#: ../plugins/htmlchars.c:478 -msgid "HTML (name)" -msgstr "" - -#: ../plugins/htmlchars.c:678 -msgid "_Insert Special HTML Characters" -msgstr "" - -#. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 -#, fuzzy -msgid "HTML Replacement" -msgstr "Substituir" - -#: ../plugins/htmlchars.c:697 -msgid "_HTMLToggle" -msgstr "" - -#: ../plugins/htmlchars.c:706 -#, fuzzy -msgid "Bulk replacement of special chars" -msgstr "Localização do separador para um novo ficheiro:" - -#: ../plugins/htmlchars.c:721 -msgid "Insert Special HTML Characters" -msgstr "" - -#: ../plugins/htmlchars.c:724 -msgid "Replace special characters" -msgstr "" - -#: ../plugins/htmlchars.c:727 -msgid "Toggle plugin status" -msgstr "" - -#: ../plugins/export.c:37 -msgid "Export" -msgstr "" - -#: ../plugins/export.c:37 -msgid "Exports the current file into different formats." -msgstr "" - -#: ../plugins/export.c:166 -msgid "Export File" -msgstr "" - -#: ../plugins/export.c:183 -msgid "_Use current zoom level" -msgstr "" - -#: ../plugins/export.c:185 -msgid "" -"Renders the font size of the document together with the current zoom level" -msgstr "" - -#: ../plugins/export.c:267 -#, c-format -msgid "Document successfully exported as '%s'." -msgstr "" - -#: ../plugins/export.c:269 -#, c-format -msgid "File '%s' could not be written (%s)." -msgstr "" - -#: ../plugins/export.c:316 -#, c-format -msgid "The file '%s' already exists. Do you want to overwrite it?" -msgstr "" - -#: ../plugins/export.c:703 -msgid "_Export" -msgstr "" - -#. HTML -#: ../plugins/export.c:710 -msgid "As _HTML" -msgstr "" - -#. LaTeX -#: ../plugins/export.c:716 -msgid "As _LaTeX" -msgstr "" - -#: ../plugins/filebrowser.c:40 -msgid "File Browser" -msgstr "" - -#: ../plugins/filebrowser.c:40 -msgid "Adds a file browser tab to the sidebar." -msgstr "" - -#: ../plugins/filebrowser.c:323 -msgid "Too many items selected!" -msgstr "" - -#: ../plugins/filebrowser.c:399 -#, c-format -msgid "Could not execute configured external command '%s' (%s)." -msgstr "" - -#: ../plugins/filebrowser.c:555 -msgid "Open _externally" -msgstr "" - -#: ../plugins/filebrowser.c:561 -msgid "_Find in Files" -msgstr "" - -#: ../plugins/filebrowser.c:571 -msgid "Show _Hidden Files" -msgstr "" - -#: ../plugins/filebrowser.c:763 -msgid "Up" -msgstr "" - -#: ../plugins/filebrowser.c:768 -msgid "Refresh" -msgstr "" - -#: ../plugins/filebrowser.c:773 -msgid "Home" -msgstr "" - -#: ../plugins/filebrowser.c:778 -msgid "Set path from document" -msgstr "" - -#: ../plugins/filebrowser.c:786 -msgid "Clear the filter" -msgstr "" - -#: ../plugins/filebrowser.c:800 -msgid "Filter:" -msgstr "" - -#: ../plugins/filebrowser.c:1019 -msgid "Focus File List" -msgstr "" - -#: ../plugins/filebrowser.c:1021 -msgid "Focus Path Entry" -msgstr "" - -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "" - -#: ../plugins/filebrowser.c:1092 -msgid "External open command:" -msgstr "" - -#: ../plugins/filebrowser.c:1101 -#, 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 "" - -#: ../plugins/filebrowser.c:1107 -msgid "Show hidden files" -msgstr "" - -#: ../plugins/filebrowser.c:1113 -msgid "Hide object files" -msgstr "" - -#: ../plugins/filebrowser.c:1117 -msgid "" -"Don't show generated object files in the file browser, this includes *.o, *." -"obj. *.so, *.dll, *.a, *.lib" -msgstr "" - -#: ../plugins/filebrowser.c:1128 -#, fuzzy -msgid "Use the project's base directory" -msgstr "Guardar o ficheiro de projecto na directoria base do projecto" - -#: ../plugins/filebrowser.c:1132 -msgid "" -"Change the directory to the base directory of the currently opened project" -msgstr "" - -#: ../plugins/saveactions.c:39 -msgid "Save Actions" -msgstr "" - -#: ../plugins/saveactions.c:39 -msgid "This plugin provides different actions related to saving of files." -msgstr "" - -#: ../plugins/saveactions.c:169 -#, c-format -msgid "Backup Copy: Directory could not be created (%s)." -msgstr "" - -#. it's unlikely that this happens -#: ../plugins/saveactions.c:201 -#, c-format -msgid "Backup Copy: File could not be read (%s)." -msgstr "" - -#: ../plugins/saveactions.c:219 -#, c-format -msgid "Backup Copy: File could not be saved (%s)." -msgstr "" - -#: ../plugins/saveactions.c:311 -#, c-format -msgid "Autosave: Saved %d file automatically." -msgid_plural "Autosave: Saved %d files automatically." -msgstr[0] "" -msgstr[1] "" - -#. initialize the dialog -#: ../plugins/saveactions.c:380 -msgid "Select Directory" -msgstr "" - -#: ../plugins/saveactions.c:463 -msgid "Backup directory does not exist or is not writable." -msgstr "" - -#: ../plugins/saveactions.c:543 -msgid "Auto Save" -msgstr "" - -#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 -#: ../plugins/saveactions.c:648 -msgid "_Enable" -msgstr "" - -#: ../plugins/saveactions.c:553 -msgid "Auto save _interval:" -msgstr "" - -#: ../plugins/saveactions.c:561 -msgid "seconds" -msgstr "" - -#: ../plugins/saveactions.c:570 -msgid "_Print status message if files have been automatically saved" -msgstr "" - -#: ../plugins/saveactions.c:578 -msgid "Save only current open _file" -msgstr "" - -#: ../plugins/saveactions.c:585 -msgid "Sa_ve all open files" -msgstr "" - -#: ../plugins/saveactions.c:605 -msgid "Instant Save" -msgstr "" - -#: ../plugins/saveactions.c:615 -msgid "_Filetype to use for newly opened files:" -msgstr "" - -#: ../plugins/saveactions.c:646 -msgid "Backup Copy" -msgstr "" - -#: ../plugins/saveactions.c:656 -msgid "_Directory to save backup files in:" -msgstr "" - -#: ../plugins/saveactions.c:679 -msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "" - -#: ../plugins/saveactions.c:692 -msgid "Directory _levels to include in the backup destination:" -msgstr "" - -#: ../plugins/splitwindow.c:36 -msgid "Split Window" -msgstr "" - -#: ../plugins/splitwindow.c:36 -msgid "Splits the editor view into two windows." -msgstr "" - -#: ../plugins/splitwindow.c:277 -#, fuzzy -msgid "Show the current document" -msgstr "Mudar para o documento à esquerda" - -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 -msgid "_Unsplit" -msgstr "" - -#: ../plugins/splitwindow.c:399 -msgid "_Split Window" -msgstr "" - -#: ../plugins/splitwindow.c:407 -msgid "_Horizontally" -msgstr "" - -#: ../plugins/splitwindow.c:412 -msgid "_Vertically" -msgstr "" - -#: ../plugins/splitwindow.c:427 -msgid "Split Horizontally" -msgstr "" - -#: ../plugins/splitwindow.c:429 -msgid "Split Vertically" -msgstr "" - -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "" - -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "Falha ao visualizar %s (verifique que já está compilado)" - -#~ msgid "Diff file" -#~ msgstr "Dif de ficheiro" - -#~ msgid "Select _All" -#~ msgstr "Seleccionar _Tudo" - -#~ msgid "Automatic symbol completion" -#~ msgstr "Completar automaticamente símbolos" - -#~ msgid "" -#~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" -#~ msgstr "" -#~ "Adiciona a numeração de página ao fundo de cada uma, ocupa 2 linhas da " -#~ "página" - -#~ msgid "" -#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -#~ "xml'. Please see the documentation for details." -#~ msgstr "" -#~ "Aviso: Para personalizar os elementos da barra de ferramentas, edite o " -#~ "ficheiro 'ui_toolbar.xml'. Por favor consulte a documentação para " -#~ "detalhes." diff -Nru geany-0.18/po/ro.po geany-0.19/po/ro.po --- geany-0.18/po/ro.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/ro.po 2010-05-23 09:08:49.000000000 +0100 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2008-10-15 01:47+0200\n" "Last-Translator: Alex Eftimie \n" "Language-Team: Romanian\n" @@ -21,7 +21,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE rapid folosind GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,53 +29,53 @@ msgid "Integrated Development Environment" msgstr "Mediu de dezvoltare" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Despre Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Un IDE rapid și puțin consumator de resurse" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(construit la sau după %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Informații" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Dezvoltatori" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "responsabil" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "dezvoltator" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "responsabil traducere" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Traducători" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Traducători precedenți" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Contribuitori" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -83,15 +83,15 @@ "Câțiva dintre mulții contribuitori (pentru o listă mai detaliată, consultați " "fișierul %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Mulțumiri" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Licență" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -99,283 +99,296 @@ "Textul licenței nu a putut fi găsit, vă rugăm vizitați http://www.gnu.org/" "licenses/gpl-2.0.txt pentru al vizualiza online." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Nu am putut găsi terminalul \"%s\" (verificați calea pentru Terminal în " -"Preferințe)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Nu am putut schimba dosarul de lucru în \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Nu am putut executa \"%s\" (scriptul de pornire nu a putut fi creat)" +msgid "%s (in directory: %s)" +msgstr "%s (în dosarul: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Procesul a eșuat (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (în dosarul: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Nu am putut schimba dosarul de lucru în \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Nu am putut executa \"%s\" (scriptul de pornire nu a putut fi creat)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Nu am putut executa fișierul în VTE deoarece probabil conține o comandă." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Nu am putut găsi terminalul \"%s\" (verificați calea pentru Terminal în " +"Preferințe)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Compilare eșuată" -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Compilare terminată cu succes." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Compilează" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "Cons_truiește" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Format dată personalizat" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." msgstr "" -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Eroarea ur_mătoare" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Eroare a_nterioră" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Stabilește includeri și argumente" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Vizualizează fișierul DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "V_izualizeză fișierul PDF" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Stabilește comenzi personalizate" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Stabilește parametri" +#: ../src/build.c:1623 ../src/toolbar.c:373 +#, fuzzy +msgid "Build the current file" +msgstr "Compilează fișierul curent" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Stabilește parametri" +#: ../src/build.c:1637 +#, fuzzy +msgid "Build the current file with Make and the default target" +msgstr "Construiește fișierul curent cu unealta make și ținta implicită" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Stabilește programele și opțiunile pentru compilarea și vizualizarea " -"fișierelor (La)TeX" +#: ../src/build.c:1639 +#, fuzzy +msgid "Build the current file with Make and the specified target" +msgstr "Construiește fișierul curent cu unealta make și ținta implicită" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Creare DVI:" +#: ../src/build.c:1641 +#, fuzzy +msgid "Compile the current file with Make" +msgstr "Compilează fișierul curent" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Creare PDF:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Procesul nu a putut fi oprit (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Previzualizare DVI:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Nu mai sunt erori de construire." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Previzualizare PDF:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f va fi înlocuit cu numele de fișier curent, i.e. test_file.c\n" -"%e va fi înlocuit cu numele de fișier fără extensie, i.e. test_file" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Stabilește includeri și argumente" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Etichetă" + +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Comandă" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Stabilește comenzile pentru construirea și executarea programelor." +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (în dosarul: %s)" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "Comenzi pentru %s" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Compilator" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Compilare" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Construire:" +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Execuție:" +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" +msgstr "Comenzi pentru %s" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1906 #, fuzzy -msgid "Build the current file" -msgstr "Compilează fișierul curent" +msgid "No Filetype" +msgstr "Stabilește _tipul de fișier" + +# FUZZY +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "Expresii regulate Grep" -#: ../src/build.c:1917 -msgid "Make Custom Target" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" msgstr "" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" -#: ../src/build.c:1967 +#: ../src/build.c:1981 #, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "Construiește fișierul curent cu unealta make și ținta implicită" +msgid "Execute Commands" +msgstr "Stabilește comenzi personalizate" + +#: ../src/build.c:1992 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" -#: ../src/build.c:1970 +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "Construiește fișierul curent cu unealta make și ținta implicită" +msgid "Set Build Commands" +msgstr "Stabilește comenzi personalizate" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Compilează" + +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "Cons_truiește" -#: ../src/build.c:1973 +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Compile the current file with Make" -msgstr "Compilează fișierul curent" +msgid "_Execute" +msgstr "Execuție:" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Execuția programului de vizualizare a eșuat." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Procesul nu a putut fi oprit (%s)." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Nu mai sunt erori de construire." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" -#: ../src/callbacks.c:152 +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Stabilește comenzi personalizate" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Sigur doriți să părăsiți programul?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Fișierul %s a fost salvat." +msgstr[1] "Fișierul %s a fost salvat." +msgstr[2] "Fișierul %s a fost salvat." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Reîncarcă" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Orice schimbări nesalvate se vor pierde." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Sunteți sigur că doriți să reîncărcați '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Mergi la linia" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Introduceți linia la care doriți să mergeți:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Vă rugăm setați tipul de fișier pentru fișierul curent înainte de a folosi " "această funcție." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "zz.ll.aaaa" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "ll.zz.aaaa" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "aaaa/ll/zz" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "zz.ll.aaaa oo:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "ll.zz.aaaa oo:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/ll/zz oo:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Folosește format dată personalizat" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Format dată personalizat" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -383,24 +396,23 @@ "Introduceți un format de dată și timp. Puteți folosi oricare dintre " "specificatorii de conversie folosiți cu funcția ANSI C strftime." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Formatul de dată nu a putut fi convertit (posibil este prea lung)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Nu mai sunt mesaje." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Deschide fișier" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Vizualizare" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -408,29 +420,29 @@ "Deschide fișierul în mod doar-citire. Dacă alegeți mai mult de un fișier, " "toate fișierele vor fi deschise în mod doar-citire." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Determină după extensie" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Determină din fișier" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "Opțiuni" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Arată fișierele _ascunse" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Stabilește codarea:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -440,11 +452,11 @@ msgstr "" #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Stabilește tipul de fișier:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -461,24 +473,24 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Salvează fișier" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "R_edenumește" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 #, fuzzy msgid "Save the file and rename it" msgstr "Salvează fișierul și redenumește-l." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Deschide fișierul într-un nou tab" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -487,41 +499,41 @@ "Păstrează deschis fișierul nesalvat curent și deschide proaspăt salvatul " "fișier într-un nou tab." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Eroare" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Întrebare" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Avertizare" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Informație" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Nu salva" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Fișierul '%s' nu este salvat." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Doriți să-l salvați înainte de a-l închide?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Alege font" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -529,106 +541,110 @@ "O eroare s-a produs, sau informațiile despre fișier nu au putut fi obținute " "(e.g. dintr-un fișier nou)" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "necunoscut" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Proprietăți" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tip:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Dimensiune:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Locație:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Doar citire:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(numai în Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Codare:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(cu BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(fără BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modificat:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Schimbat:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Accesat:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Permisiuni" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Citire:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Scriere" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Execuție:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Proprietar:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Altul:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Fișierul %s a fost închis." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Fișierul nou \"%s\" a fost deschis." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Nu am putut deschide fișierul %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -644,12 +660,12 @@ # FUZZY? #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Fișierul \"%s\" nu este un valid %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -657,30 +673,30 @@ msgstr "" "Fișierul\"%s\" nu arată ca un fișier text sau codarea nu este suportată." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Spații" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tab-uri" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tab-uri și spații" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Stabilesc modul de indentare %s pentru %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Nume de fișier invalid" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Fișierul %s a fost reîncărcat." @@ -688,21 +704,21 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Fișierul %s a fost deschis(%d%s)" -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", doar-citire" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "Eroare la salvarea fișierului." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -711,7 +727,7 @@ "O eroare s-a produs la conversia fișierului din UTF-8 în \"%s\". Fișierul " "rămâne nesalvat." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -720,41 +736,41 @@ "Mesaj de eroare: %s\n" "Eroarea s-a produs la \"%s\" (linia: %d, coloana: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Mesaj de eroare: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Eroare la salvarea fișierului." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Eroare la salvarea fișierului (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Fișierul %s a fost salvat." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nu a fost găsit." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Nu am găsit nici o potrivire pentru \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -762,11 +778,11 @@ msgstr[1] "%s: am înlocuit %d apariții ale \"%s\" cu \"%s\"" msgstr[2] "%s: am înlocuit %d apariții ale \"%s\" cu \"%s\"" -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Doriți să-l reîncărcați?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -775,24 +791,29 @@ "Fișierul '%s' de pe disc este mai recent decât\n" "tamponul curent." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Încearcă să salveze din nou fișierul?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Fișierul \"%s\" nu a fost găsit!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Introduceți lățimea tabului" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Introduceți numărul de spații care să fie înlocuite de un caracter tab." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celtică" @@ -903,587 +924,649 @@ msgid "Without encoding" msgstr "Fără codare" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Vest europeană" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Este europeană" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "_Asia de est" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Asia de _SE & SV" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Orientul mijlociu" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Sursă %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "Sursă %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Nimic" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Script consolă" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Fișier make" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Stiluri în cascadă" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Fișier SQL Dump" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Fișier configurare" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Fișier traducere gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "Fișier script %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Limbaje de _programare" # FUZZY -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Limbaje de _scripting" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Limbaje de pre_zentare" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Limbaje di_verse" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Stabilește _tipul de fișier" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Toate fișierele" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresie regulată greșită pentru tipul de fișier %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "fără titlu" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Nu am putut găsi fișierul '%s'." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "Selector _culoare" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Fișier" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Nou (din șa_blon)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "invizibil" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Deschide fi_șierul selectat" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Fișiere recente" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Sa_lvează tot" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "R_eîncarcă" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "invizibil" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Setări pa_gină" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Închide celelal_te fișiere" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Înc_hide toate" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Editare" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "F_ormat" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "" +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Transpune linia curentă" + # FUZZY -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Comentează linia/liniile" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Decome_ntează linia/liniile" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "_Comută comentarea liniilor" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Du_plică linia sau selecția" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Mărește indentarea" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Mi_cșorează indentarea" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "Trimite _selecția la" +msgid "_Smart Line Indent" +msgstr "Indentare inteligentă" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Trimite _selecția la" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Comandă" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Taie liniile curente" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Copiază liniile curente" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Șterge liniile curente" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "Du_plică linia sau selecția" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Selectează liniile curente" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Selectează paragraful curent" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Inserează spațiu alb alternativ" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Eroare a_nterioră" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "Trimite _selecția la" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "I_nserează comentarii" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Inserează intrare _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Inserează _antet fișier" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Inserează descrierea _funcției" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Inserează comentariu _multi-linie" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Inserează notiță GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Insereză notiță licență _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "In_serează dată" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Inserează \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "Preferințe" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Preferințe" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Căutare" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Caută ur_mător" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Caută _precedent" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Caută în f_ișiere" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Î_nlocuiește" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Caută _selecția" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Caută selecția an_terioară" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Mesaj următor" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Mesajul ant_erior" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Mer_gi la linia" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Schimbă _font" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Comută toate controalele adiționale" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Ecran c_omplet" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Arată _fereastra de mesaje" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Arată _bara de unelte" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Arată bara _laterală" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Arată _marginile de marcare" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Arată numerele de _linie" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "Arată spațiu albe" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "Arată sfârșiturile de linie" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "Arată ghidări indentare" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Document" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Despărțire pe _linii" -#: ../src/interface.c:792 +#: ../src/interface.c:891 #, fuzzy msgid "Line _Breaking" msgstr "Încadrare linii" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Indentare _automată" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Tip in_dentare" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tab-uri" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Spații" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_ab-uri și spații" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Doar _citire" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Sc_rie caracter Unicod BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Stabilește _tipul de fișier" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Stabilește codar_ea" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Stabilește sfârșiturile de li_nie" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convertește și stabilește _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Convertește și stabilește _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Convertește și stabilește CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Elimină dâra de spații" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Î_nlocuiește tab-urile cu spații" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Î_nlocuiește tab-urile _cu spații" # FUZZY -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Restrânge toate" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Extinde toate" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Șterge _marcatori" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Șterge _indicatori de eroare" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Proiect" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nou" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Deschide" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "Deschide proiect" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "Înc_hide" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Unelte" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Reîncarcă configurația" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "Fișierele de configurare au fost reîncărcate" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Selector _culoare" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Contor cu_vinte" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Încarcă _etichete" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Reîncarcă configurația" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Ajutor" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Site _web" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "S_curtături" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Mesaje _depanare" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Simboluri" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Documente" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Stare" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Compilator" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Mesaje" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Imagini _și text" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Doar _imagini" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Doar _text" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Icon-uri _mari" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Icon-uri m_ici" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Icon-uri m_ici" - -#: ../src/interface.c:1769 +#: ../src/interface.c:1887 #, fuzzy -msgid "_Customize Toolbar" -msgstr "_Ascunde bara de unelte" +msgid "_Toolbar Preferences" +msgstr "Preferințe" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 #, fuzzy msgid "_Hide Toolbar" msgstr "_Ascunde bara de unelte" # FUZZY -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Caută f_olosiri" # FUZZY -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Caută folosiri în _document" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Mergi la definiția e_tichetei" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Mergi la decl_arearea etichetei" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Acțiune conte_xtuală" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Preferințe" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Încarcă fișierele din ultima sesiune" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Deschide la pornire fișierele din ultima sesiune" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Încarcă suport pentru terminal virtual" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1492,40 +1575,40 @@ "Dacă suportul pentru emularea consolei virtuale să fie încărcat. Dezactivați-" "l dacă nu-l folosiți." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Activează suport pentru module" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Pornire" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Salveză poziția și geometria ferestrei" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Salveză poziția și geometria ferestrei și restabilește-le la pornire" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Confirmă ieșirea" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Arată un dialog de confirmare la ieșire." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Închidere" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Cale de pornire:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1533,40 +1616,40 @@ "Calea de pornire la deschiderea sau salvarea de fișiere. Trebuie să fie o " "cale absolută. Lăsați vidă pentru a folosi dosarul de lucru curent." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Fișierele proiectului:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Calea de pornire la deschidere fișierelor de proiect" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 #, fuzzy msgid "Extra plugin path:" msgstr "Activează suport pentru module" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Căi" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "Stare" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Bipăie la erori sau la sfârșitul compilării" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1575,11 +1658,11 @@ "Dacă programul să bipăie la producerea de erori sau la sfârșitul procesului " "de compilare." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Comută la lista de mesaje de stare la un mesaj nou" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1588,11 +1671,11 @@ "Comută la tab-ul listei de mesaje de stare (în partea de jos a ferestrei) " "dacă apare un nou mesaj de stare." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Suprimă mesajele de stare în bara de stare" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1600,37 +1683,47 @@ "Șterge toate mesajele din bara de stare. Mesajele sunt totuși afișate în " "fereastra de mesaje de stare." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Focalizeză automat controalele (focusul urmărește mouse-ul)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." msgstr "" -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Diverse" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Folosește cuvântul de sub cursor pentru dialogurile de căutare" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 #, fuzzy msgid "" "Use current word under the cursor when opening the Find, Find in Files or " @@ -1639,20 +1732,20 @@ "Folosește cuvântul de sub cursor când se deschide unul dintre dialogurile " "Caută, Caută în fișiere sau Înlocuiește și nu este nimic selectat." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Folosește cuvântul de sub cursor pentru dialogurile de căutare" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Căutare" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Folosește fișiere de sesiune bazate pe proiect" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1661,11 +1754,11 @@ "Dacă să salveze fișierele de sesiune ale proiectului și să le redeschidă o " "dată cu acesta." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Salvează fișierul proiect în dosarul de bază al proiectului" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1673,76 +1766,100 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Proiect" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "Diverse" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "General" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Arată lista de simboluri" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Comută vizibilitatea listei de simboluri" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Arată lista de documente" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Comută vizibilitatea listei de documente" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Arată bara _laterală" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Descriere:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Stânga" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Dreapta" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Bară laterală" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Listă simboluri:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Fereastra de mesaje:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Stabilește font-ul ferestrei de mesaje" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Stabilește font-ul listei de simboluri" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Stabilește font-ul editorului" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Font-uri" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Arată tab-uri în editor" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Arată butoane de închidere" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1751,114 +1868,146 @@ "Arată o cruciuliță în tab-urile de fișiere pentru închiderea rapidă prin " "click (necesită repornirea Geany)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Poziționarea tab-urilor de fișier nou:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Stânga" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Tab-urile de fișier vor fi plasate în stânga" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Dreapta" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Tab-urile de fișier vor fi plasate în dreapta" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Salvează fișierul curent" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Comută toate controalele adiționale" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Comută toate controalele adiționale" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Tab-uri editor" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Sus" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Jos" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Bară laterală:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Poziții tab-uri" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Arată bara de stare" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Dacă să arate bara de stare la baza ferestrei principale." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Interfață" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "Arată bară de unelte" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Bară de unelte" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Stil iconițe:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Dimensiune iconițe:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Aspect" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy msgid "Customize Toolbar" msgstr "Arată _bara de unelte" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Imagini _și text" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Doar _imagini" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Doar _text" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Font-uri" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Icon-uri m_ici" + +#: ../src/interface.c:3429 +#, fuzzy +msgid "_Very Small Icons" +msgstr "Icon-uri m_ici" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Icon-uri _mari" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Dimensiune:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Bară de unelte" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Bară de unelte" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Încadrare linii" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1868,11 +2017,11 @@ "următoare. Notă: despărțirea pe linii consumă multe resurse pe documente " "mari, așa că ar trebuie dezactivată pe mașini încete." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Activează tastă acasă \"inteligentă\"" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1887,30 +2036,30 @@ "liniei curente, indiferent de poziția curentă a acestuia." # FUZZY -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Dezactivează trage și plasează" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" msgstr "" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Activează restrângerea/extinderea" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Activează restrângerea respectiv extinderea codului" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Restrânge/extinde toți copii unui punct de restrângere" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1920,11 +2069,11 @@ "Shift când se dă click pe un simbol de restrângere, este utilizat " "comportamentul contrar." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Folosește indicatori pentru a arăta erorile de compilare" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1933,91 +2082,82 @@ "Dacă să folosesc indicatori (subliniere mișcată) pentru a evidenția liniile " "în care compilatorul a raportat un avertisment sau o eroare." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Linia nouă șterge dâra de spații" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Permite liniei noi să șteargă dâra de spații de pe linia precedentă." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "Marcaj linie lungă:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Funcții" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Funcții" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Mod indentare automată" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Fundamental" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Caractere curente" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Potrivește paranteze" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Tip:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Lățime:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Lățimea în caractere a indentării" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Folosește spații la indentare" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Folosește indentare la un tab" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Folosește spații dacă indentarea totală este mai mică decât lătimea tab-" "ului, altfel amândouă" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Lățime tab:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Lățimea unui tab când Taburi și spații este activat pentru un document" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " @@ -2026,60 +2166,60 @@ "Dacă să detectez tipul de indentare din conținutul fișierului la deschiderea " "acestuia." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 #, fuzzy msgid "Tab key indents" msgstr "Indentare inteligentă" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Indentare" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "Indentare" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Completare automată etichete XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Completare automată și închiderea etichetelor XML (include etichetele HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2087,28 +2227,28 @@ "Completarea automată a simbolurilor cunoscute în fișierele deschise (nume de " "funcții, variabile globale, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Caractere de tastat pentru completarea automată:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 #, fuzzy msgid "" "The amount of characters which are necessary to show the symbol " @@ -2117,122 +2257,121 @@ "Câte caractere sunt necesare pentru a arăta lista de completarea automată a " "simbolurilor." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Număr de rânduri pentru lista de completarea automată." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "Număr de rânduri pentru lista de completarea automată." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Completări" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Completări" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Inversează culorile de evidențiere" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Folosește text alb pe fundal negru" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Arată ghidări indentare" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Arată linii punctate pentru a te ajuta să folosești indentarea potrivită." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Arată spațiu albe" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Marchează spațiile cu puncte și tab-urile cu săgeți." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Arată sfârșiturile de linie" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "Arată caracterul de sfârșit de linie" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "Arată numerele de _linie" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Arată sau ascunde marginea cu numere de linie." -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 #, fuzzy msgid "Show markers margin" msgstr "Arată _marginile de marcare" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2241,199 +2380,229 @@ "Comută marginea din dreapta numerelor de linie, folosită pentru marcarea " "liniilor." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Afișare" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Marcaj linie lungă:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Companie:" -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Culoare marcaj linie lungă:" +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Culoare" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Stabilește culoarea marcajului de linie lungă" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Selector culoare" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " "greater than 0 to specify the column where it should appear." msgstr "" -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Fundal" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Dezactivat" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Activează" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Marcaj linie lungă" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Dezactivat" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Șterge dâra de spații și tab-uri de la sfârșitul liniilor." + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Căi unelte" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Afișare" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Caracter sfârșit de linie implicit:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Fișiere noi" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "Stabilește codarea implicită pentru fișierele proaspăt create." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Codare implicită (fișiere noi):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Codare implicită (fișiere existente):" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" -msgstr "Stabilește codarea implicită pentru deschiderea fișierelor existente." +msgid "Sets the default encoding for newly created files" +msgstr "Stabilește codarea implicită pentru fișierele proaspăt create." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Folosește codare fixă la deschiderea de fișiere" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Această opțiune dezactivează detectarea automată a codării fișierului la " "deschiderea fișierelor și deschide fișierul cu codarea specificată (nu este " "necesară în mod normal)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Codare implicită (fișiere existente):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Stabilește codarea implicită pentru deschiderea fișierelor existente." + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Codări" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Asigură linie nouă la sfârșitul fișierului" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Asigură că la sfârșitul fișierului este o linie nouă" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Elimină dâra de spații" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Șterge dâra de spații și tab-uri de la sfârșitul liniilor." -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Înlocuiește tab-urile cu spații" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Înlocuiește toate tab-urile în document cu spații." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Salvare fișiere" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Lungime listă fișiere recente:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Specifică numărul de fișiere care sunt reținute în lista de fișiere recente." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Fișiere" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Navigator:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Calea și upțiunile utilitarului make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2441,23 +2610,23 @@ "Un emulator de terminal ca xterm, gnome-terminal sau konsole (trebuie să " "accepte parametrul -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Calee (eventual parametrii adiționali) către navigatorul favorit" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Căi unelte" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Acțiune contextuală:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2467,67 +2636,67 @@ "Comandă acțiune contextuală. Cuvântul selectat poate fi referit prin %s. " "Poate apărea oriunde în comanda dată și va fi înlocuit înainte de execuție." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Comenzi" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Unelte" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "adresa email a dezvoltatorului" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Inițialele dezvoltatorului" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Versiunea inițială:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Numărul de versiune, pe care îl are un fișier nou" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Nume companie" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Dezvoltator:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Companie:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Adresă mail:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Inițiale:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Numele dezvoltatorului" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "An:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Data & ora:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2536,7 +2705,7 @@ "Introduceți un format de dată și timp. Puteți folosi oricare dintre " "specificatorii de conversie folosiți cu funcția ANSI C strftime." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2545,7 +2714,7 @@ "Introduceți un format de dată și timp. Puteți folosi oricare dintre " "specificatorii de conversie folosiți cu funcția ANSI C strftime." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2554,55 +2723,55 @@ "Introduceți un format de dată și timp. Puteți folosi oricare dintre " "specificatorii de conversie folosiți cu funcția ANSI C strftime." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Date șablon" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Șabloane" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Sc_himbă" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Scurtături" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Combinații de taste" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Comandă:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Cale către comanda pentru imprimare fișiere (folosiți %f pentru numele de " "fișier)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Folosește o comandă externă pentru imprimare" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimă numere de linie" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Adaugă numerele de linie la pagina imprimată" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimă numerele de pagină" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 #, fuzzy msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." @@ -2610,11 +2779,11 @@ "Adaugă numerele de pagină la baza fiecărei pagini. Ocupă două linii din " "pagină." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Imprimă antetul paginii" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2623,579 +2792,604 @@ "Adaugă un mic antet la fiecare pagină conținând numărul de pagină, numele de " "fișier și data curentă (vezi mai jos). Ocupă 3 linii din pagină." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Folosește numele fișierului imprimat" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimă numai numele (fără cale) fișierului imprimat." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Format dată:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " "with the ANSI C strftime function." msgstr "" -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Folosește imprimare GTK nativă" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Codare:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Imprimare" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Proprietăți proiect" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Afișare" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Taie" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Fișier" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Nou" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Deschide" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Deschide fișierul selectat" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Salvează" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Salvează ca" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Salvează toate" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Imprimă" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Închide" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Închide toate" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Reîncarcă fișier" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Proiect" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Proprietăți proiect" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Refă" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Repetă" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplică linia sau selecția" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Șterge liniile curente" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Șterge liniile curente" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Transpune linia curentă" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Acțiune contextuală" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Completează cuvânt" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Arată lista de macrocomenzi" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Completare automată etichete XML" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Comentează liniile" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Comentează liniile" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Taie" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Copiază" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Lipește" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Copiază liniile curente" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Taie liniile curente" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Selectează" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Selectează tot" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Selectează cuvântul curent" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Selectează liniile curente" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Selectează paragraful curent" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Selectează cuvântul curent" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Comentează liniile" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Decomentează liniile" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Mărește indentarea" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Micșorează indentarea" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Indentare inteligentă" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Trimite la comanda personalizată 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Trimite la comanda personalizată 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Trimite la comanda personalizată 3" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "Trimite _selecția la" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Inserează" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Inserează dată" -#: ../src/keybindings.c:332 -#, fuzzy -msgid "Insert alternative white space" -msgstr "Inserează spațiu alb alternativ" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Setări" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Căutare" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Caută" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Caută următor" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Caută precedent" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Caută selecția următoare" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Caută selecția precedentă" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Înlocuiește" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Caută în fișiere" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Mesajul următor" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Mesajul anterior" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Caută folosiri" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" msgstr "Caută folosiri" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "Sa_lvează tot" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Mergi la" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Mergi înapoi cu o locație" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Mergi înainte cu o locație" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Mergi la definiția etichetei" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Mergi la declarația etichetei" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Mergi la începutul liniei" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Mergi la finalul liniei" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "Mergi la finalul liniei" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Comută toate controalele adiționale" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Ecran complet" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Comută fereastra de mesaje" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Comută bara laterală" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Mărește" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Micșorează" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Micșorează" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Focalizează" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Treci la editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Treci la scribble" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Treci la VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Treci la bara de căutare" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Treci la bara laterală" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Comută la compilator" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Treci la bara laterală" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Arată _fereastra de mesaje" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Treci la documentul din stânga" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Treci la bara laterală" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Treci la documentul din stânga" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Treci la documentul din dreapta" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Treci la ultimul document folosit" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Mută documentul în stânga" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Mută documentul în dreapta" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Mută documentul la început" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Mută documentul la final" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 #, fuzzy msgid "Toggle Line wrapping" msgstr "Încadrare linii" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 #, fuzzy msgid "Toggle Line breaking" msgstr "Încadrare linii" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 #, fuzzy msgid "Replace spaces by tabs" msgstr "Î_nlocuiește tab-urile cu spații" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 #, fuzzy msgid "Toggle current fold" msgstr "Selectează cuvântul curent" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Restrânge toate" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Extinde toate" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Reîncarcă lista de simboluri" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Șterge _marcatori" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Șterge _indicatori de eroare" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Construiește" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Compilează" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Eroarea următoare" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Eroarea anterioară" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Rulează" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Rulează (comandă alternativă)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Opțiuni construcție" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Arată Selector culoare" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Ajutor" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Scurtături" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Următoarele scurtături sunt configurabile:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "Treci la documentul din stânga" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Scrieți orice doriți, folosiți spațiul ca pe o zonă de notițe/mâzgălituri" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Încărcarea unuia sau mai multor fișiere de sesiune eșuată." @@ -3203,93 +3397,107 @@ msgid "Debug Messages" msgstr "Mesaje depanare" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Căutare" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Folosește un dosar de configurare alternativ" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - # FUZZY -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Imprimă numele interne de tipuri de fișier" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Generează fișier global de etichete (vezi documentația)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Nu deschide fișierele în instanța curentă, forțează deschiderea unei noi " "instanțe" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Nu arăta fereastra de mesaje la pornire" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Nu încărca datele de completare automată (vezi documentația)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Nu încărca module" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Afișează prefixul de instalare al Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Nu încărca fișierele din sesiunea anterioară" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Nu încărca suport pentru terminal" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Numele de fișier pentru libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Arată versiunea și ieși" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FIȘIERE...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(construit la %s cu GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3298,14 +3506,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3316,39 +3524,44 @@ "Ar putea fi probleme la rularea Geany fără un dosar de configurație.\n" "Porniți oricum Geany?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Nu am putut găsi fișierul '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Acesta este Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Dosarul de configurație nu a putut fi creat (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Fișierele de configurare au fost reîncărcate" -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Mesaje de stare" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Copiază" + +#: ../src/msgwindow.c:533 #, fuzzy msgid "Copy _All" msgstr "Înc_hide toate" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Ascunde fereastra de mesaje" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Șterge toți indicatorii de eroare din documentul curent." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3357,11 +3570,11 @@ "Modulul \"%s\" nu este compatibil binar cu această versiune de Geany - vă " "rugăm compilați-l din nou." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Manager _module" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3372,85 +3585,93 @@ "Descriere: %s\n" "Autor(i): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Activ" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Modul" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Nu există module disponibile." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Module" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Mai jos este o listă de module disponibile. Selectați modulele care ar " -"trebui încărcate la pornirea Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Detalii modul:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Înhață tasta" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Tastați combinația de taste pe care doriți să o folosiți pentru \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "Găsește to_ate" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "Înc_hide toate" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Acțiune" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Scurtătură" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "S_uprascrie" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Suprascrieți combinația de taste?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Combinația '%s' este deja în uz pentru \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Introduceți căile către unelte. Numele uneltelor de care nu aveți nevoie pot " "fi lăsate goale." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3458,7 +3679,7 @@ "Stabiliți informația folosită în șabloane. Vedeți documentația pentru " "detalii." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3469,7 +3690,7 @@ "configurația." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3480,14 +3701,14 @@ "click pe o acțiune și editați direct reprezentarea ca șir a scurtăturii." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3501,48 +3722,48 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Pagina %d din %d" # FUZZY -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Setare document" -#: ../src/printing.c:410 +#: ../src/printing.c:411 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Imprimă numai numele (fără cale) fișierului imprimat." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Pagina %d din %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Imprimarea fișierului %s a fost revocată." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Fișierul %s a fost imprimat." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Imprimarea lui %s a eșuat (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "" "Vă rugăm setați mai întâi o comandă de imprimare în dialogul de preferințe." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3553,38 +3774,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Imprimarea \"%s\" a eșuat (cod returnat: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Fișierul %s a fost imprimat." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "proiecte" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Proiect nou" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "C_rează" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Nume:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Nume fișier:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Cale de bază:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3594,121 +3820,117 @@ "nouă, sau un arbore de directoare existent. Puteți folosi căi relative la " "numele de fișier al proiectului." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Alegeți calea de bază a proiectului" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Fișierul proiect \"%s\" nu a putut fi încărcat." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Deschide proiect" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Fișiere proiect" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Proiectul \"%s\" a fost închis." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Descriere:" -#: ../src/project.c:447 -msgid "Make in base path" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Comandă rulare:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Sect1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Modele fișier:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Doriți să-l închideți înainte de a merge mai departe?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Proiectul '%s' este deja deschis." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Numele de proiect specificat este prea scurt" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Numele de proiect specificat este prea lung (max. %d caractere)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Ați ales un nume de proiect invalid." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Creez dosarul cale de bază al proiectului?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Calea \"%s\" nu există." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Dosarul de bază al proiectului nu a putut fi creat (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Fișierul proiect nu a putut fi scris (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Proiectul \"%s\" a fost creat." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Proiectul \"%s\" a fost salvat." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Alegeți numele fișierului proiect" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Alegeți comanda de rulare a proiectului" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Proiectul \"%s\" a fost deschis." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "F_olosește expresii regulate" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3716,15 +3938,15 @@ "Folosește expresii regulate POSIX. Pentru informații detaliate despre " "folosirea expresiilor regulate, citiți documentația" -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Caută îna_poi" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Folosește s_ecvențe întârziate" -#: ../src/search.c:246 +#: ../src/search.c:263 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3733,134 +3955,134 @@ "Înlocuiește \\\\, \\t, \\n, \\r și \\uXXXX (caractere Unicode) cu " "caracterele de control corespunzătoare." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Ma_juscule semnificative" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Potrivește numai cu_vinte întregi" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Potriveș_te numai de la începutul cuvântului" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "A_nterior" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Următor" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Caută după:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Găsește to_ate" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Marchează" -#: ../src/search.c:433 +#: ../src/search.c:450 #, fuzzy msgid "Mark all matches in the current document" msgstr "Marchează toate potrivirile în documentul curent." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "În _sesiune" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "_În document" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Închide _dialogul" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Dezactivați aceast opțiune pentru a ține dialogul deschis." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Î_nlocuiește & Caută" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Înlocuiește c_u:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Înlocuie_ște peste tot" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "În se_lecție" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Înlocuiește toate potrivirile din textul selctat curent" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Dosar:" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "Stabilește codarea:" # FUZZY -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Ș_iruri fixe" # FUZZY -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Expresii regulate Grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 #, fuzzy msgid "See grep's manual page for more information" msgstr "Vezi pagina de manual a grep pentru mai multe informații." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Expresii regulate extinse" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Pa_rcurge recursiv subdirectoarele" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Inversează rezultatele căutării" -#: ../src/search.c:797 +#: ../src/search.c:826 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Inversează sensul potrivirii, pentru a selecta liniile care nu se potrivesc." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Opțiuni e_xtra:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Alte opțiuni pentru Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -3868,49 +4090,46 @@ msgstr[1] "Am găsit %d potriviri \"%s\"." msgstr[2] "Am găsit %d potriviri \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Am înlocuit textul în %u fișier." -msgstr[1] "Am înlocuit textul în %u fișiere." -msgstr[2] "Am înlocuit textul în %u fișiere." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Marchează toate potrivirile în documentul curent." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Dosar invalid pentru căutare în fișiere." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Nici un text de căutat." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Nu am putut executa unealta grep '%s'; verificați setările de cale din " "Preferințe." -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "Căutare" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (în dosar: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Nu am putut deschide dosarul (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Căutare eșuată." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3918,241 +4137,265 @@ msgstr[1] "Căutare finalizată cu %d potriviri." msgstr[2] "Căutare finalizată cu %d potriviri." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Nici o potrivire nu a fost găsită." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Expresie regulată greșită pentru tipul de fișier %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Capitol" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Secțiune" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Anexă" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Altul" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Tipuri" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Constructori tip" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funcții" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Secțiuni" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Chei" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variabile" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Comandă" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Mediu" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Subsecțiune" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubsecțiune" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etichetă" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "Stare" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Pachet" -#: ../src/symbols.c:655 -msgid "My" -msgstr "" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Etichete" -#: ../src/symbols.c:657 -msgid "Our" -msgstr "" +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Constante" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Interfețe" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Clase" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Constante" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 #, fuzzy msgid "Anchors" msgstr "Ancoră" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 #, fuzzy msgid "H1 Headings" msgstr "Antet (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 #, fuzzy msgid "H2 Headings" msgstr "Antet (H1)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 #, fuzzy msgid "H3 Headings" msgstr "Antet (H1)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "În se_lecție" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "Constructori tip" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Metode" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Spațiu de nume" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Proprietăți" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Exportă" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "fără titlu" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Stare" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Proprietăți" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Variabile" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Funcții" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Membri" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Etichete" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subrutine" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Blocuri" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Macrocomenzi" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Constante" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Ținte" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "Stare" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extensie necunoscută pentru \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Crearea fișierului de etichete a eșuat, probabil nu s-au găsit etichete.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4161,7 +4404,7 @@ "Folosire: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4172,101 +4415,105 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Încarcă etichete" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Fișiere de etichetă Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Am încărcat %s fișier de etichete '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Nu am putut încărca fișierul de etichete '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Nu am găsit definiția \"%s\"." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Sortează după _nume" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Sortează după _apariție" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Salvează fișierul curent" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Salvează toate fișierele deschise" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Reîncarcă fișierul curent de pe disc" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Închide fișierul curent" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "Închide toate fișierele deschide" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "Taie liniile curente" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "Compilează fișierul curent" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "Șterge liniile curente" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Anulează ultima modificare" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Reface ultima modificare" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Compilează fișierul curent" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Execută sau vizualizează fișierul curent" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" @@ -4275,82 +4522,96 @@ "culori dintr-o paletă." # FUZZY -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Mărește textul" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Micșorează textul" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Micșorează indentarea" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Mărește indentarea" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Caută textul introdus în fișierul curent" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "Sari la numărul de linie introdus." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Părăsește Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "Document XML" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "Marchează toate potrivirile în documentul curent." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Crează un fișier nou" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Crează un fișier nou" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Deschide un fișier existent" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Deschide fișierul selectat" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Nu mai sunt erori de construire." + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "Mergi la" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Afișare" @@ -4376,7 +4637,7 @@ msgid "Custom command failed: %s" msgstr "Comandă personalizată eșuată: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Stabilește comenzi personalizate" @@ -4387,196 +4648,187 @@ msgstr "" # FUZZY -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Nici o comandă personalizată." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Contor cuvinte" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "selecție" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "întregul document" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Interval:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Linii:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Cuvinte:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Caractere:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Nu am găsit etichete" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Arată lista de s_imboluri" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Arată lista de _documente" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Ascun_de bara laterală" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Arată calea com_pletă" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "linie: %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "mod: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "codare: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "tip fișier: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Font actualizat (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Biblioteca standard C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Biblioteca standard C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Biblioteca standard C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Stabilește format personalizat dată" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Selectați dosar" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Selectați fișier" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "Fișierele de configurare au fost reîncărcate" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "Sa_lvează tot" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "Înc_hide toate" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "_Stabilește calea din document" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Repornește consola" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Metode _intrare" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -4584,50 +4836,38 @@ "Nu am putut schimba directorul în VTE deoarece acesta probabil conține o " "comandă." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Modul terminal" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Aceste setări pentru controlul emulator de terminal virtual (VTE) se aplică " -"doar dacă biblioteca VTE poate fi încărcată." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Font terminal:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "Stabilește fontul pentru controlul terminal." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Culoare text:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Culoare fundal:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 #, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Stabilește culoarea textului pentru controlul terminal." -#: ../src/vte.c:775 +#: ../src/vte.c:771 #, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Stabilește culoarea fundalului pentru controlul terminal." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Linii istoric:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 #, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " @@ -4636,11 +4876,11 @@ "Specifică istoricul în linii, pe care le puteți derula înapoi în controlul " "terminal." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Shell:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 #, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " @@ -4649,38 +4889,38 @@ "Stabilește calea către consola care să fie pornită în interiorul emulării de " "terminal." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Derulare la atingere de tastă" -#: ../src/vte.c:820 +#: ../src/vte.c:816 #, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Dacă să deruleze la final atunci când se apasă pe o tastă." -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Derulare la ieșire" -#: ../src/vte.c:824 +#: ../src/vte.c:820 #, fuzzy msgid "Whether to scroll to the bottom when output is generated" msgstr "Dacă să deruleze la final când o ieșire este generată." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "Activează restrângerea respectiv extinderea codului" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Suprascrie asocierile de taste ale Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 #, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" @@ -4688,11 +4928,11 @@ "Permite VTE să primească scurtături de la tastatură (în afară de comenzile " "de focalizare)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Dezactivează scurtătura de meniu (implicit F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4702,22 +4942,22 @@ "(implicit F10). Dezactivarea este utilă dacă vreți să folosiți, de exemplu, " "Midnight Commander în VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Urmărește calea fișierului curent" -#: ../src/vte.c:841 +#: ../src/vte.c:837 #, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Dacă să execute \"cd $path\" când comutați între fișierele deschise." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Nu folosi scriptul de rulare." -#: ../src/vte.c:847 +#: ../src/vte.c:843 #, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " @@ -4726,11 +4966,11 @@ "Nu folosi scriptul simplu de rulare care este folosit pentru a afișa starea " "de ieșire a programului executat." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Execută programele în VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 #, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " @@ -4739,90 +4979,122 @@ "Rulează programele în VTE în loc să mai deschidă o fereastră terminal. " "Notați faptul că programele rulate în VTE nu pot fi oprite." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Fișiere de proiect Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Executabile" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Constructor clasă" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Crează fișiere sursă pentru noile tipuri de clase." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Crează clasă" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Spațiu de nume" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Spațiu de nume" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Clasă" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Nume clasă:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Fișier antet:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Fișier sursă:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Moștenire" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Clasă de bază:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Sursă %s" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Antet de bază:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "GType de bază:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Opțiuni" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Crează constructor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Crează destructor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Tip constructor GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Crează cla_să" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Clasă _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Clasă _GTK+" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Clasă _C++" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caractere HTML" @@ -4832,52 +5104,57 @@ msgstr "Inserează entități HTML precum '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Echipa dezvoltatorilor Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Caractere HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Caractere ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Caractere grecești" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Operatori matematici" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Caractere tehnice" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Săgețele" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Semne de punctuație" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Caractere diverse" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Dosarul de setări al modulelor nu a putut fi creat." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Caractere speciale" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Inserează" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4885,43 +5162,43 @@ "Alegeți un caracter special din lista de mai jos și faceți dublu click pe el " "sau folosiți butonul pentru a-l insera la poziția curentă a cursorului." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Caracter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (cuvântul)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Inserează caracter HTML special" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "Înlocuiește" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Poziționarea tab-urilor de fișier nou:" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Inserează caracter HTML special" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "Caractere speciale" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "" @@ -4947,105 +5224,105 @@ "Renders the font size of the document together with the current zoom level" msgstr "Randează dimensiunea fontului la nivelul curent de zoom." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documentul a fost exportat cu succes ca '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Fișierul '%s' nu a putut fi scris (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Fișierul '%s' există deja. Doriți să-l suprascrieți?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Exportă" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Ca _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Ca _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Navigator fișiere" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Adaugă un tab navigator fișiere la bara laterală." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Prea mulți itemi selectați!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Nu am putut executa comanda externă '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Deschide _extern" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Caută în fișiere" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Arată fișierele a_scunse" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Sus" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Reîmprospătare" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Acasă" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Stabilește calea din document" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Elimină filtrul" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtru:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Focalizează lista de fișiere" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Focalizează introducerea căii" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Dosarul de setări al modulelor nu a putut fi creat." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Comandă deschidere externă:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5059,15 +5336,15 @@ "%f va fi înlocuit cu numele de fișier incluzând calea completă\n" "%d va fi înlocuit cu calea fișierului fără numele acestuia" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Arată fișierele ascunse" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Ascunde fișierele obiect" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5075,12 +5352,12 @@ "Nu afișa fișierele obiect generate în navigatorul de fișiere, aceasta " "include *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Creez dosarul cale de bază al proiectului?" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 #, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" @@ -5191,41 +5468,182 @@ msgid "Splits the editor view into two windows." msgstr "Împarte vizualizarea editorului în două ferestre." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "Marchează toate potrivirile în documentul curent." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 #, fuzzy msgid "_Unsplit" msgstr "_Reunește" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Î_mparte fereastra" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Orizontal" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 #, fuzzy msgid "Split Horizontally" msgstr "_Orizontal" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Stabilește includeri și argumente" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_Vizualizează fișierul DVI" + +#~ msgid "V_iew PDF File" +#~ msgstr "V_izualizeză fișierul PDF" + +#~ msgid "_Set Arguments" +#~ msgstr "_Stabilește parametri" + +#~ msgid "Set Arguments" +#~ msgstr "Stabilește parametri" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Stabilește programele și opțiunile pentru compilarea și vizualizarea " +#~ "fișierelor (La)TeX" + +#~ msgid "DVI creation:" +#~ msgstr "Creare DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Creare PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Previzualizare DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Previzualizare PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f va fi înlocuit cu numele de fișier curent, i.e. test_file.c\n" +#~ "%e va fi înlocuit cu numele de fișier fără extensie, i.e. test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Stabilește includeri și argumente" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Stabilește comenzile pentru construirea și executarea programelor." + +#~ msgid "Compile:" +#~ msgstr "Compilare" + +#~ msgid "Build:" +#~ msgstr "Construire:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Execuția programului de vizualizare a eșuat." + +#~ msgid "Try to resave the file?" +#~ msgstr "Încearcă să salveze din nou fișierul?" + #, fuzzy -msgid "Unsplit" -msgstr "_Reunește" +#~ msgid "_Customize Toolbar" +#~ msgstr "_Ascunde bara de unelte" + +#~ msgid "Icon style:" +#~ msgstr "Stil iconițe:" + +#~ msgid "Icon size:" +#~ msgstr "Dimensiune iconițe:" + +#~ msgid "Appearance" +#~ msgstr "Aspect" + +#, fuzzy +#~ msgid "Hard tab width:" +#~ msgstr "Lățime tab:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "Lățimea unui tab când Taburi și spații este activat pentru un document" + +#~ msgid "Long line marker:" +#~ msgstr "Marcaj linie lungă:" + +#~ msgid "Long line marker color:" +#~ msgstr "Culoare marcaj linie lungă:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Calea și upțiunile utilitarului make" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplică linia sau selecția" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "Trimite _selecția la" + +#~ msgid "Run (alternative command)" +#~ msgstr "Rulează (comandă alternativă)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Mai jos este o listă de module disponibile. Selectați modulele care ar " +#~ "trebui încărcate la pornirea Geany." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Imprimarea fișierului %s a fost revocată." + +#~ msgid "Run command:" +#~ msgstr "Comandă rulare:" + +#~ msgid "Choose Project Run Command" +#~ msgstr "Alegeți comanda de rulare a proiectului" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Am înlocuit textul în %u fișier." +#~ msgstr[1] "Am înlocuit textul în %u fișiere." +#~ msgstr[2] "Am înlocuit textul în %u fișiere." + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Terminal plugin" +#~ msgstr "Modul terminal" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Aceste setări pentru controlul emulator de terminal virtual (VTE) se " +#~ "aplică doar dacă biblioteca VTE poate fi încărcată." + +#~ msgid "Terminal font:" +#~ msgstr "Font terminal:" + +#, fuzzy +#~ msgid "Unsplit" +#~ msgstr "_Reunește" #~ msgid "Diff file" #~ msgstr "Fișier diff" @@ -5370,9 +5788,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Extinde toate blocurile de cod restrânse" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Șterge toți indicatorii de eroare din documentul curent." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5386,9 +5801,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Arată lista tuturor scurtăturilor din Geany." -#~ msgid "Color" -#~ msgstr "Culoare" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Introduceți un număr de linie și sar la ea." @@ -5468,16 +5880,10 @@ #~ msgid "Items" #~ msgstr "Elemente" -#~ msgid "Use white text on a black background." -#~ msgstr "Folosește text alb pe fundal negru" - # FUZZY #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Rulează în mod depanare (înseamnă să fie gălăgios)" -#~ msgid "Search failed." -#~ msgstr "Căutare eșuată." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Nu am putut găsi fișierul hartă de pixeli: %s" diff -Nru geany-0.18/po/ru.po geany-0.19/po/ru.po --- geany-0.18/po/ru.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/ru.po 2010-05-23 09:08:49.000000000 +0100 @@ -8,9 +8,9 @@ # John Wehin , 2009 msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2009-08-06 06:38+0400\n" "Last-Translator: John Wehin \n" "Language-Team: Russian \n" @@ -27,7 +27,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Быстрая и легковесная среда разработки, использующая GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -35,68 +35,68 @@ msgid "Integrated Development Environment" msgstr "Интегрированная среда разработки" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "О Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Быстрая и легковесная среда разработки" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(собрано %s или позднее)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Информация" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Разработчики" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "ведущий разработчик" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "разработчик" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "ведущий переводчик" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "переводчики" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Предыдущие переводчики" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Участники" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Некоторые из многих участников проекта (более детальный список в файле %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "О нас" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Лицензия" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -104,278 +104,293 @@ "Текст лицензии не найден, пожалуйста посетите http://www.gnu.org/licenses/" "gpl-2.0.txt, чтобы ознакомиться с ним." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Не могу найти терминал \"%s\" (проверьте путь для терминала в Настройках)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Не могу сменить рабочий каталог на \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Ошибка запуска \"%s\" (стартовый скрипт не может быть создан)" +msgid "%s (in directory: %s)" +msgstr "%s (в каталоге: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Процесс дал сбой (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (в каталоге: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Не могу сменить рабочий каталог на \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Ошибка запуска \"%s\" (стартовый скрипт не может быть создан)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Невозможно запустить файл в VTE, так как он, возможно, содержит команду." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Не могу найти терминал \"%s\" (проверьте путь для терминала в Настройках)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Сборка завершилась с ошибкой." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Сборка прошла успешно." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Скомпилировать" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "С_борка" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Собрат_ь всё" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" msgstr "Собрать свою цель" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Сборка _объекта" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Введите здесь свои опции, весь введенный текст передается команде make." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Следующая ошибка" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "_Предыдущая ошибка" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Параметры сборки" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "_Просмотреть DVI файл" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "_Просмотреть PDF файл" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Установить пользовательские команды" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Установить _аргументы" +# Скомпилировать? +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Собрать текущий файл" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Установить аргументы" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Собрать данный файл используя make и цель сборки по умолчанию" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Установить программы и опции для сборки и просмотра (La)TeX файлов." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Собрать текущий файл, используя make и указанную цель" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Создание DVI:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Скомпилировать текущий файл, используя make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Создание PDF:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Процесс невозможно остановить (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Предварительный просмотр DVI:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Ошибок сборки больше нет." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Предварительный просмотр PDF:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f будет заменено на текущее имя файла, например: test_file.c\n" -"%e будет заменено на имя файла без расширения, т.е. test_file" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Установить \"include <...>\" и аргументы" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Метка" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Установить команды для сборки и запуска програм." +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Команда" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (в каталоге: %s)" + +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Компилятор" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s команд" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Скомпилировать:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Собрать:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Установить тип файла" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Выполнить:" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "_Регулярные выражения для Grep" -# Скомпилировать? -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Собрать текущий файл" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Собрать свою цель" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" -#: ../src/build.c:1918 +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Установить пользовательские команды" + +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Введите здесь свои опции, весь введенный текст передается команде make." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Собрать данный файл используя make и цель сборки по умолчанию" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Установить пользовательские команды" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Собрать текущий файл, используя make и указанную цель" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Скомпилировать" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Скомпилировать текущий файл, используя make" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "С_борка" + +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Выполнить:" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Невозможно запустить программу просмотра" +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Собрать свою цель" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Процесс невозможно остановить (%s)." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Сборка _объекта" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Ошибок сборки больше нет." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Собрат_ь всё" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Установить пользовательские команды" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Вы действительно хотите выйти?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Файл %s сохранен." +msgstr[1] "Файл %s сохранен." +msgstr[2] "Файл %s сохранен." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Обновить" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Любые несохраненные изменения будут потеряны." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Вы уверены, что хотите обновить '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Перейти на строку" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Введите строку, на которую перейти:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Пожалуйста, установите тип файла для текущего документа перед использованием " "этой функции." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "дд.мм.гггг" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "мм.дд.гггг" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "гггг/мм/дд" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.гггг час:мин:сек" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.гггг час:мин:сек" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "гггг/мм/дддд час:мин:сек" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Использовать свой формат даты" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Свой формат даты" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -383,25 +398,24 @@ "Введите свое описание формата даты и времени. Вы можете использовать любые " "параметры конверсии, применимые к функции strftime ANSI C." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Невозможно конвертировать строку формата даты (возможно, слишком длинная)" -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Сообщений больше нет." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Открыть файл" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "Вид" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -409,28 +423,28 @@ "Открытие файла в режиме \"только чтение\". Если выбрать более чем один файл " "для открытия, все выбранные файлы будут открыты в режиме \"только чтение\"." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Распознать по расширению файла " -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Распознать по содержимому" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Больше опций" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Показывать скрытые файлы" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Кодировка:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -444,11 +458,11 @@ "будут открыты в выбранной кодировке." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Тип файла:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -468,23 +482,23 @@ msgid "Filename already exists!" msgstr "Файл с таким именем уже существует!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Сохранить Файл" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Переи_меновать" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Сохранить и переименовать файл." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "Открыть файл _в новой вкладке" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -492,41 +506,41 @@ "Оставить текущий документ не сохраненным, а вновь сохраненный открыть в " "новой вкладке." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Ошибка" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Вопрос" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Предупреждение" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Информация" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Не сохранять" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Файл \"%s\" не сохранен." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Сохранить файл до закрытия?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Выбрать шрифт" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -534,106 +548,110 @@ "Произошла ошибка или информация о файле не может быть получена (например, " "новый файл)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "неизвестный" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Свойства" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Тип:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Размер:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Размещение:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Только чтение:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(только внутри Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Кодировка:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(с BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Модифицирован:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Изменен:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Последний доступ:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Права:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Чтение:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Запись:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Выполнить:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Владелец:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Группа:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Прочие:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Файл '%s' закрыт." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Открыт новый файл \"%s\"." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Невозможно открыть файл %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -648,12 +666,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" не является корректным %s" -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -662,30 +680,30 @@ "Файл \"%s\" не похож на текстовой или такая кодировка файла не " "поддерживается." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Пробелы" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Табуляция" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Табуляции и пробелы" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Устанавливаю режим отступа %s для %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Неправильное имя файла" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Файл %s обновлен." @@ -693,20 +711,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Файл %s открыт (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", только чтение" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Ошибка смены имени файла." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -715,7 +733,7 @@ "Произошла ошибка при переводе файла из UTF-8 в \"%s\". Файл остается не " "сохраненным." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -724,41 +742,41 @@ "Текст ошибки: %s\n" "Ошибка возникла в \"%s\" (строка: %d, столбец: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Текст ошибки: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Ошибка записи файла." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Ошибка записи файла (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Файл %s сохранен." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "Невозможно найти \"%s\"." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Перейти в начало и возобновить поиск?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Совпадений для \"%s\" не найдено." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -766,11 +784,11 @@ msgstr[1] "%s: %d замен(а,ы) для \"%s\" на \"%s\"." msgstr[2] "%s: %d замен(а,ы) для \"%s\" на \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Вы действительно хотите обновить его?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -779,23 +797,28 @@ "Файл \"%s\" на диске более новый,\n" "чем в текущем буфере." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Попытаться сохранить файл заново?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Файл \"%s\" не был найден на диске!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Ширина табуляции:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Количество пробелов, которые будут заменены символом табуляции." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Кельтская" @@ -906,612 +929,678 @@ msgid "Without encoding" msgstr "Без кодировки" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Западноевропейская" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Восточноевропейская" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Восточноазиатская" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Юговосточная и Югозападная _Азия" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Средневосточная" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Юникод" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Файл %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "файл %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Пустой" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Файл шелл-скрипта" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Файл Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Документ XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Файл каскадной таблицы стилей (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Данные разгрузки SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Файл настроек" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Файл перевода (Gettext)" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "Файл скрипта %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Языки _программирования" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Скриптовые языки" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Языки _разметки" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Прочие _языки" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Установить тип файла" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Все исходные" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Все типы" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Плохое регулярное выражение для типа файлов %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "Без имени" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Не могу найти файл \"%s\"." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "_Выбор цвета" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Файл" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Создать из _шаблона" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "невидимый" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "_Открыть выбранный файл" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Нед_авние файлы" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Сохранить _все" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Обновить _как" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "невидимый" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "_Настройка принтера" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Закрыть ост_альные" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "_Закрыть все" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Правка" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Форматирование" -#: ../src/interface.c:475 ../src/interface.c:1956 +# -- может быть передвинуть или отразить ? +#: ../src/interface.c:487 ../src/keybindings.c:372 +#, fuzzy +msgid "_Reflow Lines/Block" +msgstr "переформатировать строку/блок" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Переключить _регистр выделенного текста" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Переместить текущую строку" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Комментирование строк" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "_Раскомментирование строк" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Переключить _комментирование строк" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "_Дублировать строку или выделенное" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "У_величить отступ" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "У_меньшить отступ" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Отправить выделенное в терминал" +#: ../src/interface.c:537 ../src/keybindings.c:361 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "\"Умный\" отступ строк" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "О_тправить выделенное в" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Команда" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Вырезать текущую строку (строки)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Копировать текущую строку (строки)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Удалить текущую строку (строки)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "_Дублировать строку или выделенное" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Выбрать текущую строку (строки)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Выбрать текущий абзац" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Вставить переменный пробел" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Перейти к следующему маркеру" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Перейти к предыдущему маркеру" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Отправить выделенное в терминал" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Вставить _комментарии" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "_Вставить описание изменений" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Вставить _заголовок файла" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Вставить _описание функции" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Вставить _многострочный комментарий" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Вставить уведомление _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Вставить уведомление _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Вставить _дату" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Вставить \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Настройки" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Настройки" + +#: ../src/interface.c:720 msgid "_Search" msgstr "П_оиск" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Найти _следующее" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Найти в _файлах" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Заменить" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Най_ти выделенное" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Найти пре_дыдущее выделенное" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "_Следующее сообщение" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Предыдущее сообщение" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Перейти на строку" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Выбрать _шрифт" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Показать/Скрыть все панели" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "На весь _экран" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "_Показывать окно сообщений" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Показывать панель _инструментов" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Показывать _боковую панель" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Редактор" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Отображать _маркер строк" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Отображать _номера строк" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Отображать _пробелы" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Отображать _завершение строк" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Отображать линии _отступов" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Документ" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Динамический _перенос строк" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Перенос _строк" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Авто-отступ" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Т_ип отступа" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Табуляция" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Пробелы" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "_Табуляции и пробелы" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Только _чтение" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Использовать Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Установить тип файла" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "_Установить кодировку" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Установить _окончания строк" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Заменить окончания строк на _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Заменить окончания строк на _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Заменить окончания строк на CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Удалить лишние пробелы" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Заменить табуляции пробелами" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Заменить пробелы _табуляциями" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Свернуть все" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Развернуть все" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "_Удалить маркеры" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Убрать индикаторы о_шибок" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Проект" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Новый" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Открыть" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "_Последние проекты" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Закрыть" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Сервис" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Обновить настройки" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Файлы _настроек." + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Выбор цвета" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Количество слов" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "_Загрузить теги" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Обновить настройки" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Справка" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Са_йт проекта" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Сочетания клавиш" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Сообщения _отладки" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Теги" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Документы" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Статус" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Компилятор" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Сообщения" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Заметки" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Иконки _и текст" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Только и_конки" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Только _текст" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Большие иконки" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Маленькие иконки" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "_Очень маленькие иконки" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "_Настроить панель инструментов" +#: ../src/interface.c:1887 +#, fuzzy +msgid "_Toolbar Preferences" +msgstr "Настройки" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Скрыть панель инструментов" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "_Найти использование" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "_Статистика документа" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Перейти к _определению тега" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Перейти к _объявлению тега" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "_Контекстное действие" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Настройки" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Загрузить файлы из последней сессии" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Открывать файлы из последнего сеанса работы при загрузке программы" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Загружать виртуальный терминал" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" msgstr "" "Включить эмуляцию виртуального терминала, при запуске программы будет " -"загружена VTE-библиотека .Отключите, если вам это не требуется." +"загружена VTE-библиотека. Отключите, если вам это не требуется." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Включить поддержку плагинов" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Сохранять позицию и размеры окна" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Сохранять позицию и размеры окна, и восстанавливать их при запуске" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Подтверждение выхода" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "При закрытии, показывать диалог подтверждения выхода." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Завершение работы" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Рабочий каталог при запуске:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1519,19 +1608,19 @@ "Начальный каталог для открытия и сохранения файлов. Путь должен быть " "абсолютным. Оставьте пустым, чтобы использовать текущий рабочий каталог." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Файлы проекта:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Начальный каталог для открытия файлов проекта" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Дополнительный путь для плагинов:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1541,19 +1630,19 @@ "пути указанному здесь будет осуществлен дополнительный поиск для плагинов. " "Оставьте пустым, чтобы отключить." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Пути" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Сигнал при ошибках или по окончании сборки" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1561,11 +1650,11 @@ "Подавать ли звуковой сигнал при возникновении ошибки и при окончании " "компиляции." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Перейти к дежурным сообщениям при новых сообщениях" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1573,11 +1662,11 @@ "Переключать на закладку \"Статус\" (в служебной области снизу), если " "получено новое сообщение состояния." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Подавлять вывод дежурных сообщений в строке состояния" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1585,11 +1674,11 @@ "Удалить все сообщения из строки состояния. Сообщения по-прежнему " "отображаются в окне сообщений о состоянии." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Авто-фокус для виджетов (фокус следует за мышью)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1599,16 +1688,26 @@ "главного окна редактора, заметок, поиска на панели инструментов, полей " "перехода к строке и терминала." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Разное" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Всегда начинать поиск с начала и скрывать диалоговое окно поиска" # Всегда переходить в начало документа и прятать диалоговое окно поиска после нажатия \"Найти следующее/предыдущее\". -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1616,11 +1715,11 @@ "Всегда осуществлять поиск с начала документа и скрыть в диалоговом окне " "поиска после нажатия \"Найти следующее/предыдущее\"." -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Использовать слово под курсором для диалогов поиска" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1628,30 +1727,30 @@ "Использовать слово, находящееся под курсором, при открытии диалогов \"Найти" "\", \"Найти в файлах\" или \"Заменить\", если нет выделенного фрагмента." -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Использовать каталог текущего файла для \"Найти в файлах\"" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Поиск" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Использовать файлы сессий для проектов" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" "Хранить ли файлы сессии проекта и открыть их при повторном открытии проекта." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Хранить файл проекта внутри основного каталог проекта" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1663,75 +1762,99 @@ "Вы все равно можете изменить путь к проектному файлу в диалоге \"Новый проект" "\" (\"Проект\"->\"Новый\")." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Проекты" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Прочее" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Общее" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Отображать список тегов" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Включить отображение списка тегов" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Показывать список документов" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Включить/выключить отображение списка документов" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Показывать _боковую панель" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Описание:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Слева" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Справа" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Боковая панель" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Список тегов:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" -msgstr "Окно сообщенийи:" +msgstr "Окно сообщений:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Редактор:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Установить шрифт для окна сообщений" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Установить шрифт для списка тегов" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Установить шрифт для редактора текста" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Шрифты" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Показывать вкладки редактора текста" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Показывать кнопки закрытия" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1740,111 +1863,142 @@ "файлов, чтобы можно было легко закрывать их одним щелчком (нужен перезапуск " "программы)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Расположение новых вкладок:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Слева" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Новые закладки будут располагаться слева от блокнота" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Справа" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Новые закладки будут располагаться справа от блокнота" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Сохранить текущий файл" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Двойной-клик скрывает все дополнительные окна." -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Вызывает команду Вид->Показать/Скрыть все панели" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Вкладки редактора текста" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Вверху" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Внизу" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Боковая панель:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Положение вкладок" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Показывать строку состояния" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Установить, показывать ли строку состояния внизу главного окна." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Интерфейс" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Показывать панель _инструментов" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Добавить панель инструментов в меню" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Поместить панель инструментов в основное меню, для увеличения вертикального " "пространства" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Панель инструментов" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Стиль иконок:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Размер иконок:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Внешний вид" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 msgid "Customize Toolbar" msgstr "Настроить панель инструментов" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Иконки _и текст" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Только и_конки" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Только _текст" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Шрифты" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Маленькие иконки" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Очень маленькие иконки" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Большие иконки" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Размер:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Панель инструментов" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Панель инструментов" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Перенос строк" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1855,11 +2009,11 @@ "при работе с большими документами, поэтому на слабых машинах следует его " "отключать." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Использовать \"умную\" клавишу \"Home\"." -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1872,11 +2026,11 @@ "находится там, то он переместится к самому началу строки. Без этой функции " "клавиша Home всегда переносит курсор в самое начало строки." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Отключить Drag&Drop" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1884,19 +2038,19 @@ "Отключить Drag&Drop в окне редактора, перетаскивание выделенного в окно и из " "окна редактора станет невозможным." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Включить сворачивание блоков кода" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Включить сворачивание блоков кода" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Сворачивать/разворачивать все вложенные элементы" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1904,11 +2058,11 @@ "Сворачивать или разворачивать все вложенные элементы. При нажатой клавише " "Shift поведение будет противоположным." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Использовать индикаторы для показа ошибок при сборке" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1916,23 +2070,23 @@ "Использовать ли индикаторы(волнистое подчеркивание) для выделения строк, где " "компилятор обнаружил предупреждение или ошибку." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Новая строка убирает лишние пробелы" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Убирать пробелы в конце строки при переходе на новую строку." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Обрезать текст по столбцу:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Маркер переключения комментариев:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1941,95 +2095,87 @@ "режима комментирования строк, она используется для пометки комментариев как " "переключатель." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Особые функции" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Возможности" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Тип авто-отступа:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Базовый" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Текущие символы" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Совмещать скобки" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Тип:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Ширина:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Ширина в символах для отображения одного отступа" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Использовать пробелы при отступе" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Использовать один символ табуляции при отступе" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Использовать пробелы, если общий отступ меньше ширины символа табуляции, в " "противном случае использовать пробелы и табуляции" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Ширина табуляции:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Ширина табуляции при включенном режиме отступа \"Табуляция и пробелы\"" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Определять ли тип отступов по содержимому открываемого файла." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Отступ при помощи клавиши Tab" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Нажатие tab/shift-tab увеличивает/уменьшает отступ вместо того, чтобы " "вставить символ табуляции" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Отступы" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Отступы" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Авто-завершение фрагментов кода" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2037,20 +2183,20 @@ "Введите определенную короткую последовательность символов и дополните её до " "более сложной строки одним нажатием клавиши." -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Авто-завершение XML тегов" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Авто-завершение и закрытие открытых XML тегов (включая HTML теги)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Автоматическое продолжение многострочных комментариев" # криво звучит :( -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2058,11 +2204,11 @@ "Автоматически продолжать многострочные комментарии, в таких языках, как C, C+" "+ и Java, когда новая строка введена в таком комментарии." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Авто-завершение имён" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2070,28 +2216,28 @@ "Автоматическое завершение известных имен объектов в открытых файлах (имена " "функций, глобальные переменные и т.д.)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Автозавершение всех слов в документе" # --криво звучит-- -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Отбрасывать слова при завершении" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Макс. количество предложений для имени тега:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Количество строк в списке завершения:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Количество символов, необходимых для авто-завершения:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" @@ -2099,118 +2245,115 @@ "Количество символов, которые необходимо ввести, чтобы было показан список " "вариантов для авто-завершения." -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Количество строк, отображаемых в списке авто-завершения." -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Максимальное количество предлагаемых вариантов в списке авто-завершения." -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Авто-завершение" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Скобки ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Авто-завершение скобки при вводе открывающей" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Одинарные кавычки ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Авто-завершение одинарных кавычек при вводе открывающей" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Фигурные скобки { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Авто-завершение фигурных скобок при вводе открывающей" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Угловые скобки [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Авто-завершение квадратных скобок при вводе открывающей" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Двойные кавычки \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Авто-завершение двойных кавычек при вводе открывающей" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Авто-завершение кавычек и скобок" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Завершение" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Обратить цвета подсветки синтаксиса" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Использовать белый текст на черном фоне и инвертировать все цвета, " -"потребуется перезапуск Geany" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Использовать белый текст на чёрном фоне" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Показывать индикаторы отступа" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Показывать пунктирные линии, это поможет вам в выборе правильного отступа " "справа." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Показывать чистые пробелы" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Помечать пробелы точками, а табуляции стрелками." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Показывать окончания строк" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Отображать символы окончания строк." -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Показывать _номера строк" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Включить или выключить отображение номеров строк в редакторе" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Отступ для _маркера строк" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2218,38 +2361,40 @@ "Показывает или прячет отступ для маркера, справа от номеров строк. Маркером " "можно отмечать определенные строки." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Остановить прокрутку на последней строке" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Останавливает прокрутку на последней строке, если не выбрано то на последней " "странице." -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Отображение" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Маркер длинной строки:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Цвет маркера длинной строки:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Компания:" + +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Цвет" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Установить цвет маркера длинной строки" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Выбор цвета" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2260,11 +2405,11 @@ "строку. Установите число, большее нуля, для указания номера столбца, где " "следует отображать этот маркер." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Строка" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2272,11 +2417,11 @@ "Отображать вертикальную линию в окне редактора на заданной позиции (см. " "ниже)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2286,110 +2431,143 @@ "который установлен ниже (рекомендуется, если вы используете пропорциональные " "шрифты)." -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Отключено" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Включить" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Маркер длинной строки" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Отключено" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Убирать лишние пробелы, табуляции и окончания строк" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Пути утилит" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Отображение" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Открывать новые документы из командной строки" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Открывать новые документы из командной строки если файл существует" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Символы конца строки по умолчанию:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Новые файлы" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Устанавливает кодировку по умолчанию, для вновь создаваемых файлов." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Кодировка по умолчанию (для новых файлов):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Кодировка по умолчанию (существующие файлы):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "" -"Устанавливает кодировку по умолчанию, при открытии существующих файлов." +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Устанавливает кодировку по умолчанию, для вновь создаваемых файлов." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Использовать одну и ту же кодировку для открытия файлов" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Установить кодировку по умолчанию для открытия файлов не-Unicode" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" -"Эта опция отключает автоматическое определение кодировки файла при открытии, " -"файлы будут открывается в указанной кодировке (обычно в этом нет " -"необходимости)." +"Эта опция изменяет порядок определения кодировок для файлов не в Unicode, " +"поднимая выбранную кодировку на самый верх" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Кодировка по умолчанию (существующие не-Unicode файлы):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Устанавливает кодировку по умолчанию при открытии существующих файлов не в " +"кодировке Unicode." + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Кодировка:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Следить за наличием новой строки в конце файла" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Следить за тем, что в конце файла находится новая строка" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Убирать лишние пробелы и табуляции" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Убирать лишние пробелы, табуляции и окончания строк" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Заменить табуляции пробелами" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Все табуляции, в документе, заменить пробелами." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Сохранение файлов" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Длина списка недавних файлов:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Количество файлов, сохраняемых в списке недавно открытых файлов." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Таймаут проверки диска:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2397,27 +2575,20 @@ "Периодичность проверки на изменение файлов на диске (в секундах). Нулевое " "значение отключает проверку." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Файлы" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Терминал:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Браузер:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Путь и опции для make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2425,24 +2596,24 @@ "Эмулятор терминала,например: xterm, gnome-terminal или konsole (должен " "принимать аргумент -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Путь (и, возможно, дополнительные аргументы) к вашему любимому браузеру" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Пути утилит" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Контекстное действие:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2453,67 +2624,67 @@ "подставлять с помощью %s. Его можно вставлять в любом месте указанной " "команды и подстановка будет выполнена до её выполнения." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Команды" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Сервис" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "адрес электронной почты разработчика" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Инициалы имени разработчика" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Стартовая версия:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Номер версии, которую изначально имеет новый файл" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Имя компании:" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Разработчик:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Компания:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Адрес электронной почты:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Инициалы:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Имя разработчика:" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Год:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Дата:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Дата и время:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2521,7 +2692,7 @@ "Укажите формат для группового символа {datetime}. Можно использовать любые " "параметры, которые годятся для функции strftime ANSI C." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2529,7 +2700,7 @@ "Укажите формат для группового символа {year}. Можно использовать любые " "параметры, которые годятся для функции strftime ANSI C." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2537,64 +2708,64 @@ "Укажите формат для группового символа {date}. Можно использовать любые " "параметры, которые годятся для функции strftime ANSI C." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Данные шаблонов" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Шаблоны" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Изменить" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Сочетания клавиш" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Привязки" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Команда:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Путь к команде для вывода файла на печать (используйте %f для имени файла)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Использовать внешнюю команду для печати" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Показывать номера строк" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Добавлять номера строк на печатаемой странице" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Печатать номера страниц" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Добавлять номера страниц на каждую страницу, это займёт 2 строки внизу " "страницы." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Печатать заголовок страницы" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2602,19 +2773,19 @@ "Добавлять небольшой заголовок в начало каждой страницы с указанием номера " "страницы, имени файла и текущей даты (см. ниже). Это занимает 3 строки." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Использовать только имя текущего файла" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Печатать только имя файла, опуская путь к нему." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Формат даты:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2624,550 +2795,578 @@ "страницы. Можно использовать любые параметры, которые годятся для функции " "strftime ANSI C." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Использовать собственный механизм печати GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Кодировка:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Печать" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Свойства проекта" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Отображение" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Собрать свою цель" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Новый" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Открыть" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Открыть выбранный файл" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Сохранить" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Сохранить как" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Сохранить все" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Печать" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Закрыть" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Закрыть все" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Обновить файл" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Проект" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Свойства проекта" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Отменить" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Повторить" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Дублировать строку или выделенное" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Удалить текущую строку (строки)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Удалить до конца строки" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Переместить текущую строку" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Прокрутить до текущей строки" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Прокрутить наверх на одну строку" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Прокрутить вниз на одну строку" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Полный фрагмент кода" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Перемещать курсор в фрагменте" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Подавлять авто-завершение фрагментов кода" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Контекстное действие" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Полное слово" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Показывать подсказки" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Показывать список макросов" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Авто-завершение фрагментов кода" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Комментировать строку (строки)" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Комментировать строку (строки)" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Буфер обмена" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Вырезать" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Копировать" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Вставить" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Копировать текущую строку (строки)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Вырезать текущую строку (строки)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Выбрать" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Выбрать все" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Выбрать текущее слово" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Выбрать текущую строку (строки)" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Перейти к предыдущему маркеру" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Выбрать текущий абзац" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Перейти к следующему маркеру" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Формат" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Переключить регистр в выделении" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Переключить комментирование строк" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Комментировать строку (строки)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Разкомментировать строку (строки)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Увеличить отступ" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Уменьшить отступ" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Увеличить отступ на один пробел" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Уменьшить отступ на один пробел" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "\"Умный\" отступ строк" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Передать пользовательской команде 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Передать пользовательской команде 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Передать пользовательской команде 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Отправить выделенное в терминал" - -# -- может быть передвинуть или отразить ? -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "переформатировать строку/блок" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Вставить" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Вставить дату" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Вставить переменный пробел" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Настройки" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Поиск" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Найти" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Найти следующее" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Найти предыдущее" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Найти следующее выделение" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Найти предыдущее выделенное" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Заменить" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Найти в файлах" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Следующее сообщение" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Предыдущее сообщение" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Найти использование" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Статистика документа" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Выделить все" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Перейти" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Вернуться на шаг назад" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Перейти на шаг вперёд" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Перейти к парной скобке" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Переключить маркер" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Перейти к следующему маркеру" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Перейти к предыдущему маркеру" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Перейти к определению тега" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Перейти к объявлению тега" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Перейти к началу строки" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Перейти к концу строки" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "К концу текущей строки" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Перейти к предыдущему маркеру" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Перейти к следующему маркеру" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Вид" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Переключить все дополнительные виджеты" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Во весь экран" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Показывать окно сообщений" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Показывать боковую панель" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Увеличить" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Уменьшить" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Уменьшить" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Фокус" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Перейти к редактору" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Перейти к заметкам" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Переключиться в терминал" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Перейти к поиску" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Перейти к боковой панели" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Переключиться на компилятор" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Перейти к боковой панели" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "_Показывать окно сообщений" + +# Перейти на документ слева +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Перейти к документу" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Перейти к боковой панели" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Вкладка блокнота" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Перейти на документ слева" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Перейти на документ справа" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Перейти на последний документ" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Переместить документ влево" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Переместить документ вправо" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Переместить документ в начало" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Переместить документ в конец" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Документ" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Переключить режим переноса строк" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Переключить перенос строк" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Заменить пробелы табуляциями" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Свернуть/развернуть текущий блок" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Свернуть все" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Развернуть все" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Обновить список тегов" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "_Удалить маркеры" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Убрать индикаторы о_шибок" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Сборка" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Скомпилировать" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Сборка всего" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Сборка цели пользователя" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Сборка объекта" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Следующая ошибка" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Предыдущая ошибка" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Запустить" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Запустить (другая команда)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Опции сборки" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Показывать выбор цвета" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Справка" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Сочетания клавиш" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Следующие сочетания клавиш можно настроить:" # Перейти на документ слева -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Перейти к документу" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Здесь можно писать что угодно, используйте это для заметок и быстрых записей" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Не удалось загрузить один или несколько файлов сессии." @@ -3175,7 +3374,12 @@ msgid "Debug Messages" msgstr "Сообщения отладки" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "Компилятор" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3183,87 +3387,96 @@ "Задать начальный номер столбца для первого открытого файла (полезно в " "сочетании с --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "использовать другой каталог настроек" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Подробно." - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Выводить внутренние имена типов файлов" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Создать глобальный файл тегов (смотрите документацию)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Не использовать препроцессор для файлов C/C++ при создании тэгов " -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Не открывать файлы в запущенной копии программы, а принудительно запускать " "новую" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Установить начальный номер строки для первого открытого файла" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Не показывать окно сообщений при запуске" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Не загружать данные по авто-завершению (смотрите документацию)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Не загружать плагины" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Вывести инсталляционный префикс Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Не загружать файлы предыдущей сессии" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Не загружать поддержку терминала" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Имя файла библиотеки libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Подробно." + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Показать версию программы и выйти" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[ФАЙЛЫ...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(собрано на %s с GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Переместить это?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Перед запуском Geany необходимо переместить ваш старый каталог с настройками." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3272,7 +3485,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3281,7 +3494,7 @@ "Ваш каталог с настройками \"%s\" не может быть перемещен в \"%s\" (%s). " "Пожалуйста, переместите каталог с настройками в ручную." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3293,38 +3506,43 @@ "настроек.\n" "Запустить Geany в любом случае?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Не могу найти файл \"%s\"." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Это Geany %s" -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Каталог настроек не может быть создан (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Файлы настроек обновлены." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Дежурные сообщения" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Копировать" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "_Копировать все" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Скрыть окно сообщений" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Убрать все индикаторы ошибок в текущем документе" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3333,11 +3551,11 @@ "Плагин \"%s\" не совместим с этой версией программы Geany - пожалуйста, " "скомпилируйте его заново." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Менеджер _плагинов" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3348,80 +3566,88 @@ "Описание: %s\n" "Автор(ы): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Активный" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Плагин" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Нет доступных плагинов" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Плагины" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Внизу находится список доступных плагинов. Выберите те из них, которые вы " -"хотите загружать при запуске Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Подробнее о плагине:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Захватить клавишу" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Нажмите сочетание клавиш, которые вы хотите использовать для \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Развернуть все" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "_Свернуть все" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Действие" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Сокращение" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Переопределить" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Переопределить это сочетание?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Комбинация клавиш \"%s\" уже используется для \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Терминал" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "Введите пути к утилитам. Для ненужных утилит пути можно не указывать." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3429,7 +3655,7 @@ "Введите информацию для использования в шаблонах.\n" "Смотрите документацию для изучения работы с шаблонами." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3440,7 +3666,7 @@ "настройки." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3452,7 +3678,7 @@ "вы можете редактировать строку сочетания напрямую." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3462,7 +3688,7 @@ "старше." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3478,46 +3704,46 @@ msgid "Text will be wrongly spaced." msgstr "Интервалы в тексте будут неправильными." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Страница %d из %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Параметры документа" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Печатать только имя файла, опуская путь к нему." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Страница %d из %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Печать файла \"%s\" была отменена" +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Файл %s распечатан." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Печать \"%s\" завершилась с ошибкой (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" "Пожалуйста, сначала укажите команду для печати, в соответствующем диалоге " "настроек." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3528,38 +3754,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Печать \"%s\" завершилась с ошибкой (код ошибки: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Файл %s распечатан." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "проекты" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Новый проект" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "С_оздать" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Имя:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Имя файла:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Путь к каталогу:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3569,123 +3800,117 @@ "новый каталог, так и уже существующий. Вы можете использовать относительные " "пути (относительно имени проекта)." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Выберите путь к каталогу проекта:" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Файл проекта \"%s\" не может быть загружен." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Открыть проект" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Файлы проекта" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Проект \"%s\" закрыт." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Описание:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Скомпилировать в каталоге проекта" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Команда запуска:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Секция1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Командная строка для выполнения внутри каталога проекта. К команде можно " -"добавлять опции. Оставьте пустым для использования команды по умолчанию." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Шаблоны файлов:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Хотите закрыть его до продолжения действия?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Проект \"%s\" уже открыт" -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Указанное имя проекта слишком короткое" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Указанное имя проекта слишком длинное (максимум %d символов)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Было задано недопустимое имя проекта." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Создать каталог проекта?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Путь \"%s\" не существует." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Каталог для проекта не может быть создан (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Невозможна запись в файл проекта (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Проект \"%s\" создан." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Проект %s сохранен." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Выберите имя проекта" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Выберите команду запсука проекта" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Проект \"%s\" открыт." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Использовать _регулярные выражения" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3693,15 +3918,15 @@ "Использовать регулярные выражения POSIX. Для более подробной информации по " "использованию регулярных выражений см. соответствующую документацию." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Обратный _поиск" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "_Использовать escape-последовательности" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3709,127 +3934,127 @@ "Заменять \\\\, \\t, \\n, \\r и \\uXXXX (символы Unicode) соответствующими " "управляющими символами." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "С _учетом регистра" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Совпадение только _всего слова" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Совпадение с _начала слова" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Предыдущее" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Следующее" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Искать:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Найти все" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Пометить" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Выделить все совпадения в текущем документе." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "В с_ессии" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "В _документе" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Закрыть _диалог" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Отключите эту опцию, чтобы сохранить диалог открытым" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Найти _и заменить" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Заменить _на:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "З_аменить все" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "В в_ыделенном" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Заменить все совпадения с фразой в конкретном выделенном тексте" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Каталог:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "_Кодировка:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "_Фиксированные строки" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Регулярные выражения для Grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "См. справку grep для более подробной информации." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Расширенные регулярные выражения" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_Рекурсивно в подкаталогах" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Инвертировать результаты поиска" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Инвертировать смысл соответствия, для выбора не совпадающих с шаблоном строк." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Дополнительные _опции:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Прочие параметры для передачи утилите grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -3837,48 +4062,44 @@ msgstr[1] "Найдено %d совпадения для \"%s\"." msgstr[2] "Найдено %d совпадений для \"%s\"." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Текст заменён в файле(файлах) %u ." -msgstr[1] "Текст заменён в файле(файлах) %u ." -msgstr[2] "Текст заменён в файле(файлах) %u ." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Замена текста в текущем документе" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Для поиска в файлах указан недопустимый каталог." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Нет текста для поиска." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Не могу выполнить утилиту grep \"%s\"; проверьте путь, заданный в настройках." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Поиск..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (в каталоге: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Не могу открыть каталог (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"Ошибка поиска(для подробностей смотреть Справка->Сообщения отладки)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Поиск не удался." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3886,233 +4107,257 @@ msgstr[1] "Поиск завершен, найдено %d совпадение." msgstr[2] "Поиск завершен, найдено %d совпадение." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Совпадений нет." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Плохое регулярное выражение для типа файлов %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Раздел" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Секция1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Секция2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Секция3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Дополнение" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Другое" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Типы" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Конструкторы типов" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Функции" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Разделы" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Клавиши" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Переменные" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Команда" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Окружение" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Подраздел" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Субподраздел" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Метка" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Структуры" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:655 -msgid "My" -msgstr "My" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Local" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Метки" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Константы" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Интерфейсы" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Классы " -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Константы" - # rem Гиперссылка -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Якоря" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Заголовок (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Заголовок (H2)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Заголовок (H3)" # CSS -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Идентификаторы" # CSS -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Типы" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Модули" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Синглтоны" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Методы" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Пространства имен" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Процедуры" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "Импорт" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "Без имени" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Структуры" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Процедуры" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Переменные" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Функции" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Члены" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Метки" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Подпрограммы" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Блоки" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Макросы" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Определения" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Цели" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Структуры" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Типы / Перечисления" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Неизвестное расширение имени файла для \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Не удалось создать файл тегов, возможно, тегов найдено не было.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4121,7 +4366,7 @@ "Использование: %s -g <Файл Тегов> <Список Файлов>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4132,163 +4377,181 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Загрузить теги" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Файл тегов Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Загружено %s файлов с тегами \"%s\"." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Невозможно загрузить файл тегов \"%s\"." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Предварительное объявление \"%s\" не найдено." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Определение \"%s\" не найдено." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Сортировать по _имени" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Сортировать по _появлению" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Сохранить текущий файл" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Сохранить все открытые файлы" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Обновить текущий файл с диска" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Закрыть текущий файл" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Закрыть все открытые файлы" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Вырезать выделенное" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Скопировать выделенное" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Вставить содержимое буфера обмена" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Удалить выделенное" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Скомпилировать текущий файл" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Запустить или посмотреть текущий файл" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Открыть диалог выбора цвета, позволяющий выбирать цвет из палитры." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Увеличить текст" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Уменьшить текст" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Уменьшить отступ" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Увеличить отступ" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Найти введенный текст в текущем файле" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Перейти на введенный номер строки" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Показать диалог настроек" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Выйти из Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Печать документа" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Замена текста в текущем документе" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Создать _новый файл" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Создать _новый файл" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Открыть существующий файл" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Открыть выбранный файл" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Ошибок сборки больше нет." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Перейти" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Разделитель" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Разделитель ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -4296,11 +4559,11 @@ "Выбор элементов, отображаемых на панели инструментов. Элементы можно " "располагать путем перетаскивания." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Доступные элементы" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Отображаемые элементы" @@ -4327,7 +4590,7 @@ msgid "Custom command failed: %s" msgstr "Команда пользователя дала сбой: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Установить пользовательские команды" @@ -4339,294 +4602,274 @@ "Вы можете передать текущее выделение любой из этих команд и её вывод заменит " "это выделение." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Пользовательские команды не определены." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Подсчет слов" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "выделение" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "весь документ" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Интервал:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Строк:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Слов:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Символов:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Тегов нет." -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Показать список _тегов" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Показать список _документов" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "_Скрыть боковую панель" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Показать _пути" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "строка: %d\t столбец: %d\t выд.: %d\t" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "ТЧ" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "ПРЗ" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "ВСТ" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "ТАБ" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "ПРБ" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "ТАБ/ПРБ" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "режим: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "Кодировка: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "тип файла: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "МОД" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "область видимости: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Шрифт обновлен (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Стандартная библиотека C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Стандартная библиотека C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Cтандартная библиотека C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "С++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "_Установить формат даты" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Выбрать каталог" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Выбрать файл" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Файлы _настроек." - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Сохранить _все" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "_Закрыть все" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Мac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Терминал" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "_Установить путь из документа" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Перезапуск терминала" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Методы _ввода" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" "Невозможно изменить каталог в VTE, так как, возможно, он содержит команду." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Плагин терминала" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Эти установки для виджета виртуального терминала (VTE) действительны, если " -"VTE-библиотека может быть загружена." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Шрифт терминала:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Установить шрифт для окна терминала." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Цвет текста:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Цвет фона:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Установить цвет текста для окна терминала." -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Установить цвет фона для окна терминала." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Прокручиваемые строки:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Количество строк, которые можно прокрутить назад в терминальном окне." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Оболочка:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "" "Устанавливает путь к оболочке, которая должна быть запущена в терминале." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Прокрутка по нажатию на клавиши" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Прокрутка вниз, если была нажата клавиша" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Прокрутка по мере вывода" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Прокручивать ли вниз, если что-то было выведено." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Мигающий курсор" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Мигать ли курсором" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Переопределить сочетания клавиш Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Позволяет терминалу получать сочетания горячих клавиш (кроме команд фокуса)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Отключить горячую клавишу для меню (по умолчанию F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4635,22 +4878,22 @@ "Эта опция отключает горячую клавишу для вызова меню (обычно F10). Это может " "пригодиться, например, если вы используете MC в окне терминала." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Следовать пути текущего файла" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Выполнять ли \"cd $path\" когда вы переключаетесь между открытыми файлами." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Не использовать скрипт для запуска" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4658,11 +4901,11 @@ "Не использовать простой скрипт, который обычно используется для отображения " "кода завершения выполненной программы." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Выполнять программы в VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4670,90 +4913,123 @@ "Запускать программы в VTE, вместо того, чтобы открывать отдельное окно с " "терминалом. Внимание: программы, выполняемые в VTE, нельзя остановить." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Файлы проекта Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Выполняемые" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Генератор классов" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Создает файлы исходного кода для новых типов классов." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Создать класс" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Пространства имен" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Пространства имен" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Класс" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Имя класса:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Файл заголовка:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Файл исходного кода:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Наследование" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Базовый класс:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Pascal исходный файл" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Базовый заголовок:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Глобально" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Базовый GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Опции" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Создать конструктор" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Создать деструктор" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Синглтоны" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Конструктор GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Создать _класс" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Класс _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Класс _GTK+" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Класс _C++" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Символы HTML" @@ -4763,52 +5039,57 @@ msgstr "Вставляет символы HTML как \"&\"." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Команда разработчиков Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Символы HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Символы ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Греческие символы" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Математические символы" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Технические символы" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Символы стрелок" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Знаки препинания" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Прочие символы" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Каталог настроек плагинов не может быть создан." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Специальные символы" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Вставить" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4817,41 +5098,41 @@ "используйте кнопку для того, чтобы вставить символ на текущую позицию " "курсора." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Символ" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (имя)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Вставить _специальные символы HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Замены HTML" # _HTML переключатель ?? -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTML режим" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Полная замена специальных символов" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Вставить специальные символы HTML" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Заменить специальные символы" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Переключить статус плагина" @@ -4878,105 +5159,105 @@ "Устанавливает размер шрифта для отображения документа в соответствии с " "текущим масштабом" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Документ успешно экспортирован как \"%s\"." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Файл \"%s\" недоступен для записи (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' уже существует. Переписать поверху?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Экспорт" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "В _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "В _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Просмотр файлов" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Добавить просмотр файлов на боковую панель." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Выбрано слишком много объектов!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Невозможно выполнить внешнюю команду \"%s\" (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Открыть во _внешней программе" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Найти в файлах" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Показать _скрытые файлы" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Вверх" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Обновить" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Домой" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Установить путь из документа" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Очистить фильтр" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Фильтр:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Фокус на список файлов" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Фокус на ввод пути" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Каталог настроек плагинов не может быть создан." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Внешняя команда для открытия файла:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4990,15 +5271,15 @@ "%f будет заменено на имя файла, включая полный путь к нему.\n" "%d будет заменено только на путь, без имени файла." -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Показать скрытые файлы" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Скрыть файлы объектов" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5006,11 +5287,11 @@ "Не показывать в просмотре файлов сгенерированные объектные файлы (*.o, *." "obj. *.so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Использовать базовый путь проекта" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Измените путь на базовый путь в уже открытых проектах" @@ -5118,37 +5399,201 @@ msgid "Splits the editor view into two windows." msgstr "Разделяет окно редактирования на два отдельных окна." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Показать текущий документ" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Отменить разделение" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Разделить окно" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Горизонтально" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Вертикально" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Разделить по горизонтали" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Разделить по вертикали" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Отменить разделение" +#~ msgid "Try to resave the file?" +#~ msgstr "Попытаться сохранить файл заново?" + +#~ msgid "_Customize Toolbar" +#~ msgstr "_Настроить панель инструментов" + +#~ msgid "Icon style:" +#~ msgstr "Стиль иконок:" + +#~ msgid "Icon size:" +#~ msgstr "Размер иконок:" + +#~ msgid "Appearance" +#~ msgstr "Внешний вид" + +#~ msgid "Hard tab width:" +#~ msgstr "Ширина табуляции:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "Ширина табуляции при включенном режиме отступа \"Табуляция и пробелы\"" + +#~ msgid "Long line marker:" +#~ msgstr "Маркер длинной строки:" + +#~ msgid "Long line marker color:" +#~ msgstr "Цвет маркера длинной строки:" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Дублировать строку или выделенное" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Отправить выделенное в терминал" + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Печать файла \"%s\" была отменена" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Текст заменён в файле(файлах) %u ." +#~ msgstr[1] "Текст заменён в файле(файлах) %u ." +#~ msgstr[2] "Текст заменён в файле(файлах) %u ." + +#~ msgid "Terminal plugin" +#~ msgstr "Плагин терминала" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Эти установки для виджета виртуального терминала (VTE) действительны, " +#~ "если VTE-библиотека может быть загружена." + +#~ msgid "Terminal font:" +#~ msgstr "Шрифт терминала:" + +#~ msgid "Unsplit" +#~ msgstr "Отменить разделение" + +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Параметры сборки" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "_Просмотреть DVI файл" + +#~ msgid "V_iew PDF File" +#~ msgstr "_Просмотреть PDF файл" + +#~ msgid "_Set Arguments" +#~ msgstr "Установить _аргументы" + +#~ msgid "Set Arguments" +#~ msgstr "Установить аргументы" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "Установить программы и опции для сборки и просмотра (La)TeX файлов." + +#~ msgid "DVI creation:" +#~ msgstr "Создание DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Создание PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Предварительный просмотр DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Предварительный просмотр PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f будет заменено на текущее имя файла, например: test_file.c\n" +#~ "%e будет заменено на имя файла без расширения, т.е. test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Установить \"include <...>\" и аргументы" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Установить команды для сборки и запуска програм." + +#~ msgid "Compile:" +#~ msgstr "Скомпилировать:" + +#~ msgid "Build:" +#~ msgstr "Собрать:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Невозможно запустить программу просмотра" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Использовать белый текст на черном фоне и инвертировать все цвета, " +#~ "потребуется перезапуск Geany" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Путь и опции для make" + +#~ msgid "Run (alternative command)" +#~ msgstr "Запустить (другая команда)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Внизу находится список доступных плагинов. Выберите те из них, которые вы " +#~ "хотите загружать при запуске Geany." + +#~ msgid "Make in base path" +#~ msgstr "Скомпилировать в каталоге проекта" + +#~ msgid "Run command:" +#~ msgstr "Команда запуска:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Командная строка для выполнения внутри каталога проекта. К команде можно " +#~ "добавлять опции. Оставьте пустым для использования команды по умолчанию." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Выберите команду запсука проекта" + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "Ошибка поиска(для подробностей смотреть Справка->Сообщения отладки)." + +#~ msgid "My" +#~ msgstr "My" + +#~ msgid "Local" +#~ msgstr "Local" + +#~ msgid "Our" +#~ msgstr "Our" #~ msgid "Diff file" #~ msgstr "Файл diff с различиями" @@ -5318,9 +5763,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Развернуть все свернутые блоки кода" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Убрать все индикаторы ошибок в текущем документе" - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5341,9 +5783,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Показывает список всех сочетаний клавиш для Geany." -#~ msgid "Color" -#~ msgstr "Цвет" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Ввести номер строки и перейти на нее." @@ -5450,9 +5889,6 @@ #~ msgid "Items" #~ msgstr "Объекты" -#~ msgid "Use white text on a black background." -#~ msgstr "Использовать белый текст на чёрном фоне" - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Запущено в отладочном режиме (выдает больше сообщений)" @@ -5481,9 +5917,6 @@ #~ "Управляет тем, как должен вести себя эмулятор терминала. Не меняйте это " #~ "значение, если не знаете точно, что делаете." -#~ msgid "Search failed." -#~ msgstr "Поиск не удался." - #, fuzzy #~ msgid "Found %d matches for \"%s\"." #~ msgid_plural "Found %d matches for \"%s\"." @@ -5621,10 +6054,6 @@ #~ msgid "Ferite source file" #~ msgstr "Perl исходный файл" -#, fuzzy -#~ msgid "Haskell source file" -#~ msgstr "Pascal исходный файл" - #~ msgid "Docbook source file" #~ msgstr "Docbook исходный файл" diff -Nru geany-0.18/po/sl.po geany-0.19/po/sl.po --- geany-0.18/po/sl.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/sl.po 2010-06-03 22:13:09.000000000 +0100 @@ -1,31 +1,33 @@ -# Slovenian translations for PACKAGE package -# Slovenski prevodi paketa PACKAGE. -# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# JoĹže Klepec , 2009. +# Slovenian translations for Geany package +# Slovenski prevodi paketa Geany. +# Copyright (C) 2009 THE Geany's COPYRIGHT HOLDER +# This file is distributed under the same license as the Geany package. # +# Jože Klepec , 2009. msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-11 23:24+0100\n" +"POT-Creation-Date: 2010-06-03 10:36+0200\n" +"PO-Revision-Date: 2010-06-03 15:33+0100\n" "Last-Translator: Jože Klepec \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Lokalize 0.3\n" #: ../geany.desktop.in.h:1 msgid "A fast and lightweight IDE using GTK2" msgstr "Hitro in lahkotno vdelano razvojno okolje z uporabo GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:281 +#: ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -33,662 +35,663 @@ msgid "Integrated Development Environment" msgstr "Vdelano razvojno okolje" -#: ../src/about.c:139 +#: ../src/about.c:146 msgid "About Geany" msgstr "O Geany" -#: ../src/about.c:189 +#: ../src/about.c:196 msgid "A fast and lightweight IDE" msgstr "Hitro in lahkotno razvojno okolje" -#: ../src/about.c:210 +#: ../src/about.c:217 #, c-format msgid "(built on or after %s)" msgstr "(zgrajeno dne %s ali kasneje)" # gtk_container_add(GTK_CONTAINER(info_box), cop_label); #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:248 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:264 msgid "Developers" msgstr "Razvijalci" -#: ../src/about.c:266 +#: ../src/about.c:273 msgid "maintainer" msgstr "vzdrževalec" -#: ../src/about.c:274 +#: ../src/about.c:281 msgid "developer" msgstr "razvijalec" -#: ../src/about.c:282 +#: ../src/about.c:289 msgid "translation maintainer" msgstr "vzdrževalec prevoda" -#: ../src/about.c:291 +#: ../src/about.c:298 msgid "Translators" msgstr "Prevajalci" -#: ../src/about.c:311 +#: ../src/about.c:318 msgid "Previous Translators" msgstr "Prejšnji prevajalci" -#: ../src/about.c:332 +#: ../src/about.c:339 msgid "Contributors" msgstr "Sodelavci" -#: ../src/about.c:342 +#: ../src/about.c:349 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Nekateri od mnogih sodelavcev (za bolj natančen seznam, poglejte datoteko %" -"s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Nekateri od mnogih sodelavcev (za bolj natančen seznam, poglejte datoteko %s):" -#: ../src/about.c:368 +#: ../src/about.c:375 msgid "Credits" msgstr "Zahvale" -#: ../src/about.c:382 +#: ../src/about.c:389 msgid "License" msgstr "Licenca" -#: ../src/about.c:391 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"Besedilo licence ni najdeno, za ogled obiščite spletno mesto: http://www.gnu." -"org/licenses/gpl-2.0.txt " - -#: ../src/build.c:221 ../src/build.c:745 -#, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Ne najdem terminala \"%s\" (preverite pot za nastavitve orodja Terminal v " -"Možnostih)" +#: ../src/about.c:398 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Besedilo licence ni najdeno, za ogled obiščite spletno mesto: http://www.gnu.org/licenses/gpl-2.0.txt " + +# fall back to %d +#. fall back to %d +#: ../src/build.c:635 +#, c-format +msgid "failed to substitute %%p, no project active" +msgstr "spodletela zamenjava %%p, ni aktivnega projekta" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Spodletela proces, ni delovne mape." -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Spodletelo izvajanje \"%s\" (ni mogoče ustvariti zagonske skripte)." +msgid "%s (in directory: %s)" +msgstr "%s (v mapi: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 +#: ../src/build.c:944 +#: ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Proces spodletel (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (v mapi: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Spodletela menjava delovne mape v \"%s\"" -#: ../src/build.c:707 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Spodletelo izvajanje \"%s\" (ni mogoče ustvariti zagonske skripte)." + +#: ../src/build.c:873 +msgid "Could not execute the file in the VTE because it probably contains a command." msgstr "Izvajanje v VTE ni možno, ker verjetno vsebuje ukaz." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Ne najdem terminala \"%s\" (preverite pot za nastavitve orodja Terminal v Možnostih)" + +#: ../src/build.c:1083 msgid "Compilation failed." msgstr "Prevajanje spodletelo." -#: ../src/build.c:928 +#: ../src/build.c:1097 msgid "Compilation finished successfully." msgstr "Prevajanje uspešno zaključeno." -# prevede izvorno kodo -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Prevedi" - -# zgradi izvorno kodo -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Zgradi" - -# zgradi izvorno kodo z make all -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Zgradi _vse" - -# zgradi izvorno kodo z make custom -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Zgradi _tarčo po meri" - -# zgradi izvorno kodo z make object -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Zgradi _objekt" +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "Besedilo po meri" + +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Tu vnesite možnosti po meri, vse vneseno besedilo bo preneseno ukazu make." # skok na naslednjo napako -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1333 msgid "_Next Error" msgstr "_Naslednja napaka" # skok na prejšnjo napako -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1335 msgid "_Previous Error" msgstr "_Predhodna napaka" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Nastavi zaglavja in spremenljivke" - -# DVI -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -# PDF -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "Prikaži _DVI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Prikaži _PDF" - -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "_Nastavi ukazne spremenljivke" - -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Nastavi ukazne spremenljivke" - -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Nastavi programe in možnosti za izdelavo in pregled (La)TeX datotek" - -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Izdelava DVI:" - -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Izdelava PDF:" - -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI predogled:" - -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF predogled:" - -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f bo zamenjana s trenutno datoteko, npr. test_dat.c\n" -"%e bo zamenjano z datoteko brez podaljška, npr. test_dat " - -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Nastavi zaglavja in ukazne spremenljivke" - -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Nastavi ukaze za gradnjo in zagon programov." - -# in-dialog heading for the "Set Includes and Arguments" dialog -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "%s ukazi" - -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Prevedi:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Zgradi:" - -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Poženi:" +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "_Nastavi ukaze za gradnjo" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1625 +#: ../src/toolbar.c:373 msgid "Build the current file" msgstr "Zgradi trenutno datoteko" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Zgradi tarčo po meri" - -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Tu vnesite možnosti po meri, vse vneseno besedilo bo preneseno ukazu make." - -#: ../src/build.c:1967 +#: ../src/build.c:1639 msgid "Build the current file with Make and the default target" msgstr "Zgradi trenutno datoteko z Make in privzeto tarčo." -#: ../src/build.c:1970 +#: ../src/build.c:1641 msgid "Build the current file with Make and the specified target" msgstr "Zgradi trenutno datoteko z Make in določeno tarčo." -#: ../src/build.c:1973 +#: ../src/build.c:1643 msgid "Compile the current file with Make" msgstr "Prevede trenutno datoteko z Make" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Spodletelo izvajanje oglednega programa" - -#: ../src/build.c:2073 +#: ../src/build.c:1670 #, c-format msgid "Process could not be stopped (%s)." msgstr "Procesa ni bilo mogoče zaustaviti (%s)." -#: ../src/build.c:2092 ../src/build.c:2106 +#: ../src/build.c:1687 +#: ../src/build.c:1699 msgid "No more build errors." msgstr "Ni več napak gradnje." -#: ../src/callbacks.c:152 +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "Nastavi oznako menijske izbire" + +#: ../src/build.c:1790 +msgid "Item" +msgstr "Izbira" + +#: ../src/build.c:1791 +#: ../src/symbols.c:650 +msgid "Label" +msgstr "Oznaka" + +#: ../src/build.c:1792 +#: ../src/symbols.c:645 +msgid "Command" +msgstr "Ukaz" + +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "Delovni imenik" + +#: ../src/build.c:1794 +msgid "Clear" +msgstr "Počisti" + +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "Kliknite za nastavitev oznako menijske izbire" + +# in-dialog heading for the "Set Includes and Arguments" dialog +#: ../src/build.c:1906 +#: ../src/build.c:1908 +#, c-format +msgid "%s Commands" +msgstr "%s ukazi" + +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "Brez tipa datoteke" + +#: ../src/build.c:1916 +#: ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "Napaka regularnega izraza:" + +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "Ukazi nedatotečne vrste" + +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Opomba: Izbira 2 odpre pogovorno okno in doda odziv na ukaz." + +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "Izvedi ukaze" + +#: ../src/build.c:1994 +#, c-format +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p so zamenjani v ukazu in poljih imenika. Glej priročnik za podrobnosti uporabe. (?directory, environment, file, path ?)" + +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "Nastavi ukaze za gradnjo" + +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "_Prevedi" + +# zgradi izvorno kodo +#. build the code +#: ../src/build.c:2408 +#: ../src/build.c:2671 +#: ../src/interface.c:1075 +msgid "_Build" +msgstr "_Zgradi" + +#: ../src/build.c:2415 +#: ../src/build.c:2445 +#: ../src/build.c:2638 +msgid "_Execute" +msgstr "_Izvedi:" + +# zgradi izvorno kodo z make custom +#. build the code with make custom +#: ../src/build.c:2460 +#: ../src/build.c:2636 +#: ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "Zgradi _tarčo po meri" + +# zgradi izvorno kodo z make object +#. build the code with make object +#: ../src/build.c:2462 +#: ../src/build.c:2637 +#: ../src/build.c:2699 +msgid "Make _Object" +msgstr "Zgradi _objekt" + +#: ../src/build.c:2464 +#: ../src/build.c:2635 +msgid "_Make" +msgstr "_Zgradi:" + +# zgradi izvorno kodo z make all +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "Zgradi _vse" + +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "Nastavi ukaze za izbirnik gradnje" + +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Zares želite končati z delom?" +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d datoteka shranjena." +msgstr[1] "%d files saved." +msgstr[2] "%d datoteki shranjeni." +msgstr[3] "%d datotek shranjenih." + # ponovno naloži datoteko -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:488 +#: ../src/document.c:2895 +#: ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Ponovno odpri" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Vse neshranjene spremembe bodo izgubljene." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Zagotovo želite ponovno odpreti '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 +#: ../src/keybindings.c:428 msgid "Go to Line" msgstr "Pojdi na vrstico" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Vnesite želeno številko vrstice:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Prosim, nastavite tip datoteke za trenutno datoteko preden uporabite to " -"funkcijo." +#: ../src/callbacks.c:1296 +#: ../src/callbacks.c:1321 +msgid "Please set the filetype for the current file before using this function." +msgstr "Prosim, nastavite tip datoteke za trenutno datoteko preden uporabite to funkcijo." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 +#: ../src/ui_utils.c:548 msgid "dd.mm.yyyy" -msgstr "dd.mm.yyyy" +msgstr "dd.mm.llll" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 +#: ../src/ui_utils.c:549 msgid "mm.dd.yyyy" -msgstr "mm.dd.yyyy" +msgstr "mm.dd.lllll" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 +#: ../src/ui_utils.c:550 msgid "yyyy/mm/dd" -msgstr "yyyy/mm/dd" +msgstr "llll/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 +#: ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" -msgstr "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.llll uu:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 +#: ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" -msgstr "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.llll uu:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 +#: ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" -msgstr "yyyy/mm/dd hh:mm:ss" +msgstr "llll/mm/dd uu:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 +#: ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Uporabi obliko datuma po meri" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Oblika datuma po meri" -#: ../src/callbacks.c:1498 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Tu vnesite obliko datuma in časa po meri. Uporabite lahko vse oblike, ki jih " -"sprejme ANSI C strftime funkcija." +#: ../src/callbacks.c:1447 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Tu vnesite obliko datuma in časa po meri. Uporabite lahko vse oblike, ki jih sprejme ANSI C strftime funkcija." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Datumski oblični niz ni bil pretvorjen (verjetno predolg)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 +#: ../src/callbacks.c:1699 msgid "No more message items." msgstr "Ni več sporočilnih postavk." # initialize the dialog -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 +#: ../src/dialogs.c:229 msgid "Open File" msgstr "Odpri datoteko" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 +#: ../src/interface.c:790 msgid "_View" msgstr "_Pogled" -#: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Odpre datoteko v načinu samo za branje. Če izberete več kot eno datoteko, se " -"tako bodo odprle vse datoteke." +#: ../src/dialogs.c:151 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Odpre datoteko v načinu samo za branje. Če izberete več kot eno datoteko, se tako bodo odprle vse datoteke." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Zaznaj po podaljšku datoteke" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 +#: ../src/interface.c:3651 +#: ../src/interface.c:5263 msgid "Detect from file" msgstr "Zaznaj po vsebini" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Več možnosti" # line 1 with checkbox and encoding combo #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Pokaži _skrite datoteke" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Nastavi kodiranje:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Izrecno določi kodiranje za datoteko, če ni zaznano. To je uporabno, če " -"veste, da kodiranje datoteke ni zaznano pravilno s strani Geany.\n" -" Pozorni bodite pri izbiri več datotek, saj se bodo vse odprle v izbranem " -"kodiranju." +"Izrecno določi kodiranje za datoteko, če ni zaznano. To je uporabno, če veste, da kodiranje datoteke ni zaznano pravilno s strani Geany.\n" +" Pozorni bodite pri izbiri več datotek, saj se bodo vse odprle v izbranem kodiranju." # line 2 with filetype combo #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Nastavi tip datoteke:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Izrecno nastavi datotečni tip za datoteko, če ni bil zaznan preko podaljška " -"v imenu.\n" -"Pozorni bodite pri izbiri več datotek naenkrat, saj se vse odprejo z " -"izbranim tipom datoteke." +"Izrecno nastavi datotečni tip za datoteko, če ni bil zaznan preko podaljška v imenu.\n" +"Pozorni bodite pri izbiri več datotek naenkrat, saj se vse odprejo z izbranim tipom datoteke." #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "_Prezri" +msgstr "Prepišem?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "Datoteka s tem imenom že obstaja!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 +#: ../src/dialogs.c:552 msgid "Save File" msgstr "Shrani datoteko" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "_Preimenuj" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Shrani datoteko in jo preimenuje" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Odpri datoteko v novem zavihku" -#: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Ohrani trenutni neshranjen dokument odprt in odpre novo datoteko v novem " -"zavihku" +#: ../src/dialogs.c:442 +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Ohrani trenutni neshranjen dokument odprt in odpre novo datoteko v novem zavihku" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 +#: ../src/win32.c:681 msgid "Error" msgstr "Napaka" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 +#: ../src/dialogs.c:1443 +#: ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Vprašanje" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 +#: ../src/win32.c:693 msgid "Warning" msgstr "Opozorilo" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 +#: ../src/win32.c:699 msgid "Information" msgstr "Informacije" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Ne shrani" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Datoteka '%s' ni bila shranjena." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Ali jo želite shraniti pred zapiranjem?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Izberite nabor znakov" -#: ../src/dialogs.c:1005 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Pojavila se je napaka ali informacij o datoteki ni mogoče pridobiti (npr. o " -"novi datoteki)." - -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1057 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Pojavila se je napaka ali informacij o datoteki ni mogoče pridobiti (npr. o novi datoteki)." + +#: ../src/dialogs.c:1076 +#: ../src/dialogs.c:1077 +#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1745 +#: ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "neznano" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 +#: ../src/symbols.c:800 msgid "Properties" msgstr "Lastnosti" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tip:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Velikost:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" -msgstr "Location:" +msgstr "Pot:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Samo-za-branje:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(samo znotraj Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kodiranje:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 +#: ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(z BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(brez BOM)" # prilagojeno, spremenjeno -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Prilagojeno:" # spremenjeno, prenarejeno -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Spremenjeno:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Dostopano:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Dovoljenja:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Branje:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Pisanje:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Poženi:" + # Lastnik #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Lastnik:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Skupina:" # Drugi, npr. guest, anonymus, ostali uporabniki #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Drugi:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Datoteka %s zaprta." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Odprta nova datoteka \"%s\"." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 +#: ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Ni mogoče odpreti datoteke %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Datoteke \"%s\" ni bilo mogoče odpreti pravilno, zato je bila skrajšana. To " -"se lahko zgodi, če datoteka vsebuje znak NULL. Zavedajte se, da njeno " -"shranjevanje lahko povzroči izgubo podatkov.\n" +"Datoteke \"%s\" ni bilo mogoče odpreti pravilno, zato je bila skrajšana. To se lahko zgodi, če datoteka vsebuje znak NULL. Zavedajte se, da njeno shranjevanje lahko povzroči izgubo podatkov.\n" "Datoteka je nastavljena samo za branje." # Za prevajalce - primer: # Datoteka \"test.txt" ni veljavna UTF-8 datoteka. #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Datoteka \"%s\" ni veljavna %s datoteka." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Datoteka \"%s\" ni besedilna datoteka ali kodiranje besedila ni podprto." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Datoteka \"%s\" ni besedilna datoteka ali kodiranje besedila ni podprto." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Presledki" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Razmaki" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Razmaki in presledki" @@ -696,16 +699,16 @@ # * and Spaces), the second one is the filename #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Nastavitev %s načina zamikanja za %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Napačno ime datoteke" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Datoteka %s ponovno odprta." @@ -713,29 +716,25 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Datoteka %s je odprta (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", za branje" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Napaka med preimenovanjem datoteke." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Napaka se je pojavila med pretvorbo datoteke iz UTF-8 \"%s\". Datoteka " -"ostaja neshranjena." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Napaka se je pojavila med pretvorbo datoteke iz UTF-8 \"%s\". Datoteka ostaja neshranjena." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -744,42 +743,49 @@ "Sporočilo o napaki: %s\n" "Napaka se je pojavila na mestu \"%s\" (vrstica: %d, stolpec %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Sporočilo o napaki: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 +#: ../src/document.c:1833 msgid "Error saving file." msgstr "Napaka med shranjevanjem datoteke." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Napaka med shranjevanjem datoteke (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Datoteka %s shranjena." # Search regexp I assume for now. -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 +#: ../src/document.c:1982 +#: ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" ni bila najden." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Zaključim iskanje v preostanku?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 +#: ../src/search.c:1127 +#: ../src/search.c:1171 +#: ../src/search.c:1875 +#: ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Ni ujemanj za \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 +#: ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -788,11 +794,11 @@ msgstr[2] "%s: zamenjanih %d pojavljanj niza \"%s\" z nizom \"%s\"." msgstr[3] "%s: zamenjanih %d pojavljanj niza \"%s\" z nizom \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Ali želite ponovno odpreti datoteko?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -801,28 +807,34 @@ "Datoteka '%s' na disku je bolj sveža kot\n" "trenutni pomnilnik." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Želite ponovno shraniti?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Zapri _brez sharnjevanja" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Datoteka \"%s\" ni bila najdena na disku!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Vnesite širino tabulatorja" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Vnesite število presledkov, ki naj bodo zamenjani s tabulatorjem. " +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Opozorilo: neobičajna širina trdih razmikov: %d != 8!" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltsko" -#: ../src/encodings.c:77 ../src/encodings.c:78 +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 msgid "Greek" msgstr "Grško" @@ -834,23 +846,32 @@ msgid "South European" msgstr "Južnoevropsko" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 #: ../src/encodings.c:84 msgid "Western" msgstr "Zahodno" -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Baltic" msgstr "Baltsko" -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 msgid "Central European" -msgstr "Centralnoevropsko" +msgstr "Srednjeevropsko" # ISO-IR-111 ni na voljo pod Windows #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 msgid "Cyrillic" msgstr "Cirilsko" @@ -866,13 +887,17 @@ msgid "Romanian" msgstr "Romunsko" -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 msgid "Arabic" msgstr "Arabsko" # sploh ni na voljo, ? #. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 msgid "Hebrew" msgstr "Hebrejsko" @@ -892,36 +917,53 @@ msgid "Thai" msgstr "Tajsko" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Turkish" msgstr "Turško" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 msgid "Vietnamese" msgstr "Vietnamsko" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 msgid "Unicode" msgstr "Unicode" #. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" msgstr "Kitajsko poenostavljeno" -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 msgid "Chinese Traditional" msgstr "Kitajsko tradicionalno" -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 #: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonsko" -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 #: ../src/encodings.c:145 msgid "Korean" msgstr "Korejsko" @@ -930,2241 +972,2336 @@ msgid "Without encoding" msgstr "Brez kodiranja" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Zahodnoevropsko" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Vzhodnoevropsko" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Vzhodno _azijsko" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_JV & JZ azijsko" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Bližnjevzhodno" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s izvorna datoteka" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" msgstr "%s izvorna datoteka" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Brez" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Lupinski skript" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Datoteka gradnje" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "dokument XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Padajoča slogovna predloga (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL " -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Nastavitvena datoteka" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext datoteka s prevodi" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s skriptna datoteka" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Programski jeziki" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Skriptni jeziki" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "_Označevalni jeziki" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "_Drugi jeziki" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Prilagojeni tipi datotek" + +#: ../src/filetypes.c:1403 +#: ../src/win32.c:105 msgid "All Source" msgstr "Vsa izvorna koda" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 +#: ../src/project.c:285 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Vse datoteke" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" -msgstr "Slab regex za datotečno vrsto %s: %s" +msgstr "Slab regularni izraz za datotečno vrsto %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "neimenovano" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 +#: ../src/main.c:802 +#: ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Datoteke ni bilo mogoče najti '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "_Barvni izbiralnik" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Privzeto" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Datoteka" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Novo (iz _vzorca)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "nevidno" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "dummy tooltip, don't translate this." - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 +#: ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Odpri _izbrano datoteko" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Nedavne datoteke" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Shrani _vse" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Pono_vno odpri kot" -#: ../src/interface.c:376 +#: ../src/interface.c:371 +#: ../src/interface.c:553 +#: ../src/interface.c:682 +#: ../src/interface.c:696 +#: ../src/interface.c:950 +#: ../src/interface.c:960 +#: ../src/interface.c:2090 +#: ../src/interface.c:2104 +msgid "invisible" +msgstr "nevidno" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Nastavitev _strani" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 +#: ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Zapri _ostale dokumente" # zapre vse dokumente -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 +#: ../src/notebook.c:219 msgid "C_lose All" msgstr "Zapri _vse" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Uredi" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 +#: ../src/interface.c:2031 msgid "_Format" msgstr "_Oblika" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 +#: ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "Ponovno poravnaj vrstice/blok" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Pre_obrni izbor" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 +#: ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "Pres_tavi tekočo vrstico" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" -msgstr "Zakomentiraj vrstico ali več vrstic" +msgstr "_Komentiraj vrstico ali več vrstic" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" -msgstr "Odkomentiraj vrstico ali več vrstic" +msgstr "_Odkomentiraj vrstico ali več vrstic" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "_Preklopi komentiranje vrstic" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Po_dvoji vrstico ali izbor" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Povečaj zamik" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "_Zmanjšaj zamik" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Pošlji izbor terminalu" +#: ../src/interface.c:537 +#: ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "_Pametno zamikanje vrstic" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Pošlji izbor v" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 +#: ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Ukazi" + +#: ../src/interface.c:563 +#: ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "_Izreži tekočo vrstico ali več vrstic" + +#: ../src/interface.c:571 +#: ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "_Kopiraj tekočo vrstico ali več vrstic" + +#: ../src/interface.c:579 +#: ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "_Zbriši trenutno vrstico ali več vrstic" + +#: ../src/interface.c:583 +#: ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "Po_dvoji vrstico ali izbor" + +#: ../src/interface.c:592 +#: ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "Izberi tekočo_vrstico ali več vrstic" + +#: ../src/interface.c:596 +#: ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "Izberi tekoči _odstavek" + +#: ../src/interface.c:605 +#: ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "Vstavi alternativni presledek" + +#: ../src/interface.c:614 +#: ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Pojdi na _naslednjo oznako" + +#: ../src/interface.c:618 +#: ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Pojdi na _predhodno oznako" + +#: ../src/interface.c:627 +#: ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Pošlji izbor terminalu" + +#: ../src/interface.c:636 +#: ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Vstavi _komentar" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 +#: ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Vstavi vnos d_nevnika sprememb" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 +#: ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Vstavi _zaglavje datoteke" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 +#: ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Vstavi opis _funkcije" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 +#: ../src/interface.c:2067 msgid "Insert _Multiline Comment" -msgstr "Vstavi ve_čvrstični komentar" +msgstr "Vstavi večv_rstični komentar" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 +#: ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Vstavi _GPL obvestilo" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 +#: ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Vstavi _BSD obvestilo" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 +#: ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Vstavi _datum" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 +#: ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "_Vstavi \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "_Možnosti" -#: ../src/interface.c:621 +#: ../src/interface.c:712 +#: ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Možnosti _vstavkov" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Išči" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Išči _naslednje" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Išči _predhodno" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Išči v _datoteki" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 +#: ../src/search.c:551 msgid "_Replace" msgstr "_Zamenjaj" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Išči v _izboru" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Išči v p_rejšnjem izboru" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Naslednje _sporočilo" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Pr_ejšnje sporočilo" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 +#: ../src/interface.c:2145 msgid "_Go to Line" msgstr "Pojdi na vrs_tico" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Spremeni _nabor znakov" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Preklo_pi vse dodatne gradnike" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "_Celozaslonsko" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Pokaži _sporočilno okno" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Pokaži _orodno vrstico" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Pokaži s_transko vrstico" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 +#: ../src/interface.c:4025 +#: ../src/interface.c:5347 +#: ../src/keybindings.c:260 +#: ../src/prefs.c:1531 msgid "Editor" msgstr "Urejevalnik" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Pokaži _rob oznak" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Pokaži številke _vrstic" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Pokaži _prazne znake" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Prikaži _konce vrstic" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Pokaži vodila _zamikanja" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Dokument" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" -msgstr "_Lomljenje vrstic" +msgstr "_Zavijanje vrstic" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" -msgstr "" +msgstr "_Lomljenje vrstic" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "S_amozamikanje" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Vrsta _zamika" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 +#: ../src/interface.c:3633 +#: ../src/interface.c:5245 msgid "_Tabs" msgstr "_Razmaki" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 +#: ../src/interface.c:3624 +#: ../src/interface.c:5236 msgid "_Spaces" msgstr "_Presledki" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 +#: ../src/interface.c:3642 +#: ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "R_azmaki in presledki" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Le za _branje" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Zapiši Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Nastavi _tip datoteke" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Nastavi _kodiranje" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Nastavi ko_nce vrstic" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Pretvori in nastavi na _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Pretvori in nastavi na _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Pretvori in nastavi na CR(_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Odreži presledke na repu" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Zamenjaj _razmake s presledki" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Zamenjaj _presledke z razmaki" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Zvij vse" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" -msgstr "_Odvij vse" +msgstr "O_dvij vse" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" -msgstr "Odstrani _oznake" +msgstr "_Odstrani oznake" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Odstrani oznake _napak" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Nov" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Odpri" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Ne_davni projekti" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Zapri" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Orodja" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "_Osveži nastavitve" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "_Nastavitvene datoteke" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Barvni izbiralnik" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Preštevalnik besed" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Naloži _značke" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Osveži nastavitve" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 +#: ../src/interface.c:1130 msgid "_Help" msgstr "_Pomoč" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Splet" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" -msgstr "" +msgstr "Bližnjice _tipkovnice" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "_Razhroščevalna sporočila" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 +#: ../src/sidebar.c:130 msgid "Symbols" msgstr "Simboli" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Dokumenti" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Stanje" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Prevajalnik" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Sporočila" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Beležka" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Besedilo _in podobe" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Samo _podobe" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Samo _besedilo" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "_Velike ikone" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "_Male ikone" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "_Drobne ikone" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "_Skrij orodno vrstico" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "_Možnosti orodne vrstice" -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "_Skrij orodno vrstico" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" -msgstr "" +msgstr "Najdi _uporabo" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" -msgstr "" +msgstr "Najdi uporabo _dokumenta" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Pojdi na _opredelitev značke" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Pojdi na _navedbo značke" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Dejanje _konteksta" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 +#: ../src/keybindings.c:387 msgid "Preferences" msgstr "Možnosti" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Naloži datoteke prejšnje seje" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Ob zagonu odpre datoteke iz zadnje seje" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Naloži podporo za navidezni terminal" -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Ali naj bo ob zagonu naložena podpora za posnemovalnik navideznega terminal " -"(VTE) . Onemogočite, če je ne potrebujete." - #: ../src/interface.c:2712 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Ali naj bo ob zagonu naložena podpora za posnemovalnik navideznega terminal (VTE) . Onemogočite, če je ne potrebujete." + +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Omogoči podporo vstavkom" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Zagon" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Shrani položaj in razmerja okna" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" -msgstr "" -"Shrani položaj okna in njegova razmerja ter jih obnovi ob naslednjem zagonu" +msgstr "Shrani položaj okna in njegova razmerja ter jih obnovi ob naslednjem zagonu" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Potrdi izhod" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Prikaže potrditveno okno ob izhodu" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Zaustavitev" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Zagonska pot:" -#: ../src/interface.c:2778 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Zagonska pot kjer odpirate in shranjujete datoteke. Mora biti absolutna pot. " -"Pustite prazno, da uporabite trenutno delovno mapo." +#: ../src/interface.c:2780 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Zagonska pot kjer odpirate in shranjujete datoteke. Mora biti absolutna pot. Pustite prazno, da uporabite trenutno delovno mapo." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Projektne datoteke:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" -msgstr "" +msgstr "Začetna pot ob odprtju projektnih datotek" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Pot do dodatnih vstavkov:" -#: ../src/interface.c:2828 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Tu navedena pot bo dodatno preiskana za vstavke. Geany sicer najprej preveri " -"splošno namestitveno pot in nastavitveno mapo. Pustite prazno, da " -"onemogočite." +#: ../src/interface.c:2830 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Tu navedena pot bo dodatno preiskana za vstavke. Geany sicer najprej preveri splošno namestitveno pot in nastavitveno mapo. Pustite prazno, da onemogočite." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Poti" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Zagon" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Zapiskaj ob napaki ali ob zaključenem prevajanju" -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" +#: ../src/interface.c:2874 +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Ali naj se sproži pisk ob napaki oziroma ob zaključku prevajalnega postopka" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" -msgstr "" +msgstr "Preklopi v seznam sporočil stanja po novem sporočilu" -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" +#: ../src/interface.c:2879 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Ob novem sporočilu stanja preklopi v seznam sporočil stanja (v oknu zvezka na dnu)" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Zatri sporočila stanja v vrstici stanja" -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Odstrani vsa sporočila iz vrstice stanja. Sporočila se še dalje prikazujejo " -"v oknu sporočil stanja." +#: ../src/interface.c:2884 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Odstrani vsa sporočila iz vrstice stanja. Sporočila se še dalje prikazujejo v oknu sporočil stanja." # Kot naslednji/As next -#: ../src/interface.c:2883 -#, fuzzy +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Samodejno fokusiraj gradnike (fokus sledi miški)" # puščen delno nepreveden, bo dodelan - fokus ni najboljši prevod; will be done later, left partially undone - goto line fields? -#: ../src/interface.c:2886 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Samodejno dodeli fokus gradnikom pod miškinim kazalcem. Deluje za gradnike " -"glavnega urejevalnika, beležko, iskanje iz orodne vrstice in VTE." - -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2889 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Samodejno dodeli fokus gradnikom pod miškinim kazalcem. Deluje za gradnike glavnega urejevalnika, beležko, iskanje iz orodne vrstice in VTE." + +# Original needs rewording! +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Uporabi menijske izbire sistemskih pogovornih oken ali privzetih GTK pogovornih oken" + +# Original needs rewording! +#: ../src/interface.c:2894 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Določi ali uporabite sistemska pogovorna okna ali privzeta GTK pogovorna okna" + +#: ../src/interface.c:2896 +#: ../src/interface.c:3275 +#: ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Raznotero" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" -msgstr "" +msgstr "Vedno obrne iskanje in skrije pogovorno okno Najdi" -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" +#: ../src/interface.c:2918 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Vedno obrne iskanje izraza v preostanku dokumenta in skrije pogovorno okno Najdi po kliku na Najdi Naprej/Nazaj" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" -msgstr "" +msgstr "Uporabi trenutno besedo pod kazalko za pogovorna okna Najdi" -#: ../src/interface.c:2916 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" +#: ../src/interface.c:2923 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Uporabi trenutno besedo pod kazalko ob odpiranju pogovornih oken Najdi, Najdi v datotekah ali Zamenjaj, ko ne obstaja izbira" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" -msgstr "" +msgstr "Uporabi mapo trenutne datoteke za Najdi v datotekah" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Išči" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" -msgstr "" +msgstr "Uporabi projektno osnovane sejne datoteke" -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" +#: ../src/interface.c:2951 +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Ali naj se sejne datoteke projekta shranijo in odprejo ob ponovnem odpiranju projekta" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" -msgstr "" +msgstr "Shrani projektno datoteko v osnovnem imenu projekta" -#: ../src/interface.c:2949 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" +#: ../src/interface.c:2956 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Ko je omogočeno, se privzame shranjevanje projektne datoteke znotraj osnovnega projektnega imenika ob ustvarjanju novega projekta namesto nad njim. Še vedno pa lahko spremenite pot projektne datoteke v pogovornem oknu Nov projekt." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projekti" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" -msgstr "Raznotero" +msgstr "Razno" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 +#: ../src/prefs.c:1525 msgid "General" msgstr "Splošno" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Pokaži seznam simbolov" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Vklopi/izklopi seznam simbolov" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Pokaži seznam dokumentov" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Vklopi/izklopi seznam dokumentov" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Pokaži stransko vrstico" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Položaj:" + +#: ../src/interface.c:3026 +#: ../src/interface.c:3149 +#: ../src/interface.c:3210 +#: ../src/interface.c:3228 +#: ../src/interface.c:3246 +msgid "Left" +msgstr "Levo" + +#: ../src/interface.c:3033 +#: ../src/interface.c:3157 +#: ../src/interface.c:3211 +#: ../src/interface.c:3229 +#: ../src/interface.c:3247 +msgid "Right" +msgstr "Desno" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Stranska vrstica" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Seznam simbolov:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 +#: ../src/interface.c:3197 msgid "Message window:" msgstr "Sporočilno okno:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 +#: ../src/interface.c:3233 msgid "Editor:" msgstr "Urejevalnik:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Nastavi nabor znakov za sporočilno okno" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Nastavi nabor znakov za seznam simbolov" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Nastavi nabor znakov za urejevalnik" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Nabori znakov" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Pokaži razmake urejevalnika" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Pokaži gumbe za zapiranje" -#: ../src/interface.c:3084 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Pokaže majhen križast gumb na zavihku za lažje zapiranje datotek ob kliku " -"nanj (zahteva ponovni zagon Geany)" +#: ../src/interface.c:3130 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Pokaže majhen križast gumb na zavihku za lažje zapiranje datotek ob kliku nanj (zahteva ponovni zagon Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Položaj novih datotečnih zavihkov:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Levo" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Datotečni zavihki bodo na levi strani zvezka" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Desno" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Datotečni zavihki bodo na desni strani zvezka" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Sledi trenutnemu/trenutni" + +#: ../src/interface.c:3169 +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Postavi datotečne zavihkov rajši poleg trenutnega zavihka kot pa robno" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Dvoklik skrije vse dodatne gradnike" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Pokliče ukaz Pogled->Preklopi vse dodatne gradnike" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Razmaki urejevalnika" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 +#: ../src/interface.c:3230 +#: ../src/interface.c:3248 msgid "Top" msgstr "Vrh" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 +#: ../src/interface.c:3231 +#: ../src/interface.c:3249 msgid "Bottom" msgstr "Dno" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Stranska vrstica:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Pozicije razmakov:" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Pokaži vrstico stanja" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ali naj se prikaže statusna vrstica na dnu glavnega okna" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 +#: ../src/prefs.c:1527 msgid "Interface" msgstr "Vmesnik" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "P_okaži orodno vrstico" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "Dod_aj orodno vrstico v meni" # Ni: Add --> Temveč: Pack -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" -"Dodaj orodno vrstico v glavni meni zaradi prihranka navpičnega prostora" +msgstr "Stisni orodno vrstico v glavni izbirnik in prihrani navpični prostor" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Orodna vrstica" +#: ../src/interface.c:3340 +#: ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Prilagodi orodno vrstico" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Slog ikon:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Velikost ikon:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Izgled" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Si_stemsko privzeto" -#: ../src/interface.c:3359 ../src/toolbar.c:881 -#, fuzzy -msgid "Customize Toolbar" -msgstr "Pokaži _orodno vrstico" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Besedilo _in podobe" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Samo _podobe" -#: ../src/interface.c:3363 +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Samo _besedilo" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Slog ikon" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Sis_temsko privzeto" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "_Male ikone" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Drobne ikone" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "_Velike ikone" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Velikost ikon:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Orodna vrstica" + +#: ../src/interface.c:3455 +#: ../src/prefs.c:1529 msgid "Toolbar" msgstr "Orodna vrstica" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" -msgstr "Prelom vrstic" +msgstr "Zavijanje vrstic" -#: ../src/interface.c:3393 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Prelomi vrstico na robu okna in jo nadaljuje v naslednji. Opomba: prelom " -"vrstic ima močan vpliv na zmogljivost pri velikih dokumentih in bi moral " -"biti onemogočen na počasnejših računalnikih. " +#: ../src/interface.c:3485 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Zavije vrstico na robu okna in jo nadaljuje v naslednji. Opomba: zavijanje vrstic ima močan vpliv na zmogljivost pri velikih dokumentih in bi moralo biti onemogočen na počasnejših računalnikih. " -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Omogoči \"pametno\" tipko domov" -#: ../src/interface.c:3398 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Kadar je \"pametni\" domov omogočen, bo tipka HOME pomaknila kazalec na prvi " -"ne-prazni znak vrstice razen v primeru da se že tam nahaja. V tem primeru " -"bo kazalec pomaknjen na sam začetek vrstice. Če je ta možnost onemogočena, " -"bo tipka HOME vedno pomaknila kazalec na strogi začetek vrstice ne glede na " -"tekoči stolpec." +#: ../src/interface.c:3490 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Kadar je \"pametni\" domov omogočen, bo tipka Home pomaknila kazalec na prvi ne-prazni znak vrstice razen v primeru da se že tam nahaja. V tem primeru bo kazalec pomaknjen na sam začetek vrstice. Če je ta možnost onemogočena, bo tipka Home vedno pomaknila kazalec na strogi začetek vrstice ne glede na tekoči stolpec." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Onemogoči povleci in spusti" -#: ../src/interface.c:3403 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Popolnoma onemogoči povleci in spusti v oknu urejevalnika tako, da ne " -"morete povleci in spustiti nobenih izbir znotraj ali zunaj okna urejevalnika" +#: ../src/interface.c:3495 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Popolnoma onemogoči povleci in spusti v oknu urejevalnika tako, da ne morete povleci in spustiti nobenih izbir znotraj ali zunaj okna urejevalnika" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Omogoči zvijanje" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Ali naj bo zvijanje kode omogočeno" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Zvij/odvij vse naslednike točke zvijanja" -#: ../src/interface.c:3413 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Zvije ali odvije vse naslednike točke zvijanja. S pritiskom na tipko Shift " -"med klikom na simbol zvijanja se uporabi nasproten učinek." +#: ../src/interface.c:3505 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Zvije ali odvije vse naslednike točke zvijanja. S pritiskom na tipko Shift med klikom na simbol zvijanja se uporabi nasproten učinek." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Uporabi pokazatelje, da prikažeš napake prevajanja" # squiggly=twisty!-->wavy -#: ../src/interface.c:3418 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Ali naj bodo v uporabi pokazatelji (valovito podčrtavanje), ki poudarijo " -"vrstice kjer je prevajalnik našel opozorilo ali napako" +#: ../src/interface.c:3510 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Ali naj bodo v uporabi pokazatelji (valovito podčrtavanje), ki poudarijo vrstice kjer je prevajalnik našel opozorilo ali napako" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Nova vrstica poreže presledke na repu" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Omogoči novi vrstici rezanje presledkov na repu prejšnje vrstice" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Prelomni stolpec vrstice:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Oznaka komentarja:" -#: ../src/interface.c:3450 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Niz, ki je dodan takrat, ko preklapljamo komentar vrstice v izvorni kodi. " -"Uporablja se za oznako komentarja kot preklopljenega." +#: ../src/interface.c:3542 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Niz, ki je dodan takrat, ko preklapljamo komentar vrstice v izvorni kodi. Uporablja se za oznako komentarja kot preklopljenega." -#: ../src/interface.c:3452 -#, fuzzy +#: ../src/interface.c:3544 msgid "Features" -msgstr "Posebnosti" +msgstr "Možnosti" -#: ../src/interface.c:3457 -#, fuzzy +#: ../src/interface.c:3549 msgid "Features" -msgstr "Posebnosti" +msgstr "Možnosti" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 +#: ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Samozamikalni način:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 +#: ../src/interface.c:5207 msgid "Basic" msgstr "Osnovno" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 +#: ../src/interface.c:5208 msgid "Current chars" msgstr "Tekoči znaki" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 +#: ../src/interface.c:5209 msgid "Match braces" msgstr "Ujemanje oklepajev" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 +#: ../src/interface.c:3925 +#: ../src/interface.c:5211 msgid "Type:" msgstr "Način:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 +#: ../src/interface.c:5218 msgid "Width:" msgstr "Širina:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 +#: ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Širina enega zamika v znakih" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 +#: ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Uporabi presledke ob vrivanju zamikanja" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 +#: ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Uporabi en razmak na zamik" -#: ../src/interface.c:3554 ../src/interface.c:5122 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Uporabi presledke, če je skupni zamik manjši kot širina razmaka, sicer " -"uporabi oboje" +#: ../src/interface.c:3647 +#: ../src/interface.c:5259 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Uporabi presledke, če je skupni zamik manjši kot širina razmaka, sicer uporabi oboje" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Širina trajnega razmaka:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Širina razmaka, ko uporabljamo Razmake & presledke v dokumentu" - -#: ../src/interface.c:3587 ../src/interface.c:5155 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" +#: ../src/interface.c:3656 +#: ../src/interface.c:5268 +msgid "Whether to detect the indentation type from file contents when a file is opened" msgstr "Ali naj se zazna način zamikanja iz vsebine datoteke ob njenem odprtju" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Tipka razmaka zamakne" -#: ../src/interface.c:3592 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" +#: ../src/interface.c:3661 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Pritisk na razmak/shift-razmak zamakne/umakne namesto vrivanja znaka razmaka" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Zamikanje" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 +#: ../src/interface.c:5270 msgid "Indentation" msgstr "Zamikanje" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" -msgstr "" +msgstr "Dokončanje koščkov" -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" +#: ../src/interface.c:3694 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Natipkajte določeno kratko zaporedje znakov in ga dokončajte v bolj zapletenega z uporabo ene tipke" -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Samodokončanje XML značk" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Samodokončanje in zapiranje XML značk (vključuje HTML značke)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Samodejno nadaljevanje večvrstičnih komentarjev" -#: ../src/interface.c:3635 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Samodejno nadaljuj večvrstične komentarje v jezikih kot so C, C++ in Java, " -"ko je vrinjena nova vrstica znotraj komentarja " +#: ../src/interface.c:3704 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Samodejno nadaljuj večvrstične komentarje v jezikih kot so C, C++ in Java, ko je vrinjena nova vrstica znotraj komentarja " -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "Samodokončaj simbole" -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Samodokončanje znanih simbolov v odprtih datotekah (imena funkcij, splošne " -"spremenljivke, ...)" +#: ../src/interface.c:3709 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Samodokončanje znanih simbolov v odprtih datotekah (imena funkcij, splošne spremenljivke, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Samodokončaj vse besede v dokumentu" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "" +msgstr "Izpusti ostanek besede ob dokončanju" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Največ predloženih imen simbolov:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Višina seznama dokončanja" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Potrebni znaki za dopolnjevanje:" -#: ../src/interface.c:3683 -#, fuzzy -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" -msgstr "" -"Količina potrebnih znakov, ki je potrebna za prikaz seznama samodopolnjevanja" +#: ../src/interface.c:3752 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" +msgstr "Količina potrebnih znakov, ki je potrebna za prikaz seznama samodopolnjevanja" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Višina prikaza v vrsticah za seznam samodopolnjevanja" -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Največje število prikazanih vnosov v seznamu samodopolnjevanja" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Dopolnjevanja" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Oklepaji ()" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Samodejno zapri oklepaje med tipkanjem med odpiranjem" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Enojni narekovaji ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Samodejno zapri enojne narekovaje med odpiranjem" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Zaviti oklepaji { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Samodejno zapri zaviti oklepaje med tipkanjem" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Oglati oklepaji [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Samodejno zapri oglate oklepaje med tipkanjem" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Dvojni narekovaji \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Samodejno zapri dvojni narekovaje med tipkanjem" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Samodejno zapri narekovaje in oklepaje" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Dopolnjevanja" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Obrni barve poudarjanja skladnje" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Uporabi beli tekst na črnem ozadju in obrne vse barve. Ta izbira zahteva " -"ponovni zagon Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Obrne vse barve in privzame belo besedilo na črnem ozadju" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Pokaži vodila zamikanja" # right indent=pravilna ali desna? -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Prikaže majhne pikčaste črte, ki so vam v pomoč pri uporabi desne poravnave" +msgstr "Prikaže majhne pikčaste črte, ki so vam v pomoč pri uporabi desne poravnave" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Pokaži prazni prostor" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Prikaže presledke kot pikice in razmake kot puščice" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Pokaži konec vrstice" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Prikaže znak za konec vrstice" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Pokaži številke vrstic" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Prikaže ali skrije rob s številkami vrstic" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Pokaži rob oznak" -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Prikaže ali skrije mali rob desno od številk strani, ki se uporablja za " -"označevanje vrstic" +#: ../src/interface.c:3883 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Prikaže ali skrije mali rob desno od številk strani, ki se uporablja za označevanje vrstic" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" -msgstr "" +msgstr "Ustavi pomikanje na zadnji vrstici" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "" +msgstr "Ali naj se ustavi pomikanje za zadnjo vrstico dokumenta" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Prikaz" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Oznaka dolge vrste:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Barva oznake dolge vrste:" +#: ../src/interface.c:3911 +#: ../src/interface.c:5302 +msgid "Column:" +msgstr "Stolpec:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Barva:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Nastavi barvo oznake dolge vrste" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 +#: ../src/toolbar.c:71 +#: ../src/tools.c:717 +#: ../src/vte.c:765 +#: ../src/vte.c:772 msgid "Color Chooser" msgstr "Barvni izbiralnik" -#: ../src/interface.c:3878 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"Oznaka dolge vrste je tanka dolga navpičnica v urejevalniku. Pomaga označiti " -"dolge črte ali kot namig pri prelomu vrstice. Nastavite to vrednost na večjo " -"od 0 da določite stolpec kjer se naj pojavi." +#: ../src/interface.c:3946 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Oznaka dolge vrste je tanka dolga navpičnica v urejevalniku. Pomaga označiti dolge črte ali kot namig pri prelomu vrstice. Nastavite to vrednost na večjo od 0 da določite stolpec kjer se naj pojavi." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Črta" -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Izpiše navpično črto v oknu urejevalnika na dani poziciji kurzorja (glej " -"spodaj)" +#: ../src/interface.c:3959 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Izpiše navpično črto v oknu urejevalnika na dani poziciji kurzorja (glej spodaj)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Ozadje" -#: ../src/interface.c:3898 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"Barva ozadja znakov potem, ko se dani položaj kurzorja (glej spodaj) " -"spremenil v barvo nastavljeno spodaj. To je priporočeno, če uporabljate " -"proporcionalni nabor znakov. " +#: ../src/interface.c:3966 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "Barva ozadja znakov potem, ko se dani položaj kurzorja (glej spodaj) spremenil v barvo nastavljeno spodaj. To je priporočeno, če uporabljate proporcionalni nabor znakov. " + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Omogočeno" -#: ../src/interface.c:3902 +#: ../src/interface.c:3976 +#: ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Oznaka dolge vrste" + +#: ../src/interface.c:3995 +#: ../src/interface.c:5309 msgid "Disabled" msgstr "Onemogočeno" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Oznaka dolge vrste" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Ne prikaži navideznih presledkov" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Samo za pravokotne izbire" + +#: ../src/interface.c:4005 +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Prikaži navidezne presledke le preko konca vrstice ob izrisu pravokotne izbire" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Vedno" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Vedno prikaži navidezne presledke preko konca vrstic" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Navidezni presledki" -#: ../src/interface.c:3913 +#: ../src/interface.c:4021 msgid "Display" msgstr "Prikaz" # "Open"!="Create"; "Ustvari"=="Create"; "Start"=="Začni"; "Začni"==nonsense_translation; -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Ustvari nove dokumente iz ukazne vrstice" # "Open"!="Create"; "Ustvari"=="Create"; "Start"=="Začni"; "Začni"==nonsense_translation; -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Odpre novo datoteko za vsako datoteko iz ukazne vrstice, ki ne obstaja" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Privzeti znaki konca vrstice:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nove datoteke" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" -msgstr "" +msgstr "Privzeto kodiranje (nove datoteke):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Nastavi kodiranje za novonastale datoteke" -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Uporabi določeno kodiranje ob odpiranju ne-Unicode datotek" + +#: ../src/interface.c:4116 +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Ta možnost onemogoči samodejno zaznavanje kodiranja datotek ob odpiranju ne-Unicode datotek in odpre datoteko z določenim kodiranjem (običajno nepotrebno)." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "" +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Privzeto kodiranje (obstoječe ne-Unicode datoteke):" -#: ../src/interface.c:4030 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" -msgstr "" +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Nastavi privzeto kodiranje ob odpiranju obstoječih ne-Unicode datotek" -#: ../src/interface.c:4032 +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Kodiranja" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" -msgstr "" +msgstr "Zagotovi novo vrstico na koncu" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" -msgstr "" +msgstr "Zagotovi novo vrstico na koncu datoteke" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" -msgstr "" +msgstr "Poreži razmike in presledke na koncu" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" -msgstr "" +msgstr "Poreže razmike in presledke na koncu vrstic" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 +#: ../src/keybindings.c:522 msgid "Replace tabs by space" -msgstr "" +msgstr "Zamenja razmike s presledki" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" -msgstr "" +msgstr "Zamenja vse razmike v dokumentu s presledki" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Shranjevanje datotek" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" -msgstr "" +msgstr "Dolžina seznam nedavnih:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "" +msgstr "Določa število datotek, spravljenih na seznamu nedavnih datotek" -#: ../src/interface.c:4109 +# fsck 3rd rock from the Sun? +#: ../src/interface.c:4213 msgid "Disk check timeout:" -msgstr "" - -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" +msgstr "Potek časa za preverjanje diska:" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4226 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Preverjanje za spremembe na dokumentih na disku v sekundah. Ničla onemogoči preverjanja." + +#: ../src/interface.c:4235 +#: ../src/prefs.c:1533 +#: ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" -msgstr "" - -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "" +msgstr "Datoteke" -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" -msgstr "" +msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" -msgstr "" +msgstr "Brskalnik:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "" +#: ../src/interface.c:4287 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Posnemovalnik terminala kot xterm, gnome-terminal ali konsole (sprejeti mora možnost -e)" -#: ../src/interface.c:4197 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" - -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" -msgstr "" +msgstr "Pot (in morebitne dodatne možnosti) do vašega brskalnika " -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" -msgstr "" +msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Poti do orodij" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" -msgstr "" +msgstr "Kontekstno dejanje:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Ukaz kontekstnega dejanja. Trenutno izbrana beseda se lahko obdela s pripomočkom %s. Lahko se pojavi kjerkoli v danem ukazu in bo zamenjan pred izvedbo." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Ukazi" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 +#: ../src/keybindings.c:560 +#: ../src/prefs.c:1535 msgid "Tools" -msgstr "" +msgstr "Orodja" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "e-poštni naslov razvijalca" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Začetnice razvijalca" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Začetna različica:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Različica, ki jo nosi nova datoteka ob nastanku" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Ime družbe" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Razvijalec:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Družba:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" -msgstr "E-naslov:" +msgstr "Elektronska pošta:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Začetnice:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Ime razvijalca:" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Leto:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Datum in čas:" -#: ../src/interface.c:4434 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" +#: ../src/interface.c:4518 +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Določite obliko za zamenjavo{datetime}. Uporabite lahko katerikoli pretvorbeni določitelj, ki je uporaben v ANSI C strftime funkciji." -#: ../src/interface.c:4441 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" +#: ../src/interface.c:4525 +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Določite obliko za zamenjavo {year}. Uporabite lahko katerikoli pretvorbeni določitelj, ki je uporaben v ANSI C strftime funkciji." -#: ../src/interface.c:4448 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" +#: ../src/interface.c:4532 +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Določite obliko za zamenjavo {date}. Uporabite lahko katerikoli pretvorbeni določitelj, ki je uporaben v ANSI C strftime funkciji." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Podatki predlog" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 +#: ../src/prefs.c:1537 msgid "Templates" msgstr "Predloge" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" -msgstr "" +msgstr "_Spremeni" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Bližnjice tipkovnice" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 +#: ../src/prefs.c:1539 msgid "Keybindings" -msgstr "" +msgstr "Bližnjice tipkovnice" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Ukaz:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Pot do ukaza za tiskanje datotek (uporabite %f za ime datoteke)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Uporabi zunanji ukaz za tiskanje" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 +#: ../src/printing.c:381 msgid "Print line numbers" msgstr "Natisni številke vrstic" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 +#: ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Doda številke vrstic na natisnjeno stran" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 +#: ../src/printing.c:386 msgid "Print page numbers" msgstr "Natisni številko strani" -#: ../src/interface.c:4570 ../src/printing.c:387 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Doda številke vrstic na dno natisnjene strani kar vzame dve (2) vrstici na " -"stran." +#: ../src/interface.c:4665 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Doda številke vrstic na dno natisnjene strani kar vzame dve (2) vrstici na stran." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 +#: ../src/printing.c:391 msgid "Print page header" msgstr "Natisni glavo strani" -#: ../src/interface.c:4575 ../src/printing.c:392 -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Doda majhno glavo na vsako stran s številko strani, imenom datoteke in " -"trenutnim datumom (glej spodaj). Porabi tri (3) vrstice na stran." +#: ../src/interface.c:4670 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Doda majhno glavo na vsako stran s številko strani, imenom datoteke in trenutnim datumom (glej spodaj). Porabi tri (3) vrstice na stran." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 +#: ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Uporabi skrajšano ime natisnjene datoteke" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Natisne le skrajšano ime natisnjene datoteke (brez poti)" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 +#: ../src/printing.c:417 msgid "Date format:" msgstr "Oblika datuma:" # conversion specifier?=pretvorbeno določilo -#: ../src/interface.c:4608 ../src/printing.c:422 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Določi obliko datumskega in časovnega žiga, ki se doda v glavo vsake " -"natisnjene strani. Uporabite lahko katerakoli pretvorbena določila, ki se " -"uporabljajo s funkcijo ANSI C strftime." +#: ../src/interface.c:4703 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Določi obliko datumskega in časovnega žiga, ki se doda v glavo vsake natisnjene strani. Uporabite lahko katerakoli pretvorbena določila, ki se uporabljajo s funkcijo ANSI C strftime." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Uporabi vgrajeno GTK tiskanje" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Tiskanje" + +#: ../src/interface.c:4717 +#: ../src/prefs.c:1541 msgid "Printing" msgstr "Tiskanje" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Lastnosti projekta" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Prikaži:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Po meri" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Uporabi splošne nastavitve" + +#: ../src/keybindings.c:227 +#: ../src/plugins.c:1174 msgid "File" msgstr "Datoteka" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Novo" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Odpri" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Odpri izbrano datoteko" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Shrani" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Shrani kot" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Shrani vse" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Natisni" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Zapri" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Zapri vse" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Ponovno odpre datoteko" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Ponovno odpri zadnji zavihek" + +#: ../src/keybindings.c:255 +#: ../src/project.c:519 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Lastnosti projekta" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Razveljavi" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Ponovi" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Podvoji vrstico ali izbor" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Izbriši trenutno vrstico ali več vrstic" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "Izbriši trenutno vrstico ali več vrstic" - -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Prestavi tekočo vrstico" +msgstr "Izbriši do konca trenutne vrstice" -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" -msgstr "" +msgstr "Pomakni do trenutne vrstice" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" -msgstr "" +msgstr "Pomakni navzgor za eno vrstico" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" -msgstr "" +msgstr "Pomakni dol za eno vrstico" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" -msgstr "" +msgstr "Zaključi košček" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" -msgstr "" +msgstr "Premakni kazalko v košček" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" -msgstr "" +msgstr "Zatri dokončanje koščkov" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" -msgstr "" +msgstr "Kontekstno dejanje" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" -msgstr "" +msgstr "Dokončaj besedo" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" -msgstr "" +msgstr "Prikaži pozivni namig" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Prikaži seznam makrojev" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Dokončanje koščkov besed" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Premakni vrstico ali več navzgor" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Premakni vrstico ali več navzdol" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Odložišče" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Izreži" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopiraj" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Prilepi" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Kopiraj tekočo vrstico ali več vrstic" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Izreži tekočo vrstico ali več vrstic" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Izberi" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Izberi vse" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Izberi tekočo besedo" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Izberi tekočo vrstico ali več vrstic" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Izberi tekoči odstavek" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Izbere predhodni del besede" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Izbere naslednji del besede" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Oblika" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Preklopi velikost izbora" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Preklopi komentiranje vrstic" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Komentiraj vrstico ali več vrstic" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Odkomentiraj vrstico ali več vrstic" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Povečaj zamik" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Zmanjšaj zamik" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Povečaj zamik za presledek" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Zmanjšaj zamik za presledek" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Pametno zamikanje vrstic" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Nastavi na ukaz po meri 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Nastavi na ukaz po meri 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Nastavi na ukaz po meri 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Pošlji izbor terminalu" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Vstavi" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Vstavi datum" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Vstavi alternativni presledek" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Nastavitve" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 +#: ../src/toolbar.c:381 msgid "Search" msgstr "Išči" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 +#: ../src/search.c:396 msgid "Find" msgstr "Najdi" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Najdi naslednje" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Najdi predhodno" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Najdi naslednjo izbiro" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Najdi predhodno izbiro" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 +#: ../src/search.c:541 msgid "Replace" msgstr "Zamenjaj" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 +#: ../src/search.c:715 msgid "Find in Files" msgstr "Najdi v datotekah" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Naslednje sporočilo" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Predhodno sporočilo" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" -msgstr "" +msgstr "Najdi uporabo" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" -msgstr "" +msgstr "Najdi uporabo dokumenta" # zgradi izvorno kodo z make all -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "Zgradi _vse" +msgstr "Označi vse" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Pojdi" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 +#: ../src/toolbar.c:67 msgid "Navigate back a location" -msgstr "" +msgstr "Krmari nazaj " -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 +#: ../src/toolbar.c:68 msgid "Navigate forward a location" -msgstr "" +msgstr "Krmari naprej" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Pojdi na ujemajoči oklepaj" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Preklopi oznako" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Pojdi na naslednjo oznako" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Pojdi na predhodno oznako" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Pojdi na opredelitev značke" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Pojdi na navedbo značke" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Pojdi na začetek vrstice " -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Pojdi na konec vrstice" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" -msgstr "Pojdi na konec vrstice" +msgstr "Pojdi na konec prikazne vrstice" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Pojdi na predhodni del besede" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Pojdi na naslednji del besede" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Pogled" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Preklopi vse dodatne gradnike" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Celozaslonsko" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Preklopi sporočilno okno" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Preklopi stransko vrstico" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Približaj" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Oddalji" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Ponastavi prikaz" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Žarišče" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Preklopi v urejevalnik" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Preklopi v beležko" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Preklopi v VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Preklopi v iskalno vrstico" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Preklopi v stransko vrstico" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Preklopi v prevajalnik" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Preklopi na Sporočila" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Preklopi v sporočilno okno" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Preklopi v seznam dokumentov v stranski vrstici" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Preklopi v seznam simbolov v stranski vrstici" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Zavihek zvezka" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Preklopi v levi dokument" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Preklopi v desni dokument" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Preklopi v zadnji uporabljeni dokument" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Premakni dokument levo" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Premakni dokument desno" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Premakni dokument na prvo mesto" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Premakni dokument na zadnje mesto" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" -msgstr "" +msgstr "Preklopi zavijanje vrstic" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" -msgstr "" +msgstr "Preklopi lomljenje vrstic" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Zamenjaj presledke z razmaki" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Preklopi trenutno zvijanje" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Zvij vse" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Odvij vse" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Osveži seznam simbolov" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Odstrani _oznake" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Odstrani oznake _napak" + +#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 +#: ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Zgradi" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 +#: ../src/toolbar.c:69 msgid "Compile" msgstr "Prevedi" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Zgradi vse" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Zgradi tarčo po meri" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Zgradi objekt" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Naslednja napaka" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Predhodna napaka" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Zaženi" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Zaženi (alternativni ukaz)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Možnosti gradnje" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Prikaži barvni izbiralnik" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Help" msgstr "Pomoč" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Bližnjice tipkovnice" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Naslednje bližnjice tipkovnice so nastavljive:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Preklopi v dokument" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Tu natipkajte karkoli želite, uporabite to kot vašo beležko." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Spodletelo nalaganje ene ali večih datotek seje." @@ -3172,111 +3309,113 @@ msgid "Debug Messages" msgstr "Razhroščevalna sporočila" -#: ../src/main.c:124 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"Nastavi začetni stolpec za prvo odprto datoteko (uporabno v povezavi z --" -"line)" +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "Počis_ti" + +#: ../src/main.c:122 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Nastavi začetni stolpec za prvo odprto datoteko (uporabno v povezavi z --line)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Uporabi alternativno nastavitveno mapo" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Dolgovezi" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Natisni notranja imena tipov datotek" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Ustvari splošno datoteko (glej dokumentacijo)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" -msgstr "" +msgstr "Brez predobdelave C/C++ datotek ob ustvarjanju značk" # instance==izvod -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Ne odpri datotek v zagnanem izvodu, prisili odpiranje novega izvoda" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Uporabi ime datoteke te vtičnice za komuniciranje z zagnano instanco programa Geany" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Vrne seznam odprtih dokumentov v zagnani instanci programa Geany" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" -msgstr "" +msgstr "Nastavi začetno številko vrstice za prvo odprto datoteko" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Ne prikaži sporočilnega okna ob zagonu" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" -msgstr "Ne naloži podatkov za samodejno dopolnjevanje (glej dokumentacijo)" +msgstr "Ne nalagaj podatkov za samodejno dopolnjevanje (glej dokumentacijo)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" -msgstr "Ne naloži vstavkov" +msgstr "Ne nalagaj vstavkov" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Izpiši Geanyjevo namestitveno predpono" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" -msgstr "Ne naloži datotek prejšnje seje" +msgstr "Ne nalagaj datotek prejšnje seje" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" -msgstr "Ne naloži podpore terminalu" +msgstr "Ne nalagaj podpore terminalu" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Ime datoteke libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Dolgovezi" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Prikaži različico in zaključi" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" -msgstr "" +msgstr "[DATOTEKE...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(zgrajeno na %s z GTK %d.%d.%d, Glib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Premaknem zdaj?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany mora premakniti vašo staro nastavitveno mapo pred zagonom." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." msgstr "Vaša nastavitvena mapa je bila uspešno premaknjena iz \"%s\" v \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"Vaše stare nastavitvene mape ni bilo mogoče premakniti iz \"%s\" v \"%s\" (%" -"s). Prosim, premaknite jo ročno na novo lokacijo." +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "Vaše stare nastavitvene mape ni bilo mogoče premakniti iz \"%s\" v \"%s\" (%s). Prosim, premaknite jo ročno na novo lokacijo." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3287,51 +3426,51 @@ "Lahko boste imeli težave z uporabo Geany brez nastavitvene mape.\n" "Vseeno poženem Geany?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Datoteke ni bilo mogoče najti '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1044 #, c-format msgid "This is Geany %s." msgstr "To je Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1046 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Nastavitvene mape ni bilo mogoče ustvariti (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1257 msgid "Configuration files reloaded." msgstr "Osvežene nastavitvene datoteke." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Sporočila stanja" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:542 +msgid "C_opy" +msgstr "K_opiraj" + +#: ../src/msgwindow.c:551 msgid "Copy _All" msgstr "Kopiraj _vse" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:581 msgid "_Hide Message Window" msgstr "_Skrij sporočilno okno" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:637 #, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"Vstavek \"%s\" ni binarno združljiv s to različico Geany - prosimo, ponovno " -"prevedite vstavek. " +msgid "Could not find file '%s' - trying the current document path." +msgstr "Datoteka ni najdena: '%s'. trying the current document path." -#: ../src/plugins.c:869 +#: ../src/plugins.c:464 +#, c-format +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "Vstavek \"%s\" ni binarno združljiv s to različico Geany - prosimo, ponovno prevedite vstavek. " + +#: ../src/plugins.c:909 msgid "_Plugin Manager" msgstr "_Upravitelj vstavkov" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1086 #, c-format msgid "" "Plugin: %s %s\n" @@ -3342,762 +3481,855 @@ "Opis: %s\n" "Avtor(ji): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1162 msgid "Active" msgstr "Aktiven" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1168 msgid "Plugin" msgstr "Vstavek" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1192 msgid "No plugins available." msgstr "Ni vstavkov na voljo." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1272 msgid "Plugins" msgstr "Vstavki" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Iz spodnjega seznama izberite tiste vstavke, ki se naj naložijo ob zagonu " -"Geany. " +#: ../src/plugins.c:1292 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Izberite, kateri vstavki se naj naložijo ob zagonu:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1304 msgid "Plugin details:" msgstr "Podrobnosti o vstavku:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Nastavi vstavke" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Zagrabi tipko" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Pritisnite kombinacijo tipk, ki jo želite uporabiti za \"%s\"." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 +#: ../src/symbols.c:1866 msgid "_Expand All" msgstr "_Razširi vse" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 +#: ../src/symbols.c:1871 msgid "_Collapse All" -msgstr "" +msgstr "_Zloži vse" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Dejanje" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Bližnjica" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "_Dovoli" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Prezri" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Naj bodo povezave tipk prezrte? " -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Kombinacije '%s' se že uporablja za \"%s\". " +#: ../src/prefs.c:1543 +#: ../src/vte.c:269 +#: ../src/vte.c:723 +#: ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + # add manually GeanyWrapLabels because they can't be added with Glade # page Tools #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" +msgstr "Spodaj vnesite pot do orodij. Nepotrebnih orodij ne vnašate in pustite prazno pot." +# stran Vzorci #. page Templates -#: ../src/prefs.c:1519 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" - -#: ../src/prefs.c:1523 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany or force the reload of the settings using Tools->Reload Configuration." -"" -msgstr "" -"Opomba: Da bodo vse spremembe učinkovale, morate ponovno zagnati Geany " -"ali ga prisiliti naj osveži nastavitve z uporabo Orodja>Osveži nastavitve." +#: ../src/prefs.c:1624 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Nastavite uporabo podatkov v vzorcih. Glejte dokumentacijo za podrobnosti." + +#: ../src/prefs.c:1628 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." +msgstr "Opomba: Da bodo vse spremembe učinkovale, morate ponovno zagnati Geany ali ga prisiliti naj osveži nastavitve z uporabo Orodja>Osveži nastavitve." #. page Keybindings -#: ../src/prefs.c:1529 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" +#: ../src/prefs.c:1634 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Tu lahko spremenite bližnjice tipkovnice za različna dejanja. Izberite eno od njih in pritisnite gumb Spremeni za vnos nove bližnjice ali dvokliknite dejanje za urejanje niza, ki neposredno predstavlja bližnjico." +# stran Tiskanje #. page Printing -#: ../src/prefs.c:1534 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" +#: ../src/prefs.c:1639 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Opomba: Vgrajeno GTK tiskanje je na voljo le kadar je Geany zgrajen z GTK 2.10 ali višjim in Geany tudi teče v okolju z GTK 2.10 ali višjim." #. page Editor->Indentation -#: ../src/prefs.c:1540 -msgid "" -"Warning: these settings are overridden by the current project. See " -"Project->Properties." -msgstr "" +#: ../src/prefs.c:1645 +msgid "Warning: these settings are overridden by the current project. See Project->Properties." +msgstr "Opozorilo: teh nastavitev tekoči projekt ne upošteva (so prezrte). Glejte Projekt->Možnosti." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "Nabor znakov urejevalnika ni nabor znakov z enojnimi razmaki (vrste monospace)! " #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "Besedilo bo razmaknjeno napačno." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" -msgstr "" +msgstr "Stran %d od %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Nastavitev dokumenta" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" -msgstr "" +msgstr "Natisni le osnovno ime natisnjene datoteke, brez poti" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Stran %d od %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Tiskanje datoteke %s je bilo preklicano." +msgid "Did not send document %s to the printing subsystem." +msgstr "Dokument %s ni bil poslan v tiskanje." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Datoteka %s natisnjena." +msgid "Document %s was sent to the printing subsystem." +msgstr "Dokument %s je bil poslan v tiskanje." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Tiskanje %s spodletelo (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." -msgstr "" +msgstr "Prosimo, najprej nastavite ukaz za tiskanje v pogovornem oknu Možnosti." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" "\n" "%s" msgstr "" +"Datoteka \"%s\" bo natisnjena z naslednjim ukazom:\n" +"\n" +"%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "" +msgstr "Tiskanje \"%s\" spodletelo (povratna koda: %s)." + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Datoteka %s natisnjena." # "projects" is part of the default project base path so be careful when translating # * please avoid special characters and spaces, look at the source for details or ask Frank #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projekti" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Nov projekt" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Ustva_ri" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 +#: ../src/project.c:413 msgid "Name:" msgstr "Ime:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 +#: ../src/project.c:426 msgid "Filename:" msgstr "Ime datoteke:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 +#: ../src/project.c:456 msgid "Base path:" msgstr "Osnovna pot:" -#: ../src/project.c:171 ../src/project.c:438 -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 "" -"Osnovni imenik vseh datotek, ki sestavljajo projekt. Lahko je nova pot ali " -"že obstoječe drevo imenikov. Poti lahko uporabljate relativno glede na " -"datotečno ime projekta." +#: ../src/project.c:170 +#: ../src/project.c:465 +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 "Osnovni imenik vseh datotek, ki sestavljajo projekt. Lahko je nova pot ali že obstoječe drevo imenikov. Poti lahko uporabljate relativno glede na datotečno ime projekta." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 +#: ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Izberite osnovno pot projekta" # V izvirniku - could not be loaded, ne: opened! -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 +#: ../src/project.c:263 +#: ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektne datoteke \"%s\" ni bilo mogoče odpreti." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 +#: ../src/project.c:269 msgid "Open Project" msgstr "Odpri projekt" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Projektne datoteke" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" zaprt." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Opis:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Zgradi v osnovni poti" - -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Zaženi ukaz:" - -#: ../src/project.c:461 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Nastavi nedatotečne delovne mape gradnje na uporabo osnovne mape:" + +#: ../src/project.c:484 +msgid "Set" +msgstr "Nastavi" + +#: ../src/project.c:486 +msgid "Set the working directories (on the Build tab) for the non-filetype build commands to use the base path" +msgstr "Nastavi delovne mape na osnovno pot (na zavihku Zgradi) med uporabo nedatotečno osnovanih ukazov gradnje." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Datotečni vzorci:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" -msgstr "" +msgstr "Ali želite zapreti datoteko pred nadaljevanjem?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." -msgstr "" +msgstr "Projekt '%s' je že odprt." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." -msgstr "" +msgstr "Določeno ime projekta je prekratko." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." -msgstr "" +msgstr "Določeno ime projekta je predolgo (največ %d znakov)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." -msgstr "" +msgstr "Določili ste napačno ime projektne datoteke." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" -msgstr "" +msgstr "Ustvarim osnovni imenik projekta?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." -msgstr "" +msgstr "Pot \"%s\" ne obstaja." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." -msgstr "" +msgstr "Osnovnega imenika projekta ni bilo možno ustvariti (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." -msgstr "" +msgstr "Projektne datoteke datoteke ni bilo možno zapisati (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." -msgstr "" +msgstr "Projekt \"%s\" ustvarjen." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." -msgstr "" +msgstr "Projekt \"%s\" shranjen." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 +#: ../src/project.c:872 msgid "Choose Project Filename" -msgstr "" - -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "" +msgstr "Izberite ime datoteke projektu" -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." -msgstr "" +msgstr "Projekt \"%s\" odprt." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" -msgstr "" +msgstr "_Uporabi regularne izraze" -#: ../src/search.c:220 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" +#: ../src/search.c:237 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "Uporabi regularne izraze v maniri POSIX. Za podrobnejšo razlago o uporabi regularnih izrazov si prosimo preberite dokumentacijo." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" -msgstr "" +msgstr "Išči naza_j" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" -msgstr "" +msgstr "Uporabi _ubežna zaporedja " -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" msgstr "" +"Ali naj bodo znaki \\\\, \\t, \\n" +", \\r and \\uXXXX (znaki Unicode) zamenjani z ustreznimi kontrolnimi znaki" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 +#: ../src/search.c:810 msgid "C_ase sensitive" -msgstr "" +msgstr "_Ločevanje malih/velikih črk" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 +#: ../src/search.c:816 msgid "Match only a _whole word" -msgstr "" +msgstr "Ujemanje samo _celih besed" -#: ../src/search.c:265 +# tako imenovano mehko iskanje +# so called softseek +#: ../src/search.c:282 msgid "Match from s_tart of word" -msgstr "" +msgstr "Ujemanje od _začetka besede" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Prejšnji" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Naslednji" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 +#: ../src/search.c:562 +#: ../src/search.c:740 msgid "_Search for:" msgstr "_Išči:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Najdi vse" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Označi" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Označi vsa ujemanja v trenutnem dokumentu" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 +#: ../src/search.c:622 msgid "In Sessi_on" msgstr "_V seji" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 +#: ../src/search.c:627 msgid "_In Document" msgstr "V _dokumentu" # close window checkbox #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 +#: ../src/search.c:640 msgid "Close _dialog" msgstr "_Zapri pogovorno okno" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 +#: ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Onemogoči to možnost da ohrani odprto pogovorno okno" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Najdi & _zamenjaj" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Za_menjaj z:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Zamenjaj _vse" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "V i_zboru" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Zamenja vse pojavitve podbesedila v izbranem besedilu" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Imenik:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Kodi_ranje:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Fiksni _nizi" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grepovi regularni izrazi" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 +#: ../src/search.c:801 msgid "See grep's manual page for more information" -msgstr "" -"Za več informacij glej grepov priročnik (man grep ali info grep v terminalu)." +msgstr "Za več informacij glej grepov priročnik (man grep ali info grep v terminalu)." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Razširjeni regularni izrazi" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_Ponavljaj v podimenikih" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Obrni iskalne zadetke" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Obrne zadetke iskanja in tako izbere nezadete vrstice" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "_Dodatne možnosti:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Razne druge možno za Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 +#: ../src/search.c:1881 +#: ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Najden %d zadetek za \"%s\"." +msgstr[1] "Najdena %d zadetka za \"%s\"." +msgstr[2] "Najdeni %d zadetki za \"%s\"." +msgstr[3] "Najdenih %d zadetkov za \"%s\". " + +# %u appears twice! Think about counting. Same for the next string (Bad regex) and some else. +#: ../src/search.c:1177 +#, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Zamenjanih %u ujemanj besedila v %u dokumentih" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." -msgstr "" +msgstr "Napačna mapa za iskanje v datotekah." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." -msgstr "" +msgstr "Ni besedila za iskanje." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" +msgstr "Ni mogoče izvesti orodja grep '%s'; preverite pot v Možnosti>Orodja." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." -msgstr "" +msgstr "Iščem..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "" +msgstr "%s %s -- %s (v mapi: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" -msgstr "" +msgstr "Ni mogoče odpreti mape (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Iskanje spodletelo." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Iskanju je uspelo najti %d zadetek." +msgstr[1] "Iskanju je uspelo najti %d zadetka." +msgstr[2] "Iskanju je uspelo najti %d zadetke." +msgstr[3] "Iskanju je uspelo najti %d zadetkov." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." +msgstr "Iskanje ni bilo uspešno." + +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Slab regularni izraz:: %s" + +# Probably correct wording of first sentence: Program Geany tried to access to the UNIX domain socket of another socket logged in as another user. +# And probably proper wording of last sentence: This is a fatal error and Geany will now have to quit. +# need reword - approved by Jože Klepec +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as another user.\n" +"This is a fatal error and Geany will now quit." msgstr "" +"Program Geany je poskusll dostopati do Unix domenske vtičnice druge instance prijavljen kot drug uporabnik.\n" +"To je usodna napaka in Geany mora zato sedaj zaključiti." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/symbols.c:611 +#: ../src/symbols.c:651 +#: ../src/symbols.c:718 msgid "Chapter" -msgstr "" +msgstr "Poglavje" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 +#: ../src/symbols.c:647 +#: ../src/symbols.c:719 msgid "Section" -msgstr "" +msgstr "Razdelek" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" -msgstr "" +msgstr "Razd1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" -msgstr "" +msgstr "Razd2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" -msgstr "" +msgstr "Razd2" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" -msgstr "" +msgstr "Dodatek" # &(tv_iters.tag_macro), _("Macros"), # &(tv_iters.tag_variable), _("Variables"), -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 +#: ../src/symbols.c:652 +#: ../src/symbols.c:668 +#: ../src/symbols.c:679 +#: ../src/symbols.c:766 +#: ../src/symbols.c:777 +#: ../src/symbols.c:789 +#: ../src/symbols.c:803 +#: ../src/symbols.c:815 +#: ../src/symbols.c:827 +#: ../src/symbols.c:842 +#: ../src/symbols.c:887 msgid "Other" -msgstr "" +msgstr "Drugo" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 +#: ../src/symbols.c:835 +#: ../src/symbols.c:867 msgid "Module" -msgstr "" +msgstr "Modul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 +#: ../src/symbols.c:762 +#: ../src/symbols.c:813 +#: ../src/symbols.c:825 +#: ../src/symbols.c:840 +#: ../src/symbols.c:852 msgid "Types" -msgstr "" +msgstr "Tipi" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" -msgstr "" +msgstr "Konstruktorji tipov" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 +#: ../src/symbols.c:638 +#: ../src/symbols.c:659 +#: ../src/symbols.c:667 +#: ../src/symbols.c:676 +#: ../src/symbols.c:688 +#: ../src/symbols.c:697 +#: ../src/symbols.c:750 +#: ../src/symbols.c:799 +#: ../src/symbols.c:822 +#: ../src/symbols.c:837 +#: ../src/symbols.c:874 msgid "Functions" -msgstr "" +msgstr "Funkcije" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 +#: ../src/symbols.c:637 msgid "Sections" -msgstr "" +msgstr "Razdelki" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" -msgstr "" +msgstr "Ključi" # &(tv_iters.tag_class), _("Constants"), # &(tv_iters.tag_member), _("Members"), # &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 +#: ../src/symbols.c:690 +#: ../src/symbols.c:751 +#: ../src/symbols.c:776 +#: ../src/symbols.c:801 +#: ../src/symbols.c:814 +#: ../src/symbols.c:823 +#: ../src/symbols.c:839 +#: ../src/symbols.c:886 msgid "Variables" -msgstr "" - -#: ../src/symbols.c:631 -msgid "Command" -msgstr "" +msgstr "Spremenljivke" -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" -msgstr "" +msgstr "Okolje" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 +#: ../src/symbols.c:720 msgid "Subsection" -msgstr "" +msgstr "Podrazdelek" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 +#: ../src/symbols.c:721 msgid "Subsubsection" -msgstr "" - -#: ../src/symbols.c:636 -msgid "Label" -msgstr "" +msgstr "Podpodrazdelek" -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" -msgstr "" +msgstr "Zapisi" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 +#: ../src/symbols.c:759 +#: ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" -msgstr "" - -#: ../src/symbols.c:655 -msgid "My" -msgstr "" +msgstr "Paket" -#: ../src/symbols.c:656 -msgid "Local" -msgstr "" +#: ../src/symbols.c:677 +#: ../src/symbols.c:826 +#: ../src/symbols.c:849 +msgid "Labels" +msgstr "Oznake" -#: ../src/symbols.c:657 -msgid "Our" -msgstr "" +#: ../src/symbols.c:678 +#: ../src/symbols.c:689 +#: ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Konstante" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 +#: ../src/symbols.c:785 +#: ../src/symbols.c:797 +#: ../src/symbols.c:810 +#: ../src/symbols.c:836 msgid "Interfaces" -msgstr "" +msgstr "Vmesniki" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 +#: ../src/symbols.c:708 +#: ../src/symbols.c:729 +#: ../src/symbols.c:739 +#: ../src/symbols.c:748 +#: ../src/symbols.c:786 +#: ../src/symbols.c:798 +#: ../src/symbols.c:811 +#: ../src/symbols.c:873 msgid "Classes" -msgstr "" - -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "" +msgstr "Razredi" -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" -msgstr "" +msgstr "Sidra" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1 naslovi" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2 naslovi" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3 naslovi" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID izbirniki" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Izbirniki tipov" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 +#: ../src/symbols.c:774 msgid "Modules" msgstr "Moduli" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" -msgstr "" +msgstr "Enoelementni nizi " -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 +#: ../src/symbols.c:740 +#: ../src/symbols.c:749 +#: ../src/symbols.c:787 +#: ../src/symbols.c:812 msgid "Methods" msgstr "Metode" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 +#: ../src/symbols.c:870 msgid "Namespaces" -msgstr "" +msgstr "Imenski obsegi" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "Lastnosti" +msgstr "Postopki" -#: ../src/symbols.c:736 -#, fuzzy +#: ../src/symbols.c:752 msgid "Imports" -msgstr "Izvozi" +msgstr "Uvaža" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Entitete" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Arhitekture" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funkcije / Procedure" + +# &(tv_iters.tag_class), _("Constants"), +# &(tv_iters.tag_member), _("Members"), +# &(tv_iters.tag_macro), _("Macros"), +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Spremenljivke / Signali" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Postopki / Komponente" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Dogodki" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funkcije / Opravila" + +#: ../src/symbols.c:788 +#: ../src/symbols.c:875 msgid "Members" msgstr "Člani" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Oznake" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Podprogrami" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" -msgstr "" +msgstr "Bloki" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 +#: ../src/symbols.c:859 +#: ../src/symbols.c:883 msgid "Macros" -msgstr "" +msgstr "Makroji" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" -msgstr "" +msgstr "Določila" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" -msgstr "" +msgstr "Tarče" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" -msgstr "" +msgstr "Zapisi" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" -msgstr "" +msgstr "Definicije tipov / Naštevanja" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Neznana datotečna vrsta za \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "" -"Spodletelo ustvarjanje datoteke oznak, verjetno ker ni bilo najdenih nobenih " -"oznak.\n" +msgstr "Spodletelo ustvarjanje datoteke oznak, verjetno ker ni bilo najdenih nobenih oznak.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4106,199 +4338,203 @@ "Uporaba: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" msgstr "" "Primer:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Naloži značke" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany datoteke značk (*.tags) " #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Naložene %s značke iz datoteke z značkami '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Ni možno naložiti datoteke z značkami '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Navedba \"forward\" \"%s\" ni najdena." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Opredelitev \"%s\" ni najdena." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Uredi po _imenu" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" -msgstr "" +msgstr "Uredi po _videzu" + +#: ../src/templates.c:278 +msgid "Old" +msgstr "Staro" #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Shrani trenutno datoteko" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Shrani vse odprte datoteke" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Ponovno odpre trenutno datoteko na disku" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Zapri trenutno datoteko" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Zapri vse odprte datoteke" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Izreži tekočo izbiro" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Kopiraj tekočo izbiro" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Prilepi vsebino odložišča" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Zbriši trenutno izbiro" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Razveljavi zadnjo spremembo" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Ponovi zadnjo spremembo" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Prevedi trenutno datoteko" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Poženi ali preglej trenutno datoteko" -#: ../src/toolbar.c:70 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette" -msgstr "" -"Odpre pogovorno okno barvnega izbiralnika kjer interaktivno izbirate barve s " -"palete" - #: ../src/toolbar.c:71 -msgid "Zoom in the text" -msgstr "Poveča besedilo" +msgid "Open a color chooser dialog, to interactively pick colors from a palette" +msgstr "Odpre pogovorno okno barvnega izbiralnika kjer neposredno izberete barve s palete." #: ../src/toolbar.c:72 -msgid "Zoom out the text" -msgstr "Zmanjša besedilo" +msgid "Zoom in the text" +msgstr "Poveča besedilo." #: ../src/toolbar.c:73 -msgid "Decrease indentation" -msgstr "Zmanjša zamik" +msgid "Zoom out the text" +msgstr "Zmanjša besedilo." #: ../src/toolbar.c:74 +msgid "Decrease indentation" +msgstr "Zmanjša zamik." + +#: ../src/toolbar.c:75 msgid "Increase indentation" -msgstr "Poveča zamik" +msgstr "Poveča zamik." -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 +#: ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Najdi vneseno besedilo v trenutni datoteki" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 +#: ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Skoči na vneseno številko vrstice" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Pokaži pogovorno okno možnosti" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Zapusti Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Natisni dokument" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "Označi vsa ujemanja v trenutnem dokumentu" +msgstr "Zamenjaj besedilo v trenutnem dokumentu" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Ustvari novo datoteko" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Ustvari novo datoteko iz vzorca" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Odpri obstoječo datoteko" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Odpri nedavno datoteko" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Izberite več možnosti gradnje" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Pojdi" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "Ločilo" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- Ločilo ---" -#: ../src/toolbar.c:897 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" +#: ../src/toolbar.c:946 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Izberite izbire, ki naj bodo prikazane na orodni vrstici. S potegom in spuščanjem jih lahko preuredite." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "Dostopne izbire" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "Prikaz" +msgstr "Prikazane izbire" #: ../src/tools.c:153 #, c-format -msgid "" -"The executed custom command returned an error. Your selection was not " -"changed. Error message: %s" -msgstr "" -"Izvajani ukaz po meri je vrnil napako. Vaša izbira se ni spremenila. " -"Sporočilo o napaki: %s" +msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" +msgstr "Izvajani ukaz po meri je vrnil napako. Vaša izbira se ni spremenila. Sporočilo o napaki: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4314,434 +4550,418 @@ msgid "Custom command failed: %s" msgstr "Ukaz po meri je spodletel: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 +#: ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Nastavi ukaze po meri" #: ../src/tools.c:311 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "Izbrani izbor lahko pošljete kateremukoli od teh ukazov in izhod ukaza zamenja trenutni izbor." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Ni nastavljenih ukazov po meri." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Štetje besed" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "izbor" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "celoten dokument" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Obseg:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Vrstice:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Besede:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Znaki:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Ni najdenih značk" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Pokaži seznam sim_bolov" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Pokaži seznam _dokumentov" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 +#: ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Skr_ij stransko vrstico" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "Pokaži vrstico stanja" +msgstr "Pokaži _poti" # Status bar statistics: col = column, sel = selection. #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "vrstica: %d\t stolp: %d\t izbor: %d\t" +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "vrst: %d / %d\t st: %d\t izb: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "PRE" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "VST" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "Raz" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "Pre" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "R/P" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "način: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "kodiranje: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "tip datoteke: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "doseg: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Nabor znakov osvežen (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C standardna knjižnica" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C standardna knjižnica)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ standardna knjižnica" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" -msgstr "" +msgstr "_Nastavi prilagojeno obliko datuma" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Izberite mapo" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Izberite datoteko" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "_Nastavitvene datoteke" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Shrani vse" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Zapri vse" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "_Nastavi pot iz dokumenta" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Ponovno zaženi terminal" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "_Vnosne metode" -#: ../src/vte.c:670 -msgid "" -"Could not change the directory in the VTE because it probably contains a " -"command." -msgstr "" -"Ni bilo mogoče zamenjati mapo v VTE, ker njena pot verjetno vsebuje ukaz." - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminalski vstavek" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Te nastavitve veljajo za gradnik navideznega terminalskega posnemovalnika " -"(VTE) le, če je možno naložiti VTE knjižnico. " - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Nabor znakov v terminalu:" +#: ../src/vte.c:638 +msgid "Could not change the directory in the VTE because it probably contains a command." +msgstr "Ni bilo mogoče zamenjati mapo v VTE, ker njena pot verjetno vsebuje ukaz." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Nabor znakov:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Nastavi nabor znakov v terminalskem gradniku" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Barva ospredja:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Barva ozadja:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" -msgstr "Nastavi barvo ospredja besedilu v terminalskem gradniku" +msgstr "Nastavi barvo ospredja besedilu v terminalskem gradniku." -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" -msgstr "Nastavi barvo ozadja besedilu v terminalskem gradniku" +msgstr "Nastavi barvo ozadja besedilu v terminalskem gradniku." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Vrstice zgodovine:" -#: ../src/vte.c:790 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget" -msgstr "" -"Določa zgodovino v vrsticah, ki jo lahko zavrtite nazaj v gradniku terminala" +#: ../src/vte.c:786 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget" +msgstr "Določa zgodovino v vrsticah, ki jo lahko zavrtite nazaj v gradniku terminala." -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Lupina:" -#: ../src/vte.c:802 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation" -msgstr "" -"Nastavi pot do lupine, ki naj bo zagnana znotraj posnemovalnika termnala" +#: ../src/vte.c:798 +msgid "Sets the path to the shell which should be started inside the terminal emulation" +msgstr "Nastavi pot do lupine, ki naj bo zagnana znotraj posnemovalnika terminala." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Pomakni ob pritisku na tipko" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" -msgstr "Ali naj se pomakne izpis do dna, ko je pritisnjena tipka" +msgstr "Ali naj se izpis pomakne do dna okna/zaslona, ko je pritisnjena tipka." -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Pomakni na izhodu" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" -msgstr "Ali naj se izpis pomakne navzdol, ko se ustvari izhod" +msgstr "Ali naj se izpis pomakne navzdol, ko se ustvari izhod." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Utripanje kazalke" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Ali naj kazalka utripa ali ne?" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Zanemari bližnjice Geany-ja" -#: ../src/vte.c:833 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" -"Dovoli VTE da sprejema bližnjice s tipkovnice (ločeno od usmerjenih ukazov)" +#: ../src/vte.c:829 +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "Dovoli VTE da sprejema bližnjice s tipkovnice (ločeno od usmerjenih ukazov)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Onemogoči bližnjico v meni (privzeto - F10)" -#: ../src/vte.c:837 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" -"Ta možnost onemogoči bližnjico pojavljanja menijske vrstice (privzeto - " -"F10). Onemogočenje je lahko uporabno, če na primer, uporabljate Midnight " -"Comander znotraj VTE." +#: ../src/vte.c:833 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Ta možnost onemogoči bližnjico pojavljanja menijske vrstice (privzeto - F10). Onemogočenje je lahko uporabno, če na primer, uporabljate Midnight Comander znotraj VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 +#: ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Sledi poti trenutne datoteke" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" -msgstr "Ali naj se izvede \"cd $path\" ko preklopite med odprtimi datotekami" +msgstr "Ali naj se izvede \"cd $path\", ko preklopite med odprtimi datotekami." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Ne uporabi zagonske skripte" -#: ../src/vte.c:847 -msgid "" -"Don't use the simple run script which is usually used to display the exit " -"status of the executed program" -msgstr "" -"Ne uporabi preproste zagonske skripte katera je običajno uporabljena za " -"prikaz izhodnega statusa izvajanega programa" +#: ../src/vte.c:843 +msgid "Don't use the simple run script which is usually used to display the exit status of the executed program" +msgstr "Ne uporabi preproste zagonske skripte katera je običajno uporabljena za prikaz izhodnega statusa izvajanega programa." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Izvedi programe v VTE" -#: ../src/vte.c:851 -msgid "" -"Run programs in VTE instead of opening a terminal emulation window. Please " -"note, programs executed in VTE cannot be stopped" -msgstr "" -"Izvede programe v VTE namesto odprtja okna posnemovalnika terminala. Velja " -"opozoriti, da programov v VTE ni mogoče ustaviti" +#: ../src/vte.c:847 +msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped" +msgstr "Izvede programe v VTE namesto odprtja okna posnemovalnika terminala. Velja opozoriti, da programov v VTE ni mogoče ustaviti." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany projektne datoteke" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Izvajalne datoteke" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Graditelj razredov" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Ustvari izvorno kodo za nove tipe razredov." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Ustvari razred" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Imenski obsegi" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Imenski obsegi" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Razred" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Ime razreda:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Zaglavna datoteka:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Datoteka izvorne kode:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Dedovanje" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Osnovni razred:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Osnovna izvorna datoteka:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Osnovno zaglavje:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Splošno" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Osnovni GType:" -#: ../plugins/classbuilder.c:414 +# lahko tudi: "Izvede:" +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Izvrši:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Možnosti" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" -msgstr "Ustvari konstruktor" +msgstr "Ustvari ustvarjalec" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" -msgstr "Ustvari destruktor" +msgstr "Ustvari uničevalec" + +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Je abstraktno" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Je enoelementni niz " + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" -msgstr "GTK+ tip konstruktorja" +msgstr "GTK+ tip ustvarjalec" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Ustvari ra_zred" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ razred" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ razred" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP razred" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML znaki" @@ -4750,95 +4970,99 @@ msgid "Inserts HTML character entities like '&'." msgstr "Vstavi HTML znakovne entitete kot '&'." -#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/htmlchars.c:39 +#: ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 +#: ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geany razvojna ekipa" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML znaki" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Znaki ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Grški znaki" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Matematični znaki" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Tehnični znaki" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Puščični znaki" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Ločila" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Razni drugi znaki" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 +#: ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Mape nastavitev vstavkov ni bilo možno ustvariti." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Posebni znaki" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Vstavi" -#: ../plugins/htmlchars.c:458 -msgid "" -"Choose a special character from the list below and double click on it or use " -"the button to insert it at the current cursor position." -msgstr "" -"Izberite poseben znak iz spodnjega seznama in kliknite nanj ali uporabite " -"gumb, da ga vstavite na trenutno mesto kazalca." +#: ../plugins/htmlchars.c:493 +msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." +msgstr "Izberite poseben znak iz spodnjega seznama in kliknite nanj ali uporabite gumb, da ga vstavite na trenutno mesto kazalca." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Znak" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (ime)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "_Vstavi posebne HTML znake" # Doda menijski vnos za funkcije html zamenjav #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML zamenjave" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTMLpreklop" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Masovna zamenjava posebnih znakov" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Vstavi posebne HTML znake" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Zamenjaj posebne znake" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Preklopi stanje vstavka" @@ -4860,149 +5084,139 @@ # to render=osvetliti, izrisati, izpisati #: ../plugins/export.c:185 -msgid "" -"Renders the font size of the document together with the current zoom level" +msgid "Renders the font size of the document together with the current zoom level" msgstr "Izpiše nabor znakov dokumenta hkrati s trenutno stopnjo povečave" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument uspešno izvožen kot '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Datoteke '%s' ni mogoče zapisati (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Datoteka '%s' že obstaja. Jo želite prepisati?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Izvozi" # HTML #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Kot _HTML" # LaTeX #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Kot _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Brskalnik datotek" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Doda zavihek brskalnika datotek na stransko vrstico." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Izbranih preveč postavk!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Izvajanje nastavljenega zunanjega ukaza '%s' ni bilo mogoče (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Odpri _zunanje" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Najdi v datotekah" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Pokaži _skrite datoteke" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Gor" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Osveži" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Domov" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Nastavi pot iz dokumenta" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Počisti filter" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Izberite vaše datoteke z običajnimi zamenjavami" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" -msgstr "" +msgstr "Osredotoči se na datotečni seznam" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" -msgstr "" - -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Mape nastavitev vstavkov ni bilo možno ustvariti." +msgstr "Osredotoči se na vnos poti" # ???? -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Zunanji ukaz za odpiranje:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, 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 "" -"Ukaz, ki naj se izvede ob ukazu \"Odpri z\". Uporabite lahko nadomestna " -"znaka %f in %d.\n" +"Ukaz, ki naj se izvede ob ukazu \"Odpri z\". Uporabite lahko nadomestna znaka %f in %d.\n" "%f bo zamenjan s polno potjo do datoteke in njenim imenom\n" "%d pa s potjo do izbrane datoteke brez njenega imena." -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Pokaži skrite datoteke" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Skrij objektne datoteke" -#: ../plugins/filebrowser.c:1117 -msgid "" -"Don't show generated object files in the file browser, this includes *.o, *." -"obj. *.so, *.dll, *.a, *.lib" -msgstr "" -"Ne prikaže objektnih datotek v brskalniku datotek (*.o, *.obj, *.so, *.dll, " -"*.a, *.lib)" +#: ../plugins/filebrowser.c:1212 +msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +msgstr "Ne prikaže objektnih datotek v brskalniku datotek (*.o, *.obj, *.so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "Nastavi osnovni imenik projekta" +msgstr "Uporabi osnovni imenik projekta" -#: ../plugins/filebrowser.c:1132 -msgid "" -"Change the directory to the base directory of the currently opened project" +#: ../plugins/filebrowser.c:1227 +msgid "Change the directory to the base directory of the currently opened project" msgstr "Spremeni mapo v osnovni imenik trenutno odprtega projekta" #: ../plugins/saveactions.c:39 @@ -5011,8 +5225,7 @@ #: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." -msgstr "" -"Ta vstavek zagotavlja različna dejanja v povezavi s shranjevanjem datotek." +msgstr "Ta vstavek zagotavlja različna dejanja v povezavi s shranjevanjem datotek." #: ../plugins/saveactions.c:169 #, c-format @@ -5053,7 +5266,8 @@ msgid "Auto Save" msgstr "Samodejno shrani" -#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:545 +#: ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Omogoči" @@ -5068,7 +5282,7 @@ #: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" -msgstr "" +msgstr "Ob samodejni shranitvi datotek _natisni sporočilo stanja" #: ../plugins/saveactions.c:578 msgid "Save only current open _file" @@ -5096,13 +5310,11 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "" -"Oblika časa/da_tuma za varnostne kopije datotek (\"man strftime\" za " -"podrobnosti):" +msgstr "Oblika časa/da_tuma za varnostne kopije datotek (\"man strftime\" za podrobnosti):" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" -msgstr "Koliko nivojev kopije vk_ljučiti v cilj varnostne kopije" +msgstr "Koliko nivojev kopije želite vk_ljučiti v cilj varnostne kopije:" #: ../plugins/splitwindow.c:36 msgid "Split Window" @@ -5112,54 +5324,133 @@ msgid "Splits the editor view into two windows." msgstr "Razdeli pogled urejevalnika v dve ločeni okni" -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "Označi vsa ujemanja v trenutnem dokumentu" +msgstr "Pokaži trenutni dokument" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 +#: ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Združi" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "_Razdeli okno" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" -msgstr "_Horizontalno" +msgstr "_Vodoravno" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" -msgstr "_Vertikalno" +msgstr "_Navpično" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Razdeli vodoravno" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Razdeli navpično" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Združi" +#~ msgid "Try to resave the file?" +#~ msgstr "Želite ponovno shraniti?" + +#~ msgid "_Customize Toolbar" +#~ msgstr "Pri_lagodi orodno vrstico" + +#~ msgid "Icon style:" +#~ msgstr "Slog ikon:" + +#~ msgid "Icon size:" +#~ msgstr "Velikost ikon:" + +#~ msgid "Appearance" +#~ msgstr "Izgled" + +#~ msgid "Hard tab width:" +#~ msgstr "Širina trajnega razmaka:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "Širina razmaka, ko uporabljamo Razmake & presledke v dokumentu" + +#~ msgid "Long line marker:" +#~ msgstr "Oznaka dolge vrste:" + +#~ msgid "Long line marker color:" +#~ msgstr "Barva oznake dolge vrste:" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminalski vstavek" + +#~ msgid "Terminal font:" +#~ msgstr "Nabor znakov v terminalu:" -#~ msgid "Diff file" -#~ msgstr "Diff datoteka" +#~ msgid "Duplicate line or selection" +#~ msgstr "Podvoji vrstico ali izbor" -#~ msgid "reStructuredText file" -#~ msgstr "reStructuredText datoteka" +#~ msgid "Send Selection to Terminal" +#~ msgstr "Pošlji izbor terminalu" -#~ msgid "Select _All" -#~ msgstr "Izberi _Vse" +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Tiskanje datoteke %s je bilo preklicano." -#~ msgid "Automatic symbol completion" -#~ msgstr "Samodokončanje simbolov" +#~ msgid "Replaced text in %u file." + +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Zamenjano besedilo v %u datoteki." +#~ msgstr[1] "Zamenjano besedilo v %u datotekah." +#~ msgstr[2] "Zamenjano besedilo v %u datotekah." +#~ msgstr[3] "Zamenjano besedilo v %u datotekah." + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Te nastavitve veljajo za gradnik navideznega terminalskega posnemovalnika " +#~ "(VTE) le, če je možno naložiti VTE knjižnico. " + +#~ msgid "" +#~ "Notes:\n" +#~ " %d, %e, %f, %p are substituted in Commands and Working dir, see manual " +#~ "for details\n" +#~ " Non-filetype menu Item 2 opens a dialog and appends the reponse to the " +#~ "command" +#~ msgstr "" +#~ "Opombe:\n" +#~ " %d, %e, %f, %p so zamenjane v Ukazih in Delovnih imenikih; za " +#~ "podrobnosti glej priročnik.\n" +#~ " Nedatotečni izbirnik št. 2 odpre pogovorno okno in doda odziv na ukaz." + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr "dummy tooltip, don't translate this." #~ msgid "" -#~ "For all changes you make in this file to take effect, you need to restart " -#~ "Geany." +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" #~ msgstr "" -#~ "Da bodo vse spremembe v tej datoteki učinkovale boste morali ponovno " -#~ "zagnati Geany." +#~ "Uporabi beli tekst na črnem ozadju in obrne vse barve. Ta izbira zahteva " +#~ "ponovni zagon Geany" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Iz spodnjega seznama izberite tiste vstavke, ki se naj naložijo ob zagonu " +#~ "Geany. " + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Iskanje spodletelo" + +#~ msgid "My" +#~ msgstr "Moj" + +#~ msgid "Local" +#~ msgstr "Lokalen" + +#~ msgid "Our" +#~ msgstr "Naš" + +#~ msgid "Unsplit" +#~ msgstr "Združi" diff -Nru geany-0.18/po/sv.po geany-0.19/po/sv.po --- geany-0.18/po/sv.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/sv.po 2010-06-04 20:28:08.000000000 +0100 @@ -1,16 +1,17 @@ # Swedish translations for geany package. -# Copyright (C) 2007 - 2009 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2007 - 2010 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # -# Tony Mattsson , 2007 - 2009 +# Tony Mattsson , 2007 - 2010 msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-04-26 18:32+0100\n" +"POT-Creation-Date: 2010-06-04 21:24+0200\n" +"PO-Revision-Date: 2010-06-04 11:29+0100\n" "Last-Translator: Tony Mattsson \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,7 +24,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Ett snabbt och lättviktigt IDE som använder GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -31,68 +32,68 @@ msgid "Integrated Development Environment" msgstr "Integrerad utvecklingsmiljö" -#: ../src/about.c:139 +#: ../src/about.c:146 msgid "About Geany" msgstr "Om Geany" -#: ../src/about.c:189 +#: ../src/about.c:196 msgid "A fast and lightweight IDE" msgstr "Ett snabbt och lättviktigt IDE" -#: ../src/about.c:210 +#: ../src/about.c:217 #, c-format msgid "(built on or after %s)" msgstr "(byggd på eller efter %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:248 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:264 msgid "Developers" msgstr "Utvecklare" -#: ../src/about.c:266 +#: ../src/about.c:273 msgid "maintainer" msgstr "ansvarig" -#: ../src/about.c:274 +#: ../src/about.c:281 msgid "developer" msgstr "utvecklare" -#: ../src/about.c:282 +#: ../src/about.c:289 msgid "translation maintainer" msgstr "ansvarig för översättningar" -#: ../src/about.c:291 +#: ../src/about.c:298 msgid "Translators" msgstr "Översättare" -#: ../src/about.c:311 +#: ../src/about.c:318 msgid "Previous Translators" msgstr "Tidigare översättare" -#: ../src/about.c:332 +#: ../src/about.c:339 msgid "Contributors" msgstr "Medarbetare " -#: ../src/about.c:342 +#: ../src/about.c:349 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Några av de många bidragsgivarna (för en komplett lista, läs filen %s):" -#: ../src/about.c:368 +#: ../src/about.c:375 msgid "Credits" msgstr "Tack till ..." -#: ../src/about.c:382 +#: ../src/about.c:389 msgid "License" msgstr "Licens" -#: ../src/about.c:391 +#: ../src/about.c:398 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -100,279 +101,281 @@ "Licenstexten kunde inte hittas. Var god besök http://www.gnu.org/licenses/" "gpl-2.0.txt för att se den online." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Kunde ej hitta terminalen \"%s\" (kontrollera sökvägen till terminalen i " -"Inställningar)" +msgid "failed to substitute %%p, no project active" +msgstr "misslyckades ersätta %%p, inget projekt är aktivt" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "Processen misslyckades, ingen arbetsmapp är angiven" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Misslyckades exekvera \"%s\" (start-skriptet kunde inte skapas)" +msgid "%s (in directory: %s)" +msgstr "%s (i sökväg: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Processen misslyckades (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (i sökväg: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Misslyckades ändra arbetssökvägen till \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Misslyckades exekvera \"%s\" (start-skriptet kunde inte skapas)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Kunde inte exekvera filen i VTE därför att det troligvis innehåller ett " "kommando." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Kunde ej hitta terminalen \"%s\" (kontrollera sökvägen till terminalen i " +"Inställningar)" + +#: ../src/build.c:1083 msgid "Compilation failed." msgstr "Kompileringen misslyckades." -#: ../src/build.c:928 +#: ../src/build.c:1097 msgid "Compilation finished successfully." msgstr "Kompileringen lyckades." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "Kompilera" +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "Användardefinierad text" + +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Skriv in användardefinierad text här, allt text läggs till kommandot" -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "Bygg" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Kör Make all" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Kör Make med valbara parametrar" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Kör Make Object" - -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1333 msgid "_Next Error" msgstr "Nästa fel" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1335 msgid "_Previous Error" msgstr "Föregående fel" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Justera inkluderingar och argument" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "Visa DVI-fil" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Visa PDF-fil" +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "Ange _kommandon för att bygga" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Ange argument" +#: ../src/build.c:1625 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Kompilera aktuell fil" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Ange argument" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the default target" +msgstr "Bygger filen med Make-verktyget och förinställt mål" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "Anger program och parametrar för att kompilera och visa (La)TeX filer." +#: ../src/build.c:1641 +msgid "Build the current file with Make and the specified target" +msgstr "Bygger filen med Make-verktyget och ett specificerat mål" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Skapa DVI:" +#: ../src/build.c:1643 +msgid "Compile the current file with Make" +msgstr "Kompilera aktuell fil med Make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Skapa PDF:" +#: ../src/build.c:1670 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Processen kunde inte stoppas (%s)" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Förhandsvisa DVI:" +#: ../src/build.c:1687 ../src/build.c:1699 +msgid "No more build errors." +msgstr "Inga fler byggfel." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Förhandsvisa PDF:" +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "Ange rubrik för meny" + +#: ../src/build.c:1790 +msgid "Item" +msgstr "Element" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f kommer att ersättas med nuvarande filnamn, exempelvis test_fil.c\n" -"%e kommer att ersättas med namn utan filändelse, exempelvis test_fil" +#: ../src/build.c:1791 ../src/symbols.c:650 +msgid "Label" +msgstr "Etikett" + +#: ../src/build.c:1792 ../src/symbols.c:645 +msgid "Command" +msgstr "Kommando" + +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "Arbetsmapp" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Ange inkluderingar och argument" +#: ../src/build.c:1794 +msgid "Clear" +msgstr "Rensa" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Anger kommandon för att bygga och köra program." +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "Klicka för att ange menyrubrik" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1906 ../src/build.c:1908 #, c-format -msgid "%s commands" +msgid "%s Commands" msgstr "%s kommandon" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Kompilera:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Bygg:" +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "Ingen filtyp" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Exekvera:" +#: ../src/build.c:1916 ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "Fel på \"Regular Expression\"" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Kompilera aktuell fil" +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "Icke-filtypskommandon" + +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" +"Not: Element 2 öppnar ett fönster och lägger till svaret till kommandot" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Skapa användardefinierat mål" +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "Exekvera kommando" -#: ../src/build.c:1918 +#: ../src/build.c:1994 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Skriv in användardefinierade tillval här, allt text vidarebefordras till " -"Make-kommandot" +"%d, %e, %f, %p byts ut i kommando- och sökvägsfält, se i instruktionsboken " +"för ytterligare information." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Bygger filen med Make-verktyget och förinställt mål" +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "Ange kommandon för att bygga" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Bygger filen med Make-verktyget och ett specificerat mål" +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "Kompilera" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Kompilera aktuell fil med Make" +#. build the code +#: ../src/build.c:2408 ../src/build.c:2671 ../src/interface.c:1075 +msgid "_Build" +msgstr "Bygg" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Misslyckades exekvera visningsprogrammet" +#: ../src/build.c:2415 ../src/build.c:2445 ../src/build.c:2638 +msgid "_Execute" +msgstr "_Exekvera" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Processen kunde inte stoppas (%s)" +#. build the code with make custom +#: ../src/build.c:2460 ../src/build.c:2636 ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "Kör Make med valbara parametrar" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Inga fler byggfel." +#. build the code with make object +#: ../src/build.c:2462 ../src/build.c:2637 ../src/build.c:2699 +msgid "Make _Object" +msgstr "Kör Make Object" + +#: ../src/build.c:2464 ../src/build.c:2635 +msgid "_Make" +msgstr "_Make" + +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "Kör Make all" + +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "Ange kommandon för byggmenyn" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d fil sparad." +msgstr[1] "%d filer sparade." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Ladda om" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Alla osparade ändringar kommer att förloras." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Är du säker på att du vill ladda om '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Gå till rad" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Skriv in radnumret till den rad du vill gå till" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Var god och ange filtyp för filen innan du använder den här funktionen." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Använd användardefinierat datumformat" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Användardefinierat datumformat" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -380,24 +383,23 @@ "Skriv in användardefinierat datum- och tidsformat. Du kan använda den syntax " "som specificeras av ANSI C:s strftime funktion." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Strängen för datumformat kunde inte konverteras (möjligtvis för lång)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Inga fler meddelanden." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Öppna fil" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "Visa" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -405,28 +407,28 @@ "Öppnar filen i skrivskyddat läge. Om du väljer fler filer, kommer alla " "öppnas i skrivskyddat läge." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Upptäck från filändelse" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Upptäck från fil" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "Mer inställningar" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Visa gömda filer" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Välj teckenkodning:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -441,11 +443,11 @@ "teckenkodning." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Ange filtyp:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -456,72 +458,71 @@ "Notera att om flera filer öppnas, kommer alla att öppnas som vald filtyp." #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "Bryt" +msgstr "Skriv över?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "Filnamnet finns redan!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Spara fil" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Byt namn" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Spara och byt namn på filen." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "Öppna filen i en ny flik" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" "Vill du behålla nuvarande dokument och öppna det nya dokumentet i en ny flik?" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Fel" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Fråga" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Varning" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Information" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "Spara _inte" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Filen '%s' är inte sparad." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Vill du spara innan du stänger?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" -msgstr "Välj font" +msgstr "Välj teckensnitt" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -529,106 +530,110 @@ "Ett fel inträffade, eller så kunde inte fil-informationen hämtas (exempelvis " "från en ny fil)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "okänd" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Egenskaper" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Storlek:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Plats:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Endast läsbar:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(endast inom Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kodning:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(med BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(utan BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Modifierad:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Ändrad:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Skapad:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Behörighet:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Läs:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Skriv:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Exekvera:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Ägare:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grupp:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Annat:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." -msgstr "Fil %s är stängd." +msgstr "Filen %s är stängd." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Den nya filen \"%s\" är öppnad." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Kunde inte öppna fil %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -643,12 +648,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Filen \"%s\" är ogiltig %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -656,51 +661,51 @@ msgstr "" "Filen \"%s\" verkar inte vara en textfil, eller stöds inte textkodningen." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Mellanslag" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Tabulatorer" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tab och mellanslag" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Inställning %s indragsinställning för %s" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." -msgstr "Fil %s laddades om" +msgstr "Filen %s laddades om" #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Filen %s är öppnad (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", skrivskyddad" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Filen kunde ej döpas om." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -709,7 +714,7 @@ "Ett fel inträffade medan filen konverterades från UTF-8 vid \"%s\". Filen " "sparades inte." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -718,52 +723,52 @@ "Felmeddelande: %s\n" "Felet inträffade vid \"%s\" (rad: %d, kolumn: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Felmeddelande: %s" -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Filen kunde ej sparas." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "(%s) kunde ej sparas" -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Fil %s sparad." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" kunde ej hittas." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Vill du fortsätta sökningen från början av dokumentet?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Inga träffar hittades för \"%s\"." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: ersatt %d förekomst av \"%s\" med \"%s\"." msgstr[1] "%s: ersatt %d förekomster av \"%s\" med \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Vill du ladda om det?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -772,23 +777,28 @@ "Filen '%s' på disken är nyare än\n" "uvarande i editorn." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Vill du försöka spara om filen?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Stäng utan att spara" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "Filen \"%s\" kunde ej hittas." +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "Filen \"%s\" kunde ej hittas! Spara igen?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Ange Tab-bredd:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Ange antalet mellanslag som skall ersätta en tab." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "Varning: icke-standard hård-tabb bredd: %d !=8!" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltisk" @@ -899,574 +909,620 @@ msgid "Without encoding" msgstr "Utan kodning" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Västeuropeisk" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "Östeuropeisk" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Östasiatisk" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "SV & SÖ Asiatisk" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Mellanösternsk" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s källfil" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" -msgstr "%s källfil" +msgstr "%s fil" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Inget" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Shell script källkodsfil" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML dokument" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL dumpfil" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Config-fil" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext översättningsfil" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s skriptfil" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Programmeringsspråk" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Skriptspråk" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Märkningsspråk" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Diverse språk" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "Anpassade filtyper" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "All källkod" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Alla filer" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Felaktig rexex för filtypen %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" -msgstr "odöpt" +msgstr "namnlös" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Kunde inte hitta fil '%s'." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "Färger" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "Förvald" + +#: ../src/interface.c:295 msgid "_File" -msgstr "Fil" +msgstr "Arkiv" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Ny (med mall)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "osynlig" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Öppna vald fil" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Senaste filer" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Spara alla" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Ladda om som" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "osynlig" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Sidinställningar" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Stäng andra dokument" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Stäng alla" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "Redigera" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "Format" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "Gör om flöde för rader/block" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" -msgstr "Ändra mellan gemener och versaler" +msgstr "Växla mellan gemener och versaler" + +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "Förflytta raden" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Kommentera rader" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Avkommentera rader" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" -msgstr "Stäng av / på radkommentarer" - -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Gör en kopia av raden eller markeringen" +msgstr "Aktivera / avaktivera radkommentarer" -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Öka indrag" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Minska indrag" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "Skicka markeringen till terminalen" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "Smart radindrag" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "Skicka markering till" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "Kommandon" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "Klipp ut rad(er)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "Kopiera rad(er)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "Radera rad(er)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "Gör en kopia av raden eller markeringen" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "Välj rad(er)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "Välj paragraf" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "Infoga alternativt tomt tecken" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "Gå till nästa markör" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "Gå till föregående markör" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "Skicka markeringen till terminalen" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Infoga kommentarer" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Infoga ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Infoga filhuvud" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Infoga funktionsbeskrivning" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Infoga flerradskommentar" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Infoga en GPL-beskrivning" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Infoga en BSD-beskrivning" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Infoga datum" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Infoga \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "Inställningar" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Inställningar för insticksmoduler" + +#: ../src/interface.c:720 msgid "_Search" msgstr "Sök" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Sök nästa" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Sök föregående" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Sök i filer" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Ersätt" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Sök i markering" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Sök föregående markerade" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Nästa meddelande" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Föregående meddelande" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Gå till rad" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Byt teckensnitt" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Visa / göm verktygsfält" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Helskärm" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Visa meddelandefönster" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Visa verktygsfält" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Visa sidofält" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Visa marginalmarkörer" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Visa radnummer" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Visa tomrum" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Visa radslut" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Visa indragsmarkörer" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "Dokument" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Radbrytning" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Radbrytning (unicode break)" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Använd automatiskt indrag" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Indragstyp" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "Tabulatorer" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "Mellanslag" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "Tab och mellanslag" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Skrivskyddad" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Skriv Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Ange filtyp" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Ange kodning" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Ange radslut" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Konvertera till CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Konvertera till LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Konvertera till CR (Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" -msgstr "Ta bort överflödiga mellanslag" +msgstr "Ta bort _överflödiga mellanslag" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Ersätt tab med mellanslag" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Ersätt mellanslag med tab" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Vik ihop alla" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Vik upp alla" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Ta bort markeringar" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Ta bort felindikatorer" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "Projekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Nytt" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "Öppna" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Senaste projekt" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "Stäng" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "Verktyg" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "Ladda om konfigurationen" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Konfigurationsfiler" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Räkna ord" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Ladda taggar" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "Ladda om konfigurationen" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "Hjälp" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Webbsida" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Debugmeddelanden" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Symboler" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Dokument" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Status" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Kompilator" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Meddelanden" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Klotterplank" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Bilder och text" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Inställningar för verktygsfält" -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Endast bilder" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Endast text" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Stora ikoner" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Små ikoner" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "Mycket små ikoner" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Göm verktygsfält" - -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1900 msgid "_Hide Toolbar" -msgstr "Göm verktygsfält" +msgstr "Göm verktygsfältet" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Visa användning" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Visa dokumentets användning" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Gå till Tagg-definition" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Gå till Tagg-deklaration" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Snabbmenyhändelse" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Inställningar" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Ladda filerna från förra sessionen" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Öppnar filerna från förra sessionen vid start" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Ladda stöd för virtuell terminal" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1474,39 +1530,39 @@ "Huruvida den virtuella terminalemuleringen (VTE) skall laddas vid start. " "Välj bort om du ej behöver den." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Aktivera stöd för tillägg" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Vid start" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Spara fönsterplacering och storlek" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Sparar fönstrets position och storlek, och återställer det vid start" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Bekräfta avslut" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Begär bekräftelse vid avslut." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Vid avslut" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Sökväg vid start:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1515,19 +1571,19 @@ "absolut sökväg. Lämna blankt för att automatiskt välja filens nuvarande " "sökväg." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Projektfiler:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Sökväg att starta i när projektfiler öppnas" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Extra sökväg för insticksmoduler:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1538,30 +1594,30 @@ "skall söka i ytterligare en sökväg, kan du specificera en här. Om du lämnar " "rutan tom, söker inte Geany i någon ytterligare sökväg." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Sökvägar" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Programstart" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Pip vid fel och när kompilering har avslutats" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" "Om datorn skall avge en ljudsignal när när kompileringen har avslutats." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Byt till statusmeddelandelistan när ett nytt meddelande visas" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1569,11 +1625,11 @@ "Huruvida Geany skall byta till statusmeddelandefönstret (vid botten) om ett " "nytt statusmeddelande kommer." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" -msgstr "Undertryck statusmeddelanden i statusfältet" +msgstr "Ignorera statusmeddelanden i statusfältet" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1581,27 +1637,37 @@ "Tar bort alla meddelanden från statusfältet. Meddelanden visas fortförande i " "fönstret för statusmeddelanden." -#: ../src/interface.c:2883 -#, fuzzy +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokusera gränssnittskomponenter (fokus följer musen)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." msgstr "Ger automatiskt fokus till gränssnittskomponenter under muspekaren." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Använd Windows gränssnitt för att öppna / spara filer" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Specificerar om Windows eller GTK skall användas vid öppna / spara filer" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Övrigt" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Börja alltid om sökning från början och göm Sök-dialogrutan" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1609,11 +1675,11 @@ "Börja alltid om sökningen från början och göm Sök-dialogrutan efter du " "klickat på Sök Nästa/Föregående" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" -msgstr "Använd ordet under muspekaren i vid Sök" +msgstr "Använd ordet under muspekaren vid Sök" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1621,19 +1687,19 @@ "Använd ordet under muspekaren när Sök, Sök i filer eller Ersätt väljs och " "det inte finns något markerat tidigare" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Använd nuvarande fils sökväg för funktionen Sök i Filer" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Sök" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Använd projektbaserade sessionsfiler" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1641,11 +1707,11 @@ "Huruvida projektets sessionsfiler skall sparas för att senare öppna den när " "projektet åter öppnas" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Lagra projektfiler i projektets basmapp" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1656,75 +1722,97 @@ "projektet istället för ett steg ovanför bassökvägen. Du kan fortförande " "ändra sölvägen till projektfilen i \"Nytt projekt\"-menyn." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projekt" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Övrigt" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Generellt" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Visa symbollista" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Stäng av / på symbollistan" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Visa listan för öppna filer" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Stäng av / på listan med öppna filer" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Visa sidofält" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Position:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Vänster" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Höger" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Sidofält" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Symbollista:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Meddelandefönster:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Justerar teckensnittet för meddelandefönstret" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Justerar teckensnittet för symbollistan" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Anger texteditorns teckensnitt" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Teckensnitt" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Visa editorns flikar" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Visa knappar för stängning" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1732,111 +1820,140 @@ "Visar ett litet kors i filflikarna, som kan användas att enkelt stänga filer " "om du klickar på det (kräver att du startar om Geany)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Placering av nya filflikar:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Vänster" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Fil-tabbar kommer att placeras till vänster om anteckningsboken" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Höger" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Fil-tabbar kommer att placeras till höger om anteckningsboken" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "Nästa till aktuell" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"Huruvida nya fil-flikar skall placeras bredvid aktuell flik eller vid kanten " +"av anteckningarna" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Dubbelklick gömmer alla övriga gränssnittskomponenter" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Kör Visa -> Visa / göm verktygsfält-kommandot" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Editorns flikar" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Topp" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Botten" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Sidofält:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Tab positioner" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Visa statusfält" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Huruvida statusfältet skall visas längst ner i huvudfönstret." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Gränssnitt" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Visa verktygsfält" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "Lägg till verktygsfältet till menyn" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Lägg ihop verktygsfältet med huvudmenyn för att spara vertikalt utrymme" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Verktygsfält" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Anpassa verktygsfält" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Ikonstil" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Ikonstorlek" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Utseende" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "Grundinställningar" -#: ../src/interface.c:3359 ../src/toolbar.c:881 -#, fuzzy -msgid "Customize Toolbar" -msgstr "Visa verktygsfält" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Bilder och text" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Endast bilder" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Endast text" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Ikonstil" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "Grundinställningar" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Små ikoner" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Mycket små ikoner" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Stora ikoner" -#: ../src/interface.c:3363 +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Ikonstorlek" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Verktygsfält" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Radbrytning" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1846,11 +1963,11 @@ "radbrytning tar mycket systemresurser vid redigering av stora dokument, och " "bör därför vara avslagen på långsamma datorer." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Aktivera \"smart\" home-tangent" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1863,31 +1980,31 @@ "redan är där. När denna funktion är avaktiverad kommer HOME tangenten alltid " "flytta teckenmarkören till början av raden, oavsett dess nuvarande position." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Avaktivera drag-och-släpp" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" msgstr "Avaktivera drag-och-släpp i editor-fönstret" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Aktivera ihopvikning" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "" "Specificerar om koden skall vikas ihop för att spara utrymme och underlätta " "läsning" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Vik upp alla vid uppvikningspunkten" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1895,11 +2012,11 @@ "Vik eller vik upp allt vid vikningspunkten. Genom att hålla in shift-" "tangenten medan du klickar på vikningspunkten kan motsatt effekt uppnås." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Använd indikatorer för att visa kompileringsfel" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1907,24 +2024,24 @@ "Huruvida indikatorer skall användas (taggiga understrykningar) skall " "användas för att markera rader där kompilatorn hittat fel eller varningar." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Ta bort överflödiga mellanslag efter nyradstecken" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Gör så att nyradstecken tar bort överflödiga mellanslag från föregående rad." -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Kolumn för radbrytning:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" -msgstr "Stäng av / på kommentarmarkör:" +msgstr "Stäng av / sätt på kommentarmarkör:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1932,66 +2049,58 @@ "En sträng som läggs till när man justerar en kommentar i en källkodsfil. Den " "används för att markera den justerade kommentaren." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" -msgstr "Kännetecken" +msgstr "Inställningar" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" -msgstr "Kännetecken" +msgstr "Inställningar" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Automatiskt indrag:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Grundläggande" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Nuvarande tecken" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Matcha klamrar" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Bredd:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Bredd, i antal tecken, på ett indrag" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Använd mellanslag vid infogande av indrag" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Använd en tab per indrag" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Använd mellanslag om det totala indraget är mindre än tab-bredden -- i annat " "fall, använd båda" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Hårdtab-bredd:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "Bredden på tab när Tab och Mellanslag är påslaget för dokumentet" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1999,30 +2108,30 @@ "Huruvida indragstyp skall hittas automatiskt via filens innehåll när den " "öppnats." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Tab-tangentens indrag" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Att trycka på tab / skift-tab, ökar / minskar indrag istället för att mata " "in ett tab-tecken" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Indrag" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Indrag" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Komplettera textfragment" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2030,20 +2139,19 @@ "Geany kan gissa vad du vill skriva, och visar förslag på fullständiga " "strängar som du kan välja mellan med ett enkelt tryck på returtangenten." -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Komplettera XML-taggar automatiskt" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Autokomplettera XML- och HTMK-taggar" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Automatisk fortsättning på multiradskommentarer." -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2051,11 +2159,11 @@ "Automatiskt fortsätta multirads-kommentarer i språk som C, C++ och Java när " "en ny rad matas in i kommentaren." -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "Autokomplettera symboler" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2063,150 +2171,142 @@ "Autokomplettera kända symboler i öppna filer (funktionsnamn, globala " "variabler etc.)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Autokomplettera alla ord i dokumentet" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "" +msgstr "Ta bort resten av orden för komplettering" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Max antal symbolnamnsförslag:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Komplettering listhöjd:" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" -msgstr "Tecken att skriva för komplettering:" +msgstr "Tecken att skriva för autokomplettering:" -#: ../src/interface.c:3683 -#, fuzzy +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" -msgstr "Mängden tecken som behövs för att visa symbolautokompletteringslistan." +msgstr "Mängden tecken som behövs för att visa symbolautokompletteringslistan" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" -msgstr "Antal rader att visa i autokompletteringslistan." +msgstr "Visa höjd, i rader, för autokompletteringslistan" -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "Maximalt antal rader att visa i autokompletteringslistan." +msgstr "Maximalt antal element att visa i autokompletteringslistan" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Komplettering" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Parantes ()" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Stäng paranteser automatiskt" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Enkla citeringstecken ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Stäng automatiskt enkel citering när du skrivit in ett enkelt citeringstecken" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Klammerparanteser { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Stäng automatiskt hakparantes när du skrivit in ett hakparantestecken" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Fyrkantig parantes [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" "Stäng automatiskt fyrkantig parantes när du skrivit in ett fyrkantigt " "parantestecken" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Dubbla citationstecken \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" "Stäng automatiskt dubbel citering när du skrivit in ett dubbelt " "citeringstecken" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Stäng citeringar och hakparanteser automatiskt" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Komplettering" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Invertera syntaxfärgningen" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Använd vit text på svart bakgrund och invertera alla färger. För att detta " -"skall få effekt, måste du starta om Geany." +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Intervera alla färger" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Visa indragsmarkörer" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Visar små prickade linjer för att hjälpa dig se rätt indrag." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Visa tomrum" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markera mellanslag med prickar och tabbar med pilar." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Visa radslut" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Visa radslutstecknet" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Visa radnummer" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Visar eller gömmer radnummer-marginalen" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Visa marginalmarkörer" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2214,38 +2314,38 @@ "Visar eller gömmer den lilla marginalen till höger om radnummren som används " "för att markera rader." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Sluta rulla vid sista raden" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Huruvida programmet skall sluta rulla en sida efter den sista raden i ett " "dokument." -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Markör för lång rad" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Färg på markören för lång rad" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "Kolumn:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Färg:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Väljer färgen på markören för långa rader" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2255,22 +2355,22 @@ "hjälper till att visa var det är läge att bryta rader. Värdet anger i vilken " "kolumn markören visas." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Rad" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" "Visar en vertikal linje i editor-fönstret vid en given position (se nedan)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Bakgrund" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2279,113 +2379,143 @@ "Bakgrundsfärgen ändras vid en given kolumn för att indikera var radbrytning " "bör ske. Detta är lämpligt for proportionella teckensnitt." -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Avaktiverad" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Aktiverad" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Markör för lång rad" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Avaktiverad" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Visa inte virtuella ytor" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Endast för rektangulära markeringar" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "Visa endast virtuella ytor efter radslut vid rektangulär markering" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Alltid" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Visa alltid virtuella mellanslag och tab-tecken i slutet av rader" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Virtuella ytor" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Öppna nya dokument från kommandotolken" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Skapa en ny fil för varje filnamn som inte existerar." -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Förvalt radslutstecken:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Nya filer" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Anger förvald kodning för nyskapade filer." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Förvald kodning (nya filer):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Förvald teckenkodning (existerande filer):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Anger förvald teckenkodning för nyöppnade filer:" - -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Använd fast kodning när filer öppnas" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Anger förvald kodning för nyskapade filer." -#: ../src/interface.c:4030 +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Använd fast kodning när icke-unicode filer öppnas" + +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" -"Detta tillval väljer bort automatisk igenkänning av kodning när nya filer " -"öppnas, och använder i stället en specificerad kodning (behövs vanligen " -"inte)." +"Detta tillval väljer bort automatisk igenkänning av kodning när nya icke-" +"unicode filer öppnas, och använder i stället en specificerad kodning (behövs " +"vanligen inte)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Förvald teckenkodning (existerande icke-unicode filer):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Anger förvald teckenkodning vid öppning av icke-Unicode filer" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Teckenkod" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Skriv alltid nyradstecken i slutet av filen" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "" "Lägger till ett nyradstecken vid slutet av filen om det inte redan finns " "något" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Ta bort överflödiga mellanslag och tab-tecken" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Tar bort överflödiga mellanslag och tab-tecken i slutet av filen" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Ersätt tab-tecken med mellanslag" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "" "Ersätter alla tab-tecken i dokumentet med mellanslag (indraget blir lika " "stort)." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" -msgstr "Sparar filer" +msgstr "Spara" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" -msgstr "Senaste längd på fil-listan:" +msgstr "Längd på Senaste-filer listan:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Anger antalet filer som lagras i Senaste-filer listan." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" -msgstr "Disk timeout-kontroll:" +msgstr "Intervall för ändringskontroll:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2393,27 +2523,20 @@ "Hur ofta kontroller utförs för att se om dokumentet ändrats, i antalet " "sekunder. Noll stänger av kontroller." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Filer" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Webbläsare:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Sökväg och tillval för Make-verktyget" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2421,23 +2544,23 @@ "En terminal som Xterm, Gnome-terminal eller Konsole (måste acceptera -e " "argumentet)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Sökväg (och eventuella argument) till din favoritwebbläsare." -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Sökvägar till verktyg" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Snabbmenyhändelse:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2447,67 +2570,67 @@ "Snabbmenykommando. Det markerade ordet kan användas med %s. Det kan infogas " "var som helst i kommandot och kommer att ersättas innan exekvering." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Kommandon" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Verktyg" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "emailadressen till utvecklaren" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Utvecklarens initialer" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Inledande version:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Versionnummret som filen börjar med" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Företagets namn" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Utvecklare:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Företag:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "E-post:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Initialer:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Utvecklarens namn" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "År:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Datum och tid:" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2515,7 +2638,7 @@ "Skriv in ett format för {datetime}. Du kan använda de " "konverteringskonventioner som används i ANSI C strftime-funktionen." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2523,7 +2646,7 @@ "Skriv in ett format för att använda för {year}. Du kan använda den syntax " "som specificeras av ANSI C:s strftime funktion." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2531,62 +2654,62 @@ "Skriv in ett format för att använda till fältet {date}. Du kan använda den " "syntax som specificeras av ANSI C:s strftime funktion." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Mall-data" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Mallar" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Ändra" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Genvägar" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Kommando:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Sökvägen till kommandot för att skriva ut filer (%f ersätts med filnamnet)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Använd ett externt kommando för att skriva ut" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Visa radnummer" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Lägg till radnummer vid utskrift" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Skriv ut sidnummer" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Lägg till sidnummer i sidfoten. Detta upptar två rader på sidan." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Skriv ut filhuvud" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2594,19 +2717,19 @@ "Lägger till tre rader i sidhuvudet som visar sidnummer, filnamn och datum. " "Detta upptar tre rader på sidan." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Använd den utskrivna filens basnamn" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Skriv bara ut filnamnet, ej sökvägen." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Datumformat:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2616,550 +2739,560 @@ "sidhuvudet. Du kan använda den syntax som specificeras av ANSI C:s strftime " "funktion." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Använd GTKs utskriftshantering" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Utskrift" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Utskrift" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Projektegenskaper" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Visa:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Användardefinierad" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Använd globala inställningar" + +#: ../src/keybindings.c:227 ../src/plugins.c:1174 msgid "File" -msgstr "Fil" +msgstr "Arkiv" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Ny" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Öppna" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Öppna vald fil" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Spara" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Spara som" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Spara allt" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Skriv ut" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Stäng" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Stäng allt" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Ladda om fil" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Öppna senast stängta tab igen" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Projektets egenskaper" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Ångra" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Gör om" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Duplicera raden eller markeringen" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Radera rad(er)" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "Radera rad(er)" +msgstr "Radera till radslut" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Förflytta raden" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Flytta till vald rad" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Flytta upp en rad" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Flytta ned en rad" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Färdigställ textfragment" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Flytta markör i textfragmentet" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Undertryck komplettering av textfragment" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Snabbmenyhändelse" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Komplettera ord" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Visa calltip" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Visa macrolistan" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Komplettera ordfragment" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Flytta rad(er) uppåt" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Flytta rad(er) nedåt" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Klippbord" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Klipp ut" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopiera" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Klistra in" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Kopiera rad(er)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Klipp ut rad(er)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Markera" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Markera allt" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Välj ord" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Välj rad(er)" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Välj till föregående orddel" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Välj paragraf" +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Välj till nästa orddel" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Växla mellan versaler och gemener" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Stäng av / på radkommentarer" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Kommentera rad(er)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Ta bort kommentarer från rad(er)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Öka indrag" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Minska indrag" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Öka indrag med ett blanksteg" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Minska indrag med ett blanksteg" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Smart radindrag" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Definiera användarkommando 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Definiera användarkommando 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Definiera användarkommando 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Skicka markeringen till terminalen" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Infoga" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Klistra in datum" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Infoga alternativt tomt tecken" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Inställningar" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Sök" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Sök" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Sök nästa" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Sök föregående" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Sök nästa markering" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Sök föregående markering" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Ersätt" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Sök i filer" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Nästa meddelande" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Föregående meddelande" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Visa användning" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Visa användning" -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "Kör Make all" +msgstr "Markera allt" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Gå till rad" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Bläddra bakåt" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Bläddra frammåt" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Gå till matchande klammer" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Stäng av / på markör" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Gå till nästa markör" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Gå till föregående markör" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Gå till Tagg-definition" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Gå till Tagg-deklaration" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Gå till början av raden" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Gå till radslut" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Gå till radslut" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Gå till föregående orddel" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Gå till nästa orddel" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Visa" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Visa / göm verktygsfält" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Helskärm" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Stäng av / på meddelandefönstret" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Stäng av / på sidofältet" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Förstora" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Förminska" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Återställ förstoring" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Fokusera" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Byt till editor" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Byt till Scribble" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Byt till VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Växla till sökfältet" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Växla till sidofältet" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Växla till kompilatorn" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Växla till Meddelanden" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Växla till meddelandefönster" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Växla till dokumentlistan i sidofältet" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Växla till symbollistan i sidofältet" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Anteckningsblockets tab-kommandon" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Byt till det vänstra dokumentet" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Byt till det högra dokumentet" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Byt till det sist använda dokumentet" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Flytta dokumentet till vänster" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Flytta dokumentet till höger" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Flytta dokumentet först" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Flytta dokumentet sist" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Justera radbrytning (line-wrap)" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Justera radbrytning (line-break)" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Ersätt mellanslag med tab-tecken" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Justera nuvarande mapp" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Vik ihop alla" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Vik upp alla" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Ladda om symbollistan" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "Ta bort markeringar" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Ta bort felindikatorer" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Bygg" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Kompilera" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Kör Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Kör Make på valbart mål" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Kör Make på objekt" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Nästa fel" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Föregående fel" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Kör" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Kör (alternativt kommando)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Bygg-inställningar" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Visa färgväljaren" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Hjälp" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Tangentgenvägar" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Följande tangentbordsgenvägar kan konfigureras:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Växla till dokumentet" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Skriv vad du vill här, använd den som ett klotterplank" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Kunde ej ladda en eller fler av sessionens filer" @@ -3167,92 +3300,105 @@ msgid "Debug Messages" msgstr "Debugmeddelanden" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "Rensa" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "Sätt kolumn för markören vid öppnande av fil" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Använd en alternativ sökväg till konfigurationsfiler" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Visa mycket information" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Skriv interna filtypsnamn" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Generera globala tagg-filer (se dokumentationen)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Förbehandla inte C/C++ filer vid tag-generering" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Öppna inte filer i en existerande session, tvinga istället filen att öppnas " "i en ny session" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "Använd detta socket-filnamn vid kommunikation med en Geany instans" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Returnera en lista med öppna dokument i en Geany-instans" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Ange inledande radnummer för den först öppnade filen" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Visa inte meddelandefönster vid start" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Ladda inte autokompletteringsdata (se dokumentationen)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Ladda inte tillägg" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Visa Geany's installationsprefix" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Ladda inte förra sessionens filer" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Ladda inte terminal-stöd" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Filnamn för libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Visa mycket information" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Visa version och avsluta" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[FILER...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(byggd %s med GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Flytta nu?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany måste flytta mappen där inställningar lagras innan start." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3261,7 +3407,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3270,7 +3416,7 @@ "Mappen där inställningar lagras \"%s\" kunde inte flyttas till \"%s\" (%s). " "Du måste själv flytta mappen." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3282,38 +3428,42 @@ "konfigureringsmapp.\n" "Starta Geany ändå?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Kunde inte hitta fil '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1044 #, c-format msgid "This is Geany %s." msgstr "Detta är Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1046 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigureringsmappen kunde inte skapas (%s)" -#: ../src/main.c:1224 +#: ../src/main.c:1257 msgid "Configuration files reloaded." msgstr "Konfigurationsfilerna laddades om." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Statusmeddelanden" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:542 +msgid "C_opy" +msgstr "Kopiera" + +#: ../src/msgwindow.c:551 msgid "Copy _All" msgstr "Kopiera alla" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:581 msgid "_Hide Message Window" msgstr "Dölj meddelandefönster" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:637 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Kunde inte hitta filen '%s' - försöker med sökvägen för dokument." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3322,11 +3472,11 @@ "Tillägget \"%s\" är inte binärt kompatibel med denna version av Geany. Var " "god, kompilera om modulen." -#: ../src/plugins.c:869 +#: ../src/plugins.c:909 msgid "_Plugin Manager" msgstr "Tilläggshanteraren" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1086 #, c-format msgid "" "Plugin: %s %s\n" @@ -3337,90 +3487,98 @@ "Beskrivning: %s\n" "Utvecklare: %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1162 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1168 msgid "Plugin" msgstr "Tillägg" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1192 msgid "No plugins available." msgstr "Inga tillägg är tillgängliga" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1272 msgid "Plugins" msgstr "Tillägg" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Nedan ser du en lista med insticksmoduler. Välj vilka insticksmoduler som " -"skall laddas när Geany startas." +#: ../src/plugins.c:1292 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Ange vilka insticksmoduler som skall laddas vid start:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1304 msgid "Plugin details:" msgstr "Plugin egenskaper:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Inställningar för insticksmoduler" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Läs av tangent" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Skriv in den tangentbordskombination du vill använda för \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "Expandera alla" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Stäng alla" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Händelse" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Genväg" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "Tillåt" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "Bryt" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" -msgstr "Vill du bryta tangentbindning?" +msgstr "Bryt Geanys tangentbindning" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" "Kombinationen '%s' används redan för \"%s\".Var god och använd en annan " "kombination." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Skriv in sökvägarna till verktygen nedan. Sökvägarna till verktyg som du " "inte behöver kan lämnas tomma." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "Anger vilken information som skall användas i mallar." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3430,7 +3588,7 @@ "Geany." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3441,7 +3599,7 @@ "manuellt." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3451,7 +3609,7 @@ "eller högre." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3461,50 +3619,50 @@ #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "Valt teckensnitt i editorn har inte fast bredd!" #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "Texten kommer att få felaktigt mellanrum mellan orden." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Sida %d av %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Dokumentinställningar" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Skriv bara ut filnamnet, ej sökvägen." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Sida %d av %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Utskriften av filen %s avbröts" +msgid "Did not send document %s to the printing subsystem." +msgstr "Kunde inte skicka dokumentet %s till skrivaren." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Fil %s utskriven." +msgid "Document %s was sent to the printing subsystem." +msgstr "Dokumentet %s skickades till utskriftssystemet." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Ställ in ett utskriftskommando i inställningarna först" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3515,38 +3673,43 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Fil %s utskriven." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projekt" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Nytt projekt" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Skapa" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Namn:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Filnamn:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Bassökväg:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3555,136 +3718,133 @@ "Grundläggande sökväg för alla filer i projektet. Detta kan vara en ny sökväg " "eller ett existerande mappträd." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Välj projektets sökväg" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektfilen \"%s\" kunde inte laddas." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Öppna projekt" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Projektfiler" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" stängt." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Beskrivning:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Kör Make i bassökvägen" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "Ange arbetsmappar för icke-filtyper:" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Kör kommando:" +#: ../src/project.c:484 +msgid "Set" +msgstr "Ange" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "Kommandorad att köra i projektets grundläggande sökväg." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" +msgstr "" +"Ange arbetsmappar (i bygg-fliken) för icke-filtypers byggkommandon att " +"använda basmappen" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Fil-mönster:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Vill du stänga innan du fortsätter?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Projektet '%s' är redan öppnat." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Projektnamnet är för kort." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Projektnamnet är för långt (max. %d tecken)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Du har valt ett ogiltigt filnamn." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Vill du skapa projektets basmapp?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Sökvägen \"%s\" existerar inte." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektets basmapp kunde inte skapas (%s)" -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektfilen kunde inte skrivas (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" skapad." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" sparad." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Välj projektets filnamn" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Välj projektets körkommando" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" öppnad." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Använd regular expressions" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "" "Använd POSIX Regular Expressions. För mer information, se dokumentationen." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Sök bakåt" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Använd escape-sekvenser" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3692,405 +3852,422 @@ "Ersätt \\\\, \\t, \\n, \\r and \\uXXXX (Unicode tecken) med korresponderande " "specialtecken." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Gör skillnad mellan versaler och gemener" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Sök endast hela ord" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Sök från början av ord" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "Föregående" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "Nästa" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "Sök efter:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "Hitta alla" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "Markera" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Markera alla träffar i detta dokument." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "I Session" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "I dokumentet" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Stäng dialogruta" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Avaktivera detta tillval för att hålla dialogrutan öppen." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Sök & ersätt" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Ersätt med:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Ersätt alla" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "I markering" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Ersätt alla träffar i markerad text" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Sökväg:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Teckenkodning:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Fixerade strängar" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Grep Regular Expressions" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Läs Grep's manualsida för mer information." -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Utöka Regular Expressions" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Gå igenom undermappar" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Invertera sökresultat" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Invertera träffar, välj de rader som inte har några träffar." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Extra inställningar:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Andra tillval att skicka till Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Hittat %d träff för \"%s\"." msgstr[1] "Hittat %d träffar för \"%s\"" -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Ersatt text i %u fil." -msgstr[1] "Ersatt text i %u filer." +msgid "Replaced %u matches in %u documents." +msgstr "Ersatt %u träffar i %u dokument." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Ogiltig mapp för att söka i filer." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Ingen text att söka efter." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Kan inte exekvera grep-verktyget '%s'; kontrollera sökvägen i Inställningar." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Söker..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (i sökväg: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Kan inte öppna sökväg (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" -"Sökningen misslyckades (se Hjälp -> Debugmeddelanden för mer information)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Sökningen misslyckades." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Sökning avslutad med %d träff." msgstr[1] "Sökning avslutad med %d träffar." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Inga träffar hittade." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Felaktig rexex: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany försökte koppla till en Unix domain socket för en annan instans som " +"körs av en annan användare.\n" +"Detta är ett allvarligt fel, och Geany kommer nu att avslutas." + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Sektion" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Sekt1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Sekt2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Sekt3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Appendix" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Annat" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Typ" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Typ-konstruktörer" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Funktioner" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Markeringar" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Tangenter" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Variabler" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Kommando" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Miljö" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Subsektion" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Subsubsektion" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etikett" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Strukturer" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Paket" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Min" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Lokal" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Our" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Etiketter" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Konstanter" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Gränssnitt" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Klasser" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Konstanter" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Ankare" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Rubrik (H1)" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Rubrik (H1)" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Rubrik (H1)" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID-markering" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Typ-konstruktörer" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Moduler" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Metoder" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Namespaces" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "Egenskaper" +msgstr "Procedurer" -#: ../src/symbols.c:736 -#, fuzzy +#: ../src/symbols.c:752 msgid "Imports" -msgstr "Exportera" +msgstr "Inporterade" + +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Enhet" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Arkitekturer" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Funktioner / Procedurer" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Variabler / Signaler" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "Procedurer / Komponenter" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Händelser" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Funktioner / Uppgifter" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Medlemmar" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Etiketter" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Subrutiner" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Block" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Makron" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Definitioner" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Mål" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Strukturer" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Okänd filändelse för filen \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Misslyckades med att skapa tagg-fil.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4099,7 +4276,7 @@ "Användning: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4110,177 +4287,192 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Ladda taggar" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany tagg-filer (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Laddade %s tagg-filen '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Kunde inte ladda tagg-filen '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Deklarationen \"%s\" kunde inte hittas." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definitionen av \"%s\" kan inte hittas." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Sortera efter namn" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Sortera efter egenskaper" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Gammal" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Spara fil" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Spara alla öppna filer" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Ladda om filen från disk" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Stäng fil" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Stäng alla öppna filer" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Klipp ut markering" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Kopiera markering" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Klistra in innehållet från klippbordet" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Radera markering" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Ångra senaste ändring" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Gör om senaste ändring" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Kompilera aktuell fil" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Kör eller visa filen" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Öppnar färgväljaren, så du kan välja färger från en palett" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Förstora texten" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Förminska texten" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Minska indrag" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Öka indrag" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Sök angiven text i aktuell fil" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Gå till inskrivet radnummer." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Visa inställningar" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Avsluta Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Skriv ut dokumentet" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "Markera alla träffar i detta dokument." +msgstr "Ersätt text i detta dokument" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Skapa ny fil" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Skapa ny fil från mall" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Öppna existerande fil" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Öppna nyligen öppnade filer" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Visa fler val för bygg" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Gå till" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "Separator" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- Separator ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" +"Välj ikoner som skall visas i verktygsraden. Ikoner kan flyttas genom drag-" +"och-släpp." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "Tillgängliga element" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "Visa" +msgstr "Visade element" #: ../src/tools.c:153 #, c-format @@ -4305,7 +4497,7 @@ msgid "Custom command failed: %s" msgstr "Det egendefinierade kommandot misslyckades: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Ange användardefinierat kommando" @@ -4315,293 +4507,272 @@ "of the command replaces the current selection." msgstr "Du kan skicka markeringen till vilket av dessa kommandon som helst." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Inga användarkommandon har definierats." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Ordräkning" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "markering" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "hela dokumentet" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Område:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Rader:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Ord:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Tecken:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Inga taggar hittade" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Visa symbollistan" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Visa dokumentlistan" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Göm sidolist" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "Visa hela sökvägen" +msgstr "Visa sökvägar" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "rad: %d\t kolumn: %d\t märkning: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "rad: %d / kolumn: %d\t märkning: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "läge: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "Teckenkodning: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "filtyp: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "omfång: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Font uppdaterad (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Ställ in användardefinierat datumformat" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Välj mapp" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Välj fil" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Konfigurationsfiler" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Spara alla" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Stäng alla" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Ange sökväg från dokumentet" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "Starta om terminalen" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Inmatningsmetoder" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" "Kunde ej ändra sökväg i VTE därför att det troligvis innehåller ett kommando." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminalens insticksmodul" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Dessa inställningar för den virtuella terminalemulatorn (VTE) gäller bara om " -"VTE-biblioteket kan laddas." +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Typsnitt:" -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Terminalens font:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" -msgstr "Justerar fonten för terminalen." +msgstr "Justerar teckensnittet för terminalen." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Förgrundsfärg" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Bakgrundsfärg" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Justerar förgrundsfärgen för texten i terminalen." -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Justerar bakgrundsfärgen för texten i terminalen." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Radbuffer:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Anger hur många rader som du kan rulla tillbaka i terminalen" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Skal:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Justerar sökvägen till skalet som skall startas i terminalemulatorn." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Rulla ner" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Om texten rullas ner till botten om en tangent trycks ned" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Rulla utmatning" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Huruvida texten i fönstret längst ner skall rullas när utmatning sker." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Markör blinkar" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Huruvida textmarkören skall blinka" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Vill du bryta Geanys tangentbindning?" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "Tillåter VTE att motta tangentbordskommandon (förutom fokuskommandon)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Avaktivera genvägstangenten (F10-tangenten)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4610,22 +4781,22 @@ "Detta tillval gör så att menyn inte visas när du trycker på F10. Detta kan " "vara användbart, exempelvis om du kör Midnight Commander i VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Följ filens sökväg" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Huruvida \"cd $path\" skall exekveras när du växlar mellan öppna filer." #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Använd inte körbara skript" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4633,11 +4804,11 @@ "Använd inte det enkla körskriptet som vanligtvis används för att visa " "felmeddelanden för exekverat program." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Exekvera program i VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4645,90 +4816,118 @@ "Kör ett program i VTE i stället för att öppna ett terminalemuleringsfönster. " "Var god att notera att program som exekveras i VTE inte kan stoppas." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany projektfiler" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Exekverbara filer" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Klassbyggare" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Skapar källfiler för nya klasstyper." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Skapa klass" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "Namnrymd" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "Namnrymd:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Klass" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Klassnamn:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Header-fil:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Källfil:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Arv:" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Basklass:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Base källkodsfil" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Bas-header:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Bas GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Implementering:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Inställningar" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Skapa konstruktor" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Skapa destruktor" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Är abstract" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Är singleton" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ konstruktortyp" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Skapa klass" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "C++ klass" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "GTK+ klass" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "PHP klass" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML-tecken" @@ -4738,52 +4937,57 @@ msgstr "Infogar HTML-tecken, som '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geanys utvecklare" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML tecken" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 tecken" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Grekiska tecken" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Matematiska symboler" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Tekniska symboler" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Piltecken" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Punktueringstecken" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Övriga tecken" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Konfigureringsmappen för insticksmoduler kunde inte skapas." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Specialtecken" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "Infoga" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4791,40 +4995,40 @@ "Välj ett specialtecken från listan under och dubbelklicka på den eller " "använd knappen för att infoga den på specificerad position" -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Tecken" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (namn)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Infoga speciella HTML-tecken" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "Ersätt HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "Växla HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Ersätt specialtecken" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Klistra in speciella HTML-tecken" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Ersätt specialtecken" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Stäng av / på instickmodulens status" @@ -4850,105 +5054,105 @@ msgstr "" "Visar dokumentets teckenstorlek tillsammans med nuvarande förstoringsnivå" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokumentet exporterades som '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Filen '%s' kunde inte skrivas (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Filen '%s' finns redan. Vill du skriva över den?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "Exportera" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Som HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Som LATEX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Filhanterare" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Lägger till en filbläddrarflik i sidofältet." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" -msgstr "För många saker markerade!" +msgstr "För många element markerade!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kunde inte exekvera konfigurerat externt kommando '%s' (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Öppna externt" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "Sök i filer" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Visa gömda filer" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Upp" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Uppdatera" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Hem" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Ange sökväg" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Rensa filtret" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Filtrera dina filer med de vanliga jokertecknen" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Fokusera fillistan" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Fokusera sökvägen" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Konfigureringsmappen för insticksmoduler kunde inte skapas." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Öppna via externt kommando:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4962,15 +5166,15 @@ "%f kommer att ersättas med filnamnet och fullständig sökväg\n" "%d kommer att ersättas med sökvägen till vald fil (utan filnamnet)" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Visa gömda filer" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Göm objektfiler" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4978,12 +5182,11 @@ "Visa inte genererade objektfiler i filläsaren, detta inkluderar *.o, *.obj. " "*.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "Vill du skapa projektets basmapp?" +msgstr "Använd projektets basmapp" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Skapa en DIFF från sökvägen där den aktiva filen finns" @@ -5091,38 +5294,210 @@ msgid "Splits the editor view into two windows." msgstr "Delar editor-fönstret i två delar" -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "Markera alla träffar i detta dokument." +msgstr "Visa dokument" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "Sätt ihop" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Dela fönster" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "Vågrätt" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" -msgstr "Vertikal" +msgstr "Vertikalt" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Dela vågrätt" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Dela vertikalt" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Sätt ihop" +#~ msgid "_Customize Toolbar" +#~ msgstr "Anpassa verktygsfältet" + +#~ msgid "Icon style:" +#~ msgstr "Ikonstil" + +#~ msgid "Icon size:" +#~ msgstr "Ikonstorlek" + +#~ msgid "Appearance" +#~ msgstr "Utseende" + +#~ msgid "Hard tab width:" +#~ msgstr "Hårdtab-bredd:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "Bredden på tab när Tab och Mellanslag är påslaget för dokumentet" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminalens insticksmodul" + +#~ msgid "Terminal font:" +#~ msgstr "Teckensnitt:" + +#~ msgid "" +#~ "Notes:\n" +#~ " %d, %e, %f, %p are substituted in Commands and Working dir, see manual " +#~ "for details\n" +#~ " Non-filetype menu Item 2 opens a dialog and appends the reponse to the " +#~ "command" +#~ msgstr "" +#~ "Anteckningar:\n" +#~ " %d, %e, %f, %p är ytbytta i kommandon och arbetsmapp, se manualen för " +#~ "ytterligare information\n" +#~ " Icke-filtypsmeny 2 öppnar ett fönster där du kan ange en text som läggs " +#~ "till kommandot" + +#~ msgid "Try to resave the file?" +#~ msgstr "Vill du försöka spara om filen?" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Använd vit text på svart bakgrund och invertera alla färger. För att " +#~ "detta skall få effekt, måste du starta om Geany." + +#~ msgid "Long line marker:" +#~ msgstr "Markör för lång rad" + +#~ msgid "Long line marker color:" +#~ msgstr "Färg på markören för lång rad" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Duplicera raden eller markeringen" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Skicka markeringen till terminalen" + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Utskriften av filen %s avbröts" + +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Ersatt text i %u fil." +#~ msgstr[1] "Ersatt text i %u filer." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "" +#~ "Sökningen misslyckades (se Hjälp -> Debugmeddelanden för mer information)." + +#~ msgid "My" +#~ msgstr "Min" + +#~ msgid "Local" +#~ msgstr "Lokal" + +#~ msgid "Our" +#~ msgstr "Our" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Dessa inställningar för den virtuella terminalemulatorn (VTE) gäller bara " +#~ "om VTE-biblioteket kan laddas." + +#~ msgid "Unsplit" +#~ msgstr "Sätt ihop" + +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Justera inkluderingar och argument" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> PDF" + +#~ msgid "_View DVI File" +#~ msgstr "Visa DVI-fil" + +#~ msgid "V_iew PDF File" +#~ msgstr "Visa PDF-fil" + +#~ msgid "_Set Arguments" +#~ msgstr "Ange argument" + +#~ msgid "Set Arguments" +#~ msgstr "Ange argument" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Anger program och parametrar för att kompilera och visa (La)TeX filer." + +#~ msgid "DVI creation:" +#~ msgstr "Skapa DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Skapa PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Förhandsvisa DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Förhandsvisa PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f kommer att ersättas med nuvarande filnamn, exempelvis test_fil.c\n" +#~ "%e kommer att ersättas med namn utan filändelse, exempelvis test_fil" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Ange inkluderingar och argument" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Anger kommandon för att bygga och köra program." + +#~ msgid "Compile:" +#~ msgstr "Kompilera:" + +#~ msgid "Build:" +#~ msgstr "Bygg:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Misslyckades exekvera visningsprogrammet" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Sökväg och tillval för Make-verktyget" + +#~ msgid "Run (alternative command)" +#~ msgstr "Kör (alternativt kommando)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Nedan ser du en lista med insticksmoduler. Välj vilka insticksmoduler som " +#~ "skall laddas när Geany startas." + +#~ msgid "Make in base path" +#~ msgstr "Kör Make i bassökvägen" + +#~ msgid "Run command:" +#~ msgstr "Kör kommando:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "Kommandorad att köra i projektets grundläggande sökväg." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Välj projektets körkommando" #~ msgid "Diff file" #~ msgstr "Diff-fil" @@ -5290,9 +5665,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Viker upp alla kodblock som hör ihop" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Ta bort alla felindikatorer i hela dokumentet" - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5310,9 +5682,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Visar en lista med alla tangentbordsgenvägar för Geany." -#~ msgid "Color" -#~ msgstr "Färg" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Skriv in ett radnummer och gå till det." @@ -5407,9 +5776,6 @@ #~ msgid "Items" #~ msgstr "Tillval" -#~ msgid "Use white text on a black background." -#~ msgstr "Använd vit text på svart bakgrund" - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Kör i felsökningsläge (skriv ut extra information)" @@ -5438,9 +5804,6 @@ #~ "Kontrollerar hur terminalemulatorn skall fungera. Ändra inte detta värde " #~ "om du inte vet precis vad du håller på med." -#~ msgid "Search failed." -#~ msgstr "Sökningen misslyckades." - #~ msgid "Failed to execute the terminal program" #~ msgstr "Misslyckades exekvera terminalprogrammet" @@ -5558,9 +5921,6 @@ #~ msgid "Ferite source file" #~ msgstr "Ferite källkodsfil" -#~ msgid "Haskell source file" -#~ msgstr "Haskell källkodsfil" - #~ msgid "Docbook source file" #~ msgstr "Docbook källkodsfil" @@ -5615,5 +5975,5 @@ #~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " #~ "%s filetype: %s scope: %s" #~ msgstr "" -#~ "rad: %d\t kolumn: %d\t vald: %d\t %s %s mode: %s kodning: %" -#~ "s %s filtyp: %s scope: %s" +#~ "rad: %d\t kolumn: %d\t vald: %d\t %s %s mode: %s kodning: " +#~ "%s %s filtyp: %s scope: %s" diff -Nru geany-0.18/po/tr.po geany-0.19/po/tr.po --- geany-0.18/po/tr.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/tr.po 2010-05-31 00:30:17.000000000 +0100 @@ -1,26 +1,27 @@ # Turkish translations for geany package. # Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. -# Gürkan Gür 2008, 2009 +# Gürkan Gür 2008 - 2010 msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-08-07 18:27+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2010-05-30 21:03+0200\n" "Last-Translator: Gürkan Gür \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1\n" #: ../geany.desktop.in.h:1 msgid "A fast and lightweight IDE using GTK2" msgstr "GTK2 kullanan hızlı ve hafif bir IDE" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:281 +#: ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -28,428 +29,426 @@ msgid "Integrated Development Environment" msgstr "Tümleşik Geliştirme Ortamı" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Geany Hakkında" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Hızlı ve Hafif Bir IDE" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(%s veya daha sonrasında derlendi)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Bilgi" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Geliştiriciler" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "bakıcı" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "geliştirici" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "çeviri bakıcısı" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Çevirmenler" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Önceki Çevirmenler" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Katkıda Bulunanlar" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Bir çok geliştiriciden bazıları (daha detaylı liste için bkz: %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Yapımcılar" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Lisans" -#: ../src/about.c:391 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"Lisans yazısı bulunamadı. Lütfen çevrimiçi olarak görüntülemek için http://" -"www.gnu.org/licenses/gpl-2.0.txt adresini ziyaret edin." +#: ../src/about.c:397 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Lisans yazısı bulunamadı. Lütfen çevrimiçi olarak görüntülemek için http://www.gnu.org/licenses/gpl-2.0.txt adresini ziyaret edin." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"\"%s\" terminali bulunamadı (Terminal aracının yolunu ayarlamak için " -"Seçenekler'e bakınız)" +msgid "failed to substitute %%p, no project active" +msgstr "%%p yer değiştirmesi başarısız, aktif proje yok" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "İşlem başarısız, çalışma dizini yok" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "\"%s\" çalıştırılamadı (başlangıç-betiği oluşturulamadı)" +msgid "%s (in directory: %s)" +msgstr "%s (%s dizininde)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 +#: ../src/build.c:944 +#: ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "İşlem hatalı (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (%s dizininde)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "\"%s\" çalışma dizinine geçilemedi." -#: ../src/build.c:707 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Dosya sanal terminalde çalıştırılamadı, büyük ihtimalle bir komut içeriyor." +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "\"%s\" çalıştırılamadı (başlangıç-betiği oluşturulamadı)" + +#: ../src/build.c:873 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Dosya sanal terminalde çalıştırılamadı, büyük ihtimalle bir komut içeriyor." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "\"%s\" terminali bulunamadı (Terminal aracının yolunu ayarlamak için Seçenekler'e bakınız)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Derleme hatalı." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Derleme başarılı." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Derle" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "İn_şa Et" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Tü_münü inşa et" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "_Özel Hedef Derle" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Nesne_yi Derle" +#: ../src/build.c:1252 +msgid "Custom Text" +msgstr "Özel Yazı" + +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "Buraya özel yazıyı girin, girilen bütün yazı komuta uygulanacak." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Sonra_ki Hata" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Ön_ceki Hata" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Dahili _Seçenekleri ve Argümanları Ayarla" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "D_VI Dosyayı İncele" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "PDF Dosyayı _İncele" +#: ../src/build.c:1343 +msgid "_Set Build Commands" +msgstr "İnşa Komutlarını _Seç" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Arg_ümanları Ayarla" - -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Argümanları Ayarla" +#: ../src/build.c:1623 +#: ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Geçerli dosyayı derle" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"(La)TeX dosyalarının derlenmesi ve incelenmesi için program ve seçenekleri " -"ayarla." +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Geçerli dosyayı make aracı ile ve öntanımlı dizinde inşa et" + +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Geçerli dosyayı make aracı kullanarak belirtilen dizinde inşa et" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI oluşturma:" - -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF oluşturma:" - -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI izleme:" - -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF izleme:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Geçerli dosyayı Make ile derle" -#: ../src/build.c:1401 ../src/build.c:1583 +#: ../src/build.c:1668 #, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f geçerli dosya adı ile değişecek, örn. test_dosyasi.c\n" -"%e geçerli dosya adının uzantısız hali ile değişecek, örn. test_dosyasi" +msgid "Process could not be stopped (%s)." +msgstr "İşlem durdurulamadı (%s)." -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Dahili Seçenekleri ve Argümanları Ayarla" +#: ../src/build.c:1685 +#: ../src/build.c:1697 +msgid "No more build errors." +msgstr "Başka inşa hatası yok." -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Dosyaları derlemek ve çalıştırmak için kullanılacak komutları ayarla." +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "Menü öğesinin etiketini ayarla" + +#: ../src/build.c:1788 +msgid "Item" +msgstr "Öğe" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" -msgstr "%s komutları" +#: ../src/build.c:1789 +#: ../src/symbols.c:650 +msgid "Label" +msgstr "Etiket" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Derle:" +#: ../src/build.c:1790 +#: ../src/symbols.c:645 +msgid "Command" +msgstr "Komut" -#: ../src/build.c:1538 -msgid "Build:" -msgstr "İnşa Et:" +#: ../src/build.c:1791 +msgid "Working directory" +msgstr "Çalışma dizini" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Çalıştır:" +#: ../src/build.c:1792 +msgid "Clear" +msgstr "Temizle" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Geçerli dosyayı derle" +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "Menü öğesinin etiketini ayarlamak için tıklayın" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Özel Hedef Belirle" +#: ../src/build.c:1904 +#: ../src/build.c:1906 +#, c-format +msgid "%s Commands" +msgstr "%s Komutları" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Buraya özel seçenekleri girin, girilen bütün yazı make komutuna gidecek." +#: ../src/build.c:1906 +msgid "No Filetype" +msgstr "Dosya Türü Yok" -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Geçerli dosyayı make aracı ile ve öntanımlı dizinde inşa et" +#: ../src/build.c:1914 +#: ../src/build.c:1949 +msgid "Error Regular Expression:" +msgstr "Düzenli İfade Hatası:" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Geçerli dosyayı make aracı kullanarak belirtilen dizinde inşa et" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Geçerli dosyayı Make ile derle" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "Not: İkinci öğe bir pencere açıp komuta tepki verdi." -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Görüntüleme programı çalıştırılamadı" +#: ../src/build.c:1981 +msgid "Execute Commands" +msgstr "Komut Çalıştır" -#: ../src/build.c:2073 +#: ../src/build.c:1992 #, c-format -msgid "Process could not be stopped (%s)." -msgstr "İşlem durdurulamadı (%s)." +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p değerleri komut ve dizin isimleri ile yer değiştirmekte, detaylar için yardım klavuzuna bakın." -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Başka inşa hatası yok." +#: ../src/build.c:2177 +msgid "Set Build Commands" +msgstr "İnşa Komutu Ayarla" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Derle" + +#. build the code +#: ../src/build.c:2406 +#: ../src/build.c:2669 +#: ../src/interface.c:1075 +msgid "_Build" +msgstr "İn_şa Et" + +#: ../src/build.c:2413 +#: ../src/build.c:2443 +#: ../src/build.c:2636 +msgid "_Execute" +msgstr "_Çalıştır" + +#. build the code with make custom +#: ../src/build.c:2458 +#: ../src/build.c:2634 +#: ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "_Özel Hedef Derle" + +#. build the code with make object +#: ../src/build.c:2460 +#: ../src/build.c:2635 +#: ../src/build.c:2697 +msgid "Make _Object" +msgstr "Nesne_yi Derle" + +#: ../src/build.c:2462 +#: ../src/build.c:2633 +msgid "_Make" +msgstr "_Derle" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Tü_münü inşa et" + +#. arguments +#: ../src/build.c:2709 +msgid "_Set Build Menu Commands" +msgstr "İnşa Menü_sü Komutlarını Ayarla" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Gerçekten çıkmak istiyor musunuz?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d dosya kaydedildi." +msgstr[1] "%d dosya kaydedildi." + +#: ../src/callbacks.c:488 +#: ../src/document.c:2895 +#: ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Tek_rar Yükle" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Kaydedilmemiş bütün içerik kaybolacak." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Yeniden yüklemek istediğinize emin misiniz '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 +#: ../src/keybindings.c:428 msgid "Go to Line" msgstr "Satıra Git" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Gitmek istediğiniz satırı girin:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Lütfen bı fonksiyonu kullanmadan önce geçerli dosya için dosya türünü " -"ayarlayın." +#: ../src/callbacks.c:1296 +#: ../src/callbacks.c:1321 +msgid "Please set the filetype for the current file before using this function." +msgstr "Lütfen bı fonksiyonu kullanmadan önce geçerli dosya için dosya türünü ayarlayın." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 +#: ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "gg.aa.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 +#: ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "aa.gg.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 +#: ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/aa/gg" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 +#: ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "gg.aa.yyyy sa:dk:sn" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 +#: ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "gg.aa.yyyy sa:dk:sn" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 +#: ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/aa/gg sa:dk:sn" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 +#: ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Özel Tarih Formatını K_ullan" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Özel Tarih Formatı" -#: ../src/callbacks.c:1498 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Buraya özel tarih ve zaman biçimini girin. ANSI C uyumlu bütün olasılıkları " -"kullanabilirsiniz." +#: ../src/callbacks.c:1447 +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Buraya özel tarih ve zaman biçimini girin. ANSI C uyumlu bütün olasılıkları kullanabilirsiniz." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Tarih biçimi dönüştürülemedi (muhtemelen çok uzun)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 +#: ../src/callbacks.c:1699 msgid "No more message items." msgstr "Başka mesaj yok." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 +#: ../src/dialogs.c:229 msgid "Open File" msgstr "Dosya Aç" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 +#: ../src/interface.c:790 msgid "_View" msgstr "G_örünüm" -#: ../src/dialogs.c:147 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Dosyayı salt okuma modunda açar. Birden fazla dosya açarsanız hepsi salt " -"okunur modda açılacaktır." +#: ../src/dialogs.c:151 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Dosyayı salt okuma modunda açar. Birden fazla dosya açarsanız hepsi salt okunur modda açılacaktır." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Dosya uzantısına göre algıla" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 +#: ../src/interface.c:3651 +#: ../src/interface.c:5263 msgid "Detect from file" msgstr "Dosyadan algıla" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "_Daha fazla seçenek" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "_Gizli dosyaları görüntüle" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Kodlamayı ayarla:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Belirli dosyalar için kodlamayı belirtmenizi sağlar. Eğer Geany kodlamaları " -"otomatik olarak tanıyamıyorsa kendiniz belirtmek için bunu kullanın.\n" +"Belirli dosyalar için kodlamayı belirtmenizi sağlar. Eğer Geany kodlamaları otomatik olarak tanıyamıyorsa kendiniz belirtmek için bunu kullanın.\n" "Birden çok dosya seçerseniz hepsi seçilen kodlama ile açılacaktır." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Dosya türünü ayarla:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Belirli dosyalar için dosya türünü belirtmenizi sağlar. Eğer Geany " -"uzantılardan otomatik olarak tanıyamıyorsa kendiniz belirtmek için bunu " -"kullanın.\n" +"Belirli dosyalar için dosya türünü belirtmenizi sağlar. Eğer Geany uzantılardan otomatik olarak tanıyamıyorsa kendiniz belirtmek için bunu kullanın.\n" "Birden çok dosya seçerseniz hepsi seçilen dosya türünde açılacaktır." #: ../src/dialogs.c:389 @@ -460,222 +459,227 @@ msgid "Filename already exists!" msgstr "Dosya adı mevcut!" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 +#: ../src/dialogs.c:552 msgid "Save File" msgstr "Dosyayı Kaydet" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Y_eniden adlandır" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Dosyayı kaydet ve yeniden isimlendir" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "D_osyayı yeni sekmede aç" -#: ../src/dialogs.c:444 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Şimdiki kaydedilmemiş dökümanı açık tut ve yeni kaydedilmiş dosyayı yeni " -"sekmede aç." +#: ../src/dialogs.c:442 +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Şimdiki kaydedilmemiş dökümanı açık tut ve yeni kaydedilmiş dosyayı yeni sekmede aç." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 +#: ../src/win32.c:681 msgid "Error" msgstr "Hata" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 +#: ../src/dialogs.c:1443 +#: ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Soru" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 +#: ../src/win32.c:693 msgid "Warning" msgstr "Uyarı" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 +#: ../src/win32.c:699 msgid "Information" msgstr "Bilgi" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "Kay_detme" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' dosyası kaydedilmedi." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Kapatmadan önce kaydetmek ister misiniz?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Yazıtipi seç" -#: ../src/dialogs.c:1005 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." +#: ../src/dialogs.c:1057 +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." msgstr "Bir hata oluştu ya da dosya bilgisi getirilemedi." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 +#: ../src/dialogs.c:1077 +#: ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 +#: ../src/symbols.c:1745 +#: ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "bilinmeyen" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 +#: ../src/symbols.c:800 msgid "Properties" msgstr "Özellikler" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Tür:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Boyut:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Yer:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Salt okunur:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(sadece Geany içinde)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Kodlama:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 +#: ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(BOM ile)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(BOM olmadan)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Düzenlendi:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Değiştirildi:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Ulaşıldı:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "İzinler:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Okuma:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Yazma:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Çalıştır:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Sahibi:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Diğer:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "%s dosyası kapatıldı." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Yeni dosya \"%s\" açıldı." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 +#: ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "%s dosyası açılamadı (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"\"%s\" dosyası düzgün açılamadığından kesilerek açıldı. Bu durum içerisinde " -"boş byte bulunan dosyalarda oluşur. Dosyayı kaydetmek veri kaybına sebep " -"olabilir.\n" +"\"%s\" dosyası düzgün açılamadığından kesilerek açıldı. Bu durum içerisinde boş byte bulunan dosyalarda oluşur. Dosyayı kaydetmek veri kaybına sebep olabilir.\n" "Dosya salt okunur olarak ayarlandı." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "\"%s\" dosyası geçerli değil %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"\"%s\" dosyası bit yazı dosyası gibi görünmüyor, belki de kodlaması " -"desteklenmiyor." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "\"%s\" dosyası bit yazı dosyası gibi görünmüyor, belki de kodlaması desteklenmiyor." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Boşluklar" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Sekmeler" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Sekmeler ve Boşluklar" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%s girdileme yöntemi %s için ayarlanıyor." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Geçersiz dosya adı" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "%s dosyası yeniden yüklendi." @@ -683,29 +687,25 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "%s dosyası açıldı(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", salt okunur" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "Dosya isimlendirmesinde hata." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Dosyayı UTF-8'den \"%s\" kodlamasına çevirirken hata oluştu. Dosya " -"kaydedilmeden bırakıldı." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Dosyayı UTF-8'den \"%s\" kodlamasına çevirirken hata oluştu. Dosya kaydedilmeden bırakıldı." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -714,52 +714,59 @@ "Hata mesajı: %s\n" "Hatanın oluştuğu yer \"%s\" (satır: %d, sütun: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Hata mesajı: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 +#: ../src/document.c:1833 msgid "Error saving file." msgstr "Dosya kaydetmede hata" -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Dosya kaydetmede hata (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "%s dosyası kaydedildi." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 +#: ../src/document.c:1982 +#: ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" bulunamadı." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Aramayı geç ve tekrar bul?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 +#: ../src/search.c:1127 +#: ../src/search.c:1171 +#: ../src/search.c:1875 +#: ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "\"%s\" araması için hiçbir eşleşme bulunamadı." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 +#: ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d tane \"%s\" değeri \"%s\" ile değiştirildi." msgstr[1] "%s: %d tane \"%s\" değeri \"%s\" ile değiştirildi." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Yeniden yüklemek ister misiniz?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -768,29 +775,34 @@ "'%s' dosyasının daha güncel bir hali\n" "diskte bulunmakta." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Dosyayı tekrar kurtarmayı denemek ister misiniz?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "Kayde_tmeden Kapat" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "\"%s\" dosyası diskte bulunamadı!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "\"%s\" dosyası diskte bulunamadı! Dosyayı tekrar kaydetmeyi dene?" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Tab genişliğini girin" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." +msgstr "Bir sekme (tab) karakterinin yerine geçecek olan boşluk sayısını giriniz." + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "" -"Bir sekme (tab) karakterinin yerine geçecek olan boşluk sayısını giriniz." #: ../src/encodings.c:76 msgid "Celtic" msgstr "Celtic" -#: ../src/encodings.c:77 ../src/encodings.c:78 +#: ../src/encodings.c:77 +#: ../src/encodings.c:78 msgid "Greek" msgstr "Yunan" @@ -802,22 +814,31 @@ msgid "South European" msgstr "Güney Avrupa" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 #: ../src/encodings.c:84 msgid "Western" msgstr "Batı" -#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Baltic" msgstr "Baltık" -#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 +#: ../src/encodings.c:91 msgid "Central European" msgstr "Orta Avrupa" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:92 ../src/encodings.c:93 ../src/encodings.c:95 -#: ../src/encodings.c:96 ../src/encodings.c:97 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 msgid "Cyrillic" msgstr "Slav" @@ -833,12 +854,16 @@ msgid "Romanian" msgstr "Romanca" -#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 msgid "Arabic" msgstr "Arapça" #. not available at all, ? -#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +#: ../src/encodings.c:105 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 msgid "Hebrew" msgstr "İbranice" @@ -858,36 +883,53 @@ msgid "Thai" msgstr "Taylandca" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Turkish" msgstr "Türkçe" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 msgid "Vietnamese" msgstr "Vietnamca" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 -#: ../src/encodings.c:127 ../src/encodings.c:128 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 msgid "Unicode" msgstr "Unicode" #. maybe not available on Linux -#: ../src/encodings.c:130 ../src/encodings.c:131 ../src/encodings.c:132 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 #: ../src/encodings.c:134 msgid "Chinese Simplified" msgstr "Basitleştirilmiş Çince" -#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 +#: ../src/encodings.c:137 msgid "Chinese Traditional" msgstr "Geleneksel Çince" -#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 +#: ../src/encodings.c:140 #: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonca" -#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 +#: ../src/encodings.c:144 #: ../src/encodings.c:145 msgid "Korean" msgstr "Korece" @@ -896,2246 +938,2323 @@ msgid "Without encoding" msgstr "Kodlamasız" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Batı Avrupa" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Doğu Avrupa" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Doğu _Asya" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_GD & GB Asya" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Orta Asya" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:231 +#: ../src/filetypes.c:242 +#: ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s kaynak dosyası" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, c-format msgid "%s file" msgstr "%s dosya" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:119 +#: ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Hiçbiri" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Kabuk betiği dosyası" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML dosyası" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "CSS dosyası" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump dosyası" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Ayar dosyası" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext çeviri dosyası" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s betik dosyası" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "_Programlama Dilleri" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "_Betik Dilleri" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "İşaretle_me Dilleri" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "D_iğer Diller" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "_Özel Dosya Türleri" + +#: ../src/filetypes.c:1403 +#: ../src/win32.c:105 msgid "All Source" msgstr "Bütün Kaynak" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 +#: ../src/project.c:285 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Tüm dosyalar" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "%s dosya türü için geçersiz düzenli ifade: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "isimsiz" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 +#: ../src/main.c:802 +#: ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "'%s' dosyası bulunamadı." + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "_Renk Şemaları" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "_Öntanımlı" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Dosya" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Yeni (_kalıp ile)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "geçersiz" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 +#: ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Seç_ilen Dosyayı Aç" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "_Önceki Dosyalar" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Hepsini Kayde_t" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr ".. olarak t_ekrar yükle" -#: ../src/interface.c:376 +#: ../src/interface.c:371 +#: ../src/interface.c:553 +#: ../src/interface.c:682 +#: ../src/interface.c:696 +#: ../src/interface.c:950 +#: ../src/interface.c:960 +#: ../src/interface.c:2090 +#: ../src/interface.c:2104 +msgid "invisible" +msgstr "geçersiz" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Sayfa D_üzeni" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 +#: ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Di_ğer Dosyaları Kapat" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 +#: ../src/notebook.c:219 msgid "C_lose All" msgstr "Tümü_nü Kapat" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "Düz_enle" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 +#: ../src/interface.c:2031 msgid "_Format" msgstr "_Biçim" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 +#: ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Seçimi Büyült/Kü_çült" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 +#: ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "Geçerli Sa_tırın Yerini Değiştir" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Satırları _Yoruma Çevir" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Satırların Yorumunu _Kaldır" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Sa_tırı Yorum Yap/Yapma" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Seçimi ya da Satırı Ço_ğalt" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "Girintiyi _Artır" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Girintiyi A_zalt" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "_Seçimi Terminale Gönder" +#: ../src/interface.c:537 +#: ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "Akıllı _Satır Girintilendirme" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Seçimi yolla" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 +#: ../src/interface.c:2035 +msgid "_Commands" +msgstr "_Komutlar" + +#: ../src/interface.c:563 +#: ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "Ge_çerli satır(lar)ı kes" + +#: ../src/interface.c:571 +#: ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "Geçerli satır(lar)ı _kopyala" + +#: ../src/interface.c:579 +#: ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "Geçerli _satır(lar)ı sil" + +#: ../src/interface.c:583 +#: ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "_Seçimi veya Satır(lar)ı Çoğalt" + +#: ../src/interface.c:592 +#: ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "Geçerli _Satır(lar)ı Seç" + +#: ../src/interface.c:596 +#: ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "Geçerli Paragrafı _Seç" + +#: ../src/interface.c:605 +#: ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "Alternat_if Beyaz Alan Ekle" + +#: ../src/interface.c:614 +#: ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "_Sonraki İşaretçiye Git" + +#: ../src/interface.c:618 +#: ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "_Önceki İşaretçiye Git" + +#: ../src/interface.c:627 +#: ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Seçimi Terminale Gönder" + +#: ../src/interface.c:636 +#: ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Yoru_m Ekle" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 +#: ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "Değişiklik _Girdisi Ekle" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 +#: ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Dosya _Başlığı Ekle" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 +#: ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "_Fonksiyon Tanımı Gir" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 +#: ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Çok satırlı yo_rum girer" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 +#: ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "_GPL Lisans Notu Gir" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 +#: ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "_BSD Lisans Notu Gir" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 +#: ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Tari_h Gir" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 +#: ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" g_ir" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "_Seçenekler" -#: ../src/interface.c:621 +#: ../src/interface.c:712 +#: ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "Ek_lenti Seçenekleri" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Ara" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "So_nrakini Bul" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Ön_cekini Bul" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Dosyalar _içinde Bul" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 +#: ../src/search.c:551 msgid "_Replace" msgstr "Değişti_r" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "_Seçileni Bul" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "Önceki Seçileni B_ul" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Sonraki _Mesaj" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" msgstr "Önc_eki Mesaj" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 +#: ../src/interface.c:2145 msgid "_Go to Line" msgstr "Satıra _Git" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Ya_zıtipini Değiştir" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "B_ütün Bölgeleri Göster/Gizle" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "Tam E_kran" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Mesa_j Penceresini Göster" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Araç Ç_ubuğunu Göster" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" -msgstr "Yan Pane_li Gçster" +msgstr "Yan Pane_li Göster" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 +#: ../src/interface.c:4025 +#: ../src/interface.c:5347 +#: ../src/keybindings.c:260 +#: ../src/prefs.c:1531 msgid "Editor" msgstr "Düzenleyici" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "İşaretçi Bölü_münü Göster" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Satır Numara_larını Göster" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Beyaz Bo_ş Bölgeyi Göster" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Satır Sonlarını Göst_er" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "Girintileme Y_önergelerini Göster" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Döküman" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "Satır Ka_ydırma" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "Satır s_onu" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "Otom_atik Girintileme" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "Girintileme T_ürü" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 +#: ../src/interface.c:3633 +#: ../src/interface.c:5245 msgid "_Tabs" msgstr "S_ekmeler" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 +#: ../src/interface.c:3624 +#: ../src/interface.c:5236 msgid "_Spaces" msgstr "Bo_şluklar" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 +#: ../src/interface.c:3642 +#: ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "_Sekmeler ve Boşluklar" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Salt _Okunur" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "BOM Unicode _Yaz" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Dosya _Türünü Ayarla" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Kodlama Aya_rla" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Satır So_nunu Ayarla" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "_CR/LF (Win) türüne dönüştür ve devam et" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "_LF (Unix) türüne dönüştür ve devam et" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "CR (_Mac) türüne dönüştür ve devam et" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "_Sondaki Boşlukları Kes" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Sekmele_ri Boşluk Yap" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Boşlukları Sekme _Yap" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "Hepsini _Katla" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "Hepsini A_ç" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "İ_şaretçileri Kaldır" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Hata belirteçlerin_i Kaldır" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Proje" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Ye_ni" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "A_ç" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "Son Açılan P_rojeler" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Kapat" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Araçlar" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "Aya_rları Tekrar Yükle" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "A_yar Dosyaları" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "_Renk Seçici" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "Kelime Saya_cı" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Bi_çim Yükle" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "Aya_rları Tekrar Yükle" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 +#: ../src/interface.c:1130 msgid "_Help" msgstr "Yardı_m" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "_Web Sitesi" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Klavye Kısayolları" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Hata Mesa_jları" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 +#: ../src/sidebar.c:130 msgid "Symbols" msgstr "Semboller" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Dökümanlar" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Durum" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Derleyici" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Mesajlar" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Karalama" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Resimler ve Y_azı" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "Sadece Res_imler" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Sadece Ya_zı" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Geniş Simge_ler" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Küçük _Simgeler" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "_Çok Küçük Simgeler" - -#: ../src/interface.c:1769 -msgid "_Customize Toolbar" -msgstr "Araç Çubuğunu _Özelleştir" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "Araç Çubu_ğu Seçenekleri" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "A_raç çubuğunu gizle" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "K_ullanım Bul" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "_Döküman Kullanımı Bul" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "Etiket _Tanımına Git" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Etik_et İlanına Git" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Ba_ğlam Görevi" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 +#: ../src/keybindings.c:387 msgid "Preferences" msgstr "Seçenekler" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Önceki oturumdan dosyaları yükle" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Açılışta önceki oturumdan kalan dosyaları yükler" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Sanal terminal desteğini yükle" -#: ../src/interface.c:2710 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup, " -"disable it if you do not need it" -msgstr "" -"Sanal terminal desteği (VTE) açılışta yüklenmiş olmalı. İhtiyacınız yoksa " -"etkisizleştirin." - #: ../src/interface.c:2712 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" +msgstr "Sanal terminal desteği (VTE) açılışta yüklenmiş olmalı. İhtiyacınız yoksa etkisizleştirin." + +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Eklenti desteğini yükle" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Başlangıç" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Pencere yeri ve boyutunu kaydet" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" -msgstr "" -"Şu anki pencere pozisyonu ve boyutunu kaydeder, açılışta bu şekilde açar." +msgstr "Şu anki pencere pozisyonu ve boyutunu kaydeder, açılışta bu şekilde açar." -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Çıkışta Onay İste" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Çıkışta bir onay sorusu sorar" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Kapatma" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Başlangıç yolu:" -#: ../src/interface.c:2778 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Bir dosya açılırken veya kaydedilirken öntanımlı yol. Çalışma dizininde " -"kalması için boş bırakın." +#: ../src/interface.c:2780 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Bir dosya açılırken veya kaydedilirken öntanımlı yol. Çalışma dizininde kalması için boş bırakın." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Proje dosyaları:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Proje dosyaları açılırken açılacak yol" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "Harici eklenti yolu:" -#: ../src/interface.c:2828 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Geany öntanımlı olarak sistemde yüklendiği dizini ve kullanıcı ayar dizinini " -"izler. Buraya girdiğiniz yol da harici eklentilerin aranacağı dizin " -"olacaktır. Kullanmak istemiyorsanız boş bırakın." +#: ../src/interface.c:2830 +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Geany öntanımlı olarak sistemde yüklendiği dizini ve kullanıcı ayar dizinini izler. Buraya girdiğiniz yol da harici eklentilerin aranacağı dizin olacaktır. Kullanmak istemiyorsanız boş bırakın." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Yollar" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Başlangıç" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Hatalarda veya başarılı derleme sonlarında sesle uyar" -#: ../src/interface.c:2871 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" +#: ../src/interface.c:2874 +msgid "Whether to beep if an error occurred or when the compilation process has finished" msgstr "Bir hata oluştuğunda ya da derleme işlemi bittiğinde ses uyarısı ver" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Yeni mesaj oluştuğunda durum mesajları listesine gönder" -#: ../src/interface.c:2876 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Yeni mesaj oluştuğunda durum mesajları sekmesine (not defteri penceresinin " -"en altında) gönder" +#: ../src/interface.c:2879 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Yeni mesaj oluştuğunda durum mesajları sekmesine (not defteri penceresinin en altında) gönder" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Durum çubuğunda mesaj gösterme" -#: ../src/interface.c:2881 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Durum çubuğunda mesaj göstermez. Ancak mesajlar durum penceresinde görünmeye " -"devam eder." +#: ../src/interface.c:2884 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Durum çubuğunda mesaj göstermez. Ancak mesajlar durum penceresinde görünmeye devam eder." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Bölümleri otomatik odakla (odak fareyi takip eder)" -#: ../src/interface.c:2886 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Odağı farenin olduğu bölgeye taşır. Ana bölgede, karatahtada, arama ve git " -"bölgeleri ile Sanal Terminal'de çalışır." - -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2889 +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Odağı farenin olduğu bölgeye taşır. Ana bölgede, karatahtada, arama ve git bölgeleri ile Sanal Terminal'de çalışır." + +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "Windows dosya yöneticisinin diyaloglarını kullan" + +#: ../src/interface.c:2894 +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Windows içindeki dosya diyaloglarının mı yoksa GTK dosya diyaloglarının mı kullanılacağını belirler" + +#: ../src/interface.c:2896 +#: ../src/interface.c:3275 +#: ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Arama diyaloğu penceresini her zaman gizle" -#: ../src/interface.c:2911 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Sonraki veya önceki sonuç için tıklama yapıldığında her zaman ilk sonuca " -"ulaşıp arama diyaloğunu kapat" +#: ../src/interface.c:2918 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Sonraki veya önceki sonuç için tıklama yapıldığında her zaman ilk sonuca ulaşıp arama diyaloğunu kapat" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Arama kutularında farenin gösterdiği kelimeyi göster" -#: ../src/interface.c:2916 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Seçim durumu olmadığında, arama ve yer değiştirme kutularında farenin " -"altındaki kelime öntanımlı olarak yerleştir" +#: ../src/interface.c:2923 +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Seçim durumu olmadığında, arama ve yer değiştirme kutularında farenin altındaki kelime öntanımlı olarak yerleştir" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Dosyalarda bulmak için geçerli dosyanın dizinini kullan" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Arama" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Proje tabanlı oturum dosyalarını kullan" -#: ../src/interface.c:2944 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" +#: ../src/interface.c:2951 +msgid "Whether to store a project's session files and open them when re-opening the project" msgstr "Oturum dosyasını projeye göm ve açarken onu kullan" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Proje dosyasını projenin temel dizininde sakla" -#: ../src/interface.c:2949 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Etkinleştirildiğinde proje dosyası, proje klasörü ile aynı dizinde saklanmak " -"yerine, proje klasörünün içinde saklanır. İsterseniz proje yolunu Yeni Proje " -"penceresinden değiştirebilirsiniz." +#: ../src/interface.c:2956 +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Etkinleştirildiğinde proje dosyası, proje klasörü ile aynı dizinde saklanmak yerine, proje klasörünün içinde saklanır. İsterseniz proje yolunu Yeni Proje penceresinden değiştirebilirsiniz." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Projeler" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 +#: ../src/prefs.c:1525 msgid "General" msgstr "Genel" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Sembol listesini göster" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Sembol listesini aç ya da kapat" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Döküman listesini göster" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Döküman listesini aç ya da kapat" -#: ../src/interface.c:2993 -msgid "Sidebar" -msgstr "Yan panel" - #: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "Yan Pane_li Göster" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "Konum:" + +#: ../src/interface.c:3026 +#: ../src/interface.c:3149 +#: ../src/interface.c:3210 +#: ../src/interface.c:3228 +#: ../src/interface.c:3246 +msgid "Left" +msgstr "Sol" + +#: ../src/interface.c:3033 +#: ../src/interface.c:3157 +#: ../src/interface.c:3211 +#: ../src/interface.c:3229 +#: ../src/interface.c:3247 +msgid "Right" +msgstr "Sağ" + +#: ../src/interface.c:3039 +msgid "Sidebar" +msgstr "Yan panel" + +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Sembol listesi:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 +#: ../src/interface.c:3197 msgid "Message window:" msgstr "Mesaj penceresi:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 +#: ../src/interface.c:3233 msgid "Editor:" msgstr "Editör:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Mesaj penceresi için yazıtipini seçin" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Sembol listesi için yazıtipini seçin" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Düzenleyici için yazıtipini seçin" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Yazıtipi" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Düzenleyici sekmelerini göster" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Kapat tuşlarını göster" -#: ../src/interface.c:3084 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Kapatmayı kolaylaştırmak için sekmelerin kenarında ufak bir çarpı işareti " -"gösterir. (Geany'i yeniden başlatmanız gerekir)" +#: ../src/interface.c:3130 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Kapatmayı kolaylaştırmak için sekmelerin kenarında ufak bir çarpı işareti gösterir. (Geany'i yeniden başlatmanız gerekir)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Yeni dosya sekmelerinin yerleşimi:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Sol" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Yeni dosyalar not defterinde sola yerleşir" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Sağ" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Yeni dosyalar not defterinde sağa yerleşir" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "" + +#: ../src/interface.c:3169 +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Çift tıklama bütün bölgeleri gizler" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Görünüm->Tüm Bölümleri Göster/Gizle komutunu çağırır" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Düzenleyici sekmeleri" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 +#: ../src/interface.c:3230 +#: ../src/interface.c:3248 msgid "Top" msgstr "Üst" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 +#: ../src/interface.c:3231 +#: ../src/interface.c:3249 msgid "Bottom" msgstr "Taban" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Yan panel:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Sekme pozisyonları" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Durum çubuğunu göster" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ana pencerenin altında durum çubuğu görüntüle" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 +#: ../src/prefs.c:1527 msgid "Interface" msgstr "Arayüz" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "Araç Çubu_ğunu Göster" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "_Araç Çubuğunu Menüye Tuttur" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "Dikey alanda yer kazanmak için araç çubuğunu menüyle birleştirir" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Araç çubuğu" +#: ../src/interface.c:3340 +#: ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Araç Çubuğunu Özelleştir" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Simge tüyü:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Simge boyutu:" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "_Öntanımlı" -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Görünüm" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Resimler ve Y_azı" -#: ../src/interface.c:3359 ../src/toolbar.c:881 -msgid "Customize Toolbar" -msgstr "Araç Çubuğunu Özelleştir" +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "Sadece Res_imler" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Sadece Ya_zı" -#: ../src/interface.c:3363 +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "Simge Türü" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "_Öntanımlı" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Küçük _Simgeler" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "_Çok Küçük Simgeler" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Geniş Simge_ler" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "Singe Boyutu" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Araç çubuğu" + +#: ../src/interface.c:3455 +#: ../src/prefs.c:1529 msgid "Toolbar" msgstr "Araç Çubuğu" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Satır kaydırma" -#: ../src/interface.c:3393 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Pencerenin kenarına ulaşan satırı bir alta geçerek devam ettirir. Not: Bu " -"özellik performans kaybına sebep olur ve bu yüzden yavaş makinalarda pasif " -"olmalıdır." +#: ../src/interface.c:3485 +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Pencerenin kenarına ulaşan satırı bir alta geçerek devam ettirir. Not: Bu özellik performans kaybına sebep olur ve bu yüzden yavaş makinalarda pasif olmalıdır." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "\"Akıllı\" home tuşunu etkinleştir" -#: ../src/interface.c:3398 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"\"Akıllı\" home tuşu etkinleştirildiğinde, HOME tuşu işaretçiyi satırın ilk " -"boşluk olmayan karakterine götürür. Zaten orada ise satırın en başına " -"götürür. Bu özellik pasif ise işaretçi nerede olursa olsun HOME tuşu ile " -"boşlukları önemsemeden satırın en başına gider." +#: ../src/interface.c:3490 +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "\"Akıllı\" home tuşu etkinleştirildiğinde, HOME tuşu işaretçiyi satırın ilk boşluk olmayan karakterine götürür. Zaten orada ise satırın en başına götürür. Bu özellik pasif ise işaretçi nerede olursa olsun HOME tuşu ile boşlukları önemsemeden satırın en başına gider." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Sürükle ve bırak desteğini kapat" -#: ../src/interface.c:3403 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Sürükle ve bırak özelliğini kapatır. Bu sayede düzenleyici içinde veya " -"dışarıyla sürükle bırak yöntemi ile taşıma yapılamaz." +#: ../src/interface.c:3495 +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Sürükle ve bırak özelliğini kapatır. Bu sayede düzenleyici içinde veya dışarıyla sürükle bırak yöntemi ile taşıma yapılamaz." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Katlamayı etkinleştır" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Kod için katlama özelliğini aç ya da kapat" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Bir katlama noktasında tüm alt katlamaları aç/kapat" -#: ../src/interface.c:3413 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Bir katlama noktasında tüm alt katlamaları açar/katlar. Tersi davranış için " -"tıklarken Shift tuşunu kullanın." +#: ../src/interface.c:3505 +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Bir katlama noktasında tüm alt katlamaları açar/katlar. Tersi davranış için tıklarken Shift tuşunu kullanın." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Derleme hataları için gösterge kullan" -#: ../src/interface.c:3418 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Derleyici hata ve uyarıları için bir gösterge (dalgalı alt çizgi) kullan" +#: ../src/interface.c:3510 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Derleyici hata ve uyarıları için bir gösterge (dalgalı alt çizgi) kullan" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Yeni satır alttaki boşlukları keser" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Alttaki boşlukları yok etmesi için yeni satırı etkinleştir" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Satır sonlandırıcı sütun:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Yorum aç/kapa işaretçisi:" -#: ../src/interface.c:3450 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Kaynak dosyasında yorum satırlarını belirtmek için bir değer. Yorum " -"satırları arasında geçişlerde kullanılacak." +#: ../src/interface.c:3542 +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Kaynak dosyasında yorum satırlarını belirtmek için bir değer. Yorum satırları arasında geçişlerde kullanılacak." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Özellikler" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Özellikler" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 +#: ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Oto-Girinti modu:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 +#: ../src/interface.c:5207 msgid "Basic" msgstr "Temel" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 +#: ../src/interface.c:5208 msgid "Current chars" msgstr "Geçerli karakterler" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 +#: ../src/interface.c:5209 msgid "Match braces" msgstr "Eşleme ayraçları" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 +#: ../src/interface.c:3925 +#: ../src/interface.c:5211 msgid "Type:" msgstr "Tür:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 +#: ../src/interface.c:5218 msgid "Width:" msgstr "Genişlik" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 +#: ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Tek girdi için karakterin genişliği" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 +#: ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Girinti koyarken boşluk kullan" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 +#: ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Her girinti için bir sekme kullan" -#: ../src/interface.c:3554 ../src/interface.c:5122 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Girinti boyutu tek sekmeden küçükse boşluk, diğer türlü her ikisini de kullan" - -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Sekme genişliği:" +#: ../src/interface.c:3647 +#: ../src/interface.c:5259 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Girinti boyutu tek sekmeden küçükse boşluk, diğer türlü her ikisini de kullan" -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"Sekmeler ve Boşluklar ayarlı olan bir dökümanda kullanılacak sekme genişliği" - -#: ../src/interface.c:3587 ../src/interface.c:5155 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" +#: ../src/interface.c:3656 +#: ../src/interface.c:5268 +msgid "Whether to detect the indentation type from file contents when a file is opened" msgstr "Girintileme türünün açılan dosyanın içeriğinden tespit edilmesi" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Tab tuşu aralığı" -#: ../src/interface.c:3592 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Tab/Shift-Tab tuşları sekme karakteri eklemek yerine seçilen bölgedeki " -"girintiyi ayarlar" +#: ../src/interface.c:3661 +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Tab/Shift-Tab tuşları sekme karakteri eklemek yerine seçilen bölgedeki girintiyi ayarlar" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Girintileme" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 +#: ../src/interface.c:5270 msgid "Indentation" msgstr "Girinti" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Parça tamamlama" -#: ../src/interface.c:3625 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Önceden belirlenmiş bir değişkenin bir kısmı yazıldığında tek tuşla " -"tamamlamak için seçenek çıksın" +#: ../src/interface.c:3694 +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Önceden belirlenmiş bir değişkenin bir kısmı yazıldığında tek tuşla tamamlamak için seçenek çıksın" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XML için otomatik tamamlama" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "XML ve HTML etiketleri için otomatik tamamlama ve etiket kapatma." -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Çok satırlı yorumlara otomatik devam etme" -#: ../src/interface.c:3635 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"C, C++ ve Java gibi dillerde çoklu yorum satırlarında alt satıra geçince " -"yorum olarak işaretlemeye devam et" +#: ../src/interface.c:3704 +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "C, C++ ve Java gibi dillerde çoklu yorum satırlarında alt satıra geçince yorum olarak işaretlemeye devam et" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "Simgeleri otomatik tamamla" -#: ../src/interface.c:3640 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Bilinen sembolleri otomatik tamamlama (fonksiyon isimleri, global " -"değişkenler vs.)" +#: ../src/interface.c:3709 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Bilinen sembolleri otomatik tamamlama (fonksiyon isimleri, global değişkenler vs.)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "Dökümandaki bütün kelimeleri otomatik tamamla" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "Tamamlamada kelimenin geri kalanını kes" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "En fazla verilecek sembol ismi teklifi:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Tamamlama listesi uzunluğu:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" msgstr "Otomatik tamamlanacak karakterler:" -#: ../src/interface.c:3683 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" +#: ../src/interface.c:3752 +msgid "The amount of characters which are necessary to show the symbol autocompletion list" msgstr "Tamamlamanın devreye girmesi için yazılması gereken karakter sayısı" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Otomatik tamamlama listesindeki sıralarda uzunluğu gösterir" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Otomatik tamamlama listesinde gösterilecek en fazla sayıda öğe" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Tamamlamalar" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Parantez ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Yeni parantez kullanımında parantezi otomatik olarak kapat" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Tek tırnak ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Yeni tek tırnak kullanımında tırnağı otomatik olarak kapat" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Küme işareti { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Yeni küme işareti kullanımında kümeyi otomatik olarak kapat" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Köşeli Parantez [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "Yeni köşeli parantez kullanımında parantezi otomatik olarak kapat" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Çift tırnak \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Yeni çift tırnak kullanımında tırnağı otomatik olarak kapat" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Tırnak ve kümeleri otomatik kapat" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Tamamlamalar" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Sözdizimi renklendirmesinde renkleri tersine çevir" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" -"Siyah arkaplan üzerine beyaz yazı kullan ve bütün renkleri zıttına çevir. Bu " -"seçeneği aktifleştirdikten sonra Geany'i yeniden başlatmanız gerekir" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "Tüm renkleri ters çevir, öntanımlı olarak siyah arkaplana beyaz yazı gelecek" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Girintileme yönergelerini göster" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Doğru girintileme kullandığınızda ufak noktalı satırlar kullanarak size " -"yardımcı olur" +msgstr "Doğru girintileme kullandığınızda ufak noktalı satırlar kullanarak size yardımcı olur" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Beyaz boş bölgeyi göster" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Boşluk ve sekmelerle oluşturulmuş beyaz bölgeyi oklarla işaretler" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Satır sonlarını göster" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Satır sonu karakterini gösterir" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Satır numaralarını göster" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Satır numarası bölgesini gösterir ya da gizler" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "İşaretçi bölümünü göster" -#: ../src/interface.c:3815 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines" -msgstr "" -"Satırları işaretleyebilmek için satır numaralarının sağında ufak bir bölge " -"açar" +#: ../src/interface.c:3883 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" +msgstr "Satırları işaretleyebilmek için satır numaralarının sağında ufak bir bölge açar" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Son satırda kaydırmayı durdur" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Son satıra gelindiğinde kaydırmayı durdurur" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Görünüm" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Uzun satır işareti:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Uzun satır işareti rengi:" +#: ../src/interface.c:3911 +#: ../src/interface.c:5302 +msgid "Column:" +msgstr "Sütun:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "Renk:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Uzun satır işaretinin rengini belirler" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 +#: ../src/toolbar.c:71 +#: ../src/tools.c:717 +#: ../src/vte.c:765 +#: ../src/vte.c:772 msgid "Color Chooser" msgstr "Renk Seçici" -#: ../src/interface.c:3878 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"Uzun satır işareti, düzenleyicide ince ve dikey bir satırdır. Uzun olan " -"satırları veya satır arası ipuçlarını belirtir. Bu değeri 0 (sıfır)dan " -"farklı belirterek görünmesi gereken sütunu ayarlayabilirsiniz." +#: ../src/interface.c:3946 +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Uzun satır işareti, düzenleyicide ince ve dikey bir satırdır. Uzun olan satırları veya satır arası ipuçlarını belirtir. Bu değeri 0 (sıfır)dan farklı belirterek görünmesi gereken sütunu ayarlayabilirsiniz." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Satır" -#: ../src/interface.c:3891 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Düzenleyicide işaretci pozisyonunda düşey bir satır belirtir (ayrıntılar " -"için aşağı bkz)" +#: ../src/interface.c:3959 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Düzenleyicide işaretci pozisyonunda düşey bir satır belirtir (ayrıntılar için aşağı bkz)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Arkaplan" -#: ../src/interface.c:3898 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"Verilen işaretçi pozisyonundan (aşağı bkz) sonra gelen karakterler için " -"karakterlerin arkaplan rengini ayarlayın. (Orantılı fontlar kullanıyorsanız " -"tavsiye edilir)" +#: ../src/interface.c:3966 +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "Verilen işaretçi pozisyonundan (aşağı bkz) sonra gelen karakterler için karakterlerin arkaplan rengini ayarlayın. (Orantılı fontlar kullanıyorsanız tavsiye edilir)" + +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "Etkinleştirildi" -#: ../src/interface.c:3902 +#: ../src/interface.c:3976 +#: ../src/interface.c:5342 +msgid "Long line marker" +msgstr "Uzun satır işareti" + +#: ../src/interface.c:3995 +#: ../src/interface.c:5309 msgid "Disabled" msgstr "Pasifleştirildi" -#: ../src/interface.c:3908 -msgid "Long line marker" -msgstr "Uzun satır işareti" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "Sanal boşlukları gösterme" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "Sadece diktörtgen seçimler için" + +#: ../src/interface.c:4005 +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Diktörtgen bir seçim çizerken satır sonunun ardında sadece sanal boşlukları göster" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "Her Zaman" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Satırların sonundaki sanal boşlukları her zaman göster" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "Sanal boşluklar" -#: ../src/interface.c:3913 +#: ../src/interface.c:4021 msgid "Display" msgstr "Gösterim" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Yeni dökümanları komut satırında aç" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Komut satırında adı geçip de gerçekte olmayan dosyaları oluştur" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Öntanımlı satır sonu karakterleri:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Yeni dosyalar" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Yeni oluşturulmuş dosyalar için öntanımlı kodlamayı ayarlar" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Öntanımlı kodlama (yeni dosyalar için):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Öntanımlı kodlama (varolan dosyalar için):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Açılan eski dosyalar için öntanımlı kodlamayı ayarlar" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Yeni oluşturulmuş dosyalar için öntanımlı kodlamayı ayarlar" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "Dosyaları açarken sabit kodlama kullan" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "Unicode olmayan dosyaları açarken sabit kodlama kullan" + +#: ../src/interface.c:4116 +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Bu seçenek Unicode olmayan dosyalar açılırken kodlamayı otomatik tanıma özelliğini etkisiz kılar ve seçtiğiniz kodlamayı kullanmanızı sağlar (bu genellikle gerekmemektedir)." -#: ../src/interface.c:4030 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" -msgstr "" -"Bu seçenek dosyalar açılırken kodlamayı otomatik tanıma özelliğini etkisiz " -"kılar. Dosya sizin seçtiğiniz kodlamaya göre açılır (ki genellikle bu " -"tavsiye edilmez)" +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "Öntanımlı kodlama (Unicode olmayan dosyalar için):" + +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Unicode olmayan dosyalar için kullanılacak öntanımlı kodlamayı ayarlar" -#: ../src/interface.c:4032 +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Kodlamalar" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Dosya sonunda bir satır boş bırak" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Dosyanın son satırının altına boş bir satır bırakır" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Sondaki boşluğu temizle" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" -msgstr "" -"Dosyaların sonundaki boşluk, sekme ve diğer satır sonu karakterlerini " -"temizler" +msgstr "Dosyaların sonundaki boşluk, sekme ve diğer satır sonu karakterlerini temizler" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 +#: ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Sekmeleri boşluklara dönüştür" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Dökümandaki bütün sekme karakterlerini boşluklara dönüştürür" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Dosya kaydı" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Son açılanlar listesinin uzunluğu:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Son açılan dosyalar bölümünde kaç dosyanın gösterileceğini ayarlar" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Disk kontrolü zaman aşımı:" -#: ../src/interface.c:4122 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Dosyanın değişir değişmediğini diskten kontrol etme zaman aralığı, saniye " -"olarak. Sıfır değeri kontrolü iptal eder." - -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4226 +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Dosyanın değişir değişmediğini diskten kontrol etme zaman aralığı, saniye olarak. Sıfır değeri kontrolü iptal eder." + +#: ../src/interface.c:4235 +#: ../src/prefs.c:1533 +#: ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Dosyalar" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Derleme:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Tarayıcı:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Derleme aracı için yol ve deçenekler" +#: ../src/interface.c:4287 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "xterm, gnome-terminal veya konsole gibi bir terminal emülatörü ( -e seçeneğini kabul etmeli)" -#: ../src/interface.c:4197 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"xterm, gnome-terminal veya konsole gibi bir terminal emülatörü ( -e " -"seçeneğini kabul etmeli)" - -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Kullanacağınız tarayıcının yolu ve diğer argümanları" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Araç yolları" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Bağlam eylemi:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Bağlam eylem komutu. Şu an seçili olan cümle %s ile kullanılabilir. " -"Girilecek komutun verildiği her yerde görülür ve çalıştırılmadan önce " -"gerçeği ile yer değiştirecektir." +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Bağlam eylem komutu. Şu an seçili olan cümle %s ile kullanılabilir. Girilecek komutun verildiği her yerde görülür ve çalıştırılmadan önce gerçeği ile yer değiştirecektir." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Komutlar" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 +#: ../src/keybindings.c:560 +#: ../src/prefs.c:1535 msgid "Tools" msgstr "Araçlar" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "geliştiricinin e-posta adresi" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "geliştirici isminin baş harfleri" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Başlangıç sürümü:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Yeni dosyaya verilecek sürüm numarası" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Şirket adı" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Geliştirici" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Şirket:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "E-posta adresi:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Başlangıçlar:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Geliştiricinin adı" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Yıl:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Tarih:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Tarih ve Zaman:" -#: ../src/interface.c:4434 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"{tarihzaman} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " -"kullanabilirsiniz." +#: ../src/interface.c:4518 +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "{tarihzaman} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri kullanabilirsiniz." -#: ../src/interface.c:4441 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"{yıl} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " -"kullanabilirsiniz." +#: ../src/interface.c:4525 +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "{yıl} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri kullanabilirsiniz." -#: ../src/interface.c:4448 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"{tarih} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " -"kullanabilirsiniz." +#: ../src/interface.c:4532 +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "{tarih} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri kullanabilirsiniz." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Şema bilgisi" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 +#: ../src/prefs.c:1537 msgid "Templates" msgstr "Şemalar" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "De_ğiştir" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Klavye kısayolları" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 +#: ../src/prefs.c:1539 msgid "Keybindings" msgstr "Tuş kombinasyonları" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Komut:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Dosyaları yazdırırken kullanılacak komut (dosya adı için %f kullanın)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Yazdırma için harici bir komut kullan" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 +#: ../src/printing.c:381 msgid "Print line numbers" msgstr "Satır numaralarını yazdır" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 +#: ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Yazdırılacak sayfaya satır numaralarını da ekle" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 +#: ../src/printing.c:386 msgid "Print page numbers" msgstr "Sayfa numaralarını yazdır" -#: ../src/interface.c:4570 ../src/printing.c:387 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Her sayfanın en altında sayfa numaralarını da gösterir. Bu işlem sayfadan 2 " -"satır alır." +#: ../src/interface.c:4665 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Her sayfanın en altında sayfa numaralarını da gösterir. Bu işlem sayfadan 2 satır alır." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 +#: ../src/printing.c:391 msgid "Print page header" msgstr "Sayfa başlığını yazdır" -#: ../src/interface.c:4575 ../src/printing.c:392 -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Her sayfanın başına sayfa numarası, dosya adı ve geçerli tarihi gösteren bir " -"bilgi ekler (detay için aşağı bakın). Bu işlem sayfadan 3 satır alır." +#: ../src/interface.c:4670 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Her sayfanın başına sayfa numarası, dosya adı ve geçerli tarihi gösteren bir bilgi ekler (detay için aşağı bakın). Bu işlem sayfadan 3 satır alır." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 +#: ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Dosyanın sadece adını kullan" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "Yazdırırken dosyanın sadece adını (yolu olmadan) kullan." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 +#: ../src/printing.c:417 msgid "Date format:" msgstr "Tarih biçimi:" -#: ../src/interface.c:4608 ../src/printing.c:422 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Her sayfanın başına eklenecek tarih ve zaman için bir biçim girin. ANSI C " -"uyumlu karakterleri kullanabilirsiniz." +#: ../src/interface.c:4703 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Her sayfanın başına eklenecek tarih ve zaman için bir biçim girin. ANSI C uyumlu karakterleri kullanabilirsiniz." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Doğal GTK yazdırma kullan" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "Yazdırma" + +#: ../src/interface.c:4717 +#: ../src/prefs.c:1541 msgid "Printing" msgstr "Yazdırma" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Proje Özellikleri" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "Görüntü:" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "Özel" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "Global ayarları kullan" + +#: ../src/keybindings.c:227 +#: ../src/plugins.c:1171 msgid "File" msgstr "Dosya" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Yeni" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Aç" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Seçilen dosyayı aç" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Kaydet" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Farklı kaydet" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Tümünü kaydet" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Yazdır" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Kapat" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Hepsini kapat" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Yeniden yükle" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "Kapatılan son sekmeyi geri aç" + +#: ../src/keybindings.c:255 +#: ../src/project.c:519 msgid "Project" msgstr "Proje" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Proje özellikleri" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Geri al" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Tekrarla" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Seçimi veya satırı çoğalt" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Geçerli satır(lar)ı sil" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 msgid "Delete to line end" msgstr "Satırın sonuna kadar sil" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Geçerli satırı taşı" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Geçerli satıra git" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Görünümü bir satır yukarı kaydır" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Görünümü bir satır aşağı kaydır" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Parçayı tamamla" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "İşaretçiyi parça içinde hareket ettir" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Parça tamamlamayı engelle" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Bağlam eylemi" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Kelimeyi tamamla" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "İpucunu göster" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Makro listesini göster" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "Kelime parçası tamamlama" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "Satır(lar)ı yukarı taşı" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "Satır(lar)ı aşağı taşı" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Pano" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Kes" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Kopyala" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Yapıştır" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Geçerli satır(lar)ı kopyala" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Geçerli satır(lar)ı kes" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Seç" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Tümünü Seç" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Geçerli kelimeyi seç" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Geçerli satır(lar)ı seç" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Geçerli paragrafı seç" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "Önceki yazı parçasına git" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "Sonraki yazı parçasına git" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Biçim" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Seçimi büyült/küçült" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Seçimi Yorum yap/yapma" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Satır(lar)ı yoruma çevir" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Yorumdan satır(lar)a çevir" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Girdiyi artır" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Girdiyi azalt" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Tek boşluk ile girdiyi artır" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Tek boşluk ile girdiyi azalt" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Akıllı girintilendirme" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Özel Komut 1'e gönder" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Özel Komut 2'ye gönder" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Özel Komut 3'e gönder" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "Seçimi Terminale Gönder" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Araya ekle" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Araya tarih ekle" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Alternatif beyaz alan ekle" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Ayarlar" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 +#: ../src/toolbar.c:381 msgid "Search" msgstr "Ara" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 +#: ../src/search.c:396 msgid "Find" msgstr "Bul" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Sonrakini Bul" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Öncekini Bul" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Sonraki Seçimi Bul" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Önceki Seçimi Bul" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 +#: ../src/search.c:541 msgid "Replace" msgstr "Değiştir" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 +#: ../src/search.c:715 msgid "Find in Files" msgstr "Dosyalarda Bul" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Sonraki Mesaj" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Önceki Mesaj" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Kullanım Bul" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Döküman Kullanımı Bul" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 msgid "Mark All" msgstr "Tümünü İşaretle" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Git" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 +#: ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Bir bölüm geri yolculuk yap" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 +#: ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Bir bölüm ileri yolculuk yap" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Eşleşen ayraca git" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "İşaretçi ayarla" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Sonraki işaretçiye git" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Önceki işaretçiye git" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Etiket Tanımına Git" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Etiket İlanına Git" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Satırın Başına Git" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Satırın Sonuna Git" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" msgstr "Görüntülenen Satırın Sonuna Git" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Önceki Yazı Parçasına Git" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Sonraki Yazı Parçasına Git" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Bak" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Bütün bölümleri Aç/Kapa" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Tam ekran" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Mesaj Penceresini Aç/Kapa" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Araç çubuğunu Aç/Kapa" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Yakınlaştır" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Uzaklaştır" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "Yakınlaştırmayı Sıfırla" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Odakla" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Düzenleyiciye geç" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Karalama defterine geç" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Terminale geç" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Arama çubuğuna geç" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Araç çubuğuna geç" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Derleyiciye geç" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "Mesajlara Geç" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "Mesaj Penceresine Geç" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "Yan Panel Döküman Listesine Geç" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "Yan Panel Sembol Listesine Geç" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Not defteri sekmesi" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Soldaki dökümana geç" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Sağdaki dökümana geç" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Son kullanılan dökümana geç" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Dükümanı sola taşı" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Dükümanı sağa taşı" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Dükümanı başa taşı" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Dükümanı sona taşı" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Döküman" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Satır Kaydırmayı aç/kapat" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Satır kesmeyi aç/kapat" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Boşlukları sekmeye çevir" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Geçerli katlamayı aç/kapa" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Tümünü katla" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Tmünü aç" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Simge listesini tekrar yükle" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "İşaretçileri Kaldır" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "Hata Belirteçlerini Kaldır" + +#: ../src/keybindings.c:538 +#: ../src/keybindings.c:543 +#: ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "İnşa et" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 +#: ../src/toolbar.c:69 msgid "Compile" msgstr "Derle" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "hepsini derle" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Özel hedef yap" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Nesneyi derle" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Sonraki hata" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Önceki hata" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Çalıştır" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Çalıştır (alternatif komut)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "İnşa seçenekleri" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Renk Seçiciyi Göster" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Help" msgstr "Yardım" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Klavye Kısayolları" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Şu kısayollar düzenlenebilir:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Dökümana geç" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" -"Buraya istediğinizi yazabilirsiniz. Karalama defteri olarak " -"kullanabilirsiniz." +msgstr "Buraya istediğinizi yazabilirsiniz. Karalama defteri olarak kullanabilirsiniz." -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Bir ya da daha fazla oturum dosyasının yüklenmesi sırasında hata." @@ -3143,108 +3262,112 @@ msgid "Debug Messages" msgstr "Hata Ayıklama Mesajları" -#: ../src/main.c:124 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "T_emizle" + +#: ../src/main.c:122 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" msgstr "" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Alternatif bir ayar dizini kullan" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Daha çok bilgi ver" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Dahili dosya türü isimlerini yazdır" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Genel etiket dosyası oluştur (ayrıntılar için yardıma bkz)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Etiketleri oluştururken C/C++ dosyalarını işleme koyma" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" +msgstr "Dosyaları çalışılan ortamda açma, yeni bir ortamda açmaya zorla" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Bu soket dosya ismini çalışan bir Geany süreci ile iletişim kurmak için kullanın" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "Çalışan Geany süreçlerinde açık olan belgelerin bir listesini verir" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Başlangıçtaki mesaj penceresini gösterme" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Otomatik tamamlama verisini yükleme (yardım sayfalarına bakın)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Eklentileri yükleme" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Geany'nin kurulduğu dizinleri göster" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "önceki oturumun dosyalarını yükleme" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Terminal desteğini yükleme" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "libvte.so için dosya adı" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Daha çok bilgi ver" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Sürümü görüntüle ve çık" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[DOSYALAR...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(%s üzerinde GTK %d.%d.%d ve GLib %d.%d.%d ile derlendi)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Şimdi taşınsın mı?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany başlamadan önce eski ayar dizininizi taşıması gerek." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." msgstr "Ayar dizininiz \"%s\" konumundan \"%s\" konumuna başarıyla taşındı." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"Eski ayar dizininiz \"%s\" , \"%s\" konumuna taşınamadı (%s). Lütfen dizini " -"yeni konuma elle taşıyın." +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "Eski ayar dizininiz \"%s\" , \"%s\" konumuna taşınamadı (%s). Lütfen dizini yeni konuma elle taşıyın." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3255,51 +3378,51 @@ "Geany'i ayar dizini olmadan kullanmak bazı sorunlara yol açabilir.\n" "Yine de Geany'i açmak ister misiniz?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "'%s' dosyası bulunamadı." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Bu, Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Ayar dizini oluşturulamadı (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Ayar dosyaları tekrar yüklendi." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Durum mesajları" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "K_opyala" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Tümünü Kopy_ala" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Mesaj Penceresini Gi_zle" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 #, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"\"%s\" eklentisi derlenmiş halde Geany'nin bu sürümü ile uyumlu değil, " -"lütfen tekrar derleyin." +msgid "Could not find file '%s' - trying the current document path." +msgstr "'%s' dosyası bulunamadı - geçerli belge dizini deneniyor." + +#: ../src/plugins.c:464 +#, c-format +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "\"%s\" eklentisi derlenmiş halde Geany'nin bu sürümü ile uyumlu değil, lütfen tekrar derleyin." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Eklenti _Yöneticisi" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3310,127 +3433,114 @@ "Tanım: %s\n" "Sahip(leri): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Aktif" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Eklenti" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Erişilebilir eklenti yok." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Eklentiler" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Aşağıda erişilebilir eklentilerin listesi bulunmakta. Geany açılırken " -"çalıştırılacak eklentiler için seçiniz." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "Açılışta yüklenmesini istediğiniz eklentileri seçin:" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Eklenti detayları:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "Eklentileri Düzenle" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Tuşu Yakala" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "\"%s\" için kullanmak istediğiniz tuş kombinasyonunu girin." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 +#: ../src/symbols.c:1866 msgid "_Expand All" msgstr "H_epsini Genişlet" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 +#: ../src/symbols.c:1871 msgid "_Collapse All" msgstr "Hepsini _Katla" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Hareket" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Kısayol" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "İ_zin ver" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "Üzerine _yaz" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Bu kısayolun üzerine yaz?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "'%s' kombinasyonu zaten \"%s\" için kullanılıyor." +#: ../src/prefs.c:1543 +#: ../src/vte.c:269 +#: ../src/vte.c:723 +#: ../src/vte.c:728 +msgid "Terminal" +msgstr "Terminal" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Aşağıya araçların yollarını girin. İhtiyacınız olmayan araçlar için boş " -"bırakabilirsiniz." +msgstr "Aşağıya araçların yollarını girin. İhtiyacınız olmayan araçlar için boş bırakabilirsiniz." #. page Templates -#: ../src/prefs.c:1519 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" -"Şablonlarla kullanılacak bilgiyi ayarlayın. Detaylar için belgelere bakınız." - -#: ../src/prefs.c:1523 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany or force the reload of the settings using Tools->Reload Configuration." -"" -msgstr "" -"Not: Burada yaptığınız değişikliklerin geçerli olması için, Geany'i " -"yeniden başlatmalı ya da Araçlar->Ayarları tekrar yükle seçeneği ile " -"ayarları tekrar yüklemeye zorlamalısınız." +#: ../src/prefs.c:1624 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Şablonlarla kullanılacak bilgiyi ayarlayın. Detaylar için belgelere bakınız." + +#: ../src/prefs.c:1628 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." +msgstr "Not: Burada yaptığınız değişikliklerin geçerli olması için, Geany'i yeniden başlatmalı ya da Araçlar->Ayarları tekrar yükle seçeneği ile ayarları tekrar yüklemeye zorlamalısınız." #. page Keybindings -#: ../src/prefs.c:1529 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Burada belirli eylemlere klavye kısayolları belirleyebilirsiniz. Bir " -"tanesini seçin ve yeni bir kısayol atamak için Değiştir tuşuna basın. Direkt " -"olarak düzenlemek için çift tıklayın." +#: ../src/prefs.c:1634 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Burada belirli eylemlere klavye kısayolları belirleyebilirsiniz. Bir tanesini seçin ve yeni bir kısayol atamak için Değiştir tuşuna basın. Direkt olarak düzenlemek için çift tıklayın." #. page Printing -#: ../src/prefs.c:1534 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" -"Not: Doğal GTK yazdırma, sadece Geany GTK 2.10 (veya yukarı bir sürüm) " -"ile derlendiğinde ve Geany GTK 2.10 (veya yukarı bir sürüm) ile " -"çalışırken kullanılabilir." +#: ../src/prefs.c:1639 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "Not: Doğal GTK yazdırma, sadece Geany GTK 2.10 (veya yukarı bir sürüm) ile derlendiğinde ve Geany GTK 2.10 (veya yukarı bir sürüm) ile çalışırken kullanılabilir." #. page Editor->Indentation -#: ../src/prefs.c:1540 -msgid "" -"Warning: these settings are overridden by the current project. See " -"Project->Properties." -msgstr "" -"Uyarı: geçerli proje bu ayarları görmezden gelir. Bkz Proje-" -">Özellikler." +#: ../src/prefs.c:1645 +msgid "Warning: these settings are overridden by the current project. See Project->Properties." +msgstr "Uyarı: geçerli proje bu ayarları görmezden gelir. Bkz Proje->Özellikler." #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" @@ -3440,44 +3550,44 @@ msgid "Text will be wrongly spaced." msgstr "Yazıdaki boşluklar hatalı olacak." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Sayfa %d, toplam %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Döküman Düzeni" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "Yazdırırken dosyanın sadece (yolu olmadan) adını kullan" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Sayfa %d / %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "%s dosyasının yazdırılması iptal edildi." +msgid "Did not send document %s to the printing subsystem." +msgstr "%s belgesi yazdırma birimine gönderilmedi." -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "%s dosyası yazdırıldı." +msgid "Document %s was sent to the printing subsystem." +msgstr "%s dökümanı yazdırma birimine gönderildi." -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s dosyası yazdırılırken hata (%s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "Lütfen önce seçenekler bölümünden bir yazdırma komutu ayarlayın." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3488,583 +3598,664 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" yazdırma işlemi başarısız (dönüş kodu: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "%s dosyası yazdırıldı." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "projeler" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Yeni Proje" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Oluştu_r" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 +#: ../src/project.c:413 msgid "Name:" msgstr "Adı:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 +#: ../src/project.c:426 msgid "Filename:" msgstr "Dosya adı:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 +#: ../src/project.c:456 msgid "Base path:" msgstr "Temel yol:" -#: ../src/project.c:171 ../src/project.c:438 -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 "" -"Projenin oluşturulacağı ana dizin. Yeni bir tane oluşturabilir veya olan " -"dizinlerden kullanabilirsiniz." +#: ../src/project.c:170 +#: ../src/project.c:465 +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 "Projenin oluşturulacağı ana dizin. Yeni bir tane oluşturabilir veya olan dizinlerden kullanabilirsiniz." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 +#: ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Projenin Temel Klasörünü Seç" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 +#: ../src/project.c:263 +#: ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "\"%s\" proje dosyası yüklenemedi." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 +#: ../src/project.c:269 msgid "Open Project" msgstr "Proje Aç" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Proje dosyaları" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "\"%s\" projesi kapatıldı." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Tanım:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Temel klasör içinde yap" - -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Komutu çalıştır:" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:461 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +#: ../src/project.c:484 +msgid "Set" +msgstr "Ayarla" + +#: ../src/project.c:486 +msgid "Set the working directories (on the Build tab) for the non-filetype build commands to use the base path" msgstr "" -"Projenin temel dizininde çalıştırılacak olan komut. Komuta seçenekler " -"eklenebilir. Öntanımlı komutu kullanmak için boş bırakın." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Dosya örnekleri:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Onaylamadan kapatmak istiyor musunuz?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "'%s' projesi zaten açık." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Belirtilen proje ismi çok kısa." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Belirtilen proje ismi çok uzun (en fazla %d karakter)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Geçersiz bir dosya adı girdiniz" -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Projenin ana yolunu oluştur?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "\"%s\" yolu bulunamadı." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Proje temel dizini oluşturulamadı (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Proje dosyası yazılamadı (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "\"%s\" projesi oluşturuldu." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "\"%s\" projesi kaydedildi." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 +#: ../src/project.c:872 msgid "Choose Project Filename" msgstr "Proje Dosya Adını Seç" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Proje Çalıştırma Komutunu Seç" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "\"%s\" projesi açıldı." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Düzenli ifadeleri k_ullan" -#: ../src/search.c:220 -msgid "" -"Use POSIX-like regular expressions. For detailed information about using " -"regular expressions, please read the documentation." -msgstr "" -"POSIX tarzı düzenli ifadelendirmeyi kullan. Düzenli ifade kullanımı hakkında " -"daha fazlası için lütfen yardım sayfalarını okuyun." +#: ../src/search.c:237 +msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." +msgstr "POSIX tarzı düzenli ifadelendirmeyi kullan. Düzenli ifade kullanımı hakkında daha fazlası için lütfen yardım sayfalarını okuyun." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Geriye do_ğru ara" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" -"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " -"corresponding control characters" +"Replace \\\\, \\t, \\n" +", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" msgstr "" -"Yazıdaki \\\\, \\t, \\n, \\r ve \\uXXXX (Unicode) karakterleri kontrol " -"karakterleri ile yer değiştir" +"Yazıdaki \\\\, \\t, \\n" +", \\r ve \\uXXXX (Unicode) karakterleri kontrol karakterleri ile yer değiştir" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 +#: ../src/search.c:810 msgid "C_ase sensitive" msgstr "Büyük/Küçük harf duy_arlı" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 +#: ../src/search.c:816 msgid "Match only a _whole word" msgstr "Bütün kelimeyi e_şle" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Keli_menin başından eşle" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Önceki" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "So_nraki" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 +#: ../src/search.c:562 +#: ../src/search.c:740 msgid "_Search for:" msgstr "_Ara:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Tümünü Bul" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "İ_şaretle" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Dökümandaki bütün eşleşmeleri işaretle" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 +#: ../src/search.c:622 msgid "In Sessi_on" msgstr "_Oturumda" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 +#: ../src/search.c:627 msgid "_In Document" msgstr "D_ökümanda" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 +#: ../src/search.c:640 msgid "Close _dialog" msgstr "_Diyaloğu kapat" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 +#: ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Pencereyi açık tutmak için bu seçeneği pasifleştirin" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Değişti_r & Bul" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "Şununla değiş_tir:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Tüm_ünü değiştir" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Seç_im içinde" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Seçilen yazı içinde bütün eşleşmeleri değiştir" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Dizin:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "K_odlama:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Sabit di_ziler" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep düzenli ifadeler" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 +#: ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Daha fazla bilgi için grep'in yardım sayfalarına bakınız" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Harici düz_enli ifadeler" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Alt klasö_rlerde de uygula" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Arama sonuçlarını ters çev_ir" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Eşlenen değil, eşlenmeyen satırları seç" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Ekstra s_eçenekler:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Grep için diğer seçenekler" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 +#: ../src/search.c:1881 +#: ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d eşleşme bulundu, \"%s\"" msgstr[1] "%d eşleşme bulundu, \"%s\"" -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Yazı %u dosyada değiştirildi." -msgstr[1] "Yazı %u dosyada değiştirildi." +msgid "Replaced %u matches in %u documents." +msgstr "%u sayıdaki eşleşme %u belgede değiştirildi." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Dosyalarda bulmak için geçersiz dizin." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Bulunacak yazı yok." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "" -"grep aracı çalıştırılamadı '%s'; lütfen Seçenekler'de yolu kontrol edin." +msgstr "grep aracı çalıştırılamadı '%s'; lütfen Seçenekler'de yolu kontrol edin." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Arıyor..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (dizin: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Dizin açılamadı (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Arama başarısız (detaylar için Yardım->Hata Mesajları)." +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Arama hatalı." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Arama %d eşleşme ile tamamlandı." msgstr[1] "Arama %d eşleşme ile tamamlandı." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Eşleşme bulunamadı." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "Kötü düzensiz ifade: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany başka bir kullanıcıya ait olan Unix soketine erişmeye çalıştı.\n" +"Bu ölümcül bir hata ve Geany şimdi sonlanacak." + +#: ../src/symbols.c:611 +#: ../src/symbols.c:651 +#: ../src/symbols.c:718 msgid "Chapter" msgstr "Bölüm" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 +#: ../src/symbols.c:647 +#: ../src/symbols.c:719 msgid "Section" msgstr "Bölüm" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Kısım1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Kısım2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Kısım3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Ek" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 +#: ../src/symbols.c:652 +#: ../src/symbols.c:668 +#: ../src/symbols.c:679 +#: ../src/symbols.c:766 +#: ../src/symbols.c:777 +#: ../src/symbols.c:789 +#: ../src/symbols.c:803 +#: ../src/symbols.c:815 +#: ../src/symbols.c:827 +#: ../src/symbols.c:842 +#: ../src/symbols.c:887 msgid "Other" msgstr "Diğer" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 +#: ../src/symbols.c:835 +#: ../src/symbols.c:867 msgid "Module" msgstr "Modül" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 +#: ../src/symbols.c:762 +#: ../src/symbols.c:813 +#: ../src/symbols.c:825 +#: ../src/symbols.c:840 +#: ../src/symbols.c:852 msgid "Types" msgstr "Türler" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Tür oluşturucular" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 +#: ../src/symbols.c:638 +#: ../src/symbols.c:659 +#: ../src/symbols.c:667 +#: ../src/symbols.c:676 +#: ../src/symbols.c:688 +#: ../src/symbols.c:697 +#: ../src/symbols.c:750 +#: ../src/symbols.c:799 +#: ../src/symbols.c:822 +#: ../src/symbols.c:837 +#: ../src/symbols.c:874 msgid "Functions" msgstr "Fonksiyonlar" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 +#: ../src/symbols.c:637 msgid "Sections" msgstr "Bölümler" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Anahtarlar" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 +#: ../src/symbols.c:690 +#: ../src/symbols.c:751 +#: ../src/symbols.c:776 +#: ../src/symbols.c:801 +#: ../src/symbols.c:814 +#: ../src/symbols.c:823 +#: ../src/symbols.c:839 +#: ../src/symbols.c:886 msgid "Variables" msgstr "Değişkenler" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Komut" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Çevre" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 +#: ../src/symbols.c:720 msgid "Subsection" msgstr "Altbölüm" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 +#: ../src/symbols.c:721 msgid "Subsubsection" msgstr "Alt-Altbölüm" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Etiket" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Yapılar" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 +#: ../src/symbols.c:759 +#: ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Paket" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Benim" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Yerel" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Bizim" +#: ../src/symbols.c:677 +#: ../src/symbols.c:826 +#: ../src/symbols.c:849 +msgid "Labels" +msgstr "Etiketler" + +#: ../src/symbols.c:678 +#: ../src/symbols.c:689 +#: ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Sabitler" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 +#: ../src/symbols.c:785 +#: ../src/symbols.c:797 +#: ../src/symbols.c:810 +#: ../src/symbols.c:836 msgid "Interfaces" msgstr "Arayüzler" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 +#: ../src/symbols.c:708 +#: ../src/symbols.c:729 +#: ../src/symbols.c:739 +#: ../src/symbols.c:748 +#: ../src/symbols.c:786 +#: ../src/symbols.c:798 +#: ../src/symbols.c:811 +#: ../src/symbols.c:873 msgid "Classes" msgstr "Sınıflar" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Sabitler" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Çapalar" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "H1 Başlıkları" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "H2 Başlıkları" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "H3 Başlıkları" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Kimlik Seçicileri" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Tür Seçicileri" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 +#: ../src/symbols.c:774 msgid "Modules" msgstr "Modüller" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Tekliler" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 +#: ../src/symbols.c:740 +#: ../src/symbols.c:749 +#: ../src/symbols.c:787 +#: ../src/symbols.c:812 msgid "Methods" msgstr "Yöntemler" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 +#: ../src/symbols.c:870 msgid "Namespaces" msgstr "Ad boşlukları" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 msgid "Procedures" msgstr "Yordamlar" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "İçe aktarılanlar" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "Kişiler" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "Mimariler" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "Fonksiyonlar / Prosedürler" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "Değişkenler / Sinyaller" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "İşlemler / Bileşenler" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "Olaylar" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "Fonksiyonlar / Görevler" + +#: ../src/symbols.c:788 +#: ../src/symbols.c:875 msgid "Members" msgstr "Üyeler" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Etiketler" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Alt programlar" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Bloklar" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 +#: ../src/symbols.c:859 +#: ../src/symbols.c:883 msgid "Macros" msgstr "Makrolar" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Tanımlar" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Hedefler" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "Yapılar" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\" için bilinmeyen dosya uzantısı.\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "" -"Etiket dosyası oluşturulamadı, belki sebebi hiç etiket bulunmamasıdır.\n" +msgstr "Etiket dosyası oluşturulamadı, belki sebebi hiç etiket bulunmamasıdır.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4073,197 +4264,203 @@ "Kullanım: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" msgstr "" "Örnek:\n" -"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" -"gtk/gtk.h\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Etiketleri Yükle" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany etiket dosyaları (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s etiket dosyası yüklendi '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Etiket dosyası '%s' yüklenemedi." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" için tanım bulunamadı." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "İsme Göre Sı_rala" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Görünüme Göre Sır_ala" +#: ../src/templates.c:278 +msgid "Old" +msgstr "Eski" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Geçerli dosyayı kaydet" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Bütün açık dosyaları kaydet" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Geçerli dosyayı diskten tekrar yükle" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Geçerli dosyayı kapat" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Bütün açık dosyaları kapat" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Geçerli seçimi kes" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Geçerli seçimi kopyala" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Panodaki içeriği yapıştır" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Geçerli seçimi sil" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Son yapılan düzenlemeyi geri al" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Son yapılan düzenlemeyi tekrar uygula" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Geçerli dosyayı derle" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Geçerli dosyayı çalıştır veya incele" -#: ../src/toolbar.c:70 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette" +#: ../src/toolbar.c:71 +msgid "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Anında renk seçmek için bir renk paleti aç" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Yazıya yaklaş" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Yazıdan uzaklaş" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Girintiyi azalt" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Girintiyi artır" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 +#: ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Girilen yazıyı geçerli dosyada bul" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 +#: ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Girilen satıra git" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Seçenekler penceresini göster" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Geany'den Çık" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "Belgeyi yazdır" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 msgid "Replace text in the current document" msgstr "Mevcut dökümandaki yazıyı yer değiştir" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Yeni bir dosya oluştur" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "Kalıbı kullanarak yeni bir dosya oluştur" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Bir dosyayı aç" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "Önceden açılmış bir dosyayı aç" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "Daha fazla inşa seçeneği seç" + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Git" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "Ayırıcı" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "--- Ayıraç ---" -#: ../src/toolbar.c:897 -msgid "" -"Select items to be displayed on the toolbar. Items can be reordered by drag " -"and drop." -msgstr "" -"Araç çubuğunda gösterilecek öğeleri seçin. Öğeler sürükle bırak ile " -"düzenlenebilir." +#: ../src/toolbar.c:946 +msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." +msgstr "Araç çubuğunda gösterilecek öğeleri seçin. Öğeler sürükle bırak ile düzenlenebilir." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "Erişilebilir Öğeler" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 msgid "Displayed Items" msgstr "Gösterilen Öğeler" #: ../src/tools.c:153 #, c-format -msgid "" -"The executed custom command returned an error. Your selection was not " -"changed. Error message: %s" -msgstr "" -"Çalıştırılan özel komut bir hata ile döndü. Seçiminiz değiştirilmedi. Hata " -"mesajı: %s" +msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" +msgstr "Çalıştırılan özel komut bir hata ile döndü. Seçiminiz değiştirilmedi. Hata mesajı: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4279,432 +4476,416 @@ msgid "Custom command failed: %s" msgstr "Özel komut hatalı: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 +#: ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Özel Komut Ayarla" #: ../src/tools.c:311 -msgid "" -"You can send the current selection to any of these commands and the output " -"of the command replaces the current selection." -msgstr "" -"Seçtiğiniz bölümü bu komutlardan birine gönderebilirsiniz. Komutlardan dönen " -"değer seçtiğiniz bölüm ile yer değiştirecektir." +msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." +msgstr "Seçtiğiniz bölümü bu komutlardan birine gönderebilirsiniz. Komutlardan dönen değer seçtiğiniz bölüm ile yer değiştirecektir." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Hiç özel komut ayarlanmadı." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Kelime Sayacı" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "seçilen bölge" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "bütün döküman" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Aralık:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Satır:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Kelime:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Karakter:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Etiket bulunamadı" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Semb_ol Listesini Göster" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "_Döküman Listesini Göster" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 +#: ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Araç Çubuğunu G_izle" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 msgid "Show _Paths" msgstr "Yolları Göster" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "sat: %d\t süt: %d\t seç: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "satır: %d / %d\t süt: %d\t seç: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "SO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "mod: %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "kodlama: %s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "dosya türü: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "alan: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Yazıtipi güncellendi (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C Standart Kütüphanesi" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (C Standart Kütüphanesi)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ Standart Kütüphanesi" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Özel Tari_h Biçimi Ayarla" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Dizin Seç" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Dosya Seç" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "A_yar Dosyaları" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Tümünü kaydet" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Tümünü Kapat" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Terminal" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "D_ökümandan Yol Ayarla" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "Te_rminali Yeniden Başlat" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "G_iriş Yöntemleri" -#: ../src/vte.c:670 -msgid "" -"Could not change the directory in the VTE because it probably contains a " -"command." -msgstr "" -"Terminalde dizin değiştirilemedi, büyük ihtimalle bir komut içerdiğinden." - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Terminal eklentisi" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "" -"Bu ayarlar sadece sanal terminal kütüphanesi yüklenebilirse uygulanacak." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Terminal yazıtipi:" +#: ../src/vte.c:638 +msgid "Could not change the directory in the VTE because it probably contains a command." +msgstr "Terminalde dizin değiştirilemedi, büyük ihtimalle bir komut içerdiğinden." + +#: ../src/vte.c:736 +msgid "Font:" +msgstr "Yazıtipi:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Terminal bölgesi için yazıtipini ayarlar" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Ön plan rengi:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Arkaplan rengi:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Terminal bölgesinde yazının rengini ayarlar" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Terminal bölgesinde arkaplan rengini ayarlar" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Geri gezinti satırı:" -#: ../src/vte.c:790 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget" +#: ../src/vte.c:786 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget" msgstr "Terminal bölgesinde kaç komut geçmişe gidebileceğinizi ayarlar" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Kabuk:" -#: ../src/vte.c:802 -msgid "" -"Sets the path to the shell which should be started inside the terminal " -"emulation" +#: ../src/vte.c:798 +msgid "Sets the path to the shell which should be started inside the terminal emulation" msgstr "Terminalde kullanılacak kabuğa giden yolu ayarlar" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Tuşa tepki ver" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Bir tuşa başıldığında terminali en alta kaydır" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Çıktıya tepki ver" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Bir çıktı oluştuğunda terminali en alta kaydır" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "İşaretçi Yanıp Sönsün" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "İmlecin yanıp sönmesi" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Geany tuşlarının üzerine yaz" -#: ../src/vte.c:833 -msgid "" -"Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "" -"Geany kısayollarını görmezden gelerek terminalde kısayol tuşlarını " -"kullanmanızı sağlar" +#: ../src/vte.c:829 +msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +msgstr "Geany kısayollarını görmezden gelerek terminalde kısayol tuşlarını kullanmanızı sağlar" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Menü kısayol tuşunu etkisizleştir (öntanımlı olarak F10)" -#: ../src/vte.c:837 -msgid "" -"This option disables the keybinding to popup the menu bar (default is F10). " -"Disabling it can be useful if you use, for example, Midnight Commander " -"within the VTE." -msgstr "" -"Bu seçenek menünün belirmesini sağlayan tuşu devre dışı bırakır (öntanımlı " -"hali F10). Pasifleştirmek sanal terminalde MC kullanmak gibi durumlarda " -"kullanışlı olabilir." +#: ../src/vte.c:833 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Bu seçenek menünün belirmesini sağlayan tuşu devre dışı bırakır (öntanımlı hali F10). Pasifleştirmek sanal terminalde MC kullanmak gibi durumlarda kullanışlı olabilir." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 +#: ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Geçerli dosyanın yolunu izle" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "Açık dosyalarda gezerken \"cd $path\" komutunu çalıştır" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Çalıştırma betiği kullanma" -#: ../src/vte.c:847 -msgid "" -"Don't use the simple run script which is usually used to display the exit " -"status of the executed program" -msgstr "" -"Çalıştırılan komutun çıktısını görüntülemekte kullanılan basit çalıştırma " -"betiğini kullanma" +#: ../src/vte.c:843 +msgid "Don't use the simple run script which is usually used to display the exit status of the executed program" +msgstr "Çalıştırılan komutun çıktısını görüntülemekte kullanılan basit çalıştırma betiğini kullanma" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Terminal emülatöründe programları çalıştır" -#: ../src/vte.c:851 -msgid "" -"Run programs in VTE instead of opening a terminal emulation window. Please " -"note, programs executed in VTE cannot be stopped" -msgstr "" -"Sanal bir pencere açmak yerine programları terminal penceresinde çalıştırır. " -"Unutmayın, terminal içerisinde çalıştırılan uygulamalar sonlandırılamaz" +#: ../src/vte.c:847 +msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped" +msgstr "Sanal bir pencere açmak yerine programları terminal penceresinde çalıştırır. Unutmayın, terminal içerisinde çalıştırılan uygulamalar sonlandırılamaz" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany proje dosyaları" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Çalıştırılabilir dosyalar" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Sınıf Derleyici" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Yeni sınıf türleri için kaynak dosyaları oluşturur." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Sınıf Oluştur" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "İsim alanı" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "İsim alanı:" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Sınıf" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Sınıf adı:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Header dosyası:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Kaynak dosya:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Kalıntı" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Temel sınıf:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "Temel kaynağı:" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Temel header(başlık):" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Temel GTürü:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "Uyguladığı:" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Seçenekler" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Oluşturucu yap" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Yıkıcı yap" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "Soyut" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "Tek örnek" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ oluşturucu türü" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "_Sınıf Oluştur" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ Sınıfı" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ Sınıfı" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP Sınıfı" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML Karakterleri" @@ -4713,94 +4894,98 @@ msgid "Inserts HTML character entities like '&'." msgstr "'&' türünde HTML kümeleri ekler." -#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/htmlchars.c:39 +#: ../plugins/export.c:38 +#: ../plugins/filebrowser.c:44 +#: ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geany geliştirme takımı" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML karakterleri" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 karakterleri" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Yunan karakterleri" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Matematik karakterleri" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Teknik karakterler" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Ok karakterleri" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Noktalama karakterleri" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Diğer karakterler" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 +#: ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Eklenti düzenleme dizini oluşturulamadı." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Özel Karakterler" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "Ara_ya Ekle" -#: ../plugins/htmlchars.c:458 -msgid "" -"Choose a special character from the list below and double click on it or use " -"the button to insert it at the current cursor position." -msgstr "" -"Aşağıdaki listeden bir özel karakter seçin ve kullanmak için çift tıklayın. " -"Ya da geçerli noktaya eklemek için tuşu kullanın." +#: ../plugins/htmlchars.c:493 +msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." +msgstr "Aşağıdaki listeden bir özel karakter seçin ve kullanmak için çift tıklayın. Ya da geçerli noktaya eklemek için tuşu kullanın." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Karakter" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (isim)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Özel HTML karakterler_i Ekle" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" msgstr "HTML yer değiştirmesi" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "_HTMLBirleşimi" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "Özel karakterlerin toplu yer değişimi" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Özel HTML karakterleri Ekle" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "Özel karakterleri değiştir" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "Eklenti durumunu değiştir" @@ -4821,146 +5006,136 @@ msgstr "Geçerli yakınlaştırma seviyesini k_ullan" #: ../plugins/export.c:185 -msgid "" -"Renders the font size of the document together with the current zoom level" -msgstr "" -"Dökümanın yazıtipi boyutunu geçerli yakınlaştırma seviyesine göre ayarlar" +msgid "Renders the font size of the document together with the current zoom level" +msgstr "Dökümanın yazıtipi boyutunu geçerli yakınlaştırma seviyesine göre ayarlar" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Döküman '%s' olarak başarıyla dışa aktarıldı." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "'%s' dosyası yazılamadı (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "'%s' dosyası zaten var. Üzerine yazmak ister misiniz?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "Dı_şa Aktar" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "_HTML Olarak" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "_LaTeX Olarak" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Dosya Yönetici" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Araç çubuğuna bir dosya yönetim sekmesi ekler." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Çok fazla nesne seçildi!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Düzenlenmiş harici komut '%s' çalıştırılamadı (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "_Harici olarak aç" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "Dosyalarda _Bul" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Gizli Dosyaları G_öster" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Yukarı" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Tazele" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Ev" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Yolu dökümandan ayarla" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "Filtreyi temizle" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Filtre:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "Dosyalarınızı bilinen jokerleri kullanarak filtreleyin" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Dosya Listesini Odakla" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Yol Girdisini Odakla" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Eklenti düzenleme dizini oluşturulamadı." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Harici açma komutu:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, 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 "" -"\"Birlikte Aç\" ile kullanılacak komut. %f ve %d joker karakterlerini " -"kullanabilirsiniz.\n" +"\"Birlikte Aç\" ile kullanılacak komut. %f ve %d joker karakterlerini kullanabilirsiniz.\n" "%f dosya adı ile beraber tam dosya yolunu\n" "%d ise sadece dosya yolunu belirtir" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Gizli dosyaları göster" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Nesne dosyalarını sakla" -#: ../plugins/filebrowser.c:1117 -msgid "" -"Don't show generated object files in the file browser, this includes *.o, *." -"obj. *.so, *.dll, *.a, *.lib" -msgstr "" -"Dosya yöneticisinde oluşturulmuş nesne dosyalarını görüntüleme, bu dosyalar; " -"*.o, *.obj. *.so, *.dll, *.a, *.lib" +#: ../plugins/filebrowser.c:1212 +msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" +msgstr "Dosya yöneticisinde oluşturulmuş nesne dosyalarını görüntüleme, bu dosyalar; *.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "Projenin ana dizinini kullan" -#: ../plugins/filebrowser.c:1132 -msgid "" -"Change the directory to the base directory of the currently opened project" +#: ../plugins/filebrowser.c:1227 +msgid "Change the directory to the base directory of the currently opened project" msgstr "Dizini şu anda açık olan projenin temel dizini olarak ayarla" #: ../plugins/saveactions.c:39 @@ -5007,7 +5182,8 @@ msgid "Auto Save" msgstr "Otomatik Kayıt" -#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:545 +#: ../plugins/saveactions.c:607 #: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Etkinleştir" @@ -5050,8 +5226,7 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "" -"Yedek dosyaları için _Tarih/Zaman formatı (detaylar için \"man strftime\"):" +msgstr "Yedek dosyaları için _Tarih/Zaman formatı (detaylar için \"man strftime\"):" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" @@ -5065,37 +5240,203 @@ msgid "Splits the editor view into two windows." msgstr "Düzenleyiciyi iki pencereye böler." -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 msgid "Show the current document" msgstr "Geçerli dökümanı görüntüle" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 +#: ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Birleştir" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Pencere_yi Böl" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Yatay" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Dikey" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "Yatay olarak böl" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "Dikey olarak böl" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "Birleştir" +#~ msgid "_Customize Toolbar" +#~ msgstr "Araç Çubuğunu _Özelleştir" + +#~ msgid "Icon style:" +#~ msgstr "Simge tüyü:" + +#~ msgid "Icon size:" +#~ msgstr "Simge boyutu:" + +#~ msgid "Appearance" +#~ msgstr "Görünüm" + +#~ msgid "Hard tab width:" +#~ msgstr "Sekme genişliği:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "Sekmeler ve Boşluklar ayarlı olan bir dökümanda kullanılacak sekme " +#~ "genişliği" + +#~ msgid "Terminal plugin" +#~ msgstr "Terminal eklentisi" + +#~ msgid "Terminal font:" +#~ msgstr "Terminal yazıtipi:" + +#~ msgid "Try to resave the file?" +#~ msgstr "Dosyayı tekrar kurtarmayı denemek ister misiniz?" + +#~ msgid "Long line marker:" +#~ msgstr "Uzun satır işareti:" + +#~ msgid "Long line marker color:" +#~ msgstr "Uzun satır işareti rengi:" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Seçimi veya satırı çoğalt" + +#~ msgid "Send Selection to Terminal" +#~ msgstr "Seçimi Terminale Gönder" + +#~ msgid "Replaced text in %u file." + +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Yazı %u dosyada değiştirildi." +#~ msgstr[1] "Yazı %u dosyada değiştirildi." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "%s dosyasının yazdırılması iptal edildi." + +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Arama başarısız (detaylar için Yardım->Hata Mesajları)." + +#~ msgid "My" +#~ msgstr "Benim" + +#~ msgid "Local" +#~ msgstr "Yerel" + +#~ msgid "Our" +#~ msgstr "Bizim" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Bu ayarlar sadece sanal terminal kütüphanesi yüklenebilirse uygulanacak." + +#~ msgid "Unsplit" +#~ msgstr "Birleştir" + +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Dahili _Seçenekleri ve Argümanları Ayarla" + +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" + +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" + +#~ msgid "_View DVI File" +#~ msgstr "D_VI Dosyayı İncele" + +#~ msgid "V_iew PDF File" +#~ msgstr "PDF Dosyayı _İncele" + +#~ msgid "_Set Arguments" +#~ msgstr "Arg_ümanları Ayarla" + +#~ msgid "Set Arguments" +#~ msgstr "Argümanları Ayarla" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "(La)TeX dosyalarının derlenmesi ve incelenmesi için program ve " +#~ "seçenekleri ayarla." + +#~ msgid "DVI creation:" +#~ msgstr "DVI oluşturma:" + +#~ msgid "PDF creation:" +#~ msgstr "PDF oluşturma:" + +#~ msgid "DVI preview:" +#~ msgstr "DVI izleme:" + +#~ msgid "PDF preview:" +#~ msgstr "PDF izleme:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f geçerli dosya adı ile değişecek, örn. test_dosyasi.c\n" +#~ "%e geçerli dosya adının uzantısız hali ile değişecek, örn. test_dosyasi" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Dahili Seçenekleri ve Argümanları Ayarla" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "" +#~ "Dosyaları derlemek ve çalıştırmak için kullanılacak komutları ayarla." + +#~ msgid "Compile:" +#~ msgstr "Derle:" + +#~ msgid "Build:" +#~ msgstr "İnşa Et:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Görüntüleme programı çalıştırılamadı" + +#~ msgid "" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Siyah arkaplan üzerine beyaz yazı kullan ve bütün renkleri zıttına çevir. " +#~ "Bu seçeneği aktifleştirdikten sonra Geany'i yeniden başlatmanız gerekir" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Derleme aracı için yol ve deçenekler" + +#~ msgid "Run (alternative command)" +#~ msgstr "Çalıştır (alternatif komut)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Aşağıda erişilebilir eklentilerin listesi bulunmakta. Geany açılırken " +#~ "çalıştırılacak eklentiler için seçiniz." + +#~ msgid "Make in base path" +#~ msgstr "Temel klasör içinde yap" + +#~ msgid "Run command:" +#~ msgstr "Komutu çalıştır:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." +#~ msgstr "" +#~ "Projenin temel dizininde çalıştırılacak olan komut. Komuta seçenekler " +#~ "eklenebilir. Öntanımlı komutu kullanmak için boş bırakın." + +#~ msgid "Choose Project Run Command" +#~ msgstr "Proje Çalıştırma Komutunu Seç" #~ msgid "Diff file" #~ msgstr "Diff dosyası" @@ -5258,9 +5599,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Bütün daraltılabilir kod bloklarını açar" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Dökümandaki tüm hata işaretçilerini kaldırır." - #~ msgid "" #~ "Open a color chooser dialog, to interactively pick colors from a palette." #~ msgstr "Anında seçmek için bir renk seçim diyaloğu açar." @@ -5290,9 +5628,6 @@ #~ msgid "Show full path name in documents list" #~ msgstr "Döküman listesinde tam yolu göster" -#~ msgid "Use white text on a black background." -#~ msgstr "Siyah arkaplana beyaz yazı kullan." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Hata ayıklama modunda çalışıyor (çok fazla çıktı olacak)" @@ -5308,9 +5643,6 @@ #~ msgid "Heading (H3)" #~ msgstr "Başlık (H3)" -#~ msgid "Color" -#~ msgstr "Renk" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Gitmek için bir satır numarası giriniz." @@ -5413,10 +5745,8 @@ #~ "Terminalin nasıl davranacağını ayarlar. Ne yaptığınızı gerçekten " #~ "bilmiyorsanız bu bölümü düzenlemeyin." -#~ msgid "Search failed." -#~ msgstr "Arama hatalı." - #~ msgid "Found %d matches for \"%s\"." + #~ msgid_plural "Found %d matches for \"%s\"." #~ msgstr[0] "%d eşleşme bulundu, \"%s\"" #~ msgstr[1] "%d eşleşme bulundu, \"%s\"" diff -Nru geany-0.18/po/uk.po geany-0.19/po/uk.po --- geany-0.18/po/uk.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/uk.po 2010-05-23 09:08:49.000000000 +0100 @@ -4,9 +4,9 @@ # Boris Dibrov , 2007, 2008 msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2008-02-04 12:44+0300\n" "Last-Translator: Boris Dibrov \n" "Language-Team: \n" @@ -21,7 +21,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Швидке та легке графічне середовище, що використовує GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,69 +29,69 @@ msgid "Integrated Development Environment" msgstr "Об'єднане середовище розробки" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Про Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Швидке та легке графічне середовище" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(побудова під час, або після %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Інформація" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Розробники" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "підтримка" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "розробник" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "перекладацька підтримка" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Перекладачі" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Попередні перекладачі" -#: ../src/about.c:332 +#: ../src/about.c:338 #, fuzzy msgid "Contributors" msgstr "Конструктори типів" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:368 +#: ../src/about.c:374 #, fuzzy msgid "Credits" msgstr "Допомагали" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Ліцезнія" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -99,290 +99,298 @@ "Текст ліцензії не знайдено, будь-ласка відвідайте http://www.gnu.org/" "licenses/gpl-2.0.txt для її перегляду он-лайн." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Не вдається знайти термінал \"%s\" (перевірте шлях до інструменту термінала " -"у налаштуваннях)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Помилка при спробі змінити робочу директорію на \"%s\"" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Помилка виконання \"%s\" (стартовий скрипт не був створений)" +msgid "%s (in directory: %s)" +msgstr "%s (у теці: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Помилка процесу (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (у теці: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Помилка при спробі змінити робочу директорію на \"%s\"" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Помилка виконання \"%s\" (стартовий скрипт не був створений)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Неможливо виконати файл у VTE тому, що очевидно він містить команду." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Не вдається знайти термінал \"%s\" (перевірте шлях до інструменту термінала " +"у налаштуваннях)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Помилка під час компіляції." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Компіляція була успішною." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "_Компіляція" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Побудова" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "Виконати make для _усіх" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Виконати make для вказаного _файлу" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Нетипові налаштування make" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Виконати make над _об'єктом" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Тут введіть власні опції, увесь введений текст буде переданий команді make." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "_Наступна помилка" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 #, fuzzy msgid "_Previous Error" msgstr "_Попередній" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "_Обрати вкладення та аргументи" - -#. DVI -#: ../src/build.c:1143 +#: ../src/build.c:1343 #, fuzzy -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> DVI" +msgid "_Set Build Commands" +msgstr "Встановити власні команди" -#. PDF -#: ../src/build.c:1152 +#: ../src/build.c:1623 ../src/toolbar.c:373 #, fuzzy -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> PDF" +msgid "Build the current file" +msgstr "Компілювати поточний файл" -#. DVI view -#: ../src/build.c:1206 +#: ../src/build.c:1637 #, fuzzy -msgid "_View DVI File" -msgstr "Показати файл DVI" +msgid "Build the current file with Make and the default target" +msgstr "" +"Побудова поточного файлу з інструментом make та кінцевою точкою за " +"замовчанням" -#. PDF view -#: ../src/build.c:1216 +#: ../src/build.c:1639 #, fuzzy -msgid "V_iew PDF File" -msgstr "Відобразити PDF файл" +msgid "Build the current file with Make and the specified target" +msgstr "" +"Побудова поточного файлу з інструментом make та вказаною кінцевою точкою" -#. arguments -#: ../src/build.c:1231 +#: ../src/build.c:1641 #, fuzzy -msgid "_Set Arguments" -msgstr "Оберіть аргументи" +msgid "Compile the current file with Make" +msgstr "Компілювати поточний файл" + +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Не має змоги зупинити процес (%s)." -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Оберіть аргументи" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Більше не має помилок побудови." -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." +#: ../src/build.c:1778 +msgid "Set menu item label" msgstr "" -"Оберіть програми та опції для компіляції та відображення файлів (La)TeX" - -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "створення DVI:" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "створення PDF:" +#: ../src/build.c:1788 +msgid "Item" +msgstr "" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "попередній перегляд DVI:" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Мітка" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "попередній перегляд PDF:" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Команда" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f буде замінено на ім'я поточного файлу, наприклад test_file.c\n" -"%e буде замінено на ім'я поточного файлу без розширення, наприклад test_file" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (у теці: %s)" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Оберіть вкладення та аргументи" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Компілятор" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Оберіть команду для будування та виконання програми." +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s команди" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Компіляція:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Побудова:" - -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Виконання:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Встановити _тип файлу" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1914 ../src/build.c:1949 #, fuzzy -msgid "Build the current file" -msgstr "Компілювати поточний файл" +msgid "Error Regular Expression:" +msgstr "Проявити _регулярний вираз" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Нетипові налаштування make" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1918 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" -"Тут введіть власні опції, увесь введений текст буде переданий команді make." -#: ../src/build.c:1967 +#: ../src/build.c:1981 #, fuzzy -msgid "Build the current file with Make and the default target" +msgid "Execute Commands" +msgstr "Встановити власні команди" + +#: ../src/build.c:1992 +#, c-format +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Побудова поточного файлу з інструментом make та кінцевою точкою за " -"замовчанням" -#: ../src/build.c:1970 +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "" -"Побудова поточного файлу з інструментом make та вказаною кінцевою точкою" +msgid "Set Build Commands" +msgstr "Встановити власні команди" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "_Компіляція" + +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Побудова" -#: ../src/build.c:1973 +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Compile the current file with Make" -msgstr "Компілювати поточний файл" +msgid "_Execute" +msgstr "Виконання:" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Помилка при спробі виконати відображену програму" +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Виконати make для вказаного _файлу" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Не має змоги зупинити процес (%s)." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Виконати make над _об'єктом" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Більше не має помилок побудови." +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "Виконати make для _усіх" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Встановити власні команди" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Ви дійсно бажаєте вийти?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Файл %s збережено." +msgstr[1] "Файл %s збережено." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "_Перезавантажити" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Будь-які не збережені зміни будуть втрачені." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Ви впевнені, що бажаєте перезавантажити '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "До рядку" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Введіть рядок до якого ви хочете переміститись:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Будь-ласка оберіть тип для поточного файлу перед використанням цієї функції." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "дд.мм.рррр" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "мм.дд.рррр" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "рррр/мм/дд" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.рррр гг:хх:сс" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.рррр гг:хх:сс" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "рррр/мм/дд гг:хх:сс" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "Ви_користовувати власний формат дати" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Власний формат дати" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -390,25 +398,24 @@ "Тут введіть власний формат дати й часу. Ви можете використовувати будь який " "формат часу що буде використаний функцією ANSI C strftime." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Не вдається конвертувати рядок формату дати (можливо рядок занадто довгий)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Більше не залишилося повідомлень." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Відкрити файл" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Показати" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -416,29 +423,29 @@ "Відкрити файл тільки для читання. Якщо ви оберете більше одного файлу усі " "будуть відкриті тільки для читання." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Визначити з розширення файлу" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Визначити з файлу" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "Опції" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "Показати _приховані файли" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Встановити кодовування:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -452,11 +459,11 @@ "вказаним кодуванням." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Встановити тип файлу:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -477,24 +484,24 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Зберегти файл" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Змінити _назву" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 #, fuzzy msgid "Save the file and rename it" msgstr "Зберегти файл та змінити його назву." -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Відкрити файл у новій вкладці." -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -503,41 +510,41 @@ "Не закриваючи поточного незбереженого файлу відкрити його збережений вміст у " "новій вкладці." -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Помилка" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Запитання" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Попередження" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Інформація" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Не зберігати." -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Файл '%s' не збережено." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Чи бажаєте зберегти файл до того як вийти?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Оберіть шрифт" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -545,106 +552,110 @@ "Виникла помилка або інформація про файл не була знайдена (наприклад з нового " "файлу)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "невідоме" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "Налаштування" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Тип:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Розмір:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Розташування:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Тільки читання:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(тільки у Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Кодування:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(з BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Модифікований:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Змінений:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Використаний:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Дозволи:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Читає:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Пише:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Виконання:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Власник:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Група:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Інше:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Файл %s зачинено." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Новий файл \"%s\" відкрито." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Файл %s (%s) відкрити неможливо" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -659,12 +670,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" помилковий %s." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -672,31 +683,31 @@ msgstr "" "Файл \"%s\" має вигляд не текстового або кодування файлу не підтримується." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Пробіли" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "відступи" -#: ../src/document.c:1128 +#: ../src/document.c:1169 #, fuzzy msgid "Tabs and Spaces" msgstr "_Заміняти відступи пробілами" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Встановлення %s розподіленого режиму." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Неприпустиме ім'я файлу" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Файл %s перезавантажено." @@ -704,21 +715,21 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Файл %s відкрито(%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", тільки читання" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "Помилка зберігання файлу." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -727,7 +738,7 @@ "Помилка під час конвертації файлу з UTF-8 у \"%s\". Файл залишено не " "збереженим." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -736,52 +747,52 @@ "Повідомлення про помилку: %s\n" "Помилка виникла у \"%s\" (рядок: %d, стовпчик: %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Повідомлення про помилку: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Помилка зберігання файлу." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Помилка при збереженні файлу (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Файл %s збережено." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" не знайдено." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Повернутися до початку і шукати знову?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "\"%s\" не зустрічається у файлі." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, fuzzy, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: замінено %d випадок(-ів) \"%s\" до \"%s\"." msgstr[1] "%s: замінено %d випадок(-ів) \"%s\" до \"%s\"." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Ви дійсно бажаєте перезавантажити його?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -790,24 +801,29 @@ "Файл '%s' на жорсткому диску новіший за\n" "поточний буфер." -#: ../src/document.c:2890 -msgid "Try to resave the file?" +#: ../src/document.c:2915 +msgid "Close _without saving" msgstr "" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, fuzzy, c-format -msgid "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "\"%s\" не знайдено." -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 #, fuzzy msgid "Enter Tab Width" msgstr "Ширина абзацу:" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Кельтські" @@ -918,609 +934,667 @@ msgid "Without encoding" msgstr "Без кодування" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Західні Європейські" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Східні Європейські" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Східні _Азіатські" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_SE & SW Азіатські" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Центрального сходу" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Юнікод" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Файл-джерело %s" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "Файл-джерело %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Нічого" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Скрипт на мові Shell" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "документ XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Каскадні таблиці стилів" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL Dump файл" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Файл конфігурацій" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 #, fuzzy msgid "Gettext translation file" msgstr "перекладацька підтримка" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, fuzzy, c-format msgid "%s script file" msgstr "Скрипт на мові Shell" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Мови _програмування" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Мови _скриптів" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Мови _розмітки" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "_Інші мови" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Встановити _тип файлу" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Усі вихідні коди" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Усі файли" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "безіменний" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Не знайдено файл '%s'." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "Палітра _кольорів" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Файл" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Нове (з _шаблону)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "невидимий" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Відкрити _обраний файл" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Оста_нні файли" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Зберегти _усі" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "_Перезавантажити як" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "невидимий" + +#: ../src/interface.c:388 #, fuzzy msgid "Page Set_up" msgstr "Налаштування _сторінки" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 #, fuzzy msgid "Close Ot_her Documents" msgstr "Закрити поточний файл" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "_Закрити усе" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Редагування" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "_Формат" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Перемикач вмісту _виділення" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Перемістити поточний рядок" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "_Коментувати рядок(-ки)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "З_няти коментар з рядку(-ів)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "_Перемикач закоментованості рядку" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "_Подвоїти рядок або виділене" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "З_більшити відступ" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "З_меншити відступ" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "_Надіслати виділене до" +msgid "_Smart Line Indent" +msgstr "Встановити тип кін_ця файлу" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Надіслати виділене до" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Команда" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Вирізати поточний рядок(-ки)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Копіювати поточний рядок(-ки)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Знищити поточний рядок(-ки)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "_Подвоїти рядок або виділене" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Виділити поточний рядок(-ки)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Виділити поточний параграф" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Вставити альтернативний пробіл" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Перейти до наступної мітки" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Перейти до попередньої мітки" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "_Надіслати виділене до" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "_Вставити коментарі" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Додати історію зміни" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 #, fuzzy msgid "Insert File _Header" msgstr "Додати заголовок файлу" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 #, fuzzy msgid "Insert _Function Description" msgstr "Додати опис функції" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Додати багаторядковий коментар" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 #, fuzzy msgid "Insert _GPL Notice" msgstr "Додати GPL повідомлення" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Додати повідомлення BSD ліцензії" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Додати _дату" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Д_одати \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "Налаштування" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Налаштування" + +#: ../src/interface.c:720 msgid "_Search" msgstr "_Пошук" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Знайти _наступне" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Знайти _попереднє" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Шукати у _файлі" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "_Замінити" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Знайти _виділене" -#: ../src/interface.c:661 +#: ../src/interface.c:760 #, fuzzy msgid "Find Pre_vious Selected" msgstr "Знайти п_опереднє виділене" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" msgstr "Наступне по_відомлення" -#: ../src/interface.c:674 +#: ../src/interface.c:773 #, fuzzy msgid "Pr_evious Message" msgstr "Наступне повідомлення" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "_Йти до рядку" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Змінити _шрифт" -#: ../src/interface.c:711 +#: ../src/interface.c:810 #, fuzzy msgid "To_ggle All Additional Widgets" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "На у_весь екран" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Показувати вікно _повідомлень" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Показувати панель _інструментів" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Показати _бічну панель" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Редактор" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Показати _межу виділення" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Показувати _номери рядків" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "Показувати пробіли" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "Виділяти кінці рядків" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "Показати керівників розподілення" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Документ" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "_Перенесення рядку" -#: ../src/interface.c:792 +#: ../src/interface.c:891 #, fuzzy msgid "Line _Breaking" msgstr "Переніс рядку" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Авто розпізнання" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "_Розподілений документ" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 #, fuzzy msgid "_Tabs" msgstr "відступи" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 #, fuzzy msgid "_Spaces" msgstr "Пробіли" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 #, fuzzy msgid "T_abs and Spaces" msgstr "_Заміняти відступи пробілами" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "Тільки _читання" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "_Записати Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Встановити _тип файлу" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Встановити _кодування" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Встановити тип кін_ця файлу" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Конвертувати та встановити у _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Конвертувати та встановити у LF (_Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Конвертувати та встановити у CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Видалити _пробіли після тексту" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "_Заміняти відступи пробілами" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 #, fuzzy msgid "Replace Spaces b_y Tabs" msgstr "_Заміняти відступи пробілами" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "З_горнути усе" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Розгорнути усе" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Прибрати _маркери" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Прибрати індикатори _помилок" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Проект" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "_Нове" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Відкрити" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "Відкрити проект" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "_Зачинити" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Інструменти" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "Помилка під час компіляції." + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Палітра _кольорів" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Кількість слів" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Завантажити _теґи" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "_Допомога" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Інтернет _сторінка" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Гарячі клавіші" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 #, fuzzy msgid "_Debug Messages" msgstr "Повідомлення" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Символи" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Документи" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Статус" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Компілятор" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Повідомлення" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Друк" -#: ../src/interface.c:1727 ../src/interface.c:3286 +#: ../src/interface.c:1887 #, fuzzy -msgid "Images _and Text" -msgstr "Текст та зображення" +msgid "_Toolbar Preferences" +msgstr "Налаштування" -#: ../src/interface.c:1732 ../src/interface.c:3318 +#: ../src/interface.c:1900 #, fuzzy -msgid "_Images Only" -msgstr "Тільки зображення" +msgid "_Hide Toolbar" +msgstr "Прибрати панель інструментів" -#: ../src/interface.c:1737 ../src/interface.c:3310 +#: ../src/interface.c:2112 #, fuzzy -msgid "_Text Only" -msgstr "Тільки текст" +msgid "Find _Usage" +msgstr "Користування пошуком" -#: ../src/interface.c:1748 ../src/interface.c:3302 +#: ../src/interface.c:2120 #, fuzzy -msgid "_Large Icons" -msgstr "Великі кнопки" +msgid "Find _Document Usage" +msgstr "Користування пошуком" -#: ../src/interface.c:1753 ../src/interface.c:3294 +#: ../src/interface.c:2128 #, fuzzy -msgid "_Small Icons" -msgstr "Маленькі кнопки" +msgid "Go to _Tag Definition" +msgstr "Перейти до визначення ярлика" -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Маленькі кнопки" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Прибрати панель інструментів" - -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "Прибрати панель інструментів" - -#: ../src/interface.c:2094 -#, fuzzy -msgid "Find _Usage" -msgstr "Користування пошуком" - -#: ../src/interface.c:2102 -#, fuzzy -msgid "Find _Document Usage" -msgstr "Користування пошуком" - -#: ../src/interface.c:2110 -#, fuzzy -msgid "Go to _Tag Definition" -msgstr "Перейти до визначення ярлика" - -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Перейти до об'яви ярлику" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 #, fuzzy msgid "Conte_xt Action" msgstr "Пов'язані дії" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Налаштування" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Завантажити файли з останнього відвідування" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "На початку роботи Geany завантажити файли з останньої сесії" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Завантажити підтримку віртуального терміналу" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1529,41 +1603,41 @@ "Віртуальний термінал емуляції (VTE) буде завантажено на початку роботи. " "Вимкніть якщо він не потрібен." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Активувати підтримку додатків" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Початок роботи" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Зберегти позицію та розмір вікна" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Зберегти позицію та розмір вікна і відновляти їх при кожному виклику Geany" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Підтвердження виходу" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Питати підтвердження на виході." -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Завершення роботи" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Tека початку роботи:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1572,40 +1646,40 @@ "теки мусить бути абсолютним. Залишіть незайманим для використання поточної " "робочої теки." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Файли проекту:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Тека для початку роботи під час відкривання файлів проекту" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 #, fuzzy msgid "Extra plugin path:" msgstr "Активувати підтримку додатків" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Шляхи" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "Статус" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Звуковий сигнал при помилці і невдалій компіляції" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1614,11 +1688,11 @@ "Ви почуєте звуковий сигнал при виникненні помилки або по закінченню " "компіляції." -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "Перемкнутися до списку повідомлень статусу при новому повідомленні" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1627,11 +1701,11 @@ "Перемкнутися до вкладки повідомлень статусу (у нижньому вікні з вкладками) " "якщо нові повідомлення статусу будуть надходити." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Не показувати повідомлення у вікні статусу" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1639,12 +1713,12 @@ "Прибрати усі повідомлення з панелі статусу. Наступні повідомлення будуть " "з'являтися у ній же." -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 #, fuzzy msgid "Auto-focus widgets (focus follows mouse)" msgstr "Автоматично фокусувати віджети (фокусування дотримуючись миші)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1653,16 +1727,26 @@ "Автоматично надати фокус віджету під курсором миші. Працює для вікна віджета " "головного редактору, друку, полів пошуку та переходу до рядку і для VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Інше" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "" "Завжди при досягненні кінця файлу починати спочатку і прибирати вікно пошуку" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1671,43 +1755,43 @@ "Завжди при досягненні кінця файлу починати с початку та прибирати діалог " "пошуку після натискання наступне/попереднє" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Помилкова тека для пошуку файлів." -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 #, fuzzy msgid "Search" msgstr "Бічна панель" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Використовувати файли сесії базовані на проекті" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "Зберігати файли сесії та відкривати їх при відкритті проекту." -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Чи створити базову теку для проекту?" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1715,76 +1799,100 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Проекти" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "Інше" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Загальне" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Показати список символів" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Активізація або відключення списку символів" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Показати список документів" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Активізація або відключення списку документів" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Показати _бічну панель" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Опис:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Наліво" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Направо" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Бічна панель" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Список символів:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Вікно повідомлень:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Редактор:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Встановити шрифт для вікна повідомлень" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Встановити шрифт для списку символів" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Встановити шрифт для редактора" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Шрифти" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Показати вкладки редактору" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Показати кнопки зачинення" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1793,114 +1901,151 @@ "Показувати маленьку кнопку-хрестик у вкладках файлів для полегшеного " "закриття файлу при натисканні на нього (потребує перезапуску Geany)." -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Розташування нових вкладок з файлами:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Наліво" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Вкладки з файлами будуть розташовані зліва від блокноту" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Направо" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Вкладки з файлами будуть розташовані зправа від блокноту" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Зберегти поточний файл" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Вкладки редактору" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Вершина" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Низовина" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Бічна панель:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Розташування вкладки" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Показати панель статусу" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Показувати панель статусу у низовині головного вікна." -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Інтерфейс" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "Показати панель інструментів" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Панель інструментів" - -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Стиль кнопки:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Розмір кнопки:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Вигляд" - -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy msgid "Customize Toolbar" msgstr "Показувати панель _інструментів" -#: ../src/interface.c:3363 +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +#, fuzzy +msgid "Images _and Text" +msgstr "Текст та зображення" + +#: ../src/interface.c:3376 +#, fuzzy +msgid "_Images Only" +msgstr "Тільки зображення" + +#: ../src/interface.c:3384 +#, fuzzy +msgid "_Text Only" +msgstr "Тільки текст" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" +msgstr "Шрифти" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +#, fuzzy +msgid "_Small Icons" +msgstr "Маленькі кнопки" + +#: ../src/interface.c:3429 +#, fuzzy +msgid "_Very Small Icons" +msgstr "Маленькі кнопки" + +#: ../src/interface.c:3437 +#, fuzzy +msgid "_Large Icons" +msgstr "Великі кнопки" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Розмір:" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Панель інструментів" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Панель інструментів" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Переніс рядку" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1910,11 +2055,11 @@ "перенесення рядків потребує великої продуктивності для великих документів, " "тому на повільних комп'ютерах варто не вмикати." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1923,11 +2068,11 @@ "its current position." msgstr "" -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Заборонити перетягування" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1936,20 +2081,20 @@ "Повністю заборонити перетягування у вікні редактору щоб унеможливити " "переміщення мишею будь якого виділення назовні або до вікна редактору." -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Дозволити згортку" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Дозволити згортку коду" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Згорнути/розгорнути усі вкладені згортки у місці згортання" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1958,11 +2103,11 @@ "Згорнути або розгорнути усі внутрішні згортання у позиції. При натисненні " "Shift і кліку по символу згортки відбувається зміна його стану." -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Виділяти рядки, на котрих були помилки компіляції" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1971,154 +2116,145 @@ "Використовувати індикатори (хвилясті стрічки під текстом) для виділення " "рядків на котрих були попередження або помилки компіляції." -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Новий рядок видаляє пробіли у кінці попереднього" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Дозволити при початку нового рядку видаляти пробіли після тексту " "попереднього рядку" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "Межа довгого рядку:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Додаткові можливості" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 #, fuzzy msgid "Features" msgstr "Додаткові можливості" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Режим авто-абзацу:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Базове" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Поточні символи" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Парні скоби" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Тип:" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 #, fuzzy msgid "Width:" msgstr "Пише:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 #, fuzzy msgid "The width in chars of a single indent" msgstr "Ширина абзацу у кількості звичайних символів" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Ширина абзацу:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Визначати тип абзацу з вмісту файлу під час відкриття." -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 #, fuzzy msgid "Tab key indents" msgstr "Збільшити відступ" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Абзац" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "Абзац" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "Авто-завершення теґів XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Автоматичне завершення та зачинення початого XML теґу (включаючи HTML теґи)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2126,152 +2262,151 @@ "Автоматичне завершення знайомих слів у відкритому файлі (назви функцій, " "глобальні змінні, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" msgstr "" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "Символи до друку для завершення:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 #, fuzzy msgid "Display height in rows for the autocompletion list" msgstr "Номери рядків для показу у списку авто-доповнення" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 #, fuzzy msgid "Maximum number of entries to display in the autocompletion list" msgstr "Номери рядків для показу у списку авто-доповнення" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Завершення" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 #, fuzzy msgid "Completions" msgstr "Завершення" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Інвертувати кольори підсвічення синтаксису" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "" +#: ../src/interface.c:3858 +#, fuzzy +msgid "Invert all colors, by default using white text on a black background" +msgstr "Встановити білий колір для тексту і чорний для фону." -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 #, fuzzy msgid "Show indentation guides" msgstr "Показати керівників розподілення" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Показувати невеличку стрічку з точок для допомоги у використанні правого " "абзацу." -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Показувати пробіли" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Виділити пробіли крапками а відступи стрілками." -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Виділяти кінці рядків" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "Виділити символи кінця рядку" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "Показувати _номери рядків" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Показати чи приховати границю номерів рядків" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 #, fuzzy msgid "Show markers margin" msgstr "Показати _межу виділення" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2280,37 +2415,39 @@ "Показувати або приховувати невелику межу на номерах рядків котра " "використовується для виділення рядків." -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 #, fuzzy msgid "Stop scrolling at last line" msgstr "Переміститись до поточного рядку" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Показати" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Межа довгого рядку:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Компанія:" -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Колір межі довгого рядку:" +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "Колір" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Оберіть колір межі довгого рядку" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Палітра кольорів" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2321,11 +2458,11 @@ "виявити довгі рядки або нагадує почати з нового рядку. Встановлення сюди " "додатної величини створить цю межу на заданому стовпчику." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Рядок" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2334,11 +2471,11 @@ "Малювати вертикальну лінію у вікні редактору у позиції вказаній курсором " "(дивіться далі)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2349,143 +2486,171 @@ "вказаного нижче кольору. (Радимо у випадку, якщо ви користуєтесь " "пропорціональними шрифтами)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Деактивовано" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "Дозволити згортку" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Межа довгого рядку" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Деактивовано" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Прибрати пробіли та відступи після тексту на кожному рядку" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Теки інструментів" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Показати" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 #, fuzzy msgid "Default end of line characters:" msgstr "Кодування за замовчанням (для нових файлів):" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Нові файли" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "Встановити типове кодування для нових файлів." - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Кодування за замовчанням (для нових файлів):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Кодування за замовчанням (для існуючих файлів):" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" -msgstr "Оберіть кодування для відкриття існуючих файлів." +msgid "Sets the default encoding for newly created files" +msgstr "Встановити типове кодування для нових файлів." -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Використовувати заздалегідь обране кодування для відкриття файлів" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Ця опція забороняє автоматичне визначення кодування файлу під час його " "відкриття а відкриває його за заздалегідь визначеним кодуванням (зазвичай не " "потрібно)." -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Кодування за замовчанням (для існуючих файлів):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Оберіть кодування для відкриття існуючих файлів." + +#: ../src/interface.c:4136 #, fuzzy msgid "Encodings" msgstr "Кодування:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Гарантувати чисту лінію у кінці файлу" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Гарантувати що у кінці файлу буде чиста лінія" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Видалити пробіли після тексту" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Прибрати пробіли та відступи після тексту на кожному рядку" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Замінити відступи пробілами" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Замінити усі відступи у документі пробілами." -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Зберігання файлів" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Довжина списку останніх файлів:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Задати кількість збережених посилань у списку останніх файлів." -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Файли" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Термінал:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Браузер:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Тека та опції для інструменту make" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2493,25 +2658,25 @@ "Емулятор терміналу схожий на xterm, gnome-terminal або konsole (мусить " "обробляти аргумент -e)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Шлях (а також, по можливості, додаткові аргументи) до вашого улюбленого " "браузеру" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Виділення:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Теки інструментів" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2519,69 +2684,69 @@ "execution." msgstr "" -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Команди" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Інструменти" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "адреса електронної пошти розробника" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Ініціали ім'я розробника" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Початкова версія:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Номер версії, що новий файл має з початку" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Назва компанії" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Розробник:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Компанія:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Поштова адреса:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Ініціали:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Ім'я розробника" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 #, fuzzy msgid "Year:" msgstr "Бічна панель:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 #, fuzzy msgid "Date:" msgstr "Make:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2591,7 +2756,7 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2601,7 +2766,7 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2611,53 +2776,53 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Шаблонні дані" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Шаблони" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "_Змінити" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Гарячі клавіші" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Закріплення клавіш" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Команда:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Команда для друку файлів (користуйтесь %f як назвою файлу)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "Друкувати номера рядків" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Додати номера рядків до друкуємої сторінки." -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "Друкувати номера рядків" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 #, fuzzy msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." @@ -2665,11 +2830,11 @@ "Додати номера сторінок зверху кожної сторінки. Це буде забирати 2 рядка " "сторінки" -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "Роздрукувати титульну частину сторінки" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2679,20 +2844,20 @@ "сторінки, назву файла та поточну дату(дивіться нижче). Це буде займати 3 " "рядки сторінки." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Використовувати базове ім'я друкованого файлу" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Друкувати лише назву (без шляху) друкуємого файлу." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Формат дати:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2702,580 +2867,606 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Використовувати типове друкування GTK" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Кодування:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "Друкування" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "Властивості проекту" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Показати" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Вирізати" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Нове" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Відкрити" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Відкрити обраний файл" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Зберегти" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Зберегти усе" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Зберегти усе" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "Друкувати" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Зачинити" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Зачинити усе" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "Перезавантажити усе" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 #, fuzzy msgid "Project" msgstr "_Проект" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "Опції проекту" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Крок вперед" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Крок назад" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Подвоїти рядок або виділене" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Знищити поточний рядок(-ки)" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "Знищити поточний рядок(-ки)" -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Перемістити поточний рядок" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Переміститись до поточного рядку" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Перемістити огляд на 1 рядок вгору" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Перемістити огляд на 1 рядок вниз" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Довершений шматок" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Пов'язані дії" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Завершити слово" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Показати список макросів" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Авто-завершення теґів XML" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Закоментувати рядок(-ки)" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Закоментувати рядок(-ки)" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Вирізати" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Копіювати" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Вставити" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Копіювати поточний рядок(-ки)" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Вирізати поточний рядок(-ки)" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 #, fuzzy msgid "Select" msgstr "Виділити усе" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Виділити усе" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Виділити поточне слово" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Виділити поточний рядок(-ки)" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Перейти до попередньої мітки" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Виділити поточний параграф" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Перейти до наступної мітки" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 #, fuzzy msgid "Format" msgstr "_Формат" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Закоментувати рядок(-ки)" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Розкоментувати рядок(-ки)" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Збільшити відступ" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Зменшити відступ" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Збільшити відступ на 1 символ" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Зменшити відступ на 1 рядок" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Надіслати до власної команди 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Надіслати до власної команди 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Надіслати до власної команди 3" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "_Надіслати виділене до" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 #, fuzzy msgid "Insert" msgstr "_Вставити" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Вставити дату" -#: ../src/keybindings.c:332 -#, fuzzy -msgid "Insert alternative white space" -msgstr "Вставити альтернативний пробіл" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 #, fuzzy msgid "Settings" msgstr "Секції" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 #, fuzzy msgid "Search" msgstr "_Пошук" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Знайти" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "Знайти наступне" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Знайти попереднє" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "Знайти наступне виділення" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Знайти попереднє виділення" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Замінити" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Знайти у файлах" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "Наступне повідомлення" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 #, fuzzy msgid "Previous Message" msgstr "Наступне повідомлення" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Користування пошуком" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" msgstr "Користування пошуком" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "Виконати make для _усіх" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 #, fuzzy msgid "Go to" msgstr "До рядку" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Перейти до попередньої локації" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Перейти до наступної локації" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Перейти до парної скоби" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Перейти до наступної мітки" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Перейти до попередньої мітки" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Перейти до визначення ярлика" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Перейти до об'яви ярлику" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 #, fuzzy msgid "Go to Start of Line" msgstr "До рядку" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 #, fuzzy msgid "Go to End of Line" msgstr "До рядку" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "До рядку" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 #, fuzzy msgid "Go to Previous Word Part" msgstr "Перейти до попередньої мітки" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 #, fuzzy msgid "Go to Next Word Part" msgstr "Перейти до наступної мітки" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 #, fuzzy msgid "View" msgstr "_Показати" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "На весь екран" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Перемкнути бічну панель" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Наблизити" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Віддалити" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Віддалити" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Перемнутися до редактору" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Перемкнутися до друку" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Перемкнутися до VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Перемкнутися до панелі пошуку" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 #, fuzzy msgid "Switch to Sidebar" msgstr "Перемкнутися до панелі пошуку" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 #, fuzzy msgid "Switch to Compiler" msgstr "Перемкнутися до панелі пошуку" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Перемкнутися до панелі пошуку" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Показувати вікно _повідомлень" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Перемкнутися до документу зліва" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Перемкнутися до панелі пошуку" + +#: ../src/keybindings.c:498 #, fuzzy msgid "Notebook tab" msgstr "Команди вкладки блокноту" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Перемкнутися до документу зліва" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Перемкнутися до документу зправа" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Перемкнутися до останнього використаного документу" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Перемістити документ уліво" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Перемістити документ направо" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 #, fuzzy msgid "Move document first" msgstr "Переміститися до початку документу" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 #, fuzzy msgid "Move document last" msgstr "Переміститися до кінця документу" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 #, fuzzy msgid "Document" msgstr "_Документ" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 #, fuzzy msgid "Toggle Line wrapping" msgstr "Переніс рядку" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 #, fuzzy msgid "Toggle Line breaking" msgstr "_Перемикач закоментованості рядку" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Заміняти відступи пробілами" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 #, fuzzy msgid "Toggle current fold" msgstr "Виділити поточне слово" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Згорнути усе" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Розгорнути усе" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Перезавантажити список сипмволів" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Прибрати _маркери" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Прибрати індикатори _помилок" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Побудувати" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Компілювати" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Виконати make над усим" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Виконати make над вказаним файлом" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Виконати make над об'єктом" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "Наступна помилка" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 #, fuzzy msgid "Previous error" msgstr "Попередні перекладачі" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Виконати" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Виконати (альтернативна команда)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Опції побудови" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Показати палітру кольорів" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Допомога" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Гарячі клавіші" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Наступні гарячі клавіші були налаштовані:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "Перемкнутися до документу зліва" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Друкуйте тут усе що забажаєте і використовуйте це вікно для приміток або як " "чернетку" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Помилка завантаження одного або більше файлів сесії." @@ -3284,92 +3475,106 @@ msgid "Debug Messages" msgstr "Повідомлення" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Пошук" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Використовувати іншу теку конфігурацій" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Надрукувати внутрішні типи файлів" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Згенерувати глобальний файл теґів (дивіться документацію)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 #, fuzzy msgid "Set initial line number for the first opened file" msgstr "Встановити початковий номер рядку для першого відкритого файлу" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Не показувати вікно повідомлення на початку роботи" -#: ../src/main.c:136 +#: ../src/main.c:134 #, fuzzy msgid "Don't load auto completion data (see documentation)" msgstr "Не завантажувати автоматично завершені дані (дивіться документацію)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Не завантажувати додатків" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "Введіть префікс встановлення Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "не завантажувати файл попередньої сесії" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Не завантажувати підтримку терміналу" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Назва файлу libvte.so" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Показати версію та вийти" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[Файли...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(будувати на %s з GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3378,14 +3583,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3396,52 +3601,57 @@ "Можуть бути проблеми під час використання Geany без теки конфігурацій.\n" "Всеодно викликати Geany?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Не знайдено файл '%s'." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Це Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Тека конфігурацій не може бути створена (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 #, fuzzy msgid "Configuration files reloaded." msgstr "Помилка під час компіляції." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Повідомлення про статус" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Копіювати" + +#: ../src/msgwindow.c:533 #, fuzzy msgid "Copy _All" msgstr "_Закрити усе" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "_Приховати вікно повідомлень" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, fuzzy, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "Прибрати усі індикатори помилок у поточному документі." + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 #, fuzzy msgid "_Plugin Manager" msgstr "Менеджер додатків" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3452,84 +3662,92 @@ "Опис: %s\n" "Автор(-и): %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Активно" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Додаток" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Не доступно жодного додатку." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Додатки" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Нижче представлено список доступних додатків. Оберіть додатки що будуть " -"завантажені під час запуску Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Деталі додатку:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Захопити комбінацію" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Задайте комбінацію клавіш, котру ви бажаєте використовувати для \"%s\"" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "_Знайти усе" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "_Закрити усе" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Дія" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Опис" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Обминути" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Обминути це закріплення клавіш?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Комбінація '%s' вже використовується для \"%s\"." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Термінал" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Вкажіть теки для інструменту нижче. Для інструментів, котрих ви не " "потребуєте залишіть пустим." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3537,7 +3755,7 @@ "Встановіть інформацію для використання у шаблонах. Дивіться документацію для " "деталей." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3548,7 +3766,7 @@ "змін." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3560,7 +3778,7 @@ "закріплення." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3570,7 +3788,7 @@ "GTK 2.10 (або вище)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3584,47 +3802,47 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Сторінка %d з %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 #, fuzzy msgid "Document Setup" msgstr "Налаштування документу" -#: ../src/printing.c:410 +#: ../src/printing.c:411 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Друкувати лише назву (без шляху) друкуємого файлу." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Сторінка %d з %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Друкування \"%s\" було відмінено." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "Файл %s надруковано." +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Друкування \"%s\" завершилося помилкою %s)." -#: ../src/printing.c:867 +#: ../src/printing.c:875 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "Спочатку будь-ласка вкажіть команду друку у діалозі налаштування" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3635,173 +3853,174 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Друкування \"%s\" завершилося помилкою (повернутий код: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Файл %s надруковано." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "проекти" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Новий проект" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "С_творити" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Назва:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Назва файлу:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Базова тека:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 "" -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Оберіть базову теку проекту" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Файл проекту \"%s\" не може бути завантажено." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Відкрити проект" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Файли проекту" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Проект \"%s\" зачинено." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Опис:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Виконати make за базовим шляхом" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Виконати команду:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Секц1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Зразки файлу:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Ви дійсно бажаєте закрити це перед продовженням?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Проект '%s' вже відкрито." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Введене ім'я проекту занадто мале." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Введене ім'я проекту занадто довге (максимально %d символів)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Ви вказали неприпустиму назву файлу проекту." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Чи створити базову теку для проекту?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Шлях \"%s\" не існує." -#: ../src/project.c:670 +#: ../src/project.c:705 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Тека конфігурацій не може бути створена (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Неможливо записати файл проекту (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Проект \"%s\" створено." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Проект \"%s\" збережено." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Вкажіть назву проекту" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Вкажіть команду для виконання проекту" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Проект \"%s\" відкрито." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Використовувати _регулярні вирази" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "" -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "_Зворотній пошук" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Користуватися escape-_послідовністю" -#: ../src/search.c:246 +#: ../src/search.c:263 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3810,413 +4029,435 @@ "Заміняти \\\\, \\t, \\n, \\r і \\uXXXX (символи Юнікоду) з відповідними " "керівними символами." -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "_Чутливе до регістру" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Співпадіння тільки _усього слова" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Співпадіння у _початку слова" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "_Попередній" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" msgstr "_Наступний" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "_Шукати на:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Знайти усе" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "_Виділити" -#: ../src/search.c:433 +#: ../src/search.c:450 #, fuzzy msgid "Mark all matches in the current document" msgstr "Виділити усі співпадіння у поточному документі." -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "У _сесії" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "У _документі" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Зачинити _діалог" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Вимкнути цю опцію щоб залишити діалог відкритим." -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Знайти та за_мінити" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "_Змінити на:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "За_мінити усе" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "У _виділеному" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Замінити усі співпадіння у виділеному тексті" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "_Тека:" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "Встановити кодовування:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "_Фіксований рядок" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Проявити _регулярний вираз" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "_Розширений регулярний вираз" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "_Рекурсія у внутрішніх теках" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "_Інвертувати результати пошуку" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "_Екстра опції:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Знайдено %d співпадінь для \"%s\"." msgstr[1] "Знайдено %d співпадінь для \"%s\"." -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, fuzzy, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Замінити текст у %u файлах." -msgstr[1] "Замінити текст у %u файлах." +msgid "Replaced %u matches in %u documents." +msgstr "Виділити усі співпадіння у поточному документі." -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Помилкова тека для пошуку файлів." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Немає тексту для пошуку." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Неможливо виконати інструмент виділення '%s'; перевірте шлях у налаштуваннях." -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "_Пошук" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (у теці: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Не можу відкрити теку (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "Помилка пошуку." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Пошук закінчено з %d співпадіннями." msgstr[1] "Пошук закінчено з %d співпадіннями." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Жодних співпадінь." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Частина" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Секція" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Секц1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Секц2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Секц3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Додаток" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Інше" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Типи" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Конструктори типів" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Функції" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Секції" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Клавіші" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Змінні" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Команда" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Середовище розробки" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Підрозділ" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Під-підрозділ" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Мітка" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "Статус" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Пакунок" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Моє" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Локальне" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Наше" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Мітки" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Константи" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Інтерфейси" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Класи" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Константи" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "У _виділеному" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "Конструктори типів" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Модулі" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Одинаки" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Методи" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Поля імен" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "Налаштування" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 #, fuzzy msgid "Imports" msgstr "Експортувати" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "безіменний" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Статус" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Налаштування" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Змінні" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Функції" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Члени" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Мітки" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Макроси" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 #, fuzzy msgid "Defines" msgstr "Рядків:" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "Статус" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Незнайоме розширення файлу \"%s\".\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Помилка створення файлу теґів.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" @@ -4225,7 +4466,7 @@ "Використання: %s -g <Файл ярликів> <Файл списку>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4236,182 +4477,200 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Завантажити ярлики" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Файл ярликів Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Завантажено %s файл теґів '%s'." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Неможливо завантажити файл ярликів '%s'." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Передовий опис \"%s\" не знайдено." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Визначення \"%s\" не знайдено." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Сортувати за _ім'ям" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Сортувати за _створенням" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Зберегти поточний файл" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Зберегти усі відкриті файли" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Перезавантажити поточний файл з диску" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Закрити поточний файл" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "Закрити усі відкриті файли" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "Конвертувати вміст виділеного" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "Компілювати поточний файл" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "Конвертувати вміст виділеного" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Відмінити останню зміну" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Повторити відмінену зміну" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Компілювати поточний файл" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Виконати або відобразити поточний файл" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Знайдіть потрібний колір користуючись вікном палітри кольорів." -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Збільшити розмір шрифту" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Зменшети розмір шрифту" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Зменшити відступ" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Збільшити відступ" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Знайти уведений текст у поточному документі" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "Переміститися до введеного номеру ряду." -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "Зачинити Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "документ XML" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "Виділити усі співпадіння у поточному документі." -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Створити новий файл" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Створити новий файл" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Відкрити існуючий файл" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Відкрити обраний файл" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Більше не має помилок побудови." + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "До рядку" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "Показати" @@ -4437,7 +4696,7 @@ msgid "Custom command failed: %s" msgstr "Не встановлено жодної власної команди." -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Встановити власні команди" @@ -4449,307 +4708,286 @@ "Ви маєте змогу надати виділене будь якій з цих команд, а результат роботи " "цієї команди замінить виділене." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Не встановлено жодної власної команди." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Лічильник слів" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "виділене" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "увесь документ" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Відрізок:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Рядків:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Слів:" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Символів:" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Не знайдено жодної вкладки" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Показати список _символів" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Показати список _документів" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Прибрати _бокову панель" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "Показати _повний шлях з ім'ям" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "ряд: %d\t стов: %d\t обра: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 #, fuzzy msgid "SP" msgstr "SP " -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Встановити кодовування:" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, fuzzy, c-format msgid "filetype: %s" msgstr "Встановити тип файлу:" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Шрифт оновлений (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Стандартна бібліотека C" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Стандартна бібліотека C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Стандартна бібліотека C++" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Вкажіть власний формат _часу" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Оберіть теку" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Оберіть файл" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "Помилка під час компіляції." - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "Зберегти _усі" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "_Закрити усе" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Термінал" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 #, fuzzy msgid "_Set Path From Document" msgstr "Вкажіть шлях до документу" -#: ../src/vte.c:553 +#: ../src/vte.c:521 #, fuzzy msgid "_Restart Terminal" msgstr "Рестартувати термінал" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "Методи _вводу" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "Неможливо змінити теку у VTE тому, що очевидно вона містить команду." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Консольний додаток" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Ці опції тільки для емулятору віртуального терміналу (VTE), застосуйте якщо " -"бібліотека VTE не може бути завантажена." -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Шрифт терміналу:" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "Вкажіть шрифт для додатку терміналу." -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Колір переднього фону:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Колір заднього фону:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 #, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Вкажіть колір переднього плану тексту у додатку терміналу." -#: ../src/vte.c:775 +#: ../src/vte.c:771 #, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Вкажіть колір заднього плану тексту у додатку терміналу." -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Прокручувати назад:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "" -#: ../src/vte.c:794 +#: ../src/vte.c:790 #, fuzzy msgid "Shell:" msgstr "Оболонка:" -#: ../src/vte.c:802 +#: ../src/vte.c:798 #, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Вказати шлях до оболонки що буде стартувати у емуляції терміналу." -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Переміщуватися при натисненні клавіші" -#: ../src/vte.c:820 +#: ../src/vte.c:816 #, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Переміщуватися до низовини, якщо клавіша натиснута." -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Переміститися до результату" -#: ../src/vte.c:824 +#: ../src/vte.c:820 #, fuzzy msgid "Whether to scroll to the bottom when output is generated" msgstr "Переміщуватися до низовини коли результат згенеровано." -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "Дозволити згортку коду" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Незважаючи на закріплення клавіш у Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 #, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "Дозволити VTE отримувати комбінації клавіш (окрім команд фокусу)." -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Заборонити гарячу клавішу виклику меню (за замовчанням F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4759,11 +4997,11 @@ "F10). Її заборона корисна якщо ви користуєтесь, наприклад, Midnight " "Commander замість VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Слідувати шляху до поточного файлу" -#: ../src/vte.c:841 +#: ../src/vte.c:837 #, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" @@ -4771,11 +5009,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Не використовувати скрипт виконання" -#: ../src/vte.c:847 +#: ../src/vte.c:843 #, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " @@ -4784,11 +5022,11 @@ "Не використовувати простий скрипт виконання що зазвичай використовується для " "відображення статусу закінчення виконуємої програми." -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Виконати програму у VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 #, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " @@ -4797,92 +5035,125 @@ "Виконати програму у VTE замість відкриття у консольному вікні емуляції. Будь-" "ласка врахуйте, що програма котра виконується у VTE не може бути зупинена." -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Файли проекту Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Доступні для виконання" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Будівник класів" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Створити файл-джерело для нових типів класів." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Створити клас" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Поля імен" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Поля імен" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Клас" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Ім'я класу:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Керівний файл:" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Файл-жерело:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Успадкування" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Базовий клас:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Вихідний код на мові Haskell" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Базовий керівник:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Глобально" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Базовий GType:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Опції" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Створити конструктор" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Створити деструктор" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Одинаки" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "тип конструктора GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Створити _Клас" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 #, fuzzy msgid "_C++ Class" msgstr "Клас C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 #, fuzzy msgid "_GTK+ Class" msgstr "Клас GTK+" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Клас C++" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML символи" @@ -4892,52 +5163,57 @@ msgstr "Вставити HTML символ у вигляді '&'." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Команда розробників Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "HTML символи" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Симоли кодування ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Грецькі символи" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Математичні символи" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Технічні символи" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Символи стрілки" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Пунктуаційні символи" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Інші символи" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Тека конфігурації додатку не може бути створена." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Спеціальні символи" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "_Вставити" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4945,43 +5221,43 @@ "Оберіть спеціальний символ з поданого списку і подвійним натисканням або " "кнопкою вставки вставте його у поточну позицію курсору." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Символ" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (назва)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Вс_тавити спеціальні HTML символи" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "Замінити" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Розташування нових вкладок з файлами:" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Вставити спеціальний HTML символ" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "Спеціальні символи" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "" @@ -5007,110 +5283,110 @@ "Renders the font size of the document together with the current zoom level" msgstr "Змінювати розмір шрифту документу паралельно до масштабу." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Документ з успіхом експортовано як '%s'." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Файл '%s' неможливо записати (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' вже існує. Чи бажаєте замінити його?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Експорт" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 #, fuzzy msgid "As _HTML" msgstr "Як HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 #, fuzzy msgid "As _LaTeX" msgstr "Як LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "Оглядач файлів" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "Додати вкладку оглядача файлів до бічної панелі." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Занадто багато виділеного!" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Знайти у файлах" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "Показати при_ховані файли" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Вгору" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Перезавантажити" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Початок" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "Вкажіть шлях до документу" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 #, fuzzy msgid "Clear the filter" msgstr "Закрити поточний файл" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 #, fuzzy msgid "Filter:" msgstr "Файл" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Тека конфігурації додатку не може бути створена." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 #, fuzzy msgid "External open command:" msgstr "Інші команди" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5124,15 +5400,15 @@ "%f буде замінено на ім'я файлу включаючи повний шлях\n" "%d буде замінено на шлях до обраного файлу без його назви" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Показати приховані файли" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Сховати файли проекту" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5140,12 +5416,12 @@ "Не показувати згенеровані файли об'єкту у оглядачі файлів, це включає *.o, *." "obj, *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 #, fuzzy msgid "Use the project's base directory" msgstr "Чи створити базову теку для проекту?" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "" @@ -5259,38 +5535,183 @@ msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "Виділити усі співпадіння у поточному документі." -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "_Обрати вкладення та аргументи" + +#, fuzzy +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> DVI" + +#, fuzzy +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> PDF" + +#, fuzzy +#~ msgid "_View DVI File" +#~ msgstr "Показати файл DVI" + +#, fuzzy +#~ msgid "V_iew PDF File" +#~ msgstr "Відобразити PDF файл" + +#, fuzzy +#~ msgid "_Set Arguments" +#~ msgstr "Оберіть аргументи" + +#~ msgid "Set Arguments" +#~ msgstr "Оберіть аргументи" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." +#~ msgstr "" +#~ "Оберіть програми та опції для компіляції та відображення файлів (La)TeX" + +#~ msgid "DVI creation:" +#~ msgstr "створення DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "створення PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "попередній перегляд DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "попередній перегляд PDF:" + +#~ msgid "" +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" +#~ msgstr "" +#~ "%f буде замінено на ім'я поточного файлу, наприклад test_file.c\n" +#~ "%e буде замінено на ім'я поточного файлу без розширення, наприклад " +#~ "test_file" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Оберіть вкладення та аргументи" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Оберіть команду для будування та виконання програми." + +#~ msgid "Compile:" +#~ msgstr "Компіляція:" + +#~ msgid "Build:" +#~ msgstr "Побудова:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Помилка при спробі виконати відображену програму" + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "Прибрати панель інструментів" + +#~ msgid "Icon style:" +#~ msgstr "Стиль кнопки:" + +#~ msgid "Icon size:" +#~ msgstr "Розмір кнопки:" + +#~ msgid "Appearance" +#~ msgstr "Вигляд" + +#, fuzzy +#~ msgid "Hard tab width:" +#~ msgstr "Ширина абзацу:" + +#~ msgid "Long line marker:" +#~ msgstr "Межа довгого рядку:" + +#~ msgid "Long line marker color:" +#~ msgstr "Колір межі довгого рядку:" + +#~ msgid "Path and options for the make tool" +#~ msgstr "Тека та опції для інструменту make" + +#~ msgid "Duplicate line or selection" +#~ msgstr "Подвоїти рядок або виділене" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "_Надіслати виділене до" + +#~ msgid "Run (alternative command)" +#~ msgstr "Виконати (альтернативна команда)" + +#~ msgid "" +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." +#~ msgstr "" +#~ "Нижче представлено список доступних додатків. Оберіть додатки що будуть " +#~ "завантажені під час запуску Geany." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Друкування \"%s\" було відмінено." + +#~ msgid "Make in base path" +#~ msgstr "Виконати make за базовим шляхом" + +#~ msgid "Run command:" +#~ msgstr "Виконати команду:" + +#~ msgid "Choose Project Run Command" +#~ msgstr "Вкажіть команду для виконання проекту" + +#, fuzzy +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Замінити текст у %u файлах." +#~ msgstr[1] "Замінити текст у %u файлах." + +#~ msgid "My" +#~ msgstr "Моє" + +#~ msgid "Local" +#~ msgstr "Локальне" + +#~ msgid "Our" +#~ msgstr "Наше" + +#~ msgid "Terminal plugin" +#~ msgstr "Консольний додаток" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Ці опції тільки для емулятору віртуального терміналу (VTE), застосуйте " +#~ "якщо бібліотека VTE не може бути завантажена." + +#~ msgid "Terminal font:" +#~ msgstr "Шрифт терміналу:" #~ msgid "Diff file" #~ msgstr "Diff файл" @@ -5425,9 +5846,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "Розгорнути усі блоки коду" -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "Прибрати усі індикатори помилок у поточному документі." - #~ msgid "" #~ "Counts the words and characters in the current selection or the whole " #~ "document" @@ -5441,9 +5859,6 @@ #~ msgid "Shows a list of all keyboard shortcuts for Geany." #~ msgstr "Показати список усіх гарячих клавіш для Geany." -#~ msgid "Color" -#~ msgstr "Колір" - #~ msgid "Enter a line number and jump to it." #~ msgstr "Введіть номер рядку та перейдіть до нього." @@ -5525,16 +5940,10 @@ #~ msgid "Items" #~ msgstr "Елементи" -#~ msgid "Use white text on a black background." -#~ msgstr "Встановити білий колір для тексту і чорний для фону." - #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "" #~ "Виконати у режимі зневадження (тобто показувати будь-які повідомлення)" -#~ msgid "Search failed." -#~ msgstr "Помилка пошуку." - #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Неможливо знайти растровий файл: %s" @@ -5668,9 +6077,6 @@ #~ msgid "Ferite source file" #~ msgstr "Вихідний код на мові Ferite" -#~ msgid "Haskell source file" -#~ msgstr "Вихідний код на мові Haskell" - #~ msgid "Docbook source file" #~ msgstr "Вихідний код на мові Docbook" diff -Nru geany-0.18/po/vi.po geany-0.19/po/vi.po --- geany-0.18/po/vi.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/vi.po 2010-05-23 09:08:49.000000000 +0100 @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-02-02 22:42+1030\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" +"PO-Revision-Date: 2009-09-29 21:16+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "Một IDE nhanh và nhẹ nhàng dùng GTK2" # Name: don't translate/Tên: đừng dịch -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -29,67 +29,67 @@ msgid "Integrated Development Environment" msgstr "Môi trường Phát triển Hợp nhất" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "Giới thiệu Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "Một IDE nhanh và nhẹ nhàng" -#: ../src/about.c:210 +#: ../src/about.c:216 #, c-format msgid "(built on or after %s)" msgstr "(xây dựng vào hay sau %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "Thông tin" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "Nhà phát triển" -#: ../src/about.c:266 +#: ../src/about.c:272 msgid "maintainer" msgstr "nhà duy trì" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "nhà phát triển" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "nhà duy trì bản dịch" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "Dịch giả" -#: ../src/about.c:311 +#: ../src/about.c:317 msgid "Previous Translators" msgstr "Dịch giả trước" -#: ../src/about.c:332 +#: ../src/about.c:338 msgid "Contributors" msgstr "Người đóng góp" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Một số người đóng góp (để tìm một danh sách chi tiết, xem tập tin %s):" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "Công trạng" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "Giấy Phép" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -97,278 +97,291 @@ "Không tìm thấy văn bản giấy phép, hãy thăm địa chỉ « http://www.gnu.org/" "licenses/gpl-2.0.txt » để xem trực tuyến." -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -"Không tìm thấy thiết bị cuối « %s » (kiểm tra đường dẫn đến công cụ Thiết bị " -"cuối trong Tùy thích)" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:673 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Lỗi chuyển đổi thư mục hoạt động sang « %s »" + +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Lỗi thực hiện « %s » (không thể tạo văn lệnh khởi chạy)" +msgid "%s (in directory: %s)" +msgstr "%s (trong thư mục: %s)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "Tiến trình bị lỗi (%s)" -#: ../src/build.c:508 -#, c-format -msgid "%s (in directory: %s)" -msgstr "%s (trong thư mục: %s)" - -#: ../src/build.c:613 +#: ../src/build.c:790 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Lỗi chuyển đổi thư mục hoạt động sang « %s »" -#: ../src/build.c:707 +#: ../src/build.c:819 +#, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "Lỗi thực hiện « %s » (không thể tạo văn lệnh khởi chạy)" + +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Không thể thực hiện tập tin trong VTE vì nó rất có thể chứa lệnh." -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Không tìm thấy thiết bị cuối « %s » (kiểm tra đường dẫn đến công cụ Thiết bị " +"cuối trong Tùy thích)" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "Lỗi biên dịch." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "Mới biên dịch xong." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "Biên dị_ch" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "_Xây dựng" - -# Literal: don't translate/Nghĩa chữ : đừng dịch -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "_Make All" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "Make đích _riêng" +#: ../src/build.c:1252 +#, fuzzy +msgid "Custom Text" +msgstr "Make đích riêng" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "Make đố_i tượng" +#: ../src/build.c:1253 +#, fuzzy +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" +"Ở đây hãy nhập các tùy chọn riêng, toàn bộ đoạn đã nhập được gởi qua cho " +"lệnh « make »." -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 msgid "_Next Error" msgstr "Lỗi tiế_p" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 msgid "_Previous Error" msgstr "Lỗi t_rước" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "Đặt _Gồm và Đối số" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "Xem tập tin D_VI" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "Xem tập t_in PDF" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "Đặt lệnh riêng" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "Đặ_t đối số" +#: ../src/build.c:1623 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "Xây dựng tập tin hiện thời" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "Đặt đối số" +#: ../src/build.c:1637 +msgid "Build the current file with Make and the default target" +msgstr "Xây dựng tập tin hiện thời, dùng công cụ Make và đích đến mặc định" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Đặt các chương trình và tùy chọn để biên dịch và xem tập tin kiểu (La)TeX." +#: ../src/build.c:1639 +msgid "Build the current file with Make and the specified target" +msgstr "Xây dựng tập tin hiện thời, dùng công cụ Make và đích đến đã xác định" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "Tạo DVI:" +#: ../src/build.c:1641 +msgid "Compile the current file with Make" +msgstr "Biên dịch tập tin hiện thời dùng Make" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "Tạo PDF:" +#: ../src/build.c:1668 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Tiến trình không dừng chạy được (%s)." -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "Xem thử DVI:" +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." +msgstr "Không có lỗi xây dựng nào nữa." -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "Xem thử PDF:" +#: ../src/build.c:1778 +msgid "Set menu item label" +msgstr "" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -"%f\tsẽ được thay thế bằng tên tập tin hoàn toàn (v.d. tập_tin_thử.c)\n" -"%e\tsẽ được thay thế bằng tập tin không có phần mở rộng (v.d. tập_tin_thử)" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "Đặt đồ gồm và đối số" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "Nhãn" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "Đặt các lệnh để xây dựng và chạy chương trình." +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "Lệnh" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 -#, c-format -msgid "%s commands" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "%s (trong thư mục: %s)" + +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "Bộ biên dịch" + +#: ../src/build.c:1831 +msgid "Click to set menu item label" +msgstr "" + +#: ../src/build.c:1904 ../src/build.c:1906 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s lệnh" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "Biên dịch:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "Xây dựng:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "Đặt kiểu _tập tin" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "Thực hiện:" +#: ../src/build.c:1914 ../src/build.c:1949 +#, fuzzy +msgid "Error Regular Expression:" +msgstr "Biểu thức chính quy kiểu _grep" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "Xây dựng tập tin hiện thời" +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "Make đích riêng" +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" + +#: ../src/build.c:1981 +#, fuzzy +msgid "Execute Commands" +msgstr "Đặt lệnh riêng" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -"Ở đây hãy nhập các tùy chọn riêng, toàn bộ đoạn đã nhập được gởi qua cho " -"lệnh « make »." -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "Xây dựng tập tin hiện thời, dùng công cụ Make và đích đến mặc định" +#: ../src/build.c:2177 +#, fuzzy +msgid "Set Build Commands" +msgstr "Đặt lệnh riêng" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "Xây dựng tập tin hiện thời, dùng công cụ Make và đích đến đã xác định" +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "Biên dị_ch" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "Biên dịch tập tin hiện thời dùng Make" +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "_Xây dựng" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "Lỗi thực thi chương trình xem" +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#, fuzzy +msgid "_Execute" +msgstr "Thực hiện:" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "Tiến trình không dừng chạy được (%s)." +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +msgid "Make Custom _Target" +msgstr "Make đích _riêng" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "Không có lỗi xây dựng nào nữa." +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +msgid "Make _Object" +msgstr "Make đố_i tượng" + +# Name: don't translate/Tên: đừng dịch +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "Make:" + +# Literal: don't translate/Nghĩa chữ : đừng dịch +#. build the code with make all +#: ../src/build.c:2681 +msgid "_Make All" +msgstr "_Make All" + +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "Đặt lệnh riêng" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Bạn thật sự muốn thoát không?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "Tập tin %s đã được lưu." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "Tải _lại" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Các thay đổi chưa lưu sẽ bị mất." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Bạn có chắc muốn tải lại « %s » không?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" msgstr "Tới dòng" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "Nhập dòng cần tới:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "Hãy đặt kiểu tập tin cho tập tin hiện thời, trước khi sử dụng hàm này." -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "nn.tt.NNNN" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "tt.nn.NNNN" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "NNNN/tt/nn" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "nn.tt.NNNN GG:pp:gg" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "tt.nn.NNNN GG:pp:gg" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "NNNN/tt/nn GG:pp:gg" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "_Dùng định dạng ngày riêng" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "Định dạng ngày riêng" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -377,24 +390,23 @@ "ký tự chuyển đổi nào dùng được với hàm strftime kiểu C ANSI. Xem « man " "strftime » để tìm thêm thông tin." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "Không thể chuyển đổi chuỗi định dạng ngày tháng (có thể quá dài)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "Không có mục thông điệp nào nữa." -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "Mở tập tin" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "_Xem" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -402,29 +414,28 @@ "Mở tập tin trong chế độ chỉ đọc. Nếu bạn chọn mở nhiều tập tin, tất cả các " "tập tin đó sẽ được mở chỉ-đọc." -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "Phát hiện theo phần mở rộng tập tin" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "Phát hiện từ tập tin" -#: ../src/dialogs.c:258 -#, fuzzy +#: ../src/dialogs.c:262 msgid "_More Options" -msgstr "Tùy chọn" +msgstr "Tùy chọn _bổ sung" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "_Hiện tập tin ẩn" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "Đặt bảng mã:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -439,11 +450,11 @@ "bảng mã đã chọn." #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "Đặt kiểu tập tin:" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -456,31 +467,30 @@ "kiểu tập tin đã chọn." #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "_Ghi đè" +msgstr "Ghi đè ?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "Tên tập tin đã có !" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "Lưu tập tin" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "Tha_y tên:" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "Lưu tập tin và thay tên nó" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "_Mở tập tin trên thẻ mới" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -488,146 +498,150 @@ "Giữ lại còn mở tài liệu chưa lưu hiện thời, và mở tập tin mới lưu trên một " "thẻ mới" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "Lỗi" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "Câu hỏi" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "Cảnh báo" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "Thông tin" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "_Không lưu" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "Tập tin « %s » chưa được lưu." -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "Bạn có muốn lưu nó trước khi đóng không?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "Chọn phông" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "Gặp lỗi hoặc không thể lấy thông tin về tập tin (v.d. từ tập tin mới)." -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "không rõ" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" -msgstr "Tài sản" +msgstr "Thuộc tính" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "Kiểu :" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "Cỡ :" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "Vị trí:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "Chỉ đọc:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "(chỉ bên trong Geany)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "Bảng mã:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "(có BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "(không có BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "Sửa đổi:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "Đổi:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "Truy cập:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "Quyền hạn:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "Đọc:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "Ghi:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "Thực hiện:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "Sở hữu :" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "Nhóm:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "Khác:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "Tập tin %s đã được đóng." -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "Tập tin mới « %s » đã được mở." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "Không thể mở tập tin: %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -642,12 +656,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Tập tin « %s » không phải là %s hợp lệ." -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -656,30 +670,30 @@ "Tập tin « %s » có vẻ không phải là tập tin văn bản, hoặc bảng mã tập tin " "không được hỗ trợ." -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "Dấu cách" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "Thẻ" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "Tab và Dấu cách" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Đang đặt chế độ thụt lề %s cho %s." -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "Tên tập tin không hợp lệ" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "Tập tin %s đã được tải lại." @@ -687,21 +701,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "Tập tin %s đã được mở (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ", chỉ đọc" -#: ../src/document.c:1512 -#, fuzzy +#: ../src/document.c:1558 msgid "Error renaming file." -msgstr "Gặp lỗi khi lưu tập tin." +msgstr "Gặp lỗi khi thay đổi tên của tập tin." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -710,7 +723,7 @@ "Gặp lỗi khi chuyển đổi tập tin từ UTF-8 trong « %s ». Tập tin vẫn còn chưa " "được lưu." -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" @@ -719,51 +732,51 @@ "Thông điệp lỗi: %s\n" "Lỗi xảy ra ở « %s » (dòng %d, cột %d)." -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." msgstr "Thông điệp lỗi: %s." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "Gặp lỗi khi lưu tập tin." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "Gặp lỗi khi lưu tập tin (%s)." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "Tập tin %s đã được lưu." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "Không tìm thấy « %s »." -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "Cuộn qua việc tìm và tìm lại không?" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." msgstr "Không tìm thấy cái nào tương ứng với « %s »." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: mới thay thế %d lần gặp « %s » bằng « %s »." -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "Bạn có muốn tải lại nó không?" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -772,23 +785,28 @@ "Tập tin « %s » nằm trên đĩa là mới hơn\n" "bộ đệm hiện thời." -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "Thử lưu lại tập tin ?" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "" -#: ../src/document.c:2891 -#, c-format -msgid "File \"%s\" was not found on disk!" +#: ../src/document.c:2919 +#, fuzzy, c-format +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "Không tìm thấy tập tin « %s » trên đĩa." -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "Nhập chiều rộng của khoảng tab" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Hãy nhập số các dấu cách nên bị một ký tự tab thay thế." +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "Xen-tơ" @@ -900,579 +918,638 @@ msgid "Without encoding" msgstr "Không có bảng mã" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "Vùng Tâ_y Âu" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "Vùng Đôn_g Âu" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "_Vùng Đông Á" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "Vùng _Nam Đông và Nam Tay Á" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "Vùng T_rung Đông" # Name: don't translate / Tên: đừng dịch -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "Tập tin mã nguồn %s" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" -msgstr "Tập tin mã nguồn %s" +msgstr "Tập tin %s" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "Không có" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Tập tin tập lệnh trình bao" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Tập tin tạo ứng dụng (Makefile)" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "Tài liệu XML" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Bảng kiểu dáng xếp tầng (CSS)" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "Tập tin đổ SQL" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "Tập tin cấu hình" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Tập tin thông dịch Gettext" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "Tập tin văn lệnh %s" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "Ngôn ngữ _lập trình" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "Ngôn ngữ tạo _văn lệnh" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "Ngôn ngữ định _dạng" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "Ngôn ngữ l_inh tinh" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "Đặt kiểu _tập tin" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "Mọi mã nguồn" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Mọi tập tin" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Sai đặt biểu thức chính quy cho dạng tập tin %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "không tên" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "Không tìm thấy tập tin « %s »." + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "Bảng _chọn màu" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "_Tập tin" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" msgstr "Mới (dùng Mẫ_u)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "vô hình" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "dummy tooltip, don't translate this." - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "Mở tập t_in đã chọn" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "Tập tin _gần đây" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "Lưu tất _cả" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "Tải lại _dạng" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "vô hình" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "Thiết lập tr_ang" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "Đóng các tập tin k_hác" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "Đóng tất _cả" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "_Sửa" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "Định _dạng" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +#, fuzzy +msgid "_Reflow Lines/Block" +msgstr "Cuộn lại dòng/khối" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "Chuyển đổi chữ h_oa/thường của vùng chọn" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Chuyển vị dòng hiện tại" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "Ghi _chú dòng" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" msgstr "Hủy ghi chú dò_ng" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "Bật/_tắt ghi chú dòng" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "_Nhân đôi dòng hay vùng chọn" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "_Thụt lề thêm" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "Thụt lề _kém" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "_Gửi vùng chọn cho" +msgid "_Smart Line Indent" +msgstr "Thụt lề dòng khéo" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "_Gửi vùng chọn cho" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "Lệnh" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "Cắt các dòng hiện tại" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "Chép các dòng hiện tại" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "Xoá các dòng hiện tại" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "_Nhân đôi dòng hay vùng chọn" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "Chọn các dòng hiện tại" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "Chọn đoạn văn hiện tại" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +#, fuzzy +msgid "_Insert Alternative White Space" +msgstr "Chèn khoảng trắng xen kẽ" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "Tới dấu tiếp" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "Về dấu trước" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "_Gửi vùng chọn cho Thiết bị cuối" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "Chè_n chú thích" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "_Chèn mục nhập ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "Chèn p_hần đầu tập tin" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "Chèn _mô tả hàm" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "Chèn _ghi chú đa dòng" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" msgstr "Chèn thông báo _GPL" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" msgstr "Chèn thông báo giấy phép _BSD" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "Chèn ngà_y" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "Chèn \"_include <...>\"" -#: ../src/interface.c:613 -#, fuzzy +#: ../src/interface.c:704 msgid "Preference_s" +msgstr "Tù_y thích" + +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" msgstr "Tùy thích" -#: ../src/interface.c:621 +#: ../src/interface.c:720 msgid "_Search" msgstr "_Tìm" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "Tìm tiế_p" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "Tìm t_rước" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "Tìm trong tập t_in" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "Tha_y thế" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "Tìm đã _chọn" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" -msgstr "Tìm mục chọn t_rước" +msgstr "Tìm _mục chọn trước" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" -msgstr "Thông điệp _kế" +msgstr "Thông điệp tiế_p" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" -msgstr "Thông điệ_p trước" +msgstr "Thông điệp t_rước" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "Tới dòn_g" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "Đổi _phông" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "Bật/tắt mọi ô điều khiển bổ sun_g" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "T_oàn màn hình" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "Hiện cửa _sổ thông điệp" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "Hiện _thanh công cụ" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "Hiện khung _lề" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "Trình soạn thảo" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "Hiện lề đánh _dấu" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "Hiện _số hiệu dòng" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "Hiện kh_oảng trắng" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "Hiện _kết thúc dòng" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "H_iện nét dẫn thụt lề" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "_Tài liệu" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "N_gắt dòng" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" msgstr "N_gắt dòng" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "_Tự động thụt lề" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "_Kiểu thụt lề" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "_Tab" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "_Dấu cách" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "T_ab và Dấu cách" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "_Chỉ đọc" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "Ghi _BOM Unicode" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "Đặt kiểu _tập tin" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "Đặt _bảng mã" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "Đặt kết thúc dò_ng" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" msgstr "Chuyển đổi và đặt thành _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" msgstr "Chuyển đổi và đặt thành _LF (UNIX)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" msgstr "Chuyển đổi và đặt thành CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "Bỏ dấu cách theo _sau" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "Tha_y thế các tab bằng dấu cách" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "Tha_y thế các dấu cách bằng Tab" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "_Gấp tất cả" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "_Mở lại tất cả" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "Bỏ _dấu" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "Bỏ mọi cá_i chỉ lỗi" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "_Dự án" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "Mớ_i" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "_Mở" -#: ../src/interface.c:955 -#, fuzzy +#: ../src/interface.c:1054 msgid "_Recent Projects" -msgstr "Mở dự án" +msgstr "Dự án _vừa mở" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "Đón_g" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "_Công cụ" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "Nạp _lại cấu hình" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "Tập tin Cấ_u hình" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "Bảng _chọn màu" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "_Tổng từ" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "Nạ_p thẻ" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "Nạp _lại cấu hình" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "Trợ _giúp" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "Chỗ _Mạng" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "_Phím tắt" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" msgstr "Thông điệp _Gỡ lỗi" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "Ký hiệu" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "Tài liệu" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "Trạng thái" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "Bộ biên dịch" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "Thông điệp" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "Viết tháu" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "Ảnh _và Nhãn" +#: ../src/interface.c:1887 +#, fuzzy +msgid "_Toolbar Preferences" +msgstr "Tùy thích" -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "_Chỉ ảnh" +#: ../src/interface.c:1900 +msgid "_Hide Toolbar" +msgstr "Ẩn t_hanh công cụ" -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "Chỉ _nhãn" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "Biểu tượng _lớn" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "Biểu tượng _nhỏ" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "Biểu tượng _nhỏ" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "Ẩn t_hanh công cụ" - -#: ../src/interface.c:1777 -#, fuzzy -msgid "_Hide Toolbar" -msgstr "Ẩn t_hanh công cụ" - -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "Tìm cách _sử dụng" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "Tìm cách sử _dụng tài liệu" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "_Tới lời xác định thẻ" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "Tớ_i lời tuyên bố thẻ" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" msgstr "Hành _vị Ngữ cảnh" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "Tùy thích" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "Tải các tập tin từ phiên chạy trước" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "Khi khởi chạy, mở những tập tin từ phiên chạy cuối cùng" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "Nạp hỗ trợ thiết bị cuối ảo" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1480,39 +1557,39 @@ "Mô phỏng thiết bị cuối ảo (VTE) có nên được nạp khi khởi chạy chương trình " "hay không. Không cần thì tắt tùy chọn này." -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "Bật hỗ trợ phần bổ sung" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "Khởi chạy" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "Lưu vị trí và dạng hình cửa sổ" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "Lư vị trí và dạng hình của cửa sổ, và phục hồi lại khi khởi chạy" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "Xác nhận thoát" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "Hiển thị hộp thoại xác nhận khi thoát" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "Tắt máy" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "Đường dẫn khởi chạy:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1520,50 +1597,52 @@ "Đường dẫn đầu tiên khi mở/lưu tập tin. Phải là đường dẫn tuyệt đối. Bỏ rỗng " "để sử dụng thư mục làm việc hiện thời." -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" msgstr "Tập tin dự án:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "Đường dẫn trong đó cần bắt đầu khi mở tập tin dự án" -#: ../src/interface.c:2816 -#, fuzzy +#: ../src/interface.c:2818 msgid "Extra plugin path:" -msgstr "Bật hỗ trợ phần bổ sung" +msgstr "Đường dẫn phần bổ sung khác:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" +"Mặc định là Geany tìm qua đường dẫn cài đặt toàn cục và trong thư mục cấu " +"hình. Gõ thêm đường dẫn vào đây thì cũng tìm phần bổ sung qua nó. Bỏ trống " +"để tắt." -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "Đường dẫn" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "Khởi chạy" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "Bíp khi gặp lỗi, hay khi biên dịch xong" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Có nên kêu bíp nếu gặp lỗi, hoặc khi tiến trình biên dịch mới hoàn tất" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "" "Chuyển đổi sang danh sách thông điệp trạng thái khi nhận thông điệp mới" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1571,11 +1650,11 @@ "Chuyển đổi sang thanh thông điệp trạng thái (trong cửa sổ cuốn vở bên dưới) " "khi nhận thông điệp trạng thái mới." -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "Đừng hiển thị thông điệp trạng thái trên thanh trạng thái" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1583,12 +1662,11 @@ "Gỡ bỏ mọi thông điệp khỏi thanh trạng thái. Các thông điệp này vẫn còn được " "hiển thị trong cửa sổ thông điệp trạng thái." -#: ../src/interface.c:2883 -#, fuzzy +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Tự động đặt tiêu điểm trên ô điều khiển (tiêu điểm theo con chuột)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1598,15 +1676,25 @@ "được cho ô điều khiển trình soạn thảo chính, vùng viết tháu, ô tìm kiếm trên " "thanh công cụ, các trường đi tới dòng riêng, và VTE." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "Lặt vặt" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "Luôn luôn cuộn việc tìm và ẩn hộp thoại Tìm" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1614,11 +1702,11 @@ "Lúc nào cũng cuộn vòng việc tìm qua tài liệu và ẩn hộp thoại Tìm sau khi " "nhấn vào mục Tìm tiếp/trước" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "Dùng từ hiện thời nằm dưới con trỏ cho các hộp thoại Tìm" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1626,19 +1714,19 @@ "Dùng từ hiện thời nằm dưới con trỏ khi mở hộp thoại kiểu Tìm, Tìm trong Tập " "tin, hay Thay thế mà không có chuỗi đã chọn" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "Dùng thư mục của tập tin hiện thời khi Tìm trong Tập tin" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "Tìm kiếm" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "Dùng tập tin phiên chạy dựa vào dự án" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1646,12 +1734,11 @@ "Có nên cất giữ các tập tin phiên chạy của dự án, và mở lại chúng khi lại mở " "dự án đó, hay không" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "Lưu tập tin dự án vào thư mục cơ bản của dự án" -#: ../src/interface.c:2949 -#, fuzzy +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1661,77 +1748,101 @@ "Bật tùy chọn này thì một tập tin dự án được lưu lại theo mặc định bên trong " "thư mục cơ bản của dự án khi tạo dự án mới, thay cho thư mục cấp trên. Bạn " "vẫn còn có khả năng thay đổi đường dẫn của tập tin dự án trong hộp thoại Dự " -"án Mới" +"án Mới." -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "Dự án" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "Linh tinh" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "Chung" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "Hiện danh sách ký hiệu" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "Hiện/ẩn danh sách ký hiệu" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "Hiện danh sách tài liệu" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "Hiện/ẩn danh sách tài liệu" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "Hiện khung _lề" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "Mô tả:" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "Trái" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "Phải" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "Khung lề" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" msgstr "Danh sách ký hiệu :" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" msgstr "Cửa sổ thông điệp:" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" msgstr "Bộ soạn thảo :" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "Đặt phông chữ cho cửa sổ thông điệp" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "Đặt phông chữ cho danh sách các ký hiệu" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "Đặt phông soạn thảo" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "Phông" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "Hiện các thanh soạn thảo" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "Hiện nút Đóng" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1739,111 +1850,141 @@ "Hiển thị một cái nút chữ thập nhỏ trên mỗi thẻ tập tin: nhấn vào thì dễ đóng " "tập tin (tùy chọn này yêu cầu khởi chạy lại Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "Vị trí thanh tập tin mới:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Trái" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "Các thanh tập tin mới sẽ nằm bên trái cuốn vở" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Phải" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "Các thanh tập tin mới sẽ nằm bên phải cuốn vở" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "Lưu tập tin hiện thời" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "Nhấn đôi thì ẩn mọi ô điều khiển bổ sung" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Gọi chức năng Xem > Bật/tắt mọi ô điều khiển bổ sung" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "Thẻ trình soạn thảo" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "Trên" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "Dưới" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" msgstr "Khung lề:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "Vị trí thẻ" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "Hiện thanh trạng thái" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Có nên hiển thị thanh trạng thái ở dưới cửa sổ chính hay không" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "Giao diện" -#: ../src/interface.c:3242 -#, fuzzy +#: ../src/interface.c:3311 msgid "Show T_oolbar" -msgstr "Hiện thanh công cụ" +msgstr "Hiện Th_anh công cụ" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Phụ thêm Thanh công cụ vào Trình đơn" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" +"Gắn thanh công cụ với trình đơn chính để tiết kiệm sức chứa theo chiều dọc" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "Thanh công cụ" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "Tùy chỉnh thanh công cụ" + +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "Ảnh _và Nhãn" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "Kiểu biểu tượng:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "Cỡ biểu tượng:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "Diện mạo" +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "_Chỉ ảnh" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "Chỉ _nhãn" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3392 #, fuzzy -msgid "Customize Toolbar" -msgstr "Hiện _thanh công cụ" +msgid "Icon Style" +msgstr "Phông" + +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "Biểu tượng _nhỏ" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "Biểu tượng _rất nhỏ" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "Biểu tượng _lớn" + +#: ../src/interface.c:3445 +#, fuzzy +msgid "Icon Size" +msgstr "Cỡ :" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "Thanh công cụ" -#: ../src/interface.c:3363 +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "Thanh công cụ" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "Ngắt dòng" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1853,11 +1994,11 @@ "năng ngắt dòng trong tài liệu lớn chiếm hiệu suất nhiều, vì vậy nó nên bị " "tắt trên máy chạy chậm." -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "Bật phím Home khéo" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1870,11 +2011,11 @@ "này thì phím HOME lúc nào cũng di chuyển về đầu của dòng hiện tại, bất chấp " "vị trí hiện thời." -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "Tắt Kéo và Thả" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1882,20 +2023,19 @@ "Tắt hoàn toàn khả năng Kéo và Thả trong cửa sổ soạn thảo nên không thể kéo " "và thả vùng chọn nào bên trong hay bên ngoài cửa sổ đó" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "Bật gấp lại" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "Có nên bật gấp lại mã hay không" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "Gấp lại/Mở ra mọi điểm con của một điểm gấp" -#: ../src/interface.c:3413 -#, fuzzy +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1903,11 +2043,11 @@ "Gấp lại hay mở ra tất cả các điểm con của một điểm gấp. Ấn giữ phím Shift " "trong khi nhấn vào ký hiệu gấp để đảo ngược ứng xử này" -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "Dùng cái chỉ để hiển thị lỗi biên dịch" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1915,23 +2055,23 @@ "Có nên dùng cái chỉ (dấu gạch dưới vặn vẹo) hay không để tô sáng mỗi dòng " "trên đó bộ biên dịch tìm cảnh báo hay lỗi" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "Dòng mới bỏ dấu cách theo sau" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Hiệu lực dòng mới để bỏ các dấu cách theo sau trên dòng trước" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "Cột ngắt dòng:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" msgstr "Dấu bật/tắt ghi chú :" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1939,68 +2079,58 @@ "Một chuỗi được thêm khi bật/tắt một ghi chú dòng trong một tập tin nguồn; nó " "dùng để đánh dấu ghi chú đã được bật/tắt." -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "Tính năng" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "Tính năng" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" msgstr "Chế độ tự động thụt lề:" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "Cơ bản" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "Ký tự hiện thời" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "Khớp dấu ngoặc móc" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" msgstr "Kiểu :" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" msgstr "Rộng:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "Chiều rộng theo ký tự của một khoảng thụt lề riêng lẻ" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "Dùng dấu cách khi chèn khoảng thụt lề" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "Thụt lề theo một khoảng tab" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Dùng các dấu cách nếu khoảng thụt lề vẫn nhỏ hơn chiều rộng của khoảng tab, " "không thì dùng cả hai" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "Rộng tab cứng:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" -"Chiều rộng của một khoảng tab khi tùy chọn Tab và Dấu cách được đặt cho tài " -"liệu đó" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2008,30 +2138,30 @@ "Có nên phát hiện cách thụt lề dựa vào nội dung tập tin khi mở tập tin, hay " "không" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "Thụt lề phím Tab" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Bấm phím Tab hay Shift+Tab thì thụt lề hay bỏ thụt lề thay vào chèn một ký " "tự tab" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "Thụt lề" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "Thụt lề" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "Làm xong đoạn" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2039,20 +2169,19 @@ "Gõ một dãy ký tự ngắn đã định sẵn và bấm một phím nào đó để điền nốt chuỗi " "phức tạp hơn" -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "Tự động điền nốt thẻ XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Tự động gõ xong và đóng các thể XML mở (bao gồm các thẻ HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "Tự động tiếp tục ghi chú đa dòng" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2060,11 +2189,11 @@ "Tự động tiếp tục ghi chú đa dòng bằng ngôn ngữ như C, C++ và Java khi xuống " "dòng bên trong một ghi chú như vậy" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "Tự động điền nốt ký hiệu" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2072,183 +2201,173 @@ "Tự động gõ xong các ký hiệu đã biết trong tập tin được mở (tên hàm, biến " "toàn cục v.v.)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Tự động điền nốt mọi từ trong tài liệu" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "" +msgstr "Bỏ phần từ còn lại một khi điền nốt" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "Số tối đa các góp ý tên ký hiệu :" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "Bề cao danh sách điền nốt:" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" -msgstr "Ký tự cần gõ để làm xong:" +msgstr "Ký tự cần gõ để tự động điền nốt:" -#: ../src/interface.c:3683 -#, fuzzy +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "Số các ký tự cần thiết để hiển thị danh sách tự động điền nốt ký hiệu" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "Chiều cao hiển thị theo hàng cho danh sách tự động điền nốt" -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Số tối đa các mục nhập cần hiển thị trong danh sách tự động điền nốt" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "Làm xong" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "Ngoặc đơn ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "Tự động điền nốt một cặp dấu ngoặc đơn khi nhập một dấu ngoặc đơn mở" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "Nháy đơn ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "Tự động điền nốt một cặp dấu nháy đơn khi nhập một dấu nháy đơn mở" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "Ngoặc móc { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "Tự động điền nốt một cặp dấu ngoặc móc khi nhập một dấu ngoặc móc mở" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "Ngoặc vuông [ ]" -#: ../src/interface.c:3750 -#, fuzzy +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" -"Tự động điền nốt một cặp dấu ngoặc vuông khi nhập một dấu ngoặc vuông mở" +msgstr "Tự động điền nốt một cặp dấu ngoặc vuông khi gõ một dấu ngoặc vuông mở" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "Nháy kép \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "Tự động điền nốt một cặp dấu nháy kép khi nhập một dấu nháy kép mở" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "Tự động điền nốt Nháy và Ngoặc" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "Mục điền nốt" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "Đảo ngược màu sắc tô sáng cú pháp" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Hiển thị chữ màu trắng trên một nền màu đen và đảo ngược mọi màu ; tùy chọn " -"này chỉ có tác động sau khi khởi chạy lại Geany" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "Hiện nét dẫn thụt lề" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "Hiển thị đường chấm chấm nhỏ để giúp bạn thụt lề đúng" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "Hiện khoảng trắng" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "Nhãn dấu cách bằng chấm và tab bằng mũi tên" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "Hiện kết thúc dòng" -#: ../src/interface.c:3805 -#, fuzzy +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "Hiện ký tự kết thúc dòng" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "Hiện số thứ tự dòng" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "Hiện/ẩn lề số thứ tự dòng" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "Hiện lề đánh dấu" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "Hiện/ẩn lề nhỏ bên phải các số thứ tự dòng, được dùng để đánh dấu dòng" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "Dừng cuộn ở dòng cuối" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Có nên dừng cuộn lại một trang đằng sau dòng cuối cùng của tài liệu" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "Hiển thị" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "Dấu dòng dài:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "Màu dấu dòng dài:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "Công ty:" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "Đặt màu của dấu dòng dài" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "Bộ chọn màu" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2258,11 +2377,11 @@ "dấu dòng dài, hoặc nhắc nhở bạn ngắt dòng đó. Đặt giá trị này thành một giá " "trị hơn 0 để xác định vị trí của cột này." -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "Dòng" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2270,11 +2389,11 @@ "In ra một đường nằm dọc trong cửa sổ trình soạn thảo tại vị trí con trỏ đã " "cho (xem dưới)." -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "Nền" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2283,109 +2402,146 @@ "Màu nền của các ký tự nằm sau vị trí con trỏ đã cho (xem dưới) được thay đổi " "thành màu được đặt bên dưới. (Khuyến khích nếu bạn sử dụng phông tỷ lệ.)" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "Bị tắt" +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "_Bật" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "Dấu dòng dài" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "Bị tắt" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "Gỡ bỏ các dấu cách theo sau, tab, và kết thúc dòng" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "Đường dẫn công cụ" + +#: ../src/interface.c:4021 msgid "Display" msgstr "Hiển thị" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "Mở tài liệu mới từ dòng lệnh" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Tạo một tập tin mới cho mỗi tên tập tin dòng lệnh không tồn tại" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "Ký tự kết thúc dòng mặc định:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "Tập tin mới" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "Đặt bảng mã mặc định cho tập tin mới tạo" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" msgstr "Bảng mã mặc định (tập tin mới):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "Bảng mã mặc định (tập tin đã có):" - -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "Đặt bảng mã mặc định để mở tập tin đã có" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "Đặt bảng mã mặc định cho tập tin mới tạo" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Dùng bảng mã cố định khi mở tập tin" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Tùy chọn này tắt chức năng tự động phát hiện bảng mã tập tin khi mở tập tin, " "và mở tập tin bằng bảng mã đã ghi rõ (thường không cần)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Bảng mã mặc định (tập tin đã có):" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Đặt bảng mã mặc định để mở tập tin đã có" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "Bảng mã" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "Đảm bảo có ký tự dòng mới tại kết thúc tập tin" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "Đảm bảo có ký tự dòng mới tại kết thúc tập tin" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "Bỏ dấu cách và Tab theo sau" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Gỡ bỏ các dấu cách theo sau, tab, và kết thúc dòng" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "Thay thế các tab bằng dấu cách" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "Thay thế bằng dấu cách mọi tab trong tài liệu" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "Lưu tập tin" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "Độ dài danh sách tập tin gần đây:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Xác định số tối đa các tập tin được giữ lại trong danh sách Tập tin gần đây" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "Thời hạn kiểm tra đĩa:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2393,28 +2549,20 @@ "Có nên kiểm tra có thay đổi trong tập tin tài liệu trên đĩa thường xuyên cỡ " "nào, theo giây. Số không tắt chức năng kiểm tra." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "Tập tin" -# Name: don't translate/Tên: đừng dịch -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "Make:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" msgstr "Thiết bị cuối:" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" msgstr "Bộ duyệt:" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "Đường dẫn và tùy chọn cho công cụ « make »" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2422,24 +2570,24 @@ "Mô phỏng thiết bị cuối như xterm, gnome-terminal hay konsole (nên chấp nhận " "đối số « -e »)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Đường dẫn (có thể thêm đối số) đến bộ duyệt ưa thích của bạn" # Name: don't translate/Tên: đừng dịch -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "Đường dẫn công cụ" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" msgstr "Hành động ngữ cảnh:" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2450,67 +2598,67 @@ "s. Nó có thể nằm ở mọi vị trí trong lệnh đã cho, cũng sẽ được thay thế trước " "khi thực hiện." -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "Lệnh" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "Công cụ" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "địa chỉ thư của nhà phát triển" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "Tên tắt của nhà phát triển" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "Phiên bản đầu tiên:" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "Số hiệu phiên bản đầu tiên của tập tin mới" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "Tên công ty" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" msgstr "Nhà phát triển:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" msgstr "Công ty:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" msgstr "Địa chỉ bưu điện:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "Tên tắt:" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "Tên của nhà phát triển" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" msgstr "Năm:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" msgstr "Ngày:" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "Ngày Giờ :" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2518,7 +2666,7 @@ "Ghi rõ định dạng cho ký hiệu đại diện ngày/giờ {datetime}. Có thể sử dụng " "bất cứ đặc tả chuyển đổi nào tương thích với hàm strftime C ANSI." -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2526,7 +2674,7 @@ "Ghi rõ định dạng cho ký hiệu đại diện năm {year}. Có thể sử dụng bất cứ đặc " "tả chuyển đổi nào tương thích với hàm strftime C ANSI." -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2534,63 +2682,61 @@ "Ghi rõ định dạng cho ký hiệu đại diện ngày tháng {date}. Có thể sử dụng bất " "cứ đặc tả chuyển đổi nào tương thích với hàm strftime C ANSI." -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "Dữ liệu mẫu" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "Biểu mẫu" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" msgstr "Đổ_i" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "Phím tắt" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "Tổ hợp phím" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "Lệnh:" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Đường dẫn tới lệnh để in tập tin (dùng %f thay cho tên tập tin)." -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "Dùng lệnh bên ngoài để in" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "In số thứ tự dòng" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Thêm vào trang in các số thứ tự dòng" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" msgstr "In số thứ tự trang" -#: ../src/interface.c:4570 ../src/printing.c:387 -#, fuzzy +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "Thêm số thứ tự dòng vào đáy từng trang (chiếm 2 dòng)" +msgstr "Thêm số thứ tự dòng vào đáy từng trang (chiếm 2 dòng của trang)." -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "In phần đầu trang" -#: ../src/interface.c:4575 ../src/printing.c:392 -#, fuzzy +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2598,20 +2744,19 @@ "Thêm vào mỗi trang một phần đầu trang nhỏ chứa số thứ tự trang, tên tập tin " "và ngày tháng hiện thời (xem bên dưới). Phần này chiếm 3 dòng của trang." -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Dùng tên cơ bản của tập tin đã in" -#: ../src/interface.c:4595 -#, fuzzy +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" -msgstr "In chỉ tên cơ bản (không có đường dẫn) của tập tin in." +msgstr "In chỉ tên cơ bản (không có phần đường dẫn) của tập tin in ra." -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "Định dạng ngày tháng:" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2621,552 +2766,576 @@ "trang. Bạn có khả năng sử dụng bất cứ ký hiệu chuyển đổi nào dùng được với " "hàm strftime kiểu C ANSI. Xem « man strftime » để tìm thêm thông tin." -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "Dùng chức năng in GTK sở hữu" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "Bảng mã:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "In" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" -msgstr "Tài sản dự án" +msgstr "Thuộc tính dự án" + +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "Hiển thị" + +#: ../src/interface.c:5317 +#, fuzzy +msgid "Custom" +msgstr "Cắt" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "Tập tin" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "Mới" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "Mở" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "Mở tập tin đã chọn" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "Lưu" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "Lưu dạng" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "Lưu tất cả" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "In" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "Đóng" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "Đóng tất cả" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" -msgstr "Tải lại tập tin" +msgstr "Nạp lại tập tin" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "Dự án" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" -msgstr "Tài sản dự án" +msgstr "Thuộc tính dự án" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "Hủy bước" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "Bước lại" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "Nhân đôi dòng hay vùng chọn" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "Xoá các dòng hiện tại" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "Xoá các dòng hiện tại" - -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "Chuyển vị dòng hiện tại" +msgstr "Xoá đến cuối dòng" -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" msgstr "Cuộn đến dòng hiện tại" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "Cuộn lên một dòng" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "Cuộn xuống một dòng" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "Làm xong đoạn" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "Chuyển con trỏ trong đoạn" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "Tắt chức năng làm xong đoạn" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" msgstr "Hành động ngữ cảnh" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "Gõ xong từ" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "Hiện mẹo gọi" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "Hiện danh sách vĩ lệnh" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "Làm xong đoạn" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "Ghi chú dòng" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "Ghi chú dòng" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "Bảng nháp" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "Cắt" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "Chép" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "Dán" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "Chép các dòng hiện tại" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "Cắt các dòng hiện tại" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "Chọn" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "Chọn tất cả" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "Chọn từ hiện thời" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "Chọn các dòng hiện tại" +#: ../src/keybindings.c:334 +#, fuzzy +msgid "Select to previous word part" +msgstr "Về phần từ trước" -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "Chọn đoạn văn hiện tại" +#: ../src/keybindings.c:336 +#, fuzzy +msgid "Select to next word part" +msgstr "Tới phần từ tiếp" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" msgstr "Định dạng" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "Chuyển đổi chữ hoa/thường của vùng chọn" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "Bật/tắt ghi chú dòng" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "Ghi chú dòng" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" msgstr "Hủy ghi chú dòng" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "Thụt lề thêm" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "Thụt lề kém" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" msgstr "Thụt lề thêm một dấu cách" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" msgstr "Thụt lề kém một dấu cách" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "Thụt lề dòng khéo" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "Gửi cho Lệnh riêng 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "Gửi cho Lệnh riêng 1" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "Gửi cho Lệnh riêng 3" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "_Gửi vùng chọn cho" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "Chèn" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "Chèn ngày" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "Chèn khoảng trắng xen kẽ" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "Thiết lập" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "Tìm kiếm" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "Tìm" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" -msgstr "Tìm kế" +msgstr "Tìm tiếp" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "Tìm trước" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" -msgstr "Tìm vùng chọn kế" +msgstr "Tìm vùng chọn tiếp" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "Tìm vùng chọn trước" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "Thay thế" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "Tìm trong tập tin" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" -msgstr "Thông điệp kế" +msgstr "Thông điệp tiếp" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" msgstr "Thông điệp trước" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "Tìm cách sử dụng" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "Tìm cách sử dụng tài liệu" # Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "_Make All" +msgstr "Đánh dấu tất cả" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" msgstr "Đi tới" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "Duyệt ngược một vị trí" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "Duyệt tới một vị trí" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "Tới dấu ngoặc móc khớp" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" msgstr "Dấu bật/tắt" -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "Tới dấu kế" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "Về dấu trước" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "Tới lời xác định thẻ" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "Tới lời tuyên bố thẻ" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "Tới đầu dòng" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" msgstr "Tới cuối dòng" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" -msgstr "Tới cuối dòng" +msgstr "Tới cuối dòng hiển thị" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "Về phần từ trước" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "Tới phần từ tiếp" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "Xem" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" -msgstr "Bật/tắt mọi ô điều khiển thêm" +msgstr "Bật/tắt mọi ô điều khiển bổ sung" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "Toàn màn hình" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "Hiện/ẩn cửa sổ thông điệp" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "Hiện/ẩn khung lề" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "Phóng to" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "Thu nhỏ" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "Thu nhỏ" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "Tập trung" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "Chuyển sang bộ soạn thảo" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "Chuyển sang Viết tháu" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "Chuyển sang VTE" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "Chuyển sang Thanh tìm" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "Chuyển sang Khung lề" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "Chuyển sang Bộ biên dịch" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "Chuyển sang Khung lề" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "Hiện cửa _sổ thông điệp" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "Chuyển sang Tài liệu" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "Chuyển sang Khung lề" + +#: ../src/keybindings.c:498 msgid "Notebook tab" msgstr "Thẻ cuốn vở" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "Chuyển dang tài liệu bên trái" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "Chuyển dang tài liệu bên phải" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "Chuyển sang tài liệu dùng cuối" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "Dời tài liệu qua bên trái" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "Dời tài liệu qua bên phải" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" msgstr "Dời tài liệu trên đầu" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" msgstr "Dời tài liệu xuống cuối" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "Tài liệu" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "Bật/tắt cuộn dòng" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "Bật/tắt ngắt dòng" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "Thay thế bằng tab các dấu cách" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "Bật/tắt phần gấp hiện thời" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "Gấp tất cả" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "Mở lại tất cả" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "Tải lại danh sách ký hiệu" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +#, fuzzy +msgid "Remove Markers" +msgstr "Bỏ _dấu" + +#: ../src/keybindings.c:536 +#, fuzzy +msgid "Remove Error Indicators" +msgstr "Bỏ mọi cá_i chỉ lỗi" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "Xây dựng" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "Biên dịch" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "Make đích riêng" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "Make đối tượng" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" -msgstr "Lỗi kế" +msgstr "Lỗi tiếp" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" msgstr "Lỗi trước" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "Chạy" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "Chạy (lệnh xen kẽ)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "Tùy chọn xây dựng" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "Hiện bảng chọn màu" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "Trợ giúp" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "Phím tắt" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "Có thể cấu hình những phím tắt này:" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "Chuyển sang Tài liệu" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Gõ bất cứ đoạn nào vào đây: dùng nó là bảng thông báo/viết tháu" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "Lỗi nạp một hay nhiều tập tin phiên chạy." @@ -3174,7 +3343,12 @@ msgid "Debug Messages" msgstr "Thông điệp Gỡ lỗi" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "_Tìm" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" @@ -3182,84 +3356,93 @@ "Đặt số thứ tự cột đầu tiên cho tập tin được mở thứ nhất (có ích cùng với « -" "line »)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" msgstr "Dùng tập tin cấu hình xen kẽ" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "Xuất chi tiết" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "In tên kiểu tập tin nội bộ" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Tạo ra tập tin thẻ toàn cục (xem tài liệu hướng dẫn)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "Không tiền xử lý tập tin C/C++ khi tạo ra các thẻ" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "Đừng mở tập tin trong tiến trình đang chạy: buộc mở một tiến trình mới" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "Đặt số thứ tự dòng đầu tiên cho tập tin được mở thứ nhất" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "Đừng hiển thị cửa sổ thông điệp khi khởi chạy" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" msgstr "Đừng nạp dữ liệu làm xong tự động (xem tài liệu hướng dẫn)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "Đừng nạp phần bổ sung" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "In tiền tố cài đặt của Geany" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "Đừng nạp các tập tin của phiên bản trước" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "Đừng nạp hỗ trợ thiết bị cuối" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" msgstr "Tên tập tin của « libvte.so »" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "Xuất chi tiết" + +#: ../src/main.c:145 msgid "Show version and exit" msgstr "Hiện phiên bản rồi thoát" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[TẬP_TIN...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(xây dựng trên %s dùng GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "Chuyển nó ngay ?" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany cần phải di chuyển thư mục cấu hình cũ trước khi khởi chạy." -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3268,7 +3451,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3277,7 +3460,7 @@ "Thư mục cấu hình cũ « %s » không thể di chuyển được sang « %s » (%s). Hãy di " "chuyển nó bằng tay sang vị trí mới." -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3288,38 +3471,43 @@ "Có thể gặp lỗi khi sử dụng Geany mà không có thư mục cấu hình.\n" "Vẫn khởi chạy Geany không?" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "Không tìm thấy tập tin « %s »." - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "Đây là Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Không thể tạo thư mục cấu hình (%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." msgstr "Các tập tin cấu hình đã được nạp lại." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "Thông điệp trạng thái" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "Chép" + +#: ../src/msgwindow.c:533 msgid "Copy _All" msgstr "Ché_p tất cả" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "Ẩn cửa sổ t_hông điệp" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3328,11 +3516,11 @@ "Phần bổ sung « %s » không tương thích nhị phân với bản phát hành Geany này: " "hãy biên dịch lại nó." -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "Quản lý _Phần bổ sung" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3343,80 +3531,88 @@ "Mô tả: %s\n" "Tác giả: %s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "Hoạt động" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "Phần bổ sung" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "Không có phần bổ sung sẵn sàng." -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "Phần bổ sung" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -"Bên dưới có danh sách các phần bổ sung sẵn sàng. Chọn những phần bổ sung cần " -"nạp khi khởi chạy Geany." -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "Chi tiết về Phần bổ sung" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Bắt phím" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Gõ tổ hợp phím nên đại diện « %s »." -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "Giãn _ra tất cả" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "_Co lại tất cả" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "Hành động" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "Phím tắt" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "_Ghi đè" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "Ghi đè lên tổ hợp phím đó không?" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Tổ hợp « %s » đã được dùng cho « %s »." +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "Thiết bị cuối" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "Hãy nhập bên dưới những đường dẫn công; bỏ trống công cụ không cần." #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3424,7 +3620,7 @@ "Ở đây hãy xác định thông tin cần dùng trong mẫu. Xem tài liệu hướng dẫn để " "tìm chi tiết." -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3435,7 +3631,7 @@ "hình." #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3446,7 +3642,7 @@ "nào để chỉnh sửa trực tiếp chuỗi đại diện phím tắt đó." #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3455,7 +3651,7 @@ "GTK 2.10 (hay sau) và Geany đang chạy với GTK 2.10 (hay sau)." #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3465,51 +3661,50 @@ #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "Phông chữ trình soạn thảo không phải là một phông chữ đơn cách." #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "Vậy văn bản không giãn cách đúng." -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "Trang %d trên %d" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "Thiết lập Tài liệu" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "In chỉ tên cơ bản (không có đường dẫn) của tập tin in." -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "Trang %d trên %d" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "Tiến trình in tập tin %s bị thôi." +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 -#, c-format -msgid "File %s printed." -msgstr "Tập tin %s đã được in." +#: ../src/printing.c:783 +#, c-format +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "Tiến trình in tập tin %s bị lỗi (%s)." -#: ../src/printing.c:867 -#, fuzzy +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." -msgstr "Trước tiên hãy đặt một câu lệnh in trong hộp thoại Tùy thích." +msgstr "Trước tiên hãy đặt một câu lệnh in ấn trong hộp thoại Tùy thích." -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3520,39 +3715,44 @@ "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Lỗi in « %s » (mã trả lại: %s)." +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "Tập tin %s đã được in." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "dự án" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "Dự án mới" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "Tạ_o" # Name: don't translate/Tên: đừng dịch -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "Tên:" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" msgstr "Tên tập tin:" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "Đường dẫn cơ bản:" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3562,123 +3762,117 @@ "mục tồn tại cũng được. Bạn cũng có thể đặt đường dẫn tương đối so với tên " "tập tin dự án." -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "Chọn đường dẫn cơ bản dự án" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Không thể nạp tập tin dự án « %s »." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "Mở dự án" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "Tập tin dự án" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "Dự án « %s » đã được đóng." -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" msgstr "Mô tả:" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "Tạo trên đường dẫn cơ bản" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "Chạy lệnh:" +#: ../src/project.c:484 +#, fuzzy +msgid "Set" +msgstr "Phần 1" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -"Chuỗi dòng lệnh cần chạy trong thư mục cơ bản của dự án. Cũng có thể phụ " -"thêm tùy chọn vào lệnh này. Bỏ rỗng để dùng lệnh chạy mặc định." -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" msgstr "Mẫu tập tin:" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "Bạn có muốn đóng nó trước khi tiếp tục không?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "Dự án « %s » đã mở." -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "Bạn đã ghi rõ một tên dự án quá ngắn." -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Bạn đã ghi rõ một tên dự án quá dài (tối đa %d ký tự)." -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "Bạn đã ghi rõ một tên dự án không hợp lệ." -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "Tạo thư mục cơ bản của dự án không?" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "Đường dẫn « %s » không tồn tại." -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Không thể tạo thư mục cơ bản của dự án (%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "Không thể ghi tập tin dự án (%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "Dự án « %s » đã được tạo." -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." msgstr "Dự án « %s » đã được lưu." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "Chọn tên tập tin dự án" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "Chọn lệnh chạy dự án" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "Dự án « %s » đã được mở." -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "Dùng biể_u thức chính quy" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3686,15 +3880,15 @@ "Dùng biểu thức chính quy kiểu POSIX. Để tìm thông tin chi tiết về cách sử " "dụng regex, xem tài liệu hướng dẫn." -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "Tìm n_gược" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "Dùng chuỗi t_hoát" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3702,412 +3896,433 @@ "Thay thế dãy « \\\\ », « \\t », « \\n », « \\r » và « \\uXXXX » (ký tự Unicode) " "bằng ký tự điều khiển tương ứng" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "Phân biệt chữ ho_a/thường" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "Khớp chỉ t_oàn từ" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "Khớp _từ đầu từ" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" msgstr "T_rước" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" -msgstr "_Kế" +msgstr "_Tiếp" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" msgstr "Tìm _kiếm:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" msgstr "_Tìm tất cả" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "Đánh _dấu" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "Đánh dấu mọi mục khớp trong tài liệu hiện thời" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "Tr_ong phiên chạy" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "Trong tà_i liệu" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "Đóng _hộp thoại" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "Tắt tùy chọn này để bảo tồn hộp thoại mở" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "Thay thế _và Tìm:" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "T_hay thế bằng:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "Tha_y thế tất cả" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "Trong _vùng chọn" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "Thay thế mọi điều khớp nằm trong đoạn đã chọn hiện thời" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "Thư _mục:" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "Bả_ng mã:" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "Chuỗi đã _sửa chữa" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "Biểu thức chính quy kiểu _grep" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "Dùng câu lệnh « man grep » để tìm thêm thông tin" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "Biểu thức chính quy đã _mở rộng" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "Đệ qui t_rong thư mục con" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "Đảo kết quả tìm k_iếm" -#: ../src/search.c:797 -#, fuzzy +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" -msgstr "Đảo điều cần khớp, để chọn các dòng không khớp." +msgstr "Đảo chức năng khớp, để chọn các dòng không tương ứng." -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "Tù_y chọn thêm:" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "Tùy chọn khác cần gửi cho Grep" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Tìm %d mục tương ứng với « %s »." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "Đã thay thế đoạn văn trong %u tập tin." +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "Thay thế văn bản trong tài liệu hiện thời" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "Thư mục không hợp lệ để tìm trong tập tin." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "Không có đoạn cần tìm." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Không thể thực hiện công cụ grep « %s »: kiểm tra xem thiết lập đường dẫn là " "đúng trong Tùy thích." -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "Đang tìm kiếm..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (trong thư mục: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "Không thể mở thư mục (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Lỗi tìm kiếm (xem Trợ giúp > Thông điệp Gỡ lỗi để tìm chi tiết)." +#: ../src/search.c:1601 +#, fuzzy +msgid "Search failed." +msgstr "Tìm _kiếm:" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Hoàn tất tìm kiếm: có %d kết quả." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "Không tìm thấy." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, fuzzy, c-format +msgid "Bad regex: %s" +msgstr "Sai đặt biểu thức chính quy cho dạng tập tin %s: %s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "Chương" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "Phần" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "Phần 1" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "Phần 2" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "Phần 3" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "Phụ lục" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "Khác" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "Mô-đun" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "Kiểu" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "Hàm tạo kiểu" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "Hàm" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "Phần" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "Khoá" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "Biến" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "Lệnh" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "Môi trường" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "Phần phụ" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "Phần phụ con" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "Nhãn" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "Cấu trúc" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "Gói" -#: ../src/symbols.c:655 -msgid "My" -msgstr "Tôi" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "Cục bộ" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "Chúng ta" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "Nhãn" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "Hằng" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "Giao diện" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "Hạng" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "Hằng" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "Neo" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "Tiêu đề H1" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "Tiêu đề H2" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "Tiêu đề H3" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "Bộ chọn ID" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "Bộ chọn kiểu" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "Mô-đun" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "Vật đơn" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "Phương pháp" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "Miền tên" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "Tài sản" +msgstr "Thủ tục" -#: ../src/symbols.c:736 -#, fuzzy +#: ../src/symbols.c:752 msgid "Imports" -msgstr "Xuất" +msgstr "Nhập khẩu" + +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "không tên" + +#: ../src/symbols.c:761 +#, fuzzy +msgid "Architectures" +msgstr "Cấu trúc" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "Thủ tục" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "Biến" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "Hàm" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "Bộ phạn" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "Nhãn" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "Thường trình con" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "Khối" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "Vĩ lệnh" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "Xác định" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "Đích" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" -msgstr "Struct" +msgstr "Cấu trúc" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" -msgstr "Typedef / Enum" +msgstr "Xác định kiểu / Đánh số" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Gặp phần mở rộng kiểu tập tin lạ cho « %s ».\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Lỗi tạo tập tin thẻ, có lẽ vì không tìm thấy thẻ.\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" -"Cách sử dụng: %s -g \n" +"Sử dụng: %s -g \n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4118,178 +4333,195 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "Nạp thẻ" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Tập tin thẻ Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Mới nạp tập tin thẻ %s « %s »." -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." msgstr "Không thể nạp tập tin thẻ « %s »." -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Không tìm thấy lời tuyên bố tới « %s »." -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "Không tìm thấy lời xác định « %s »." -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "Sắp xếp theo Tê_n" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "Sắp xếp theo _Diện mạo" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "Lưu tập tin hiện thời" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "Lưu mọi tập tin đang mở" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "Tải lại tập tin hiện thời từ đĩa" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "Đóng tập tin hiện thời" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "Đóng mọi tập tin còn mở" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "Cắt vùng chọn hiện thời" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "Chép vùng chọn hiện thời" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "Dán nội dung của bảng nháp" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "Xoá vùng chọn hiện thời" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "Hủy bước sự sửa đổi cuối cùng" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "Bước lại sự sửa đổi cuối cùng" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "Biên dịch tập tin hiện thời" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "Chạy hay xem tập tin hiện thời" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Mở hộp thoại chọn màu sắc, để kén tương tác màu trong bảng chọn" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "Phóng to đoạn" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "Thu nhỏ đoạn" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 msgid "Decrease indentation" msgstr "Giảm khoảng thụt lề" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 msgid "Increase indentation" msgstr "Tăng khoảng thụt lề" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "Tìm đoạn đã nhập trong tập tin hiện thời" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "Nhảy tới số thứ tự dòng đã nhập" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "Hiển thị hộp thoại Tùy thích" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" -msgstr "Thoát Geany" +msgstr "Thoát khỏi Geany" -#: ../src/toolbar.c:79 -#, fuzzy +#: ../src/toolbar.c:80 msgid "Print document" -msgstr "Tài liệu XML" +msgstr "In ấn tài liệu" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "Đánh dấu mọi mục khớp trong tài liệu hiện thời" +msgstr "Thay thế văn bản trong tài liệu hiện thời" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "Tạo tập tin mới" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "Tạo tập tin mới" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Mở tập tin đã có" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "Mở tập tin đã chọn" + +#: ../src/toolbar.c:374 +#, fuzzy +msgid "Choose more build actions" +msgstr "Không có lỗi xây dựng nào nữa." + +#: ../src/toolbar.c:389 msgid "Goto" msgstr "Đi tới" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "Phân cách" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- Phân cách ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" +"Hãy chọn những mục cần hiển thị trên thanh công cụ. Các mục cũng có thể được " +"sắp đặt lại bằng cách kéo và thả." -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "Mục sẵn sàng" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "Hiển thị" +msgstr "Mục hiển thị" #: ../src/tools.c:153 #, c-format @@ -4315,7 +4547,7 @@ msgid "Custom command failed: %s" msgstr "Câu lệnh riêng không thành công: %s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "Đặt lệnh riêng" @@ -4327,244 +4559,223 @@ "Bạn có khả năng đặt vùng chọn hiện thời thành bất cứ lệnh nào trong những " "lệnh này: dữ liệu xuất lệnh sẽ thay thế vùng chọn hiện thời." -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "Chưa xác định lệnh riêng nào." -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "Tổng từ" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "vùng chọn" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "toàn tài liệu" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" msgstr "Phạm vị:" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" msgstr "Dòng:" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "Từ :" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" msgstr "Ký tự :" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "Không tìm thấy thẻ" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "Hiện danh sách _Ký hiệu" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "Hiện _danh sách Tài liệu" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "Ẩ_n khung lề" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "Hiện thanh trạng thái" +msgstr "Hiện Đường _dẫn" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 -#, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +#: ../src/ui_utils.c:194 +#, fuzzy, c-format +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "dòng: %d\t cột: %d\t chọn: %d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "CĐ " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "ĐÈ" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "CHÈN" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "chế độ : %s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" msgstr "bảng mã: %s: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "dạng tập tin: %s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "SỬA" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "phạm vi: %s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "Phông chữ đã được cập nhật (%s)." -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "Thư Viện Chuẩn C" # Name: don't translate/Tên: đừng dịch -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++ (Thư Viện Chuẩn C)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "Thư Viện Chuẩn C++" # Name: don't translate/Tên: đừng dịch -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "Đặt định dạng ngày _riêng" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "Chọn thư mục" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "Chọn tập tin" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "Tập tin Cấ_u hình" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "Lưu tất cả" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "Đóng tất cả" # Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" # Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" # Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "UNIX (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "Thiết bị cuối" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "Đặt đường dẫn dựa _vào tài liệu" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "_Khởi chạy lại Thiết bị cuối" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" -msgstr "K_iểu nhập" +msgstr "Cách _gõ" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "Không thể chuyển đổi thư mục trong VTE vì nó rất có thể chứa lệnh." -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "Bổ sung thiết bị cuối" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -"Những thiết lập này cho ô điều khiển mô phỏng thiết bị cuối ảo (VTE) chỉ " -"hoạt động nếu thư viện VTE nạp được." - -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "Phông dòng lệnh:" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" msgstr "Đặt phông chữ cho ô điều khiển thiết bị cuối" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" msgstr "Màu cảnh gần:" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" msgstr "Màu nền:" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Đặt màu cảnh gần của văn bản trong ô điều khiển thiết bị cuối" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "Đặt màu nền của văn bản trong ô điều khiển thiết bị cuối" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "Dòng cuộn ngược:" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" @@ -4572,11 +4783,11 @@ "Xác định lịch sử theo dòng, mà bạn có thể cuộn ngược trong ô điều khiển " "thiết bị cuối" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "Trình bao :" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" @@ -4584,44 +4795,44 @@ "Đặt đường dẫn tới trình bao (mà nên được khởi chạy bên trong mô phỏng thiết " "bị cuối)" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "Cuộn khi ấn phím" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Có nên cuộn đến đáy khi được ấn phím hay không" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "Cuộn kết xuất" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "Có nên cuộn đến đáy khi kết xuất được tạo ra hay không" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "Nháy con chạy" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "Có nên nháy con chạy hay không" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "Ghi đè lên tổ hợp phím Geany" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "Cho phép VTE nhận tín hiệu phím tắt (ra khỏi lệnh đặt tiêu điểm)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "Tắt phím tắt trình đơn (mặc định F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " @@ -4631,11 +4842,11 @@ "năng F10). Việc tắt nó có ích nếu, chẳng hạn, bạn dùng Midnight Commander " "bên trong VTE." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "Theo đường dẫn đến tập tin hiện thời" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Có nên thực hiện câu lệnh « cd $path » hay không khi bạn chuyển đổi giữa các " @@ -4643,11 +4854,11 @@ #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "Đừng dùng văn lệnh chạy" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4655,11 +4866,11 @@ "Đừng dùng văn lệnh chạy đơn giản thường dùng để hiển thị trạng thái thoát " "của chương trình đã thực hiện" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "Thực hiện chương trình trong VTE" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4667,90 +4878,123 @@ "Chạy chương trình trong VTE thay vào mở một cửa sổ mô phỏng thiết bị cuối. " "Ghi chú rằng chương trình được thực hiện trong VTE thì không dừng chạy được" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Tập tin dự án Geany" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "Tập tin có thể chạy" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "Bộ xây dựng hạng" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "Tạo tập tin mã nguồn cho kiểu hạng mới." -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "Tạo hạng" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "Miền tên" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "Miền tên" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "Hạng" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" msgstr "Tên hạng:" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" msgstr "Tập tin phần đầu :" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" msgstr "Tập tin mã nguồn:" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "Kế thừa" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "Hạng cơ bản:" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Tập tin mã nguồn %s" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "Phần đầu cơ bản:" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "Toàn cục" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" msgstr "Kiểu GType cơ bản:" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "Tùy chọn" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "Tạo hàm tạo dựng" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "Tạo hàm phá hủy" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +#, fuzzy +msgid "Is singleton" +msgstr "Vật đơn" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "Kiểu hàm tạo GTK+" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "Tạo _hạng" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "Hạng _C++" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "Hạng _GTK+" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "Hạng _C++" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Ký tự HTML" @@ -4760,52 +5004,57 @@ msgstr "Chèn thực thể ký tự HTML như « & »." #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Nhóm nhà phát triển Geany" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "Ký tự HTML" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "Ký tự ISO 8859-1" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "Ký tự Hy-lạp" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "Ký tự toán học" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "Ký tự kỹ thuật" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "Ký tự mũi tên" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "Ký tự dấu chấm câu" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "Ký tự lặt vặt" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "Không thể tạo thư mục cấu hình phần bổ sung." + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "Ký tự Đặc biệt" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "C_hèn" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4813,46 +5062,42 @@ "Hãy chọn một ký tự đặc biệt trong danh sách bên dưới, rồi nhấn đôi vào nó, " "hoặc bấm cái nút để chèn nó vào vị trí con trỏ hiện thời." -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "Ký tự" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "HTML (tên)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "Chèn ký tự HTML đặc b_iệt" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 -#, fuzzy +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" -msgstr "Thay thế" +msgstr "Thay thế mã HTML" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" -msgstr "" +msgstr "Bật/tắt _HTML" -#: ../plugins/htmlchars.c:706 -#, fuzzy +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" -msgstr "Vị trí thanh tập tin mới:" +msgstr "Thay thế hàng loại các ký tự đặc biệt" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "Chèn ký tự HTML đặc biệt" -#: ../plugins/htmlchars.c:724 -#, fuzzy +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" -msgstr "Ký tự Đặc biệt" +msgstr "Thay thế ký tự đặc biệt" -#: ../plugins/htmlchars.c:727 -#, fuzzy +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" -msgstr "Bật/tắt ghi chú dòng" +msgstr "Bật/tắt trạng thái phần bổ sung" #: ../plugins/export.c:37 msgid "Export" @@ -4868,113 +5113,113 @@ #: ../plugins/export.c:183 msgid "_Use current zoom level" -msgstr "Dùng hệ số th_u phóng hiện thời" +msgstr "Dùng hệ số th_u phóng hiện có" #: ../plugins/export.c:185 -#, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" -msgstr "Vẽ kích cỡ phông của tài liệu cùng với hệ số thu phóng hiện thời." +msgstr "" +"Vẽ kích cỡ phông chữ của tài liệu cùng với hệ số thu phóng chữ hiện thời." -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "Tài liệu đã được xuất khẩu theo « %s »." -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Không thể ghi tập tin « %s » (%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Tập tin « %s » đã có. Bạn có muốn ghi đè lên không?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "_Xuất" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "Theo _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "Theo _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" -msgstr "Bộ duyệt qua tập tin" +msgstr "Bộ duyệt tập tin" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." -msgstr "Thêm vào khung lề một thẻ bộ duyệt qua tập tin." +msgstr "Thêm vào khung lề một thẻ duyệt qua tập tin." -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "Chọn quá nhiều mục !" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Không thể thực hiện câu lệnh bên ngoài đã cấu hình « %s » (%s)." -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "Mở _bên ngoài" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "_Tìm trong tập tin" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "_Hiện tập tin ẩn" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "Lên" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "Cập nhật" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "Nhà" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" -msgstr "Đặt đường dẫn dựa vào tài liệu" +msgstr "Đặt đường dẫn từ tài liệu" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" -msgstr "Xoá sạch bộ lọc" +msgstr "Xoá bộ lọc" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "Bộ lọc:" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "Danh sách Tập tin Tập trung" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "Mục nhập Đường dẫn Tập trung" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "Không thể tạo thư mục cấu hình phần bổ sung." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" msgstr "Câu lệnh mở ngoài:" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4989,15 +5234,15 @@ "%d\tsẽ được thay thế bằng tên đường dẫn của tập tin đã chọn (không có tên " "tập tin)" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "Hiện tập tin ẩn" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "Ẩn tập tin đối tượng" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -5005,12 +5250,11 @@ "Đừng hiển thị trong bộ duyệt qua tập tin các tập tin đối tượng đã tạo ra " "(bao gồm *.o, *.obj. *.so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "Đặt thư mục cơ bản của dự án" +msgstr "Dùng thư mục cơ bản của dự án" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Chuyển đổi thư mục sang thư mục cơ bản của dự án được mở hiện thời" @@ -5117,121 +5361,199 @@ msgid "Splits the editor view into two windows." msgstr "Tạch khung xem soạn thảo ra hai cửa sổ." -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "Đánh dấu mọi mục khớp trong tài liệu hiện thời" +msgstr "Hiển thị tài liệu hiện thời" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "_Bỏ tách" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "Tách cửa _sổ" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "_Ngang" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "_Dọc" -#: ../plugins/splitwindow.c:427 -#, fuzzy +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" -msgstr "_Ngang" +msgstr "Tách ra ngang" -#: ../plugins/splitwindow.c:429 -#, fuzzy +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" -msgstr "_Dọc" +msgstr "Tách ra dọc" -#: ../plugins/splitwindow.c:431 -#, fuzzy -msgid "Unsplit" -msgstr "_Bỏ tách" +#~ msgid "_Set Includes and Arguments" +#~ msgstr "Đặt _Gồm và Đối số" -#~ msgid "Diff file" -#~ msgstr "Tập tin khác biệt" +#~ msgid "LaTeX -> _DVI" +#~ msgstr "LaTeX -> _DVI" -#~ msgid "reStructuredText file" -#~ msgstr "Tập tin reStructuredText" +#~ msgid "LaTeX -> _PDF" +#~ msgstr "LaTeX -> _PDF" -#~ msgid "Select _All" -#~ msgstr "Chọn tất _cả" +#~ msgid "_View DVI File" +#~ msgstr "Xem tập tin D_VI" -#~ msgid "Automatic symbol completion" -#~ msgstr "Tự động gõ xong ký hiệu" +#~ msgid "V_iew PDF File" +#~ msgstr "Xem tập t_in PDF" -#~ msgid "" -#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -#~ "xml'. Please see the documentation for details." +#~ msgid "_Set Arguments" +#~ msgstr "Đặ_t đối số" + +#~ msgid "Set Arguments" +#~ msgstr "Đặt đối số" + +#~ msgid "Set programs and options for compiling and viewing (La)TeX files." #~ msgstr "" -#~ "Ghi chú : để tùy chỉnh yếu tố trên thanh công cụ, hãy chỉnh sửa tập " -#~ "tin « ui_toolbar.xml ». Xem tài liệu hướng dẫn để tìm chi tiết." +#~ "Đặt các chương trình và tùy chọn để biên dịch và xem tập tin kiểu (La)TeX." + +#~ msgid "DVI creation:" +#~ msgstr "Tạo DVI:" + +#~ msgid "PDF creation:" +#~ msgstr "Tạo PDF:" + +#~ msgid "DVI preview:" +#~ msgstr "Xem thử DVI:" + +#~ msgid "PDF preview:" +#~ msgstr "Xem thử PDF:" #~ msgid "" -#~ "For all changes you make in this file to take effect, you need to restart " -#~ "Geany." +#~ "%f will be replaced by the current filename, e.g. test_file.c\n" +#~ "%e will be replaced by the filename without extension, e.g. test_file" #~ msgstr "" -#~ "Để tất cả các thay đổi bạn làm trong tập tin này có tác động thì bạn cần " -#~ "phải khởi chạy lại Geany." +#~ "%f\tsẽ được thay thế bằng tên tập tin hoàn toàn (v.d. tập_tin_thử.c)\n" +#~ "%e\tsẽ được thay thế bằng tập tin không có phần mở rộng (v.d. tập_tin_thử)" + +#~ msgid "Set Includes and Arguments" +#~ msgstr "Đặt đồ gồm và đối số" + +#~ msgid "Set the commands for building and running programs." +#~ msgstr "Đặt các lệnh để xây dựng và chạy chương trình." + +#~ msgid "Compile:" +#~ msgstr "Biên dịch:" + +#~ msgid "Build:" +#~ msgstr "Xây dựng:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "Lỗi thực thi chương trình xem" + +#~ msgid "Try to resave the file?" +#~ msgstr "Thử lưu lại tập tin ?" + +#~ msgid "dummy tooltip, don't translate this." +#~ msgstr "dummy tooltip, don't translate this." -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "Lỗi xem %s (kiểm tra xem nó đã được biên dịch chưa)" +#~ msgid "_Customize Toolbar" +#~ msgstr "Tùy _chỉnh thanh công cụ" + +#~ msgid "Icon style:" +#~ msgstr "Kiểu biểu tượng:" + +#~ msgid "Icon size:" +#~ msgstr "Cỡ biểu tượng:" + +#~ msgid "Appearance" +#~ msgstr "Diện mạo" + +#~ msgid "Hard tab width:" +#~ msgstr "Rộng tab cứng:" + +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "" +#~ "Chiều rộng của một khoảng tab khi tùy chọn Tab và Dấu cách được đặt cho " +#~ "tài liệu đó" #~ msgid "" -#~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" -#~ msgstr "Thêm số thứ tự trang ở dưới từng trang (chiếm 2 dòng)" +#~ "Use white text on a black background and invert all colors, this option " +#~ "requires a restart of Geany" +#~ msgstr "" +#~ "Hiển thị chữ màu trắng trên một nền màu đen và đảo ngược mọi màu ; tùy " +#~ "chọn này chỉ có tác động sau khi khởi chạy lại Geany" + +#~ msgid "Long line marker:" +#~ msgstr "Dấu dòng dài:" -#~ msgid "Jump to the entered line number." -#~ msgstr "Nhảy tới số hiệu dòng đã nhập." +#~ msgid "Long line marker color:" +#~ msgstr "Màu dấu dòng dài:" -#~ msgid "Version Diff" -#~ msgstr "Khác biệt Phiên bản" +#~ msgid "Path and options for the make tool" +#~ msgstr "Đường dẫn và tùy chọn cho công cụ « make »" -#~ msgid "Creates a patch of a file against version control." -#~ msgstr "Tạo một đắp vá của tập tin đối với hiện trạng Điều khiển Phiên bản." +#~ msgid "Duplicate line or selection" +#~ msgstr "Nhân đôi dòng hay vùng chọn" -#~ msgid "Input conversion of the diff output failed." -#~ msgstr "Lỗi chuyển đổi dữ liệu nhập là kết xuất khác biệt." +#~ msgid "Send Selection to Terminal" +#~ msgstr "Gửi vùng chọn cho Thiết bị cuối" + +#~ msgid "Run (alternative command)" +#~ msgstr "Chạy (lệnh xen kẽ)" #~ msgid "" -#~ "%s exited with an error: \n" -#~ "%s." +#~ "Below is a list of available plugins. Select the plugins which should be " +#~ "loaded when Geany is started." #~ msgstr "" -#~ "%s đã thoát với lỗi:\n" -#~ "%s." +#~ "Bên dưới có danh sách các phần bổ sung sẵn sàng. Chọn những phần bổ sung " +#~ "cần nạp khi khởi chạy Geany." + +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "Tiến trình in tập tin %s bị thôi." -#~ msgid "No changes were made." -#~ msgstr "Chưa thay đổi gì." +#~ msgid "Make in base path" +#~ msgstr "Tạo trên đường dẫn cơ bản" -#~ msgid "unknown error while trying to spawn a process for %s" +#~ msgid "Run command:" +#~ msgstr "Chạy lệnh:" + +#~ msgid "" +#~ "Command-line to run in the project base directory. Options can be " +#~ "appended to the command. Leave blank to use the default run command." #~ msgstr "" -#~ "gặp lỗi không rõ trong khi thử tạo và thực hiện một tiến trình cho %s" +#~ "Chuỗi dòng lệnh cần chạy trong thư mục cơ bản của dự án. Cũng có thể phụ " +#~ "thêm tùy chọn vào lệnh này. Bỏ rỗng để dùng lệnh chạy mặc định." -#~ msgid "An error occurred (%s)." -#~ msgstr "Một lỗi xảy ra (%s)." +#~ msgid "Choose Project Run Command" +#~ msgstr "Chọn lệnh chạy dự án" -#~ msgid "_Version Diff" -#~ msgstr "Khác biệt _Phiên bản" +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "Đã thay thế đoạn văn trong %u tập tin." -#~ msgid "From Current _File" -#~ msgstr "Dựa _vào tập tin hiện tại" +#~ msgid "Search failed (see Help->Debug Messages for details)." +#~ msgstr "Lỗi tìm kiếm (xem Trợ giúp > Thông điệp Gỡ lỗi để tìm chi tiết)." -#~ msgid "Make a diff from the current active file" -#~ msgstr "Tạo bản khác biệt dựa vào tập tin hoạt động hiện thời" +#~ msgid "My" +#~ msgstr "Tôi" -#~ msgid "From Current _Directory" -#~ msgstr "_Dựa vào thư mục hiện tại" +#~ msgid "Local" +#~ msgstr "Cục bộ" -#~ msgid "Make a diff from the directory of the current active file" -#~ msgstr "Tạo bản khác biệt dựa vào thư mục chứa tập tin hoạt động hiện thời" +#~ msgid "Our" +#~ msgstr "Chúng ta" + +#~ msgid "Terminal plugin" +#~ msgstr "Bổ sung thiết bị cuối" + +#~ msgid "" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "" +#~ "Những thiết lập này cho ô điều khiển mô phỏng thiết bị cuối ảo (VTE) chỉ " +#~ "hoạt động nếu thư viện VTE nạp được." -#~ msgid "From Current _Project" -#~ msgstr "Dựa vào dự án _hiện có" +#~ msgid "Terminal font:" +#~ msgstr "Phông dòng lệnh:" -#~ msgid "Make a diff from the current project's base path" -#~ msgstr "Tạo bản khác biệt dựa vào đường dẫn cơ bản của dự án hiện thời" +#~ msgid "Unsplit" +#~ msgstr "Bỏ tách" diff -Nru geany-0.18/po/zh_CN.po geany-0.19/po/zh_CN.po --- geany-0.18/po/zh_CN.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/zh_CN.po 2010-05-29 19:06:33.000000000 +0100 @@ -4,25 +4,27 @@ # This file is distributed under the same license as the geany package. # # Dormouse Young , 2006-2008, 2009. +# Xhacker Liu , 2009, 2010. msgid "" msgstr "" -"Project-Id-Version: Geany 0.18\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" -"PO-Revision-Date: 2009-04-25 11:19+0800\n" -"Last-Translator: Dormouse Young\n" -"Language-Team: zh_CN\n" +"POT-Creation-Date: 2010-05-29 16:11+0200\n" +"PO-Revision-Date: 2010-05-25 10:05+0800\n" +"Last-Translator: Xhacker Liu \n" +"Language-Team: zh_CN <>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 1.9.6\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../geany.desktop.in.h:1 msgid "A fast and lightweight IDE using GTK2" -msgstr "一个使用 GTK2 编写的轻快的IDE" +msgstr "一个使用 GTK2 编写的轻快的 IDE" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "Geany" @@ -30,391 +32,390 @@ msgid "Integrated Development Environment" msgstr "集成开发环境" -#: ../src/about.c:139 +#: ../src/about.c:146 msgid "About Geany" msgstr "关于 Geany" -#: ../src/about.c:189 +#: ../src/about.c:196 msgid "A fast and lightweight IDE" -msgstr "一个轻快的IDE" +msgstr "一个轻快的 IDE" -#: ../src/about.c:210 +#: ../src/about.c:217 #, c-format msgid "(built on or after %s)" -msgstr "(基于%s生成或之后)" +msgstr "(%s 或之后生成)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:248 msgid "Info" msgstr "信息" -#: ../src/about.c:257 +#: ../src/about.c:264 msgid "Developers" msgstr "开发人员" -#: ../src/about.c:266 +#: ../src/about.c:273 msgid "maintainer" msgstr "主管" -#: ../src/about.c:274 +#: ../src/about.c:281 msgid "developer" msgstr "开发" -#: ../src/about.c:282 +#: ../src/about.c:289 msgid "translation maintainer" msgstr "翻译" -#: ../src/about.c:291 +#: ../src/about.c:298 msgid "Translators" msgstr "翻译者" -#: ../src/about.c:311 +#: ../src/about.c:318 msgid "Previous Translators" -msgstr "前译者" +msgstr "原翻译者" -#: ../src/about.c:332 +#: ../src/about.c:339 msgid "Contributors" msgstr "贡献者" -#: ../src/about.c:342 +#: ../src/about.c:349 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "一部分贡献者（详细清单参见文件 %s ）" +msgstr "一部分贡献者 (详细清单参见文件 %s)" -#: ../src/about.c:368 +#: ../src/about.c:375 msgid "Credits" msgstr "荣誉" -#: ../src/about.c:382 +#: ../src/about.c:389 msgid "License" msgstr "许可条款" -#: ../src/about.c:391 +#: ../src/about.c:398 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." msgstr "" "许可条款未找到，请到 http://www.gnu.org/licenses/gpl-2.0.txt 在线查看。" -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "无法找到虚拟终端“'%s” (请检查在首选项中的路径设置)" +msgid "failed to substitute %%p, no project active" +msgstr "无法替代 %%p，没有活动的项目" + +#: ../src/build.c:673 +msgid "Process failed, no working directory" +msgstr "进程失败，没有工作目录" -#: ../src/build.c:236 ../src/build.c:650 +#: ../src/build.c:699 #, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "执行 %s 失败(开始代码无法创建)" +msgid "%s (in directory: %s)" +msgstr "%s (在目录 %s 中)" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" -msgstr "进程失败(%s)" +msgstr "进程失败 (%s)" -#: ../src/build.c:508 +#: ../src/build.c:790 #, c-format -msgid "%s (in directory: %s)" -msgstr "%s (在目录%s中)" +msgid "Failed to change the working directory to \"%s\"" +msgstr "改变工作路径到“%s”失败" -#: ../src/build.c:613 +#: ../src/build.c:819 #, c-format -msgid "Failed to change the working directory to \"%s\"" -msgstr "改变工作路径到 \"%s\" 失败" +msgid "Failed to execute \"%s\" (start-script could not be created)" +msgstr "执行 %s 失败 (启动脚本无法创建)" -#: ../src/build.c:707 +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "因为文件中可能含有命令所以无法在虚拟终端中执行这个文件" -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "无法找到虚拟终端“%s” (请检查在首选项中的路径设置)" + +#: ../src/build.c:1083 msgid "Compilation failed." -msgstr "编译失败" +msgstr "编译失败。" -#: ../src/build.c:928 +#: ../src/build.c:1097 msgid "Compilation finished successfully." msgstr "编译成功结束。" -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "编译(_C)" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "生成(_B)" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -msgid "_Make All" -msgstr "生成全部(_M)" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 -msgid "Make Custom _Target" -msgstr "生成自定义目标(_T)" - -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -msgid "Make _Object" -msgstr "生成目标文件(_O)" +#: ../src/build.c:1254 +msgid "Custom Text" +msgstr "自定义文本" + +#: ../src/build.c:1255 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "在这里输入自定义文本，所有输入的文本将追加到命令上。" -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1333 msgid "_Next Error" msgstr "下一个错误(_N)" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1335 msgid "_Previous Error" msgstr "前一个错误(_P)" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "设置编译参数(_S)" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "LaTeX -> _DVI" - -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "LaTeX -> _PDF" - -#. DVI view -#: ../src/build.c:1206 -msgid "_View DVI File" -msgstr "查看DVI文件(_V)" - -#. PDF view -#: ../src/build.c:1216 -msgid "V_iew PDF File" -msgstr "查看PDF文件(_I)" +#: ../src/build.c:1345 +msgid "_Set Build Commands" +msgstr "设置生成命令(_S)" -#. arguments -#: ../src/build.c:1231 -msgid "_Set Arguments" -msgstr "设置参数(_S)" +#: ../src/build.c:1625 ../src/toolbar.c:373 +msgid "Build the current file" +msgstr "生成当前文件" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "设置参数" +#: ../src/build.c:1639 +msgid "Build the current file with Make and the default target" +msgstr "使用 Make 和缺省目标来生成当前文件" -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "为编译和查看(La)TeX文件设置程序和参数" +#: ../src/build.c:1641 +msgid "Build the current file with Make and the specified target" +msgstr "使用 Make 和特定目标来生成当前文件" -#: ../src/build.c:1324 -msgid "DVI creation:" -msgstr "DVI生成:" +#: ../src/build.c:1643 +msgid "Compile the current file with Make" +msgstr "使用 Make 来编译文件" -#: ../src/build.c:1344 -msgid "PDF creation:" -msgstr "PDF生成:" +#: ../src/build.c:1670 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "进程无法停止 (%s)。" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "DVI预览" +#: ../src/build.c:1687 ../src/build.c:1699 +msgid "No more build errors." +msgstr "没有生成错误。" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "PDF预览" +#: ../src/build.c:1780 +msgid "Set menu item label" +msgstr "设置菜单项的标签" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f 会被替换为当前文件名，如： test_file.c\n" -"%e 会被替换为没有扩展名的当前文件名如. test_file" +#: ../src/build.c:1790 +msgid "Item" +msgstr "项" + +#: ../src/build.c:1791 ../src/symbols.c:650 +msgid "Label" +msgstr "标签" + +#: ../src/build.c:1792 ../src/symbols.c:645 +msgid "Command" +msgstr "命令" + +#: ../src/build.c:1793 +msgid "Working directory" +msgstr "工作目录" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "设置包含和参数" +#: ../src/build.c:1794 +msgid "Clear" +msgstr "清除" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." -msgstr "设置生成命令并运行程序" +#: ../src/build.c:1833 +msgid "Click to set menu item label" +msgstr "点击设置菜单项标签" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1906 ../src/build.c:1908 #, c-format -msgid "%s commands" +msgid "%s Commands" msgstr "%s 命令" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "编译:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "生成:" +#: ../src/build.c:1908 +msgid "No Filetype" +msgstr "无类型文件" -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "执行:" +#: ../src/build.c:1916 ../src/build.c:1951 +msgid "Error Regular Expression:" +msgstr "错误正则表达式：" -#: ../src/build.c:1892 ../src/toolbar.c:344 -msgid "Build the current file" -msgstr "生成当前文件" +#: ../src/build.c:1944 +msgid "Non-Filetype Commands" +msgstr "文件类型无关的命令" + +#: ../src/build.c:1974 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "附注：第 2 项会打开一个对话框，并将输入的文本追加到命令中。" -#: ../src/build.c:1917 -msgid "Make Custom Target" -msgstr "编译自定义目标" +#: ../src/build.c:1983 +msgid "Execute Commands" +msgstr "执行命令" -#: ../src/build.c:1918 +#: ../src/build.c:1994 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "在这里输入自定义参数，所有输入的文本将作为 make 命令的参数。" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "命令和目录字段中的 %d、%e、%f、%p 将被替代，详见手册。" -#: ../src/build.c:1967 -msgid "Build the current file with Make and the default target" -msgstr "使用 Make 和缺省目标来生成当前文件" +#: ../src/build.c:2179 +msgid "Set Build Commands" +msgstr "设置生成命令" -#: ../src/build.c:1970 -msgid "Build the current file with Make and the specified target" -msgstr "使用 Make 和特定目标来生成当前文件" +#: ../src/build.c:2401 +msgid "_Compile" +msgstr "编译(_C)" -#: ../src/build.c:1973 -msgid "Compile the current file with Make" -msgstr "使用 Make 来编译文件" +#. build the code +#: ../src/build.c:2408 ../src/build.c:2671 ../src/interface.c:1075 +msgid "_Build" +msgstr "生成(_B)" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "执行查看程序失败" +#: ../src/build.c:2415 ../src/build.c:2445 ../src/build.c:2638 +msgid "_Execute" +msgstr "执行(_E)" -#: ../src/build.c:2073 -#, c-format -msgid "Process could not be stopped (%s)." -msgstr "进程无法停止(%s)" +#. build the code with make custom +#: ../src/build.c:2460 ../src/build.c:2636 ../src/build.c:2691 +msgid "Make Custom _Target" +msgstr "生成自定义目标(_T)" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "没有 生成 错误。" +#. build the code with make object +#: ../src/build.c:2462 ../src/build.c:2637 ../src/build.c:2699 +msgid "Make _Object" +msgstr "生成目标文件(_O)" + +#: ../src/build.c:2464 ../src/build.c:2635 +msgid "_Make" +msgstr "生成(_M)" + +#. build the code with make all +#: ../src/build.c:2683 +msgid "_Make All" +msgstr "生成全部(_M)" + +#. arguments +#: ../src/build.c:2711 +msgid "_Set Build Menu Commands" +msgstr "设置生成菜单命令(_S)" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "您真的要退出吗？" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "%d个文件已保存。" + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "重新载入(_R)" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." -msgstr "未保存的东东会消失。" +msgstr "未保存的东西会丢失。" -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" -msgstr "您确定要重新载入 '%s' 吗？" +msgstr "您确定要重新载入“%s”吗？" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 msgid "Go to Line" -msgstr "跳转行" +msgstr "跳转到行" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" -msgstr "输入您要跳转到的行号:" +msgstr "输入您要跳转到的行号：" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "在使用这个功能前请设置当前文件的文件类型。" -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 msgid "_Use Custom Date Format" msgstr "使用自定义日期格式(_U)" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 msgid "Custom Date Format" msgstr "自定义日期格式" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"请在这里输入自定义日期和时间格式。你可以使用ANSI C strftime函数中的任何一个转" -"义符。" +"请在这里输入自定义日期和时间格式。你可以使用 ANSI C strftime 函数中的任何一个" +"转义符。" -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." -msgstr "日期格式字符串无法转换(可能太长了)" +msgstr "日期格式字符串无法转换 (可能太长了)。" -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "没有消息" -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "打开文件" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "查看(_V)" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." msgstr "以只读模式打开文件。如果你打开多个文件，所有文件都会以只读模式打开。" -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "根据文件扩展名探测" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "根据文件探测" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 msgid "_More Options" msgstr "更多选项(_M)" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "显示隐藏文件(_H)" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" -msgstr "设置编码" +msgstr "设置编码：" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -422,195 +423,198 @@ "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"明确定义文件的编码。当Geany无法准确探测到文件的编码时应明确定义。\n" +"明确定义文件的编码。当 Geany 无法准确探测到文件的编码时应明确定义。\n" "如果同时打开多个文件，则所有文件都被以该编码打开。" #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" -msgstr "设置文件类型:" +msgstr "设置文件类型：" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" "Note if you choose multiple files, they will all be opened with the chosen " "filetype." msgstr "" -"明确定义文件类型。当Geany无法准确探测到文件类型时应明确定义。\n" +"明确定义文件类型。当 Geany 无法准确探测到文件类型时应明确定义。\n" "如果同时打开多个文件，则所在文件都被以该类型打开。" #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "覆写(_O)" +msgstr "覆盖？" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "文件名已经存在！" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "保存文件" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 msgid "R_ename" msgstr "重命名(_E)" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "保存并重命名文件" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "在新标签打开文件(_O)" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "不关闭未保存的文件并在新标签中打开新保存的文件。" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "错误" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "问题" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "警告" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "信息" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "不保存(_D)" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." -msgstr "文件 %s 没有保存" +msgstr "文件“%s”没有保存。" -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "您要在关闭文件前保存吗？" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "选择字体" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." -msgstr "产生了一个错误或文件信息取不到(比如一个空文件)" +msgstr "发生了一个错误或无法取得文件信息 (比如一个空文件)。" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "未知" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "属性" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" -msgstr "类型:" +msgstr "类型：" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" -msgstr "大小:" +msgstr "大小：" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" -msgstr "位置:" +msgstr "位置：" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" -msgstr "只读:" +msgstr "只读：" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" -msgstr "(仅在Geany中)" +msgstr " (仅在Geany中)" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" -msgstr "编码:" +msgstr "编码：" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" -msgstr "(含有 BOM)" +msgstr " (含有 BOM)" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" -msgstr "(没有 BOM)" +msgstr " (无 BOM)" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" -msgstr "修改于:" +msgstr "修改于：" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" -msgstr "变更于:" +msgstr "变更于：" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" -msgstr "访问于:" +msgstr "访问于：" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" -msgstr "权限:" +msgstr "权限：" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" -msgstr "读:" +msgstr "读：" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" -msgstr "写:" +msgstr "写：" + +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "执行：" #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" -msgstr "所有者:" +msgstr "所有者：" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" -msgstr "组:" +msgstr "组：" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" -msgstr "其他" +msgstr "其他：" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "文件 %s 已关闭。" -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." -msgstr "新文件 \"%s\" 已打开。" +msgstr "新文件“%s”已打开。" -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "无法打开文件 %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -618,48 +622,48 @@ "cause data loss.\n" "The file was set to read-only." msgstr "" -"文件\"%s\"无法正确打开并已被截短。可以因为文件含有空字节。保存文件会导致数据" -"丢失。\n" +"文件“%s”无法正确打开并已被截短。可能因为文件含有 NULL 字节。保存文件会导致数" +"据丢失。\n" "文件被设置为只读状态。" #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." -msgstr "文件 \"%s\" 是非法的 %s." +msgstr "文件“%s”是非法的 %s。" -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." -msgstr "文件 \"%s\" 可能不是文本文件或文件编码不支持。" +msgstr "文件“%s”可能不是文本文件或文件编码不支持。" -#: ../src/document.c:1122 +#: ../src/document.c:1163 msgid "Spaces" msgstr "空格" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "制表符" -#: ../src/document.c:1128 +#: ../src/document.c:1169 msgid "Tabs and Spaces" msgstr "制表符和空格" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, c-format msgid "Setting %s indentation mode for %s." -msgstr "设置 %s 缩进模式用于 %s 。" +msgstr "为 %s 设置 %s 缩进模式。" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "非法文件名" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "文件 %s 已重新载入。" @@ -667,105 +671,109 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." -msgstr "文件 %s 已打开(%d%s)。" +msgstr "文件 %s 已打开 (%d%s)。" -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" -msgstr ", 只读" +msgstr "，只读" -#: ../src/document.c:1512 +#: ../src/document.c:1558 msgid "Error renaming file." msgstr "重命名文件出错。" -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." -msgstr "文件 \"%s\".从UTF-8转换过来时出错。文件未保存。" +msgstr "文件“%s”从UTF-8转换过来时出错。文件未保存。" -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" -"出错信息： %s\n" -"错误产生于 \"%s\" (行： %d, 列： %d)。" +"错误信息：%s\n" +"错误产生于“%s” (行：%d，列：%d)。" -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, c-format msgid "Error message: %s." -msgstr "出错信息： %s 。" +msgstr "错误信息：%s 。" -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "保存文件出错。" -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." -msgstr "保存文件(%s)出错。" +msgstr "保存文件出错 (%s)。" -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "文件 %s 已保存。" -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." -msgstr "\"%s\" 未找到。" +msgstr "“%s”未找到。" -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" -msgstr "要从循环查找吗？" +msgstr "要循环查找吗？" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, c-format msgid "No matches found for \"%s\"." -msgstr "未找到匹配项“'%s”。" +msgstr "未找到匹配项“%s”。" -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "%s:替换了 %d 处，由\"%s\" 变为 \"%s\"。" -msgstr[1] "%s:替换了 %d 处，由\"%s\" 变为 \"%s\"。" +msgstr[0] "%s：替换了 %d 处，从“%s”变为“%s”。" -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "您要重新载入吗？" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "" -"磁盘中的文件 '%s' \n" +"磁盘中的文件“%s”\n" "比当前编辑的新。" -#: ../src/document.c:2890 -msgid "Try to resave the file?" -msgstr "尝试重新保存文件？" +#: ../src/document.c:2915 +msgid "Close _without saving" +msgstr "关闭且不保存(_W)" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" -msgstr "文件 \"%s\" 未找到！" +msgid "File \"%s\" was not found on disk! Try to resave the file?" +msgstr "没有在磁盘上找到文件“%s”！尝试重新保存文件？" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 msgid "Enter Tab Width" msgstr "输入制表符宽度" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "输入制表符占用多少空格的宽度。" +msgstr "输入要用一个制表符代替多少个空格。" + +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "警告：非标准的硬 tab 宽度：%d != 8！" #: ../src/encodings.c:76 msgid "Celtic" @@ -804,11 +812,11 @@ #: ../src/encodings.c:98 msgid "Cyrillic/Russian" -msgstr "斯拉夫/俄语" +msgstr "斯拉夫／俄语" #: ../src/encodings.c:99 msgid "Cyrillic/Ukrainian" -msgstr "斯拉夫/乌克兰语" +msgstr "斯拉夫／乌克兰语" #: ../src/encodings.c:100 msgid "Romanian" @@ -825,7 +833,7 @@ #: ../src/encodings.c:109 msgid "Hebrew Visual" -msgstr "视觉希伯来语" +msgstr "希伯来语 (Hebrew Visual)" #: ../src/encodings.c:111 msgid "Armenian" @@ -877,939 +885,1043 @@ msgid "Without encoding" msgstr "没有编码" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "西欧语系(_W)" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "东欧语系(_E)" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "东亚语系(_A)" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "东南亚和西南亚语系(_S)" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "中东语系(_M)" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, c-format msgid "%s source file" msgstr "%s 源文件" -#: ../src/filetypes.c:97 -#, fuzzy, c-format +#: ../src/filetypes.c:102 +#, c-format msgid "%s file" -msgstr "%s 源文件" +msgstr "%s 文件" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "没有" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" -msgstr "Shell 源文件" +msgstr "Shell 脚本文件" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "XML 文档" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" -msgstr "样式表" +msgstr "层叠样式表" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL 转储文件" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "配置文件" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 msgid "Gettext translation file" msgstr "Gettext 翻译文件" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, c-format msgid "%s script file" msgstr "%s 脚本文件" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "编程语言(_P)" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "脚本语言(_S)" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "标记语言(_M)" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "其他语言(_I)" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +msgid "_Custom Filetypes" +msgstr "自定义文件类型(_C)" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "所有源文件" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "所有文件" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" -msgstr "文件类型 %s 的错误正则表达式: %s" +msgstr "文件类型 %s 的错误正则表达式：%s" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "未命名" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, c-format +msgid "Could not find file '%s'." +msgstr "无法找到“%s”文件。" + +#: ../src/highlighting.c:3398 +msgid "_Color Schemes" +msgstr "配色方案(_C)" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "默认(_D)" + +#: ../src/interface.c:295 msgid "_File" msgstr "文件(_F)" -#: ../src/interface.c:287 +#: ../src/interface.c:306 msgid "New (with _Template)" -msgstr "根据模板新建(_T)" +msgstr "从模板新建(_T)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "不可见" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 msgid "Open Selected F_ile" msgstr "打开选择的文件(_I)" -#: ../src/interface.c:315 +#: ../src/interface.c:327 msgid "Recent _Files" msgstr "最近打开的文件(_F)" -#: ../src/interface.c:332 +#: ../src/interface.c:344 msgid "Save A_ll" msgstr "全部保存(_L)" -#: ../src/interface.c:348 +#: ../src/interface.c:360 msgid "R_eload As" msgstr "重新载入为(_E)" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "不可见" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "页面设置(_U)" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 msgid "Close Ot_her Documents" msgstr "关闭其它文件(_H)" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 msgid "C_lose All" msgstr "全部关闭(_L)" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "编辑(_E)" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" -msgstr "格式化(_F)" +msgstr "格式(_F)" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "重排行/区块(_R)" + +#: ../src/interface.c:491 msgid "T_oggle Case of Selection" msgstr "切换大小写(_O)" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +msgid "_Transpose Current Line" +msgstr "调换当前行(_T)" + +#: ../src/interface.c:504 msgid "_Comment Line(s)" msgstr "转换为注释(_C)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 msgid "U_ncomment Line(s)" -msgstr "去除注释(_N)" +msgstr "取消注释(_N)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 msgid "_Toggle Line Commentation" msgstr "切换注释状态(_T)" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "复制行或选中的文本" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "增加缩进(_I)" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "减少缩进(_D)" -#: ../src/interface.c:526 ../src/interface.c:2007 -msgid "_Send Selection to Terminal" -msgstr "发送选中的文字到终端(_S)" +#: ../src/interface.c:537 ../src/keybindings.c:361 +msgid "_Smart Line Indent" +msgstr "智能缩进(_S)" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 msgid "_Send Selection to" msgstr "发送选中的文字到(_S)" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +msgid "_Commands" +msgstr "命令(_C)" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +msgid "_Cut Current Line(s)" +msgstr "剪切当前行(_C)" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +msgid "_Copy Current Line(s)" +msgstr "复制当前行(_C)" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +msgid "_Delete Current Line(s)" +msgstr "删除当前行(_D)" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +msgid "_Duplicate Line or Selection" +msgstr "重复行或选中的文本(_D)" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +msgid "_Select Current Line(s)" +msgstr "选择当前行(_S)" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +msgid "_Select Current Paragraph" +msgstr "选择当前段落(_S)" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "插入额外的空白(_I)" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +msgid "_Go to Next Marker" +msgstr "到下一个标记(_G)" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +msgid "_Go to Previous Marker" +msgstr "到上一个标记(_G)" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +msgid "_Send Selection to Terminal" +msgstr "发送选中的文字到终端(_S)" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "插入注释(_N)" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 msgid "Insert _ChangeLog Entry" msgstr "插入更改记录(_C)" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 msgid "Insert File _Header" msgstr "插入文件头(_H)" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 msgid "Insert _Function Description" msgstr "插入函数描述(_F)" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 msgid "Insert _Multiline Comment" msgstr "插入多行注释(_M)" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 msgid "Insert _GPL Notice" -msgstr "插入GPL告知(_G)" +msgstr "插入 GPL 公告(_G)" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 msgid "Insert _BSD License Notice" -msgstr "插入BSD许可公告(_B)" +msgstr "插入 BSD 许可公告(_B)" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "插入日期(_E)" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" -msgstr "插入 \"include <...>\"(I)" +msgstr "插入“include <...>”(_I)" -#: ../src/interface.c:613 +#: ../src/interface.c:704 msgid "Preference_s" msgstr "首选项(_S)" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +msgid "P_lugin Preferences" +msgstr "插件首选项(_L)" + +#: ../src/interface.c:720 msgid "_Search" msgstr "搜索(_S)" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../src/interface.c:640 +#: ../src/interface.c:739 msgid "Find in F_iles" msgstr "在多个文件中查找(_I)" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "替换(_R)" -#: ../src/interface.c:657 +#: ../src/interface.c:756 msgid "Find _Selected" msgstr "查找选择的(_S)" -#: ../src/interface.c:661 +#: ../src/interface.c:760 msgid "Find Pre_vious Selected" msgstr "查找前一个选择的(_V)" -#: ../src/interface.c:670 +#: ../src/interface.c:769 msgid "Next _Message" -msgstr "下一个信息" +msgstr "下一个信息(_M)" -#: ../src/interface.c:674 +#: ../src/interface.c:773 msgid "Pr_evious Message" -msgstr "下一个信息(_E)" +msgstr "前一个信息(_E)" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 msgid "_Go to Line" msgstr "跳转到指定行(_G)" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" -msgstr "修改字体(_F)" +msgstr "更改字体(_F)" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" -msgstr "开关所有附加构件(_G)" +msgstr "开关所有附加部件(_G)" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "全屏(_S)" -#: ../src/interface.c:719 +#: ../src/interface.c:818 msgid "Show Message _Window" msgstr "显示信息窗口(_W)" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "显示工具栏(_T)" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "显示侧边栏(_B)" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "编辑器" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" -msgstr "显示标记页边空白(_M)" +msgstr "显示页边标注区域(_M)" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "显示行号(_L)" -#: ../src/interface.c:751 +#: ../src/interface.c:850 msgid "Show _White Space" msgstr "显示空白(_W)" -#: ../src/interface.c:755 +#: ../src/interface.c:854 msgid "Show Line _Endings" msgstr "显示行尾(_E)" -#: ../src/interface.c:759 +#: ../src/interface.c:858 msgid "Show _Indentation Guides" msgstr "显示缩进标记(_I)" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "文档(_D)" -#: ../src/interface.c:787 +#: ../src/interface.c:886 msgid "_Line Wrapping" msgstr "自动换行(_L)" -#: ../src/interface.c:792 +#: ../src/interface.c:891 msgid "Line _Breaking" -msgstr "自动换行(_B)" +msgstr "自动断行(_B)" -#: ../src/interface.c:796 +#: ../src/interface.c:895 msgid "_Auto-indentation" msgstr "自动缩进(_A)" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "缩进类型(_D)" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "制表符(_T)" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 msgid "_Spaces" msgstr "空格(_S)" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 msgid "T_abs and Spaces" msgstr "制表符和空格(_A)" -#: ../src/interface.c:831 +#: ../src/interface.c:930 msgid "Read _Only" msgstr "只读(_O)" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" -msgstr "写Unicode BOM (_W)" +msgstr "写 Unicode BOM (_W)" -#: ../src/interface.c:844 +#: ../src/interface.c:943 msgid "Set File_type" msgstr "设置文件类型(_T)" -#: ../src/interface.c:854 +#: ../src/interface.c:953 msgid "Set _Encoding" msgstr "设置文件编码(_E)" -#: ../src/interface.c:864 +#: ../src/interface.c:963 msgid "Set Line E_ndings" msgstr "设置换行符(_N)" -#: ../src/interface.c:871 +#: ../src/interface.c:970 msgid "Convert and Set to _CR/LF (Win)" -msgstr "转换并设置为_CR/LF (Win)" +msgstr "转换并设置为 _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 msgid "Convert and Set to _LF (Unix)" -msgstr "转换并设置为_LF (Unix)" +msgstr "转换并设置为 _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 msgid "Convert and Set to CR (_Mac)" -msgstr "转换并设置为CR (_Mac)" +msgstr "转换并设置为 CR (_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "去除行尾空白(_S)" -#: ../src/interface.c:898 +#: ../src/interface.c:997 msgid "_Replace Tabs by Spaces" msgstr "替换制表符为空格(_R)" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 msgid "Replace Spaces b_y Tabs" msgstr "替换空格为制表符为(_Y)" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 msgid "_Fold All" msgstr "全部折叠(_F)" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 msgid "_Unfold All" msgstr "全部展开(_U)" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "去除记号(_M)" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "去除所有出错指示(_I)" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 msgid "_Project" msgstr "项目(_P)" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 msgid "_New" msgstr "新建(_N)" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 msgid "_Open" msgstr "打开(_O)" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 msgid "_Recent Projects" msgstr "最近项目(_R)" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 msgid "_Close" msgstr "关闭(_C)" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "工具(_T)" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "重新载入设置(_R)" + +#: ../src/interface.c:1094 +msgid "C_onfiguration Files" +msgstr "配置文件(_O)" + +#: ../src/interface.c:1107 msgid "_Color Chooser" msgstr "颜色选择器(_C)" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "字数统计(_W)" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "载入标记文件(_G)" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "重新载入设置(_R)" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "帮助(_H)" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "网站(_W)" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 msgid "_Keyboard Shortcuts" msgstr "快捷键(_K)" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 msgid "_Debug Messages" -msgstr "除错信息(_D)" +msgstr "调试信息(_D)" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "标记" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 msgid "Documents" msgstr "文档" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "状态" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "编译器" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "信息" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "便签" -#: ../src/interface.c:1727 ../src/interface.c:3286 -msgid "Images _and Text" -msgstr "图像和文字(_A)" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -msgid "_Images Only" -msgstr "只有图像(_I)" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -msgid "_Text Only" -msgstr "只有文字(_T)" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -msgid "_Large Icons" -msgstr "大图标(_L)" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -msgid "_Small Icons" -msgstr "小图标(_S)" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -msgid "_Very Small Icons" -msgstr "小小图标(_V)" - -#: ../src/interface.c:1769 -#, fuzzy -msgid "_Customize Toolbar" -msgstr "隐藏工具栏(_H)" +#: ../src/interface.c:1887 +msgid "_Toolbar Preferences" +msgstr "工具栏首选项(_T)" -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1900 msgid "_Hide Toolbar" msgstr "隐藏工具栏(_H)" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 msgid "Find _Usage" msgstr "查找用法(_U)" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 msgid "Find _Document Usage" msgstr "查找文档用法(_D)" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 msgid "Go to _Tag Definition" msgstr "跳转到标记定义(_T)" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 msgid "Go to T_ag Declaration" msgstr "跳转到标记说明(_A)" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 msgid "Conte_xt Action" -msgstr "背景运行(_X)" +msgstr "上下文动作(_X)" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "首选项" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" -msgstr "打开上次会话的文件" +msgstr "在启动时打开上次会话的文件" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "打开上次会话的文件" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 msgid "Load virtual terminal support" msgstr "启用虚拟终端支持" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" -msgstr "是否有开始时载入虚拟终端，如果你不需要就禁用这个选项" +msgstr "是否在开始时载入虚拟终端，如果你不需要就禁用这个选项" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "启用插件支持" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 msgid "Startup" msgstr "启动" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "保存窗口位置和尺寸" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" -msgstr "保存窗口位置和尺寸" +msgstr "保存窗口位置和尺寸并在启动时恢复" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "退出时确认" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 msgid "Shows a confirmation dialog on exit" msgstr "退出时显示确认对话框" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 msgid "Shutdown" msgstr "关闭" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" -msgstr "根路径:" +msgstr "根路径：" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." msgstr "" "打开或保存文件时要进入的路径，必须是一个绝对路径。留空表示使用当前工作路径。" -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 msgid "Project files:" -msgstr "项目路径:" +msgstr "项目文件：" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" -msgstr "当打开项目时的路径" +msgstr "打开项目文件时的路径" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" -msgstr "额外插件路径:" +msgstr "额外插件路径：" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -"Geany 会在安装路径和定义路径中找寻插件。这里可以定义额外的插件路径。如果留空" -"则取消这个功能。" +"Geany 会在安装路径和配置文件目录中找寻插件。这里可以定义额外的插件路径。如果" +"留空则取消这个功能。" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 msgid "Paths" msgstr "路径" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 msgid "Startup" msgstr "启动" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "当编译结束时响铃" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "当编译出错或结束时是否响铃" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "有新的信息时切换到信息窗口" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" -msgstr "有新的信息时切换到信息窗口(在底部的分页窗口中)" +msgstr "有新的信息时切换到信息窗口 (在底部的分页窗口中)" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "禁止在状态栏中显示信息" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "清空状态栏信息。保留状态信息窗口中的信息。" -#: ../src/interface.c:2883 -#, fuzzy +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" -msgstr "自动焦点构件(焦点跟随鼠标)" +msgstr "部件自动获得鼠标焦点" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." msgstr "" -"鼠标下的构件自动获得焦点。起作用的构件有主编辑窗口、便签窗口、工具栏中查找定" -"位框和VTE。" +"将焦点自动给鼠标指针下的部件。起作用的部件有主编辑窗口、便签窗口、工具栏中查" +"找和定位框和虚拟终端。" -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "使用 Winodows 文件打开/保存对话框" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "选择使用原生的 Windows 文件打开/保存对话框或者 GTK 默认的对话框" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "Miscellaneous" msgstr "杂项" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "总是循环查找并隐藏查找对话框" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "在点击查找下一个或上一个按钮后总是循环查找并隐藏查找对话框" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" -msgstr "使用查找时自动填入当前光标下单词" +msgstr "使用查找时自动填入当前光标后面单词" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -"在未选中单词时，打开查找、在文件中查找或替换对话框时使用当前光标下的单词。" +"在未选中单词时，打开查找、在文件中查找或替换对话框时使用当前光标后面的单词。" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 msgid "Use the current file's directory for Find in Files" msgstr "多文件查找时使用当前文档目录" -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 msgid "Search" msgstr "搜索" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 msgid "Use project-based session files" msgstr "使用基于项目的会话文件" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "是否保存项目会话文件并在下次打开这个项目时使用会话文件。" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "在项目根目录保存项目文件" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " "directory. You can still change the path of the project file in the New " "Project dialog." msgstr "" -"选用这个选项后，创建一个新项目时，缺省地项目文件会保存在项目文件的根目录。当" +"选用这个选项后，创建一个新项目时，缺省的项目文件会保存在项目文件的根目录。当" "然你仍可以在新建项目对话框中改变项目文件的保存目录" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 msgid "Projects" msgstr "项目" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 msgid "Miscellaneous" msgstr "杂项" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "常规" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "显示标记列表" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "开关标记列表" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 msgid "Show documents list" msgstr "显示文件列表" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 msgid "Toggle the documents list on and off" msgstr "开关文件列表" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +msgid "Show sidebar" +msgstr "显示侧边栏" + +#: ../src/interface.c:3022 +msgid "Position:" +msgstr "位置：" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "左边" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "右边" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "边栏" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 msgid "Symbol list:" -msgstr "标记列表:" +msgstr "标记列表：" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 msgid "Message window:" -msgstr "信息窗口:" +msgstr "信息窗口：" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 msgid "Editor:" -msgstr "编辑器:" +msgstr "编辑器：" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "设置信息窗口字体" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 msgid "Sets the font for the symbol list" msgstr "设置标记列表字体" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 msgid "Sets the editor font" msgstr "设置编辑器字体" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "字体" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 msgid "Show editor tabs" msgstr "显示编辑器标签" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 msgid "Show close buttons" msgstr "显示关闭按钮" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" -msgstr "在文件标签栏上显示一个叉号，以方便关闭标签（需要重启 Geany )。" +msgstr "在文件标签栏上显示一个叉号，以方便关闭标签 (需要重启 Geany)。" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" -msgstr "把新文件标签放在:" - -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "左边" +msgstr "把新文件标签放在：" -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "新文件标签会放在标签列表的左边" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "右边" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "新文件标签会放在标签列表的右边" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +msgid "Next to current" +msgstr "在当前文件旁边" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "在当前文件旁边或者在标签栏的边缘放置标签" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" -msgstr "双击隐藏所有附加构件" +msgstr "双击隐藏所有附加部件" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" -msgstr "调用查看->开关所有附加构件命令" +msgstr "调用查看 -> 开关所有附加部件的命令" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 msgid "Editor tabs" msgstr "编辑器标签" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "顶端" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "底端" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 msgid "Sidebar:" -msgstr "边栏:" +msgstr "边栏：" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 msgid "Tab positions" msgstr "标签位置" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 msgid "Show status bar" msgstr "显示状态栏" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "是否在主窗口底部显示状态栏" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "界面" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 msgid "Show T_oolbar" msgstr "显示工具栏(_O)" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" -msgstr "向菜单添加工具栏(_A)" +msgstr "将工具栏添加到菜单(_A)" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "把工具栏放在菜单中以节省垂直空间" +msgstr "把工具栏放在主菜单中以节省垂直空间" -#: ../src/interface.c:3251 -msgid "Toolbar" -msgstr "工具栏" +#: ../src/interface.c:3340 ../src/toolbar.c:930 +msgid "Customize Toolbar" +msgstr "自定义工具栏(_T)" -#: ../src/interface.c:3272 -msgid "Icon style:" -msgstr "图标样式:" - -#: ../src/interface.c:3279 -msgid "Icon size:" -msgstr "图标大小:" - -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "外观" +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "系统默认(_D)" -#: ../src/interface.c:3359 ../src/toolbar.c:881 -#, fuzzy -msgid "Customize Toolbar" -msgstr "显示工具栏(_T)" +#: ../src/interface.c:3368 +msgid "Images _and Text" +msgstr "图像和文字(_A)" + +#: ../src/interface.c:3376 +msgid "_Images Only" +msgstr "只有图像(_I)" + +#: ../src/interface.c:3384 +msgid "_Text Only" +msgstr "只有文字(_T)" + +#: ../src/interface.c:3392 +msgid "Icon Style" +msgstr "图标样式" -#: ../src/interface.c:3363 +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "系统默认(_Y)" + +#: ../src/interface.c:3421 +msgid "_Small Icons" +msgstr "小图标(_S)" + +#: ../src/interface.c:3429 +msgid "_Very Small Icons" +msgstr "小小图标(_V)" + +#: ../src/interface.c:3437 +msgid "_Large Icons" +msgstr "大图标(_L)" + +#: ../src/interface.c:3445 +msgid "Icon Size" +msgstr "图标尺寸" + +#: ../src/interface.c:3450 +msgid "Toolbar" +msgstr "工具栏" + +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "工具栏" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "自动换行" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." msgstr "" -"在窗口边缘自动换行。注意：因为在打开大文档时使用自动换行对性能影响很大，所以" -"在比较慢的机器上应当关闭自动换行。" +"在窗口边缘自动换行。注意：在打开大文档时使用自动换行对性能影响很大，所以在较" +"慢的机器上应关闭自动换行。" -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "启用“智能” home 键" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1818,363 +1930,347 @@ "its current position." msgstr "" "当启用“智能” home 键时，按下 HOME 键光标会移到本行的第一个非空字符，如果按下" -"时光标已经在第一个非空字符则会移动到行首。禁用这个功能则按按下 HOME 键光标会" +"时光标已经在第一个非空字符则会移动到行首。禁用这个功能时，按下 HOME 键光标会" "移到行首。" -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "禁用拖放" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" -msgstr "在编辑窗口完全禁用拖放。" +msgstr "在编辑窗口完全禁用拖放" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "允许代码折叠" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "是否允许代码折叠" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" -msgstr "折叠或伸展一个折叠点的所有子孙" +msgstr "展开折叠点的所有子折叠点" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." msgstr "" -"折叠或伸展一个折叠点的所有子孙。当按下 Shift 键时点击折叠点符号时使用相反的选" -"项。" +"展开折叠点的所有子折叠点。按下 Shift 键同时点击折叠点符号可以使用相反的选项。" -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "使用指示器显示编译错误" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" -msgstr "使用指示器显示编译错误" +msgstr "是否使用指示器 (弯曲的下划线) 将编译器找到错误或警告的行高亮。" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" -msgstr "使用新的行去除行尾空白" +msgstr "换行时去除行尾空白" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "使用新的行去除上一行的尾部空白。" +msgstr "在换行时去除上一行的行尾空白" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" -msgstr "换行列：" +msgstr "断行列：" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 msgid "Comment toggle marker:" -msgstr "注释开关记号：" +msgstr "注释开关标记：" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "当开关源文件中一个行注释时添加的一个字符串。用于标记注释的开关。" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "功能" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 msgid "Features" msgstr "功能" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 msgid "Auto-indent mode:" -msgstr "自动缩进模式:" +msgstr "自动缩进模式：" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 msgid "Basic" msgstr "基本" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "当前字符" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 msgid "Match braces" msgstr "匹配花括号" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 msgid "Type:" -msgstr "类型:" +msgstr "类型：" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 msgid "Width:" -msgstr "宽度:" +msgstr "宽度：" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "一个缩进的宽度" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "缩进时使用空格" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "每个缩进使用一个制表符" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "当缩进小于制表符宽度时使用空格，否则两者都使用" -#: ../src/interface.c:3569 ../src/interface.c:5137 -msgid "Hard tab width:" -msgstr "硬制表符宽度:" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "当文件设置“制表符和空格”时制表符的宽度" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" -msgstr "当打开文件时自动探测使用哪种缩进方式。" +msgstr "打开文件时自动探测使用哪种缩进方式" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 msgid "Tab key indents" msgstr "用 Tab 键缩进" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "使用 tab/shift-tab 来缩进或突出，而不是插入一个制表符。" +msgstr "使用 tab/shift-tab 来增加或减少缩进，而不是插入一个制表符" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 msgid "Indentation" msgstr "缩进" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 msgid "Indentation" msgstr "缩进" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 msgid "Snippet completion" msgstr "片断自动完成" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" -msgstr "使用一个按键来使用输入的简短字符串变成一个复杂的语句。" +msgstr "使用一个按键来使输入的简短字符串变成一个复杂的语句。" -#: ../src/interface.c:3627 -#, fuzzy +#: ../src/interface.c:3696 msgid "XML tag autocompletion" msgstr "XML 标记自动完成" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" -msgstr "XML标记自动完成(包括HTML标记)" +msgstr "自动完成、关闭 XML 标记 (包括HTML标记)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "自动多行注释" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" "在如 C 、C++ 和 Java 之类语言的源文件中，注释中插入新行时自动进行多行注释" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" -msgstr "" +msgstr "自动补全符号" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" -msgstr "在打开的文件中用已知的符号自动自动补全(函数名、全局变量等等)" +msgstr "在打开的文件中用已知的符号自动补全 (函数名、全局变量等)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" -msgstr "" +msgstr "自动完成文档中的所有单词" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 msgid "Drop rest of word on completion" -msgstr "" +msgstr "弹出剩余文字以完成" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "最大符号名称建议：" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "自动完成列表高度：" -#: ../src/interface.c:3670 -#, fuzzy +#: ../src/interface.c:3739 msgid "Characters to type for autocompletion:" -msgstr "用于自动完成的字符串：" +msgstr "键入多少字符启动自动完成：" -#: ../src/interface.c:3683 -#, fuzzy +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" -msgstr "显示符号自动完成列表的最小字符数量。" +msgstr "在键入多少字符时显示符号列表" -#: ../src/interface.c:3692 -#, fuzzy +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" -msgstr "自动完成列表的行数。" +msgstr "自动完成列表显示的行数" -#: ../src/interface.c:3701 -#, fuzzy +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "自动完成列表的最大条目数。" +msgstr "自动完成列表显示的最大条目数" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 msgid "Completions" msgstr "自动完成" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "圆括号 ( )" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "自动配对圆括号" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "单引号 ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "自动配对单引号" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "花括号 { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "自动配对花括号" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "中括号 [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "自动配对中括号" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "双引号 \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "自动配对双引号" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "自动配对引号和括号" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 msgid "Completions" msgstr "自动完成" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "反转语法高亮颜色" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" -msgstr "使用白色文本和黑色背景，并且反转所有高亮颜色，重启 Geany 生效" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" +msgstr "反转所有颜色，默认使用黑底白字" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "显示缩进标记" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "显示小点来标示缩进" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "显示空白" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "用点表示空格，箭头表示制表符" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "显示行尾" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 msgid "Shows the line ending character" msgstr "显示行尾符号" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 msgid "Show line numbers" msgstr "显示行号" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" -msgstr "显示或隐藏行号页边空白" +msgstr "显示或隐藏行号页边的行号" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" -msgstr "显示标记页边空白" +msgstr "显示页边标记区域" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" -msgstr "显示或隐藏行号右边的可作标记的空白" +msgstr "显示或隐藏行号右边的可作标记的区域" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 msgid "Stop scrolling at last line" msgstr "在最后一行停止滚动" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "当移动到文档的最后一行时停止滚动。" +msgstr "当移动到文档的最后一行时停止滚动" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "显示" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "长行标志:" - -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "长行标志颜色:" +#: ../src/interface.c:3911 ../src/interface.c:5302 +msgid "Column:" +msgstr "列：" + +#: ../src/interface.c:3918 +msgid "Color:" +msgstr "颜色：" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "设置长行标志颜色" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "颜色选择器" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2183,340 +2279,364 @@ "长行标志是编辑器中的一根细的竖线。它用于标志或提示比较长的行。请设置大于0的列" "数。" -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "线型" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "显示一根细的竖线" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "背景型" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "以背景色来标示长行，当使用等宽字体时适用" -#: ../src/interface.c:3902 -msgid "Disabled" -msgstr "关闭" +#: ../src/interface.c:3970 +msgid "Enabled" +msgstr "启用" -#: ../src/interface.c:3908 +#: ../src/interface.c:3976 ../src/interface.c:5342 msgid "Long line marker" msgstr "长行标志" -#: ../src/interface.c:3913 +#: ../src/interface.c:3995 ../src/interface.c:5309 +msgid "Disabled" +msgstr "关闭" + +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" +msgstr "不显示虚拟空格" + +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "仅在矩形选区" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "仅在画矩形选区时在行末显示虚拟空格" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "总是" + +#: ../src/interface.c:4012 +msgid "Always show virtual spaces beyond the end of lines" +msgstr "总在行末显示虚拟空格" + +#: ../src/interface.c:4016 +msgid "Virtual spaces" +msgstr "虚拟空格" + +#: ../src/interface.c:4021 msgid "Display" msgstr "显示" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "从命令行打开新文档" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "当命令行中的文件名不存在时打开一个新文档。" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 msgid "Default end of line characters:" msgstr "缺省文件行尾符：" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "新建文件" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "设置新建文件的缺省编码" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 msgid "Default encoding (new files):" -msgstr "缺省编码（新文件）:" - -#: ../src/interface.c:4007 -msgid "Default encoding (existing files):" -msgstr "缺省编码（已存在文件）:" +msgstr "缺省编码 (新文件)：" -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing files" -msgstr "设置打开已存在文件的缺省编码。" +#: ../src/interface.c:4107 +msgid "Sets the default encoding for newly created files" +msgstr "设置新建文件的缺省编码" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" -msgstr "使用固定的编码打开文件" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" +msgstr "使用固定的编码打开非 Unicode 文件" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" -"这个选项禁止打开文件时进行编码检测并且用特定的编码打开文件(通常不需要)。" +"这个选项禁止打开文件时进行编码检测并且用特定的编码打开非 Unicode 文件 (通常不" +"需要)" + +#: ../src/interface.c:4122 +msgid "Default encoding (existing non-Unicode files):" +msgstr "缺省编码 (已存在的非 Unicode 文件)：" -#: ../src/interface.c:4032 +#: ../src/interface.c:4130 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "设置打开已存在的非 Unicode 文件时的缺省编码" + +#: ../src/interface.c:4136 msgid "Encodings" msgstr "编码" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" -msgstr "保证文件尾有一个新的行" +msgstr "保证文件尾有一个新行" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" -msgstr "保证文件尾有一个新的行" +msgstr "保证文件的末端是一个新行" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 msgid "Strip trailing spaces and tabs" msgstr "去除行尾空白" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "去除行尾空格和制表符" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "用空格替换制表符" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 msgid "Replaces all tabs in document by spaces" msgstr "替换文档中所有制表符为空格" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "保存文件" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "最近文件的个数：" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "指定最近文件列表的文件个数" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "磁盘检查间隔：" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "设置磁盘检查的间隔时间。零表示不检查。" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "文件" -#: ../src/interface.c:4164 -msgid "Make:" -msgstr "生成:" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 msgid "Terminal:" -msgstr "虚拟终端:" +msgstr "虚拟终端：" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 msgid "Browser:" -msgstr "浏览器:" - -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "生成工具的路径和参数" +msgstr "浏览器：" -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" -msgstr "虚拟终端如xterm、gnome-terminal或konsole(应当接受 -e 参数)" +msgstr "虚拟终端如 xterm、gnome-terminal 或 konsole (应当接受 -e 参数)" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "浏览器的路径和参数" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 msgid "Grep:" -msgstr "Grep:" +msgstr "Grep：" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 msgid "Tool paths" msgstr "工具路径" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 msgid "Context action:" -msgstr "背景运行:" +msgstr "上下文动作：" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " "can appear anywhere in the given command and will be replaced before " "execution." msgstr "" -"背景运行命令。当前选中的文字可以和%s一起使用。它可以在给出的命令的任何地方，" -"并且在执行前会被替换。" +"上下文动作命令。当前选中的文字可以与 %s 一起使用。它可以出现在给出命令的任何" +"地方，在执行前会被替换。" -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 msgid "Commands" msgstr "命令" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "工具" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "开发者的电子邮件" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "开发者名字的开头字母" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" -msgstr "开始的版本号:" +msgstr "起始版本号：" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "新建文件使用的版本号" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "公司名称" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 msgid "Developer:" -msgstr "开发者:" +msgstr "开发者：" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 msgid "Company:" -msgstr "公司:" +msgstr "公司：" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 msgid "Mail address:" -msgstr "电子邮件:" +msgstr "电子邮件：" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" -msgstr "开头字母:" +msgstr "开头字母：" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "开发者的名字" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 msgid "Year:" -msgstr "年:" +msgstr "年：" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 msgid "Date:" -msgstr "日期:" +msgstr "日期：" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" -msgstr "日期和时间:" +msgstr "日期和时间：" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"定义 {datetime}（日期时间）通配符的格式。可以使用 ANSI C strftime 函数的转义" +"定义 {datetime} (日期时间) 通配符的格式。可以使用 ANSI C strftime 函数的转义" "符。" -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." -msgstr "定义 {year}（年）通配符的格式。可以使用 ANSI C strftime 函数的转义符。" +msgstr "定义 {year} (年) 通配符的格式。可以使用 ANSI C strftime 函数的转义符。" -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"定义 {date}（日期）通配符的格式。可以使用 ANSI C strftime 函数的转义符。" +"定义 {date} (日期) 通配符的格式。可以使用 ANSI C strftime 函数的转义符。" -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 msgid "Template data" msgstr "模板数据" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "模板" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 msgid "C_hange" -msgstr "改变(_H)" +msgstr "更改(_H)" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 msgid "Keyboard shortcuts" msgstr "快捷键" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "快捷键" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 msgid "Command:" msgstr "命令：" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" -msgstr "打印文件命令路径（使用 %f 作为文件名）" +msgstr "打印文件命令路径 (使用 %f 作为文件名)" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "使用外部命令打印" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 msgid "Print line numbers" msgstr "打印行号" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" -msgstr "在打印的页面上添加行号。" +msgstr "在打印的页面上添加行号" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 msgid "Print page numbers" -msgstr "打印页数" +msgstr "打印页码" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "在每页底部打印页号，占用每页的两行。" -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "打印页头" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." msgstr "" -"在每页打印页头。页头包括页号、文件名和当前日期（见下）。页头占用每页三行。" +"在每页打印页头。页头包括页码、文件名和当前日期 (见下)。页头占用每页三行。" -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" -msgstr "使用打印文件的基本文件名" +msgstr "只打印基本文件名" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" -msgstr "只打印文件的基本文件名，不包括路径。" +msgstr "只打印文件的基本文件名，不包括路径" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 msgid "Date format:" msgstr "自定义日期格式：" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2524,827 +2644,864 @@ msgstr "" "定义用于每页页头的日期和时间戳的格式。可以使用 ANSI C strftime 函数的转义符。" -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" -msgstr "使用本地 GTK 打印" +msgstr "使用原生的 GTK 打印" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +msgid "Printing" +msgstr "打印" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" msgstr "打印" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 msgid "Project Properties" msgstr "项目属性" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +msgid "Display:" +msgstr "显示：" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "自定义" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "使用全局设置" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 msgid "File" msgstr "文件" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "新建" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "打开" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 msgid "Open selected file" msgstr "打开选择的文件" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "保存" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 msgid "Save as" msgstr "另存为" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "全部保存" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "打印" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "关闭" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "全部关闭" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "重新载入文件" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "重新载入刚刚关闭的标签" + +#: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" msgstr "项目" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 msgid "Project properties" msgstr "项目属性" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "撤消" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "重做" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "复制行或选中的文本" - -#: ../src/keybindings.c:239 -msgid "Delete current line(s)" -msgstr "删除当前行" - -#: ../src/keybindings.c:242 -#, fuzzy +#: ../src/keybindings.c:274 msgid "Delete to line end" -msgstr "删除当前行" - -#: ../src/keybindings.c:244 -msgid "Transpose current line" -msgstr "调换当前行" +msgstr "删除到行尾" -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 msgid "Scroll to current line" -msgstr "滚到当前行" +msgstr "滚动到当前行" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 msgid "Scroll up the view by one line" msgstr "逐行移动" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "逐行地向下滚动视图" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 msgid "Complete snippet" msgstr "完成片断" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "在片断中移动光标" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 msgid "Suppress snippet completion" msgstr "禁止完成片断" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 msgid "Context Action" -msgstr "背景运行" +msgstr "上下文动作" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "自动完成" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "显示函数原型" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "显示宏列表" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +msgid "Word part completion" +msgstr "单词片段完成" + +#: ../src/keybindings.c:302 +msgid "Move line(s) up" +msgstr "上移行" + +#: ../src/keybindings.c:304 +msgid "Move line(s) down" +msgstr "下移行" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "剪贴板" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "剪切" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 msgid "Copy" msgstr "复制" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "粘贴" -#: ../src/keybindings.c:276 -msgid "Copy current line(s)" -msgstr "复制当前行" - -#: ../src/keybindings.c:278 -msgid "Cut current line(s)" -msgstr "剪切当前行" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 msgid "Select" msgstr "选择" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "全选" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 msgid "Select current word" msgstr "选择当前词" -#: ../src/keybindings.c:287 -msgid "Select current line(s)" -msgstr "选择当前行" - -#: ../src/keybindings.c:289 -msgid "Select current paragraph" -msgstr "选择当前节" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "选择上一个单词片段" + +#: ../src/keybindings.c:336 +msgid "Select to next word part" +msgstr "选择下一个单词片段" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 msgid "Format" -msgstr "格式化" +msgstr "格式" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 msgid "Toggle Case of Selection" msgstr "开关注释" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "开关行注释" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 msgid "Comment line(s)" msgstr "注释行" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 msgid "Uncomment line(s)" -msgstr "非注释行" +msgstr "取消注释行" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" -msgstr "增大缩进" +msgstr "增加缩进" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" -msgstr "减小缩进" +msgstr "减少缩进" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 msgid "Increase indent by one space" -msgstr "增大缩进" +msgstr "增加一个空格缩进" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 msgid "Decrease indent by one space" -msgstr "减小缩进" +msgstr "减少一个空格缩进" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "智能缩进" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 1" msgstr "发送自定义命令 1" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 msgid "Send to Custom Command 2" msgstr "发送自定义命令 2" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 msgid "Send to Custom Command 3" msgstr "发送自定义命令 3" -#: ../src/keybindings.c:322 -msgid "Send Selection to Terminal" -msgstr "发送选中的文字到终端" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 msgid "Insert" msgstr "插入" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "插入日期" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "入可选择的空白" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 msgid "Settings" msgstr "设置" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 msgid "Search" msgstr "搜索" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "查找" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "查找下一个" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "查找上一个" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 msgid "Find Next Selection" msgstr "查找下一个选择" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 msgid "Find Previous Selection" msgstr "查找上一个选择" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "替换" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 msgid "Find in Files" msgstr "在多个文件中查找" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 msgid "Next Message" msgstr "下一个信息" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 msgid "Previous Message" -msgstr "前一个信息" +msgstr "上一个信息" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "查找用法" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 msgid "Find Document Usage" msgstr "查找文档用法" -#: ../src/keybindings.c:367 -#, fuzzy +#: ../src/keybindings.c:419 msgid "Mark All" -msgstr "生成全部(_M)" +msgstr "标记全部(_M)" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 msgid "Go to" -msgstr "跳转行" +msgstr "跳转到行" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "返回上一个位置" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "前进一个位置" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 msgid "Go to matching brace" msgstr "跳转到对应花括号" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 msgid "Toggle marker" -msgstr "开关记号" - -#: ../src/keybindings.c:385 -msgid "Go to next marker" -msgstr "到下一个记号" +msgstr "开关标记" -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "回到前一个记号" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" -msgstr "跳转到标记边界" +msgstr "跳转到标记定义" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "跳转到标记说明" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 msgid "Go to Start of Line" msgstr "跳转到行首" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 msgid "Go to End of Line" -msgstr "跳转行尾" +msgstr "跳转到行尾" -#: ../src/keybindings.c:398 -#, fuzzy +#: ../src/keybindings.c:450 msgid "Go to End of Display Line" -msgstr "跳转行尾" +msgstr "跳转到显示的行尾" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "跳转到前一个词" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 msgid "Go to Next Word Part" msgstr "跳转到下一个词" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 msgid "View" msgstr "查看" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" -msgstr "开关所有附加构件" +msgstr "开关所有附加部件" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "全屏" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "开关信息窗口" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "开关边栏" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" -msgstr "缩小" +msgstr "放大" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" -msgstr "扩大" +msgstr "缩小" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +msgid "Zoom Reset" +msgstr "重置缩放" + +#: ../src/keybindings.c:475 msgid "Focus" msgstr "焦点" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "切换到编辑器" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "切换到便签" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "切换到虚拟终端" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 msgid "Switch to Search Bar" msgstr "切换到查找栏" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 msgid "Switch to Sidebar" msgstr "切换到边栏" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 msgid "Switch to Compiler" msgstr "切换到编译器" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +msgid "Switch to Messages" +msgstr "切换到信息" + +#: ../src/keybindings.c:492 +msgid "Switch to Message Window" +msgstr "切换到信息窗口" + +#: ../src/keybindings.c:494 +msgid "Switch to Sidebar Document List" +msgstr "切换到边栏文档列表" + +#: ../src/keybindings.c:496 +msgid "Switch to Sidebar Symbol List" +msgstr "切换到边栏符号列表" + +#: ../src/keybindings.c:498 msgid "Notebook tab" -msgstr "分页窗口标签" +msgstr "标签页" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" -msgstr "切换到左文档" +msgstr "切换到左侧文档" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" -msgstr "切换到右文档" +msgstr "切换到右侧文档" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 msgid "Switch to last used document" msgstr "切换到上次使用的文楼" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 msgid "Move document left" msgstr "向左移动文档" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 msgid "Move document right" msgstr "向右移动文档" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 msgid "Move document first" -msgstr "移动到第一个文档" +msgstr "将文档移动到最前" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 msgid "Move document last" -msgstr "移动到最后一个文档" +msgstr "将文档移动到最后" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 msgid "Document" msgstr "文档" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 msgid "Toggle Line wrapping" msgstr "切换自动换行" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 msgid "Toggle Line breaking" msgstr "切换自动断行" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 msgid "Replace spaces by tabs" msgstr "替换空格为制表符" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 msgid "Toggle current fold" msgstr "开关当前折叠点" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "折叠全部" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "展开全部" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "重新载入符号列表" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "移除标记" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "移除出错指示" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" -msgstr "生成全部" +msgstr "生成" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "编译" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" -msgstr "产生全部" +msgstr "生成全部" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" -msgstr "自定义生成参数" +msgstr "生成自定义目标" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" -msgstr "生成目标" +msgstr "生成目标文件" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "下一个错误" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 msgid "Previous error" -msgstr "前一个错误" +msgstr "上一个错误" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "运行" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "运行(可选命令)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "生成参数" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 msgid "Show Color Chooser" msgstr "显示颜色选择器" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 msgid "Help" msgstr "帮助" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 msgid "Keyboard Shortcuts" msgstr "快捷键" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" -msgstr "下列快捷键可定义:" +msgstr "下列快捷键可定义：" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 msgid "Switch to Document" msgstr "切换到文档" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "您请随便写，当便签或草稿好了。" +msgstr "随便谢谢，当便签或草稿好了。从前有座山，山里有个庙……" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 msgid "Failed to load one or more session files." msgstr "打开一个或多个上次会话的文件失败。" #: ../src/log.c:181 msgid "Debug Messages" -msgstr "除错信息" +msgstr "调试信息" -#: ../src/main.c:124 +#: ../src/log.c:183 +msgid "Cl_ear" +msgstr "清除(_E)" + +#: ../src/main.c:122 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" -msgstr "设置第一个打开的文件的初始列（用于以--联结的行）" +msgstr "设置第一个打开的文件的初始行号 (用于以 --line 连接)" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Use an alternate configuration directory" -msgstr "使用自定义的设置文件目录" - -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "细节" +msgstr "使用自定义的配置文件目录" -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "打印内部文件类型名" -#: ../src/main.c:128 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" -msgstr "生成全局标记文件(参见文档)" +msgstr "生成全局标记文件 (参见文档)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "当生成标记时不要预处理 C/C++ 文件" -#: ../src/main.c:132 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" msgstr "不要在一个已运行的实例中打开文件，强制在新的实例中打开" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "使用这个 socket 文件名与一个正在运行的 Geany 实例进行通信" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "返回一个正在运行的 Geany 实例打开的文件列表" + +#: ../src/main.c:132 msgid "Set initial line number for the first opened file" msgstr "设置第一个打开的文件的初始行号" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't show message window at startup" msgstr "启动时不要显示信息窗口" -#: ../src/main.c:136 +#: ../src/main.c:134 msgid "Don't load auto completion data (see documentation)" -msgstr "不要载入自动完成数据（参见文档）" +msgstr "不要载入自动完成数据 (参见文档)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "不要载入插件" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" -msgstr "打印 Geany 的安装前辍" +msgstr "打印 Geany 安装前辍" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "不要载入上次会话文件" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Don't load terminal support" msgstr "不要载入虚拟终端" -#: ../src/main.c:144 +#: ../src/main.c:142 msgid "Filename of libvte.so" -msgstr "libvte.so的文件名" +msgstr "libvte.so 的文件名" + +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "细节" -#: ../src/main.c:147 +#: ../src/main.c:145 msgid "Show version and exit" -msgstr "显示版本和退出" +msgstr "显示版本并退出" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "[文件...]" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" -msgstr "(创建于%s，使用GTK %d.%d.%d, GLib %d.%d.%d)" +msgstr " (创建于 %s，使用 GTK %d.%d.%d，GLib %d.%d.%d)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "现在移动？" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." -msgstr "Geany 需要在开始前移动你的老设置路径。" +msgstr "Geany 需要在开始前移动您原来的设置路径。" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." -msgstr "你的设置路径已成功从 \"%s\" 变为 \"%s\". " +msgstr "你的设置路径已成功从“%s”变为“%s”。" #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." -msgstr "你的设置路径无法 \"%s\" 变为 \"%s\" (%s). 请手动变更。" +msgstr "您的配置文件路径无法从“%s”移动到“%s” (%s)。请手动移动文件夹到新路径。" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" msgstr "" -"设置文件目录无法创建 (%s)。\n" -"如果没有设置文件目录Geany可能会出问题。\n" -"不管他，继续使用？" +"无法创建配置文件目录 (%s)。\n" +"如果没有配置文件目录 Geany 可能会出现问题。\n" +"不管它，启动 Geany？" -#: ../src/main.c:780 ../src/socket.c:164 -#, c-format -msgid "Could not find file '%s'." -msgstr "无法找到 '%s'文件。" - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." -msgstr "这是Geany %s." +msgstr "这是 Geany %s。" -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." -msgstr "设置文件目录无法创建 (%s)。" +msgstr "无法创建配置文件目录 (%s)。" -#: ../src/main.c:1224 +#: ../src/main.c:1244 msgid "Configuration files reloaded." -msgstr "设置文件已重新载入。" +msgstr "配置文件已重新载入。" -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "状态信息" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +msgid "C_opy" +msgstr "复制(_O)" + +#: ../src/msgwindow.c:533 msgid "Copy _All" -msgstr "全部复制(_A)" +msgstr "复制全部(_A)" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 msgid "_Hide Message Window" msgstr "隐藏信息窗口(_H)" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "无法找到文件“%s” - 尝试当前文档路径。" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." -msgstr "插件 \"%s\" 与这个版本的 Geany 不匹配，请重新编译该插件。" +msgstr "插件“%s”与这个版本的 Geany 不匹配，请重新编译该插件。" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "插件管理器(_P)" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" "Description: %s\n" "Author(s): %s" msgstr "" -"插件： %s %s\n" -"说明： %s\n" -"作者： %s" +"插件：%s %s\n" +"说明：%s\n" +"作者：%s" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 msgid "Active" msgstr "激活" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "插件" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "没有可用插件。" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "插件" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "以下是可用插件列表，请选择 Geany 启动时要载入的插件。" +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" +msgstr "选择哪些插件应该在启动时装载：" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 msgid "Plugin details:" msgstr "插件细节：" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "设置插件" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "获取按键" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." -msgstr "请按下用于\"%s\"的按键组合。" +msgstr "请按下用于“%s”的按键组合。" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 msgid "_Expand All" msgstr "全部展开(_E)" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 msgid "_Collapse All" msgstr "全部折叠(_C)" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "操作" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "快捷键" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "允许(_A)" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "覆写(_O)" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "覆写快捷键？" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." -msgstr "按键组合 '%s' 已用于 \"%s\" 。" +msgstr "按键组合“%s”已用于“%s”。" + +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "虚拟终端" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "在下面输入工具路径。不需要的请留空。" #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." -msgstr "定义用于模板的信息。如果不清楚模板如何工作请帮助文档。" +msgstr "定义用于模板的信息。查看帮助文档了解更多细节。" -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." "" msgstr "" -"注意：这里所有改动要重启 Geany 后或者通过菜单中“工具->重新载入设置”后才会" -"生效。 " +"注意：这里所有改动要重启 Geany 或者通过点击菜单中的“工具->重新载入设置”后" +"才会生效。 " #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " "action to edit the string representation of the shortcut directly." msgstr "" -"你可以在这里改变各种操作的快捷键。选择一个操作并按“改变”按钮输入一个按键或双" -"击一个操作直接编辑快捷键的字符串，您就可以设置操作的快捷键。" +"您可以在这里更改各种操作的快捷键。选择一个操作并按“更改”按钮输入一个按键或双" +"击一个操作直接编辑快捷键的字符串。" #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" -"注意：只有 Geany 使用 GTK 2.10 ( 或以上版本 ) 编译并且 Geany 运行" -"于 GTK 2.10 ( 或以上版本 ) 时本地 GTK 打印才可用。" +"注意：只有 Geany 使用 GTK 2.10 (或以上版本) 编译并且 Geany 运行于 " +"GTK 2.10 (或以上版本) 时本地 GTK 打印才可用。" #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3352,92 +3509,97 @@ #: ../src/printing.c:188 msgid "The editor font is not a monospaced font!" -msgstr "" +msgstr "编辑器字体不是等宽字体！" #: ../src/printing.c:189 msgid "Text will be wrongly spaced." -msgstr "" +msgstr "文本将错误地空格" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, c-format msgid "Page %d of %d" msgstr "第 %d 页，共 %d 页" -#: ../src/printing.c:375 +#: ../src/printing.c:376 msgid "Document Setup" msgstr "文档设置" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "打印文件的基本文件名，不包括路径。" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, c-format msgid "Page %d of %d" msgstr "第 %d 页，共 %d 页" -#: ../src/printing.c:776 +#: ../src/printing.c:781 #, c-format -msgid "Printing of file %s was cancelled." -msgstr "打印 \"%s\" 取消。" +msgid "Did not send document %s to the printing subsystem." +msgstr "没有将文档 %s 发送到打印子系统。" -#: ../src/printing.c:778 ../src/printing.c:897 +#: ../src/printing.c:783 #, c-format -msgid "File %s printed." -msgstr "文件 %s 打印完毕。" +msgid "Document %s was sent to the printing subsystem." +msgstr "文档 %s 已发送到打印子系统。" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, c-format msgid "Printing of %s failed (%s)." msgstr "打印 %s 失败 (%s)。" -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "请先在首选项对话框中设置打印命令。" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" "\n" "%s" msgstr "" -"文件 \"%s\" 会用以下命令打印:\n" +"文件“%s”将会用以下命令打印：\n" "\n" "%s" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "打印 \"%s\" 失败 (返回代码: %s)。" +msgstr "打印“%s”失败 (返回代码：%s)。" + +#: ../src/printing.c:905 +#, c-format +msgid "File %s printed." +msgstr "文件 %s 打印完毕。" #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" -msgstr "projects" +msgstr "项目" -#: ../src/project.c:118 +#: ../src/project.c:117 msgid "New Project" msgstr "新项目" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "创建(_R)" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" -msgstr "名称:" +msgstr "名称：" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 msgid "Filename:" -msgstr "文件名:" +msgstr "文件名：" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" -msgstr "根路径:" +msgstr "根路径：" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 " @@ -3446,735 +3608,757 @@ "组成项目的所有文件的根路径，可以是一个新路径或一个已存在的路径。你可以使用与" "项目名关联的路径。" -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "选择项目根目录" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, c-format msgid "Project file \"%s\" could not be loaded." -msgstr "项目文件 \"%s\" 无法载入。" +msgstr "项目文件“%s”无法载入。" -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 msgid "Open Project" msgstr "打开项目" -#: ../src/project.c:296 +#: ../src/project.c:289 msgid "Project files" msgstr "项目文件" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." -msgstr "项目 %s 已关闭。" +msgstr "项目\"%s\"已关闭。" -#: ../src/project.c:412 +#: ../src/project.c:439 msgid "Description:" -msgstr "描述:" +msgstr "描述：" -#: ../src/project.c:447 -msgid "Make in base path" -msgstr "在根路径中编译" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" +msgstr "将生成无文件类型的工作目录设置为基本路径：" -#: ../src/project.c:452 -msgid "Run command:" -msgstr "运行命令:" +#: ../src/project.c:484 +msgid "Set" +msgstr "设置" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" -"在项目根目录中运行的命令行。可以给命令添加参数。留空则使用缺省的运行命令。" +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" +msgstr "为无文件类型生成命令设置工作目录 (在生成标签中)" -#: ../src/project.c:476 +#: ../src/project.c:501 msgid "File patterns:" -msgstr "文件模式:" +msgstr "文件模式：" -#: ../src/project.c:578 +#: ../src/project.c:610 msgid "Do you want to close it before proceeding?" msgstr "您要在执行前关闭文件吗？" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." -msgstr "'%s' 项目已经打开。" +msgstr "项目“%s”已经打开。" -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "定义的项目名称太短。" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." -msgstr "定义的项目名称太短。(最大%d个字符)。" +msgstr "定义的项目名称太短 (最大%d个字符)。" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "项目文件名非法。" -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "创建项目根目录？" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." -msgstr "路径 \"%s\" 不存在。" +msgstr "路径“%s”不存在。" -#: ../src/project.c:670 +#: ../src/project.c:705 #, c-format msgid "Project base directory could not be created (%s)." -msgstr "项目文件根目录无法创建 (%s)。" +msgstr "项目根目录无法创建 (%s)。" -#: ../src/project.c:682 +#: ../src/project.c:717 #, c-format msgid "Project file could not be written (%s)." msgstr "项目文件无法写入 (%s)。" -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." -msgstr "项目\"%s\"已创建。" +msgstr "项目“%s”已创建。" -#: ../src/project.c:732 +#: ../src/project.c:796 #, c-format msgid "Project \"%s\" saved." -msgstr "项目 \"%s\" 已保存。" +msgstr "项目“%s”已保存。" #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 msgid "Choose Project Filename" msgstr "选择项目文件名" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "选择项目运行命令" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." -msgstr "项目\"%s\"已打开。" +msgstr "项目“%s”已打开。" -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "使用正则表达式(_U)" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "使用POSIX-like正则表达式，详见帮助文档。" -#: ../src/search.c:227 +#: ../src/search.c:244 msgid "Search _backwards" msgstr "向后搜索(_B)" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "使用转义序列(_E)" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" -msgstr "替换\\\\, \\t, \\n, \\r and \\uXXXX (Unicode字符串)为对应的控制字符。" +msgstr "替换 \\\\、\\t、\\n、\\r 和 \\uXXXX (Unicode字符串) 为对应的控制字符。" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 msgid "C_ase sensitive" msgstr "大小写敏感(_A)" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "整词配对(_W)" -#: ../src/search.c:265 +#: ../src/search.c:282 msgid "Match from s_tart of word" msgstr "匹配词首(_T)" -#: ../src/search.c:386 +#: ../src/search.c:403 msgid "_Previous" -msgstr "查找上一个(_P)" +msgstr "上一个(_P)" -#: ../src/search.c:392 +#: ../src/search.c:409 msgid "_Next" -msgstr "查找下一个(_N)" +msgstr "下一个(_N)" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 msgid "_Search for:" -msgstr "搜索(_S):" +msgstr "搜索(_S)：" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 msgid "_Find All" -msgstr "全部查找(_F)" +msgstr "查找全部(_F)" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "标记(_M)" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "在当前文档中标记所有匹配项。" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "在所有打开的文档中(_O)" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 msgid "_In Document" msgstr "在当前文档中(_I)" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "关闭对话框(_D)" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "禁止该选项使对话框保持打开" -#: ../src/search.c:529 +#: ../src/search.c:556 msgid "Replace & Fi_nd" msgstr "替换和查找(_N)" -#: ../src/search.c:538 +#: ../src/search.c:565 msgid "Replace wit_h:" msgstr "替换为(_H)：" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 msgid "Re_place All" msgstr "全部替换(_P)" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "在选中的文字中(_L)" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "在当前选中的文字中替换" -#: ../src/search.c:696 +#: ../src/search.c:725 msgid "_Directory:" msgstr "目录(_D):" -#: ../src/search.c:727 +#: ../src/search.c:756 msgid "E_ncoding:" msgstr "编码(_N):" -#: ../src/search.c:752 +#: ../src/search.c:781 msgid "Fixed s_trings" msgstr "完全匹配(_T)" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "_Grep正则表达式" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" -msgstr "详情请参阅 grep 手册" +msgstr "详情请参阅 Grep 手册" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" -msgstr "扩展正则表达式" +msgstr "扩展正则表达式(_E)" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "搜索子目录(_R)" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "反转查找结果(_I)" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "反转查找结果以选择不匹配的行" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" -msgstr "额外的参数:" +msgstr "额外的参数：(_X)" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" -msgstr "传给Grep的其它参数" +msgstr "传给 Grep 的其它参数" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "找到 %d 个 \"%s\" 的匹配项。" -msgstr[1] "找到 %d 个 \"%s\" 的匹配项。" +msgstr[0] "找到 %d 个“%s”的匹配项。" -#: ../src/search.c:1203 +#: ../src/search.c:1177 #, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "在 %u 个文件中替换了文本。" -msgstr[1] "在 %u 个文件中替换了文本。" +msgid "Replaced %u matches in %u documents." +msgstr "在 %2$u 个文档中替换了 %1$u 个匹配项。" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." -msgstr "非法目录" +msgstr "非法目录。" -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." -msgstr "未找到" +msgstr "未找到。" -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "无法执行grep工具 '%s'，请检查首选项中的设置。" +msgstr "无法执行 Grep 工具“%s”，请检查首选项中的设置。" -#: ../src/search.c:1419 +#: ../src/search.c:1483 msgid "Searching..." msgstr "搜索..." -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "%s %s -- %s (在目录 %s中)" +msgstr "%s %s -- %s (在目录 %s 中)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" -msgstr "无法打开目录(%s)" +msgstr "无法打开目录 (%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "搜索失败（详见 帮助->除错信息）" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "搜索失败。" -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "搜索完成，找到 %d 个匹配项。" -msgstr[1] "搜索完成，找到 %d 个匹配项。" -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "未找到匹配项。" -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "错误的正则表达式：%s" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" +"Geany 尝试访问以另一用户身份运行的另一实例的 Unix Domain socket。\n" +"这是一个致命错误，Geany 即将退出。" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "章" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "节" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" -msgstr "节1" +msgstr "第1节" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" -msgstr "节2" +msgstr "第2节" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" -msgstr "节3" +msgstr "第3节" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "索引" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "其他" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "模块" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 msgid "Types" msgstr "类型" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 msgid "Type constructors" msgstr "类型结构" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "函数" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 msgid "Sections" msgstr "节" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" -msgstr "按键" +msgstr "键值" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "变量" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "命令" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "环境" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "小节" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "小小节" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "标签" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 msgid "Structures" msgstr "结构" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "包" -#: ../src/symbols.c:655 -msgid "My" -msgstr "我的" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "本地的" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "我们的" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +msgid "Labels" +msgstr "标签" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "固定值" + +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "接口" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "类" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "固定值" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "锚点" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" -msgstr "标题 (H1)" +msgstr "标题一" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" -msgstr "标题 (H2)" +msgstr "标题二" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" -msgstr "标题 (H3)" +msgstr "标题三" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 msgid "ID Selectors" msgstr "ID 选择" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Type Selectors" msgstr "类型选择" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 msgid "Modules" msgstr "模块" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "单态" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "方法" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "命名空间" -#: ../src/symbols.c:725 -#, fuzzy +#: ../src/symbols.c:741 msgid "Procedures" -msgstr "属性" +msgstr "过程" -#: ../src/symbols.c:736 -#, fuzzy +#: ../src/symbols.c:752 msgid "Imports" msgstr "导出" -#: ../src/symbols.c:766 ../src/symbols.c:855 +#: ../src/symbols.c:760 +msgid "Entities" +msgstr "实体" + +#: ../src/symbols.c:761 +msgid "Architectures" +msgstr "结构" + +#: ../src/symbols.c:763 +msgid "Functions / Procedures" +msgstr "函数 / 过程" + +#: ../src/symbols.c:764 +msgid "Variables / Signals" +msgstr "变量 / 信号" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "进程 / 组件" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "事件" + +#: ../src/symbols.c:775 +msgid "Functions / Tasks" +msgstr "函数 / 任务" + +#: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" msgstr "成员" -#: ../src/symbols.c:806 ../src/symbols.c:829 -msgid "Labels" -msgstr "标签" - -#: ../src/symbols.c:818 +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "子程序" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "块" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "宏" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 msgid "Defines" msgstr "预定义" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "目标" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 msgid "Structs" msgstr "结构" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" -msgstr "定义 / 枚举" +msgstr "定义/枚举" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" -msgstr "\"%s\"是未知的文件类型。\n" +msgstr "“%s”是未知的文件类型。\n" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" -msgstr "创建标记文件失败，可能因为没找到标记。\n" +msgstr "创建标记文件失败，可能因为未找到标记。\n" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" -"用法: %s -g <标记文件> <文件列表>\n" +"用法：%s -g <标记文件> <文件列表>\n" "\n" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" msgstr "" -"示例:\n" +"示例：\n" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "载入标记" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "Geany 标记文件 (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, c-format msgid "Loaded %s tags file '%s'." -msgstr "载入 %s 标记文件 '%s'。" +msgstr "载入 %s 标记文件“%s”。" -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, c-format msgid "Could not load tags file '%s'." -msgstr "无法载入标记文件 '%s'。" +msgstr "无法载入标记文件“%s”。" -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." -msgstr " \"%s()\" 的声明未找到。" +msgstr "未找到“%s”的声明。" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." -msgstr " \"%s()\" 的定义未找到。" +msgstr "未找到“%s”的定义。" -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 msgid "Sort by _Name" msgstr "按名称排序(_N)" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 msgid "Sort by _Appearance" msgstr "按外观排序(_A)" +#: ../src/templates.c:278 +msgid "Old" +msgstr "原来的" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" -msgstr "保存文件" +msgstr "保存当前文件" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "保存全部打开的文件" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" -msgstr "重新载入文件" +msgstr "重新载入当前文件" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" -msgstr "关闭文件" +msgstr "关闭当前文件" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 msgid "Close all open files" msgstr "关闭所有打开的文件" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 msgid "Cut the current selection" msgstr "剪切选中的文字" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 msgid "Copy the current selection" msgstr "复制选中的文字" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" -msgstr "把内容粘贴到剪帖板" +msgstr "粘贴剪帖板的内容" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 msgid "Delete the current selection" msgstr "删除选中的文字" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "撤消上次操作" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "重做上次操作" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "编译文件" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "运行或查看文件" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "打开颜色选择器对话框，从调色盘中选择颜色" -#: ../src/toolbar.c:71 -msgid "Zoom in the text" -msgstr "缩小文字" - #: ../src/toolbar.c:72 -msgid "Zoom out the text" +msgid "Zoom in the text" msgstr "放大文字" #: ../src/toolbar.c:73 -msgid "Decrease indentation" -msgstr "减小缩进" +msgid "Zoom out the text" +msgstr "缩小文字" #: ../src/toolbar.c:74 +msgid "Decrease indentation" +msgstr "减少缩进" + +#: ../src/toolbar.c:75 msgid "Increase indentation" -msgstr "增大缩进" +msgstr "增加缩进" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" -msgstr "输入要查找的文字" +msgstr "在当前文件中查找输入的文字" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 msgid "Jump to the entered line number" msgstr "跳转到指定行" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" -msgstr "显示属性对话框" +msgstr "显示首选项对话框" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" -msgstr "退出" +msgstr "退出 Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 msgid "Print document" msgstr "打印文档" -#: ../src/toolbar.c:80 -#, fuzzy +#: ../src/toolbar.c:81 msgid "Replace text in the current document" -msgstr "在当前文档中标记所有匹配项。" +msgstr "在当前文档中替换文本" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "新建文件" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +msgid "Create a new file from a template" +msgstr "从模板新建文件" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "打开文件" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +msgid "Open a recent file" +msgstr "打开最近的文件" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "选择更多生成动作" + +#: ../src/toolbar.c:389 msgid "Goto" -msgstr "跳转行" +msgstr "跳转到行" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" -msgstr "" +msgstr "分隔线" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" -msgstr "" +msgstr "--- 分隔线 ---" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." -msgstr "" +msgstr "选择在工具栏上显示的项，可以拖拽项进行排列。" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" -msgstr "" +msgstr "可用的项" -#: ../src/toolbar.c:934 -#, fuzzy +#: ../src/toolbar.c:983 msgid "Displayed Items" -msgstr "显示" +msgstr "显示的项" #: ../src/tools.c:153 #, c-format msgid "" "The executed custom command returned an error. Your selection was not " "changed. Error message: %s" -msgstr "运行的自定义命令返回一个错误。你的选择内容没有变化。出错信息： %s" +msgstr "运行的自定义命令返回一个错误。您的选择内容没有变化。错误信息：%s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4183,14 +4367,14 @@ #: ../src/tools.c:246 #, c-format msgid "Passing data and executing custom command: %s" -msgstr "传送数据并执行自定义命令: %s" +msgstr "传送数据并执行自定义命令：%s" #: ../src/tools.c:290 #, c-format msgid "Custom command failed: %s" -msgstr "自定义命令失败： %s" +msgstr "自定义命令失败：%s" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 msgid "Set Custom Commands" msgstr "设置自定义命令" @@ -4198,470 +4382,483 @@ msgid "" "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." -msgstr "你可以发送当前选择给这些命令中的任一个，命令的输出替换当前选择。" +msgstr "你可以发送当前选择给这些命令中的任一个，命令的输出将替换当前选择。" -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." -msgstr "没有自定义命令被定义。" +msgstr "没有定义自定义命令。" -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "字数统计" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "选中的文本" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "整个文档" -#: ../src/tools.c:640 +#: ../src/tools.c:611 msgid "Range:" -msgstr "范围:" +msgstr "范围：" -#: ../src/tools.c:652 +#: ../src/tools.c:623 msgid "Lines:" -msgstr "行数:" +msgstr "行数：" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" -msgstr "词数:" +msgstr "字数：" -#: ../src/tools.c:680 +#: ../src/tools.c:651 msgid "Characters:" -msgstr "字数:" +msgstr "字符：" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "未找到标记" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 msgid "Show S_ymbol List" msgstr "显示符号列表(_Y)" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 msgid "Show _Document List" msgstr "显示打开的文件的列表(_D)" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 msgid "H_ide Sidebar" msgstr "隐藏边栏(_I)" -#: ../src/treeviews.c:591 -#, fuzzy +#: ../src/sidebar.c:631 msgid "Show _Paths" -msgstr "显示全路径名(_F)" +msgstr "显示路径(_P)" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " -msgstr "行： %d\t 列： %d\t 选择： %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " +msgstr "行：%d / %d\t 列：%d\t 选择：%d\t " #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " -msgstr "只读 " +msgstr "只读" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "覆盖" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "插入" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "制表符" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "空格" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "制表符或空格" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" -msgstr "模式： %s" +msgstr "模式：%s" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, c-format msgid "encoding: %s %s" -msgstr "编码： %s %s" +msgstr "编码：%s %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" -msgstr "文件类型： %s" +msgstr "文件类型：%s" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "已修改" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" -msgstr "范围： %s" +msgstr "范围：%s" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." -msgstr "字体已更新(%s)。" +msgstr "字体已更新 (%s)。" -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C标准库" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" -msgstr "C++ (C 标准库)" +msgstr "C++ (C标准库)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "C++ 标准库" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 msgid "_Set Custom Date Format" msgstr "设置自定义日期格式(_S)" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select Folder" msgstr "选择目录" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 msgid "Select File" msgstr "选择文件" -#: ../src/ui_utils.c:1767 -msgid "C_onfiguration Files" -msgstr "设置文件(_O)" - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 msgid "Save All" msgstr "全部保存" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 msgid "Close All" msgstr "全部关闭" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "虚拟终端" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 msgid "_Set Path From Document" msgstr "根据文档设置路径(_S)" -#: ../src/vte.c:553 +#: ../src/vte.c:521 msgid "_Restart Terminal" msgstr "重启虚拟终端(_R)" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" -msgstr "输入方法(_I)" +msgstr "输入法(_I)" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." -msgstr "因为可以含有命令所以无法改变虚拟终端的路径。" - -#: ../src/vte.c:721 -msgid "Terminal plugin" -msgstr "虚拟终端插件" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." -msgstr "这些是虚拟终端(VTE)的设置。只有VTE库能被载入时这些设置才会生效。" +msgstr "可以含有命令，无法改变虚拟终端的路径。" -#: ../src/vte.c:740 -msgid "Terminal font:" -msgstr "终端字体:" +#: ../src/vte.c:736 +msgid "Font:" +msgstr "字体：" -#: ../src/vte.c:750 +#: ../src/vte.c:746 msgid "Sets the font for the terminal widget" -msgstr "设置终端的字体" +msgstr "设置虚拟终端的字体" -#: ../src/vte.c:752 +#: ../src/vte.c:748 msgid "Foreground color:" -msgstr "前景颜色:" +msgstr "前景颜色：" -#: ../src/vte.c:758 +#: ../src/vte.c:754 msgid "Background color:" -msgstr "背景颜色:" +msgstr "背景颜色：" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" -msgstr "设置终端前景色" +msgstr "设置虚拟终端前景色" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" -msgstr "设置终端背景色" +msgstr "设置虚拟终端背景色" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" -msgstr "回滚条数:" +msgstr "回滚条数：" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "定义历史条数，以便于回滚。" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" -msgstr "Shell:" +msgstr "Shell：" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" -msgstr "设置Shell的路径" +msgstr "设置在虚拟终端中启动的Shell的路径" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "按键时滚动" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" -msgstr "按键时是否滚动到底端。" +msgstr "按键时是否滚动到底端" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "输出时滚动" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "输出时是否滚动到底端。" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "光标闪烁" -#: ../src/vte.c:828 +#: ../src/vte.c:824 msgid "Whether to blink the cursor" msgstr "是否闪烁光标" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "覆写 Geany 的快捷键" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" -msgstr "允许在虚拟终端使用快捷键（与焦点命令相区别）" +msgstr "允许在虚拟终端使用快捷键 (与焦点命令相区别)" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" -msgstr "禁止菜单快捷键(缺省为F10)" +msgstr "禁止菜单快捷键 (缺省为F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " "within the VTE." msgstr "" -"这个选项禁止菜单快捷键(缺省为F10)。当在虚拟终端中使用比如Midnight Commander " -"这类程序时有用。" +"这个选项禁止通过快捷键 (缺省为F10) 弹出菜单。当在虚拟终端中使用类似 Midnight " +"Commander 这类程序时有用。" -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "切换到当前文件路径" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" -msgstr "当切换打开的文件时，是否执行\"cd $path\"。" +msgstr "当切换打开的文件时，是否执行“cd $path”。" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" -msgstr "不要使用运行代码" +msgstr "不要使用运行脚本" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" -msgstr "简单运行代码通常用于显示程序的退出状态，不要使用。" +msgstr "不使用用于显示程序的退出状态的简单运行脚本。" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "在虚拟终端中执行程序" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" -msgstr "" -"在虚拟终端中而不是在一个终端中执行程序。注意：虚拟终端中的程序不能停止。" +msgstr "在虚拟终端而不是一个终端中执行程序。注意：虚拟终端中的程序不能停止。" -#: ../src/win32.c:135 +#: ../src/win32.c:161 msgid "Geany project files" msgstr "Geany 项目文件" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "可执行" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Class Builder" msgstr "类创建器" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." -msgstr "为新的类种类创建源代码" +msgstr "为新的类种类创建源代码。" -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "创建类" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +msgid "Namespace" +msgstr "命名空间" + +#: ../plugins/classbuilder.c:393 +msgid "Namespace:" +msgstr "命名空间：" + +#: ../plugins/classbuilder.c:402 msgid "Class" msgstr "类" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 msgid "Class name:" -msgstr "类名称:" +msgstr "类名称：" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 msgid "Header file:" -msgstr "头文件:" +msgstr "头文件：" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 msgid "Source file:" -msgstr "源文件:" +msgstr "源文件：" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 msgid "Inheritance" msgstr "继承" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" -msgstr "基础类:" +msgstr "基础类：" + +#: ../plugins/classbuilder.c:463 +msgid "Base source:" +msgstr "基础源文件：" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:465 msgid "Base header:" -msgstr "基础头文件:" +msgstr "基础头文件：" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" -msgstr "全局变量" +msgstr "全局" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 msgid "Base GType:" -msgstr "基础 GType:" +msgstr "基础 GType：" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "实现接口：" + +#: ../plugins/classbuilder.c:505 msgid "Options" msgstr "参数" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 msgid "Create constructor" msgstr "创建构造器" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 msgid "Create destructor" msgstr "创建析出器" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "抽象" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "单态" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "GTK+ 构造类型" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "创建类(_S)" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 msgid "_C++ Class" msgstr "_C++ 类" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 msgid "_GTK+ Class" msgstr "_GTK+ 类" +#: ../plugins/classbuilder.c:1052 +msgid "_PHP Class" +msgstr "_PHP 类" + #: ../plugins/htmlchars.c:38 msgid "HTML Characters" -msgstr "HTML字符" +msgstr "HTML 字符" #: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." -msgstr "插入 HTML 实体字符如 like '&'。" +msgstr "插入 HTML 实体字符如“&”。" #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 msgid "The Geany developer team" msgstr "Geany 开发团队" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" -msgstr "HTML字符" +msgstr "HTML 字符" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" -msgstr "ISO 8859-1字符" +msgstr "ISO 8859-1 字符" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "希腊字符" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "数学字符" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "技术字符" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "箭头字符" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "标点符号" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "其他字符" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +msgid "Plugin configuration directory could not be created." +msgstr "无法创建插件定义目录。" + +#: ../plugins/htmlchars.c:482 msgid "Special Characters" msgstr "特殊字符" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 msgid "_Insert" msgstr "插入(_I)" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -4669,40 +4866,40 @@ "从下面的列表中选择一个特殊字符后点击插入按钮或双击特殊字符就可以在当前光标位" "置插入该特殊字符。" -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 msgid "Character" msgstr "字符" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" -msgstr "HTML表示" +msgstr "HTML (名称)" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" -msgstr "插入特殊HTML字符(_I)" +msgstr "插入特殊 HTML 字符(_I)" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 msgid "HTML Replacement" -msgstr "HTML替换" +msgstr "HTML 替换" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" -msgstr "HTML开关(_H)" +msgstr "HTML 开关(_H)" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "大量替换特殊字符" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" -msgstr "插入特殊HTML字符" +msgstr "插入特殊 HTML 字符" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 msgid "Replace special characters" msgstr "替换特殊字符" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 msgid "Toggle plugin status" msgstr "开关插件状态" @@ -4727,105 +4924,105 @@ "Renders the font size of the document together with the current zoom level" msgstr "把当前缩放级别应用到所有文档上" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." -msgstr "文档成功导出为 '%s'。" +msgstr "文档成功导出为“%s”。" -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, c-format msgid "File '%s' could not be written (%s)." -msgstr "文件“'%s”无法写成为(%s)。" +msgstr "文件“%s”不可写 (%s)。" -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" -msgstr "文件 '%s' 已存在。您要覆盖吗？" +msgstr "文件“%s”已存在。您要覆盖吗？" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "导出(_E)" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "为 _HTML" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "为 _LaTeX" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "File Browser" msgstr "文件浏览器" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." -msgstr "在边栏上增加浏览器标签" +msgstr "在边栏上增加文件浏览器标签。" -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "选择了太多项！" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." -msgstr "无法执行定义的外部命令 '%s' (%s) 。" +msgstr "无法执行设置的外部命令“%s” (%s)。" -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "外部打开(_E)" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 msgid "_Find in Files" msgstr "在多个文件中查找(_F)" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 msgid "Show _Hidden Files" msgstr "显示隐藏文件(_H)" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" -msgstr "上" +msgstr "向上" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "刷新" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" -msgstr "家" +msgstr "家目录" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 msgid "Set path from document" msgstr "根据文档设置路径" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 msgid "Clear the filter" msgstr "清空过滤器" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 msgid "Filter:" msgstr "过滤器：" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "用常用的通配符过滤您的文件" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "聚焦文件列表" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "聚焦路径输入框" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -msgid "Plugin configuration directory could not be created." -msgstr "插件定义目录无法创建。" - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 msgid "External open command:" -msgstr "外部打开命令:" +msgstr "外部打开命令：" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4834,35 +5031,34 @@ "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" -"当使用 \"以...打开\" 时执行的命令。你可以使用 %f 和 %d 通配符。\n" -"%f 代表包括全路径的文件名。\n" -"%d 代表选定文件的路径，不包括文件名。" +"当使用“以...打开”时执行的命令。你可以使用 %f 和 %d 通配符。\n" +"%f 代表包括全路径的文件名\n" +"%d 代表选定文件的路径，不包括文件名" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 msgid "Show hidden files" msgstr "显示隐藏文件" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 msgid "Hide object files" msgstr "隐藏目标文件" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" -"不要在文件浏览器中显示生成的目标文件，包括 *.o, *.obj. *.so, *.dll, *.a, *." +"不要在文件浏览器中显示生成的目标文件，包括 *.o、*.obj、*.so、*.dll、*.a、*." "lib" -#: ../plugins/filebrowser.c:1128 -#, fuzzy +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" -msgstr "设置项目根路径" +msgstr "使用项目根目录" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 msgid "" "Change the directory to the base directory of the currently opened project" -msgstr "改变当前打开项目的根路径" +msgstr "将目录切换至当前打开的项目的根目录" #: ../plugins/saveactions.c:39 msgid "Save Actions" @@ -4875,7 +5071,7 @@ #: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." -msgstr "备份复制：目录无法创建 (%s)。" +msgstr "备份复制：无法创建目录 (%s)。" #. it's unlikely that this happens #: ../plugins/saveactions.c:201 @@ -4893,7 +5089,6 @@ msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." msgstr[0] "自动保存：保存了 %d 个文件。" -msgstr[1] "自动保存：保存了 %d 个文件。" #. initialize the dialog #: ../plugins/saveactions.c:380 @@ -4923,11 +5118,11 @@ #: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" -msgstr "文件自动保存后输出信息(_P)" +msgstr "文件自动保存后输出状态信息(_P)" #: ../plugins/saveactions.c:578 msgid "Save only current open _file" -msgstr "仅保存当前打开文件(_F)" +msgstr "仅保存当前打开的文件(_F)" #: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" @@ -4951,7 +5146,7 @@ #: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "备份文件的日期时间格式（详见 \"man strftime\" ）(_T)：" +msgstr "备份文件的日期时间格式 (详见“man strftime”) (_T)：" #: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" @@ -4965,320 +5160,85 @@ msgid "Splits the editor view into two windows." msgstr "把编辑视图分割为两个窗口。" -#: ../plugins/splitwindow.c:277 -#, fuzzy +#: ../plugins/splitwindow.c:244 msgid "Show the current document" -msgstr "在当前文档中标记所有匹配项。" +msgstr "显示当前文件" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "合并(_U)" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "分割窗口(_S)" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" -msgstr "水平分割(_H)" +msgstr "水平(_H)" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" -msgstr "垂直分割(_V)" +msgstr "垂直(_V)" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "水平分割" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "垂直分割" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "合并" - -#~ msgid "Diff file" -#~ msgstr "不同文件" - -#~ msgid "reStructuredText file" -#~ msgstr "重新结构化文件" - -#~ msgid "Select _All" -#~ msgstr "全选(_A)" - -#~ msgid "Automatic symbol completion" -#~ msgstr "符号自动完成" - -#~ msgid "" -#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -#~ "xml'. Please see the documentation for details." -#~ msgstr "" -#~ "注意：要自定义工具栏，请编辑 'ui_toolbar.xml 文件'. 详见相关文档。" - -#~ msgid "" -#~ "For all changes you make in this file to take effect, you need to restart " -#~ "Geany." -#~ msgstr "这个文件中的改动在重启 Geany 后生效。" - -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "查看 %s 失败(请确保其已编译)" - -#~ msgid "" -#~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" -#~ msgstr "在每页底部打印页数，占用每页的两行。" - -#~ msgid "Jump to the entered line number." -#~ msgstr "跳转到指定行" +#~ msgid "Try to resave the file?" +#~ msgstr "尝试重新保存文件？" -#~ msgid "Version Diff" -#~ msgstr "版本差别" +#~ msgid "_Customize Toolbar" +#~ msgstr "自定义工具栏(_C)" -#~ msgid "Creates a patch of a file against version control." -#~ msgstr "创建一个文件的版本控制用补丁" +#~ msgid "Icon style:" +#~ msgstr "图标样式：" -#~ msgid "Input conversion of the diff output failed." -#~ msgstr "diff 输出转化输入失败。" +#~ msgid "Icon size:" +#~ msgstr "图标大小：" -#~ msgid "" -#~ "%s exited with an error: \n" -#~ "%s." -#~ msgstr "" -#~ "%s 退出，出错信息： \n" -#~ "%s 。" - -#~ msgid "No changes were made." -#~ msgstr "没有变化。" - -#~ msgid "unknown error while trying to spawn a process for %s" -#~ msgstr "在尝试为 %s 产生过程时出现未知错误" - -#~ msgid "An error occurred (%s)." -#~ msgstr "出现一个错误 (%s) 。" - -#~ msgid "_Version Diff" -#~ msgstr "版本差别(_V)" - -#~ msgid "From Current _File" -#~ msgstr "从当前文件(_F)" - -#~ msgid "Make a diff from the current active file" -#~ msgstr "生成当前活动文件的差别" +#~ msgid "Appearance" +#~ msgstr "外观" -#~ msgid "From Current _Directory" -#~ msgstr "从当前目录(_D)" +#~ msgid "Hard tab width:" +#~ msgstr "硬制表符宽度：" -#~ msgid "Make a diff from the directory of the current active file" -#~ msgstr "生成当前活动文件所在目录的差别" +#~ msgid "The width of a tab when Tabs & Spaces is set for a document" +#~ msgstr "当文件设置“制表符和空格”时制表符的宽度" -#~ msgid "From Current _Project" -#~ msgstr "从当前项目(_P)" +#~ msgid "Long line marker:" +#~ msgstr "长行标志：" -#~ msgid "Make a diff from the current project's base path" -#~ msgstr "生成当前项目根目录的差别" +#~ msgid "Long line marker color:" +#~ msgstr "长行标志颜色：" -#~ msgid "Command stopped because the current file has no extension." -#~ msgstr "命令中止因为当前文件没有扩展名。" +#~ msgid "Duplicate line or selection" +#~ msgstr "复制行或选中的文本" -#~ msgid "Failed to execute \"%s\" (make sure it is already built)" -#~ msgstr "无法执行“ %s”(请确保已生成)" +#~ msgid "Send Selection to Terminal" +#~ msgstr "发送选中的文字到终端" -#~ msgid "Compiles the current file" -#~ msgstr "编译当前文件" +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "取消打印“%s”文件。" -#~ msgid "Builds the current file (generate an executable file)" -#~ msgstr "生成当前文件(生成一个可执行文件)" +#~ msgid "Replaced text in %u file." +#~ msgid_plural "Replaced text in %u files." +#~ msgstr[0] "在 %u 个文件中替换了文本。" -#~ msgid "Compiles the current file using the make tool" -#~ msgstr "编译当前文件" +#~ msgid "Terminal plugin" +#~ msgstr "虚拟终端插件" #~ msgid "" -#~ "Sets the includes and library paths for the compiler and the program " -#~ "arguments for execution" -#~ msgstr "设置编译参数" - -#~ msgid "Compiles the current file into a DVI file" -#~ msgstr "编译当前文件为DVI文件" - -#~ msgid "Compiles the current file into a PDF file" -#~ msgstr "编译当前文件为PDFI文件" - -#~ msgid "Compile and view the current file" -#~ msgstr "编译并查看当前文件" - -#~ msgid "Sets the program paths and arguments" -#~ msgstr "设置程序路径和参数" - -#~ msgid "Saves all open files" -#~ msgstr "保存所在打开的文件" - -#~ msgid "Prints the current file" -#~ msgstr "打印当前文件" - -#~ msgid "Inserts a typical ChangeLog entry in the current file" -#~ msgstr "在当前文件中插入一个典型的更改记录" +#~ "These settings for the virtual terminal emulator widget (VTE) only apply " +#~ "if the VTE library could be loaded." +#~ msgstr "这些是虚拟终端（VTE）的设置，只有VTE库可以载入时才会生效。" -#~ msgid "Inserts a file header at the beginning of the file" -#~ msgstr "在文件开头插入一个文件头" +#~ msgid "Terminal font:" +#~ msgstr "终端字体：" -#~ msgid "Inserts a description before the current function" -#~ msgstr "在当前函数前插入该函数的描述" - -#~ msgid "Inserts a multiline comment" -#~ msgstr "插入多行注释" - -#~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" -#~ msgstr "插入GPL告知(在文件头部)" - -#~ msgid "" -#~ "Inserts a BSD license notice (should be done at the beginning of the file)" -#~ msgstr "插入BSD许可公告(应当在文件头部)" - -#~ msgid "Change the default font" -#~ msgstr "修改缺省字体" - -#~ msgid "Toggle the window with status and compiler messages on and off" -#~ msgstr "开关显示状态和编译信息的窗口" - -#~ msgid "Toggle the toolbar on and off" -#~ msgstr "开关工具栏" - -#~ msgid "Treat this file as read-only. No changes can be made." -#~ msgstr "锁定文件，不允许编辑。" - -#~ msgid "Replaces all spaces in the document by tab characters." -#~ msgstr "替换文件中所有空格为制表符" - -#~ msgid "Folds all contractible code blocks" -#~ msgstr "折叠全部缩进的代码" - -#~ msgid "Unfolds all contracted code blocks" -#~ msgstr "展开全部缩进的代码" - -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "去除文件中所有出错指示" - -#~ msgid "" -#~ "Counts the words and characters in the current selection or the whole " -#~ "document" -#~ msgstr "在整个或选中的文档中统计字数和词数" - -#~ msgid "Load global tags file" -#~ msgstr "载入全局标记文件" - -#~ msgid "" -#~ "Reload configuration data like snippets, templates and filetype " -#~ "extensions." -#~ msgstr "重新载入设置，如片断、模板和文件类型扩展。" - -#~ msgid "Shows a list of all keyboard shortcuts for Geany." -#~ msgstr "列出所有Geany的快捷键" - -#~ msgid "Color" -#~ msgstr "颜色" - -#~ msgid "Enter a line number and jump to it." -#~ msgstr "输入要跳转到的行号" - -#~ msgid "Go to the entered line" -#~ msgstr "跳转到输入行" - -#~ msgid "Show full path name in documents list" -#~ msgstr "在文件列表中显示全路径" - -#~ msgid "Show file operation buttons" -#~ msgstr "显示文件操作按钮" - -#~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -#~ msgstr "显示新建、打开、关闭、保存和重新载入按钮" - -#~ msgid "Show Redo and Undo buttons" -#~ msgstr "显示重做和撤消按钮" - -#~ msgid "Display the Redo and Undo buttons in the toolbar" -#~ msgstr "显示重做和撤消按钮重做 撤消" - -#~ msgid "Show Back and Forward buttons" -#~ msgstr "显示向前和向后按钮" - -#~ msgid "" -#~ "Display the Back and Forward buttons in the toolbar used for code " -#~ "navigation" -#~ msgstr "在工具栏中显示向前和向后按钮用于代码导航" - -#~ msgid "Show Compile and Run buttons" -#~ msgstr "显示编译和运行按钮" - -#~ msgid "Display the Compile and Run buttons in the toolbar" -#~ msgstr "显示编译和运行按钮" - -#~ msgid "Show Color Chooser button" -#~ msgstr "显示颜色选择器按钮" - -#~ msgid "Display the Color Chooser button in the toolbar" -#~ msgstr "在工具栏中显示颜色选择器按钮" - -#~ msgid "Show Zoom In and Zoom Out buttons" -#~ msgstr "显示缩小和放大按钮" - -#~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" -#~ msgstr "显示缩小和广大按钮" - -#~ msgid "Show Increase and Decrease Indentation buttons" -#~ msgstr "显示增大和缩小缩进按钮" - -#~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" -#~ msgstr "在工具栏中显示增大和缩小缩进按钮" - -#~ msgid "Show Search field" -#~ msgstr "显示搜索栏" - -#~ msgid "Display the search field and button in the toolbar" -#~ msgstr "显示搜索栏" - -#~ msgid "Show Go to Line field" -#~ msgstr "显示跳转行栏" - -#~ msgid "Display the line number field and button in the toolbar" -#~ msgstr "显示跳转行栏" - -#~ msgid "Show Quit button" -#~ msgstr "显示退出按钮" - -#~ msgid "Display the quit button in the toolbar" -#~ msgstr "显示退出按钮" - -#~ msgid "Items" -#~ msgstr "项目" - -#~ msgid "Use white text on a black background." -#~ msgstr "使用黑底白字" - -#~ msgid "Runs in debug mode (means being verbose)" -#~ msgstr "在DEBUG模式下运行" - -#~ msgid "Search failed." -#~ msgstr "搜索失败。" - -#~ msgid "Couldn't find pixmap file: %s" -#~ msgstr "无法找到名为%s的pixmap文件" - -#~ msgid "JavaScript functions" -#~ msgstr "Javascript 函数" - -#~ msgid "Heading (H2)" -#~ msgstr "标题 (H2)" - -#~ msgid "Heading (H3)" -#~ msgstr "标题 (H3)" - -#~ msgid "Structs / Typedefs" -#~ msgstr "结构" - -#~ msgid "Terminal emulation:" -#~ msgstr "虚拟终端:" - -#~ msgid "" -#~ "Controls how the terminal emulator should behave. Do not change this " -#~ "value unless you know exactly what you are doing." -#~ msgstr "控制终端行为，不知道如何使用就不要更改。" +#~ msgid "Unsplit" +#~ msgstr "合并" diff -Nru geany-0.18/po/zh_TW.po geany-0.19/po/zh_TW.po --- geany-0.18/po/zh_TW.po 2009-08-16 17:18:28.000000000 +0100 +++ geany-0.19/po/zh_TW.po 2010-05-23 09:08:49.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.18\n" +"Project-Id-Version: geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"POT-Creation-Date: 2010-05-23 10:05+0200\n" "PO-Revision-Date: 2006-11-16 22:02+0800\n" "Last-Translator: KoViCH \n" "Language-Team: Chinese \n" @@ -23,7 +23,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "一個快速且輕巧的整合開發環境" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:281 ../src/interface.c:1624 msgid "Geany" msgstr "" @@ -31,406 +31,415 @@ msgid "Integrated Development Environment" msgstr "" -#: ../src/about.c:139 +#: ../src/about.c:145 msgid "About Geany" msgstr "關於Geany" -#: ../src/about.c:189 +#: ../src/about.c:195 msgid "A fast and lightweight IDE" msgstr "一個快速且輕巧的整合開發環境" -#: ../src/about.c:210 +#: ../src/about.c:216 #, fuzzy, c-format msgid "(built on or after %s)" msgstr "(在%s建立)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:247 msgid "Info" msgstr "資訊" -#: ../src/about.c:257 +#: ../src/about.c:263 msgid "Developers" msgstr "開發者" -#: ../src/about.c:266 +#: ../src/about.c:272 #, fuzzy msgid "maintainer" msgstr "維護者" -#: ../src/about.c:274 +#: ../src/about.c:280 msgid "developer" msgstr "開發者" -#: ../src/about.c:282 +#: ../src/about.c:288 msgid "translation maintainer" msgstr "翻譯維護者" -#: ../src/about.c:291 +#: ../src/about.c:297 msgid "Translators" msgstr "翻譯者" -#: ../src/about.c:311 +#: ../src/about.c:317 #, fuzzy msgid "Previous Translators" msgstr "翻譯者" -#: ../src/about.c:332 +#: ../src/about.c:338 #, fuzzy msgid "Contributors" msgstr "自動補完文字" -#: ../src/about.c:342 +#: ../src/about.c:348 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:368 +#: ../src/about.c:374 msgid "Credits" msgstr "鳴謝" -#: ../src/about.c:382 +#: ../src/about.c:388 msgid "License" msgstr "授權條款" -#: ../src/about.c:391 +#: ../src/about.c:397 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." msgstr "" -#: ../src/build.c:221 ../src/build.c:745 +#. fall back to %d +#: ../src/build.c:635 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" +msgid "failed to substitute %%p, no project active" msgstr "" -#: ../src/build.c:236 ../src/build.c:650 -#, c-format -msgid "Failed to execute \"%s\" (start-script could not be created)" +#: ../src/build.c:673 +msgid "Process failed, no working directory" msgstr "" -#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 -#: ../src/search.c:1411 +#: ../src/build.c:699 +#, c-format +msgid "%s (in directory: %s)" +msgstr "%s(在目錄: %s)" + +#: ../src/build.c:719 ../src/build.c:944 ../src/search.c:1475 #, c-format msgid "Process failed (%s)" msgstr "行程(%s)失敗" -#: ../src/build.c:508 +#: ../src/build.c:790 #, c-format -msgid "%s (in directory: %s)" -msgstr "%s(在目錄: %s)" +msgid "Failed to change the working directory to \"%s\"" +msgstr "" -#: ../src/build.c:613 +#: ../src/build.c:819 #, c-format -msgid "Failed to change the working directory to \"%s\"" +msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "" -#: ../src/build.c:707 +#: ../src/build.c:873 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" -#: ../src/build.c:914 +#: ../src/build.c:911 +#, c-format +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" + +#: ../src/build.c:1081 msgid "Compilation failed." msgstr "編譯失敗." -#: ../src/build.c:928 +#: ../src/build.c:1095 msgid "Compilation finished successfully." msgstr "編譯成功結束." -#. compile the code -#: ../src/build.c:1039 -msgid "_Compile" -msgstr "編譯(_C)" - -#. build the code -#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 -msgid "_Build" -msgstr "建立(_B)" - -#. build the code with make all -#: ../src/build.c:1059 ../src/build.c:1165 ../src/build.c:2131 -#, fuzzy -msgid "_Make All" -msgstr "建立全部" - -#. build the code with make custom -#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 +#: ../src/build.c:1252 #, fuzzy -msgid "Make Custom _Target" +msgid "Custom Text" msgstr "建立自定義目標(_t)" -#. build the code with make object -#: ../src/build.c:1077 ../src/build.c:2147 -#, fuzzy -msgid "Make _Object" -msgstr "建立物件(_o)" +#: ../src/build.c:1253 +msgid "Enter custom text here, all entered text is appended to the command." +msgstr "" -#. next error -#: ../src/build.c:1090 ../src/build.c:1187 +#: ../src/build.c:1331 #, fuzzy msgid "_Next Error" msgstr "錯誤" -#: ../src/build.c:1097 ../src/build.c:1194 +#: ../src/build.c:1333 #, fuzzy msgid "_Previous Error" msgstr "找上一個(_P)" -#. arguments -#: ../src/build.c:1122 ../src/build.c:2159 -msgid "_Set Includes and Arguments" -msgstr "" - -#. DVI -#: ../src/build.c:1143 -msgid "LaTeX -> _DVI" -msgstr "" +#: ../src/build.c:1343 +#, fuzzy +msgid "_Set Build Commands" +msgstr "設定自定義日期格式" -#. PDF -#: ../src/build.c:1152 -msgid "LaTeX -> _PDF" -msgstr "" +#: ../src/build.c:1623 ../src/toolbar.c:373 +#, fuzzy +msgid "Build the current file" +msgstr "編譯目前檔案" -#. DVI view -#: ../src/build.c:1206 +#: ../src/build.c:1637 #, fuzzy -msgid "_View DVI File" -msgstr "檢視DVI檔案" +msgid "Build the current file with Make and the default target" +msgstr "以建立工具和預設目標建構目前檔案" -#. PDF view -#: ../src/build.c:1216 +#: ../src/build.c:1639 #, fuzzy -msgid "V_iew PDF File" -msgstr "檢視PDF檔案" +msgid "Build the current file with Make and the specified target" +msgstr "以建立工具和指定目標建構目前檔案" -#. arguments -#: ../src/build.c:1231 +#: ../src/build.c:1641 #, fuzzy -msgid "_Set Arguments" -msgstr "設定參數" +msgid "Compile the current file with Make" +msgstr "編譯目前檔案" -#: ../src/build.c:1306 -msgid "Set Arguments" -msgstr "設定參數" +#: ../src/build.c:1668 +#, fuzzy, c-format +msgid "Process could not be stopped (%s)." +msgstr "無法建立組態文件目錄(%s)." -#: ../src/build.c:1313 -msgid "Set programs and options for compiling and viewing (La)TeX files." +#: ../src/build.c:1685 ../src/build.c:1697 +msgid "No more build errors." msgstr "" -#: ../src/build.c:1324 -msgid "DVI creation:" +#: ../src/build.c:1778 +msgid "Set menu item label" msgstr "" -#: ../src/build.c:1344 -msgid "PDF creation:" +#: ../src/build.c:1788 +msgid "Item" msgstr "" -#: ../src/build.c:1364 -msgid "DVI preview:" -msgstr "" +#: ../src/build.c:1789 ../src/symbols.c:650 +msgid "Label" +msgstr "標籤" -#: ../src/build.c:1384 -msgid "PDF preview:" -msgstr "" +#: ../src/build.c:1790 ../src/symbols.c:645 +msgid "Command" +msgstr "指令" -#: ../src/build.c:1401 ../src/build.c:1583 -#, c-format -msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" +#: ../src/build.c:1791 +#, fuzzy +msgid "Working directory" +msgstr "目錄:" -#: ../src/build.c:1486 -msgid "Set Includes and Arguments" -msgstr "" +#: ../src/build.c:1792 +#, fuzzy +msgid "Clear" +msgstr "編譯器" -#: ../src/build.c:1493 -msgid "Set the commands for building and running programs." +#: ../src/build.c:1831 +msgid "Click to set menu item label" msgstr "" -#. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1501 +#: ../src/build.c:1904 ../src/build.c:1906 #, fuzzy, c-format -msgid "%s commands" +msgid "%s Commands" msgstr "指令" -#: ../src/build.c:1516 -msgid "Compile:" -msgstr "編譯:" - -#: ../src/build.c:1538 -msgid "Build:" -msgstr "建構:" - -#: ../src/build.c:1560 ../src/dialogs.c:1223 -msgid "Execute:" -msgstr "執行:" +#: ../src/build.c:1906 +#, fuzzy +msgid "No Filetype" +msgstr "設定檔案類型(_t)" -#: ../src/build.c:1892 ../src/toolbar.c:344 +#: ../src/build.c:1914 ../src/build.c:1949 #, fuzzy -msgid "Build the current file" -msgstr "編譯目前檔案" +msgid "Error Regular Expression:" +msgstr "使用正規式(_U)" + +#: ../src/build.c:1942 +msgid "Non-Filetype Commands" +msgstr "" + +#: ../src/build.c:1972 +msgid "Note: Item 2 opens a dialog and appends the response to the command." +msgstr "" -#: ../src/build.c:1917 +#: ../src/build.c:1981 #, fuzzy -msgid "Make Custom Target" -msgstr "建立自定義目標(_t)" +msgid "Execute Commands" +msgstr "設定自定義日期格式" -#: ../src/build.c:1918 +#: ../src/build.c:1992 +#, c-format msgid "" -"Enter custom options here, all entered text is passed to the make command." +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -#: ../src/build.c:1967 +#: ../src/build.c:2177 #, fuzzy -msgid "Build the current file with Make and the default target" -msgstr "以建立工具和預設目標建構目前檔案" +msgid "Set Build Commands" +msgstr "設定自定義日期格式" + +#: ../src/build.c:2399 +msgid "_Compile" +msgstr "編譯(_C)" -#: ../src/build.c:1970 +#. build the code +#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +msgid "_Build" +msgstr "建立(_B)" + +#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 #, fuzzy -msgid "Build the current file with Make and the specified target" -msgstr "以建立工具和指定目標建構目前檔案" +msgid "_Execute" +msgstr "執行:" + +#. build the code with make custom +#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +#, fuzzy +msgid "Make Custom _Target" +msgstr "建立自定義目標(_t)" -#: ../src/build.c:1973 +#. build the code with make object +#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 #, fuzzy -msgid "Compile the current file with Make" -msgstr "編譯目前檔案" +msgid "Make _Object" +msgstr "建立物件(_o)" -#: ../src/build.c:2035 -msgid "Failed to execute the view program" -msgstr "無法執行檢視程式" +#: ../src/build.c:2462 ../src/build.c:2633 +#, fuzzy +msgid "_Make" +msgstr "建立全部" -#: ../src/build.c:2073 -#, fuzzy, c-format -msgid "Process could not be stopped (%s)." -msgstr "無法建立組態文件目錄(%s)." +#. build the code with make all +#: ../src/build.c:2681 +#, fuzzy +msgid "_Make All" +msgstr "建立全部" -#: ../src/build.c:2092 ../src/build.c:2106 -msgid "No more build errors." -msgstr "" +#. arguments +#: ../src/build.c:2709 +#, fuzzy +msgid "_Set Build Menu Commands" +msgstr "設定自定義日期格式" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "您真的想要離開嗎?" -#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:228 +#, fuzzy, c-format +msgid "%d file saved." +msgid_plural "%d files saved." +msgstr[0] "檔案%s已儲存." +msgstr[1] "檔案%s已儲存." + +#: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 +#: ../src/sidebar.c:618 msgid "_Reload" msgstr "重新載入(_R)" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "" -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "" -#: ../src/callbacks.c:1249 ../src/keybindings.c:376 +#: ../src/callbacks.c:1202 ../src/keybindings.c:428 #, fuzzy msgid "Go to Line" msgstr "前往行數" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1202 msgid "Enter the line you want to go to:" msgstr "請輸入您想移至的行:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1296 ../src/callbacks.c:1321 msgid "" "Please set the filetype for the current file before using this function." msgstr "" -#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1429 ../src/ui_utils.c:548 msgid "dd.mm.yyyy" msgstr "" -#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:549 msgid "mm.dd.yyyy" msgstr "" -#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:550 msgid "yyyy/mm/dd" msgstr "" -#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:559 msgid "dd.mm.yyyy hh:mm:ss" msgstr "" -#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:560 msgid "mm.dd.yyyy hh:mm:ss" msgstr "" -#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:561 msgid "yyyy/mm/dd hh:mm:ss" msgstr "" -#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:570 #, fuzzy msgid "_Use Custom Date Format" msgstr "使用自定的日期格式" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1446 #, fuzzy msgid "Custom Date Format" msgstr "自定日期格式" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1447 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1466 msgid "Date format string could not be converted (possibly too long)." msgstr "" -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1689 ../src/callbacks.c:1699 msgid "No more message items." msgstr "" -#. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1640 +#: ../src/dialogs.c:144 ../src/dialogs.c:229 msgid "Open File" msgstr "開啟檔案" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:148 ../src/interface.c:790 msgid "_View" msgstr "檢視(_V)" -#: ../src/dialogs.c:147 +#: ../src/dialogs.c:151 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." msgstr "" -#: ../src/dialogs.c:169 +#: ../src/dialogs.c:173 msgid "Detect by file extension" msgstr "以附加檔名偵測" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +#: ../src/dialogs.c:200 ../src/interface.c:3651 ../src/interface.c:5263 msgid "Detect from file" msgstr "從檔案偵測" -#: ../src/dialogs.c:258 +#: ../src/dialogs.c:262 #, fuzzy msgid "_More Options" msgstr "函式" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:265 +#: ../src/dialogs.c:269 msgid "Show _hidden files" msgstr "顯示隱藏檔案" -#: ../src/dialogs.c:276 +#: ../src/dialogs.c:280 msgid "Set encoding:" msgstr "設定字元編碼:" -#: ../src/dialogs.c:286 +#: ../src/dialogs.c:290 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -440,11 +449,11 @@ msgstr "" #. line 2 with filetype combo -#: ../src/dialogs.c:293 +#: ../src/dialogs.c:297 msgid "Set filetype:" msgstr "" -#: ../src/dialogs.c:303 +#: ../src/dialogs.c:307 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -460,169 +469,173 @@ msgid "Filename already exists!" msgstr "" -#: ../src/dialogs.c:424 +#: ../src/dialogs.c:422 ../src/dialogs.c:552 msgid "Save File" msgstr "儲存檔案" -#: ../src/dialogs.c:432 +#: ../src/dialogs.c:430 #, fuzzy msgid "R_ename" msgstr "越南文" -#: ../src/dialogs.c:434 +#: ../src/dialogs.c:432 msgid "Save the file and rename it" msgstr "" -#: ../src/dialogs.c:442 +#: ../src/dialogs.c:440 msgid "_Open file in a new tab" msgstr "" -#: ../src/dialogs.c:444 +#: ../src/dialogs.c:442 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" -#: ../src/dialogs.c:567 ../src/win32.c:562 +#: ../src/dialogs.c:570 ../src/win32.c:681 msgid "Error" msgstr "錯誤" -#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 -#: ../src/win32.c:627 +#: ../src/dialogs.c:573 ../src/dialogs.c:1443 ../src/win32.c:687 +#: ../src/win32.c:746 msgid "Question" msgstr "問題" -#: ../src/dialogs.c:573 ../src/win32.c:574 +#: ../src/dialogs.c:576 ../src/win32.c:693 msgid "Warning" msgstr "警告" -#: ../src/dialogs.c:576 ../src/win32.c:580 +#: ../src/dialogs.c:579 ../src/win32.c:699 msgid "Information" msgstr "資訊" -#: ../src/dialogs.c:656 +#: ../src/dialogs.c:660 msgid "_Don't save" msgstr "不要儲存(_D)" -#: ../src/dialogs.c:687 +#: ../src/dialogs.c:691 #, c-format msgid "The file '%s' is not saved." msgstr "" -#: ../src/dialogs.c:689 +#: ../src/dialogs.c:693 msgid "Do you want to save it before closing?" msgstr "離開前您要存檔嗎?" -#: ../src/dialogs.c:764 +#: ../src/dialogs.c:768 msgid "Choose font" msgstr "選擇字型" -#: ../src/dialogs.c:1005 +#: ../src/dialogs.c:1057 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" -#: ../src/dialogs.c:1024 ../src/dialogs.c:1025 ../src/dialogs.c:1026 -#: ../src/dialogs.c:1032 ../src/dialogs.c:1033 ../src/dialogs.c:1034 -#: ../src/symbols.c:1706 ../src/symbols.c:1727 ../src/symbols.c:1779 -#: ../src/ui_utils.c:216 +#: ../src/dialogs.c:1076 ../src/dialogs.c:1077 ../src/dialogs.c:1078 +#: ../src/dialogs.c:1084 ../src/dialogs.c:1085 ../src/dialogs.c:1086 +#: ../src/symbols.c:1724 ../src/symbols.c:1745 ../src/symbols.c:1797 +#: ../src/ui_utils.c:222 msgid "unknown" msgstr "不詳" -#: ../src/dialogs.c:1039 ../src/symbols.c:780 +#: ../src/dialogs.c:1091 ../src/symbols.c:800 msgid "Properties" msgstr "屬性" -#: ../src/dialogs.c:1070 +#: ../src/dialogs.c:1120 msgid "Type:" msgstr "類型:" -#: ../src/dialogs.c:1084 +#: ../src/dialogs.c:1134 msgid "Size:" msgstr "大小:" -#: ../src/dialogs.c:1100 +#: ../src/dialogs.c:1150 msgid "Location:" msgstr "位置:" -#: ../src/dialogs.c:1114 +#: ../src/dialogs.c:1164 msgid "Read-only:" msgstr "唯讀:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1171 msgid "(only inside Geany)" msgstr "" -#: ../src/dialogs.c:1130 +#: ../src/dialogs.c:1180 msgid "Encoding:" msgstr "編碼:" #. BOM = byte order mark -#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1190 ../src/ui_utils.c:225 msgid "(with BOM)" msgstr "" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1190 msgid "(without BOM)" msgstr "" -#: ../src/dialogs.c:1151 +#: ../src/dialogs.c:1201 msgid "Modified:" msgstr "修改時間:" -#: ../src/dialogs.c:1165 +#: ../src/dialogs.c:1215 msgid "Changed:" msgstr "變更:" -#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1229 msgid "Accessed:" msgstr "存取時間:" -#: ../src/dialogs.c:1201 +#: ../src/dialogs.c:1251 msgid "Permissions:" msgstr "權限:" #. Header -#: ../src/dialogs.c:1209 +#: ../src/dialogs.c:1259 msgid "Read:" msgstr "讀取:" -#: ../src/dialogs.c:1216 +#: ../src/dialogs.c:1266 msgid "Write:" msgstr "寫入:" +#: ../src/dialogs.c:1273 +msgid "Execute:" +msgstr "執行:" + #. Owner -#: ../src/dialogs.c:1231 +#: ../src/dialogs.c:1281 msgid "Owner:" msgstr "擁有者:" #. Group -#: ../src/dialogs.c:1267 +#: ../src/dialogs.c:1317 msgid "Group:" msgstr "群組:" #. Other -#: ../src/dialogs.c:1303 +#: ../src/dialogs.c:1353 msgid "Other:" msgstr "其他:" -#: ../src/document.c:622 +#: ../src/document.c:648 #, c-format msgid "File %s closed." msgstr "" -#: ../src/document.c:745 +#: ../src/document.c:775 #, c-format msgid "New file \"%s\" opened." msgstr "" -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:948 ../src/document.c:1464 #, c-format msgid "Could not open file %s (%s)" msgstr "無法開啟檔案%s(%s)" -#: ../src/document.c:948 +#: ../src/document.c:978 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -633,44 +646,44 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:1004 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "" -#: ../src/document.c:984 +#: ../src/document.c:1014 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." msgstr "" -#: ../src/document.c:1122 +#: ../src/document.c:1163 #, fuzzy msgid "Spaces" msgstr "命名空間" -#: ../src/document.c:1125 +#: ../src/document.c:1166 msgid "Tabs" msgstr "" -#: ../src/document.c:1128 +#: ../src/document.c:1169 #, fuzzy msgid "Tabs and Spaces" msgstr "置換tab字元為空白(_R)" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1174 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "自動縮排" -#: ../src/document.c:1186 +#: ../src/document.c:1227 msgid "Invalid filename" msgstr "無效的檔案名稱" -#: ../src/document.c:1309 +#: ../src/document.c:1342 #, c-format msgid "File %s reloaded." msgstr "" @@ -678,104 +691,109 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1347 #, c-format msgid "File %s opened(%d%s)." msgstr "" -#: ../src/document.c:1316 +#: ../src/document.c:1349 msgid ", read-only" msgstr ",唯讀" -#: ../src/document.c:1512 +#: ../src/document.c:1558 #, fuzzy msgid "Error renaming file." msgstr "儲存檔案時出現錯誤." -#: ../src/document.c:1587 +#: ../src/document.c:1643 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." msgstr "" -#: ../src/document.c:1609 +#: ../src/document.c:1665 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" -#: ../src/document.c:1614 +#: ../src/document.c:1670 #, fuzzy, c-format msgid "Error message: %s." msgstr "儲存檔案( %s)時出現錯誤." -#: ../src/document.c:1715 ../src/document.c:1775 +#: ../src/document.c:1770 ../src/document.c:1833 msgid "Error saving file." msgstr "儲存檔案時出現錯誤." -#: ../src/document.c:1774 +#: ../src/document.c:1832 #, c-format msgid "Error saving file (%s)." msgstr "儲存檔案( %s)時出現錯誤." -#: ../src/document.c:1799 +#: ../src/document.c:1857 #, c-format msgid "File %s saved." msgstr "檔案%s已儲存." -#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#: ../src/document.c:1925 ../src/document.c:1982 ../src/document.c:1990 #, c-format msgid "\"%s\" was not found." msgstr "" -#: ../src/document.c:1932 +#: ../src/document.c:1990 msgid "Wrap search and find again?" msgstr "" -#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2069 ../src/search.c:1127 ../src/search.c:1171 +#: ../src/search.c:1875 ../src/search.c:1876 #, fuzzy, c-format msgid "No matches found for \"%s\"." msgstr "找不到符合「%s」的內容." -#: ../src/document.c:2022 ../src/document.c:2031 +#: ../src/document.c:2080 ../src/document.c:2089 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "" msgstr[1] "" -#: ../src/document.c:2868 +#: ../src/document.c:2896 msgid "Do you want to reload it?" msgstr "" -#: ../src/document.c:2869 +#: ../src/document.c:2897 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "" -#: ../src/document.c:2890 -msgid "Try to resave the file?" +#: ../src/document.c:2915 +msgid "Close _without saving" msgstr "" -#: ../src/document.c:2891 +#: ../src/document.c:2919 #, c-format -msgid "File \"%s\" was not found on disk!" +msgid "File \"%s\" was not found on disk! Try to resave the file?" msgstr "" -#: ../src/editor.c:4288 +#: ../src/editor.c:4425 #, fuzzy msgid "Enter Tab Width" msgstr "Tab字符寬度：" -#: ../src/editor.c:4289 +#: ../src/editor.c:4426 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" +#: ../src/editor.c:4577 +#, c-format +msgid "Warning: non-standard hard tab width: %d != 8!" +msgstr "" + #: ../src/encodings.c:76 msgid "Celtic" msgstr "塞爾特文" @@ -886,812 +904,878 @@ msgid "Without encoding" msgstr "沒有編碼" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "西歐語系(_W)" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "東歐語系(_E)" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "東亞語系(_A)" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "東南亞及西南亞語系(_S)" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "中東語系(_M)" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "萬國碼(_U)" -#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 -#: ../src/filetypes.c:237 ../src/filetypes.c:259 +#: ../src/filetypes.c:101 ../src/filetypes.c:209 ../src/filetypes.c:231 +#: ../src/filetypes.c:242 ../src/filetypes.c:264 #, fuzzy, c-format msgid "%s source file" msgstr "C 原始檔" -#: ../src/filetypes.c:97 +#: ../src/filetypes.c:102 #, fuzzy, c-format msgid "%s file" msgstr "C 原始檔" -#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 -#: ../src/interface.c:5069 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3594 +#: ../src/interface.c:5206 msgid "None" msgstr "無" -#: ../src/filetypes.c:382 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "" -#: ../src/filetypes.c:394 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:433 #, fuzzy msgid "XML document" msgstr "整個文件" -#: ../src/filetypes.c:441 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "" -#: ../src/filetypes.c:496 +#: ../src/filetypes.c:534 msgid "Config file" msgstr "設定檔" -#: ../src/filetypes.c:508 +#: ../src/filetypes.c:546 #, fuzzy msgid "Gettext translation file" msgstr "翻譯維護者" -#: ../src/filetypes.c:541 +#: ../src/filetypes.c:579 #, fuzzy, c-format msgid "%s script file" msgstr "C 原始檔" -#: ../src/filetypes.c:738 +#: ../src/filetypes.c:826 msgid "_Programming Languages" msgstr "" -#: ../src/filetypes.c:739 +#: ../src/filetypes.c:827 msgid "_Scripting Languages" msgstr "" -#: ../src/filetypes.c:740 +#: ../src/filetypes.c:828 msgid "_Markup Languages" msgstr "" -#: ../src/filetypes.c:741 +#: ../src/filetypes.c:829 msgid "M_iscellaneous Languages" msgstr "" -#: ../src/filetypes.c:1331 ../src/win32.c:107 +#: ../src/filetypes.c:830 +#, fuzzy +msgid "_Custom Filetypes" +msgstr "設定檔案類型(_t)" + +#: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" msgstr "" -#: ../src/filetypes.c:1356 ../src/project.c:292 +#. create meta file filter "All files" +#: ../src/filetypes.c:1428 ../src/project.c:285 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "所有檔案" -#: ../src/filetypes.c:1414 +#: ../src/filetypes.c:1487 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:53 +#: ../src/geany.h:52 msgid "untitled" msgstr "未命名" -#: ../src/interface.c:276 +#: ../src/highlighting.c:3349 ../src/main.c:802 ../src/socket.c:165 +#: ../src/templates.c:384 +#, fuzzy, c-format +msgid "Could not find file '%s'." +msgstr "無法開啟檔案%s(%s)" + +#: ../src/highlighting.c:3398 +#, fuzzy +msgid "_Color Schemes" +msgstr "顏色選擇程式(_C)" + +#: ../src/highlighting.c:3405 +msgid "_Default" +msgstr "" + +#: ../src/interface.c:295 msgid "_File" msgstr "檔案(_F)" -#: ../src/interface.c:287 +#: ../src/interface.c:306 #, fuzzy msgid "New (with _Template)" msgstr "開新檔案(範例)(_t)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "隱藏" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "" - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:323 ../src/interface.c:2022 #, fuzzy msgid "Open Selected F_ile" msgstr "開啟檔案" -#: ../src/interface.c:315 +#: ../src/interface.c:327 #, fuzzy msgid "Recent _Files" msgstr "最近開啟的檔案(_f)" -#: ../src/interface.c:332 +#: ../src/interface.c:344 #, fuzzy msgid "Save A_ll" msgstr "全部儲存(_l)" -#: ../src/interface.c:348 +#: ../src/interface.c:360 #, fuzzy msgid "R_eload As" msgstr "重新載入為(_e)" -#: ../src/interface.c:376 +#: ../src/interface.c:371 ../src/interface.c:553 ../src/interface.c:682 +#: ../src/interface.c:696 ../src/interface.c:950 ../src/interface.c:960 +#: ../src/interface.c:2090 ../src/interface.c:2104 +msgid "invisible" +msgstr "隱藏" + +#: ../src/interface.c:388 msgid "Page Set_up" msgstr "" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:405 ../src/notebook.c:214 #, fuzzy msgid "Close Ot_her Documents" msgstr "關閉目前檔案" -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:413 ../src/notebook.c:219 #, fuzzy msgid "C_lose All" msgstr "全部關閉(_l)" -#: ../src/interface.c:418 +#: ../src/interface.c:430 msgid "_Edit" msgstr "編輯(_E)" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:480 ../src/interface.c:2031 msgid "_Format" msgstr "格式(_F)" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:487 ../src/keybindings.c:372 +msgid "_Reflow Lines/Block" +msgstr "" + +#: ../src/interface.c:491 #, fuzzy msgid "T_oggle Case of Selection" msgstr "複製行或選擇區域" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:495 ../src/keybindings.c:277 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "列印目前的檔案" + +#: ../src/interface.c:504 #, fuzzy msgid "_Comment Line(s)" msgstr "單行注釋(_C)" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:508 #, fuzzy msgid "U_ncomment Line(s)" msgstr "取消單行注釋(_n)" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:512 #, fuzzy msgid "_Toggle Line Commentation" msgstr "切換行註譯狀態(_T)" -#: ../src/interface.c:496 ../src/interface.c:1977 -#, fuzzy -msgid "Du_plicate Line or Selection" -msgstr "複製行或選擇區域" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:521 msgid "_Increase Indent" msgstr "增加縮排(_I)" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:529 msgid "_Decrease Indent" msgstr "減少縮排(_D)" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:537 ../src/keybindings.c:361 #, fuzzy -msgid "_Send Selection to Terminal" -msgstr "在選擇區域中(_l)" +msgid "_Smart Line Indent" +msgstr "設定行結束符號(_n)" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:546 #, fuzzy msgid "_Send Selection to" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:556 ../src/interface.c:2035 +#, fuzzy +msgid "_Commands" +msgstr "指令" + +#: ../src/interface.c:563 ../src/keybindings.c:318 +#, fuzzy +msgid "_Cut Current Line(s)" +msgstr "關閉目前檔案" + +#: ../src/interface.c:571 ../src/keybindings.c:315 +#, fuzzy +msgid "_Copy Current Line(s)" +msgstr "編譯目前檔案" + +#: ../src/interface.c:579 ../src/keybindings.c:270 +#, fuzzy +msgid "_Delete Current Line(s)" +msgstr "關閉目前檔案" + +#: ../src/interface.c:583 ../src/keybindings.c:267 +#, fuzzy +msgid "_Duplicate Line or Selection" +msgstr "複製行或選擇區域" + +#: ../src/interface.c:592 ../src/keybindings.c:328 +#, fuzzy +msgid "_Select Current Line(s)" +msgstr "儲存目前檔案" + +#: ../src/interface.c:596 ../src/keybindings.c:331 +#, fuzzy +msgid "_Select Current Paragraph" +msgstr "儲存目前檔案" + +#: ../src/interface.c:605 ../src/keybindings.c:381 +msgid "_Insert Alternative White Space" +msgstr "" + +#: ../src/interface.c:614 ../src/keybindings.c:437 +#, fuzzy +msgid "_Go to Next Marker" +msgstr "開啟側邊欄" + +#: ../src/interface.c:618 ../src/keybindings.c:440 +#, fuzzy +msgid "_Go to Previous Marker" +msgstr "開啟側邊欄" + +#: ../src/interface.c:627 ../src/keybindings.c:370 +#, fuzzy +msgid "_Send Selection to Terminal" +msgstr "在選擇區域中(_l)" + +#: ../src/interface.c:636 ../src/interface.c:2044 msgid "I_nsert Comments" msgstr "插入註解(_I)" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:647 ../src/interface.c:2055 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "插入改變記錄項目" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:651 ../src/interface.c:2059 #, fuzzy msgid "Insert File _Header" msgstr "插入檔案標頭" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:655 ../src/interface.c:2063 #, fuzzy msgid "Insert _Function Description" msgstr "插入函數描述" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:659 ../src/interface.c:2067 #, fuzzy msgid "Insert _Multiline Comment" msgstr "插入多列註釋" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:663 ../src/interface.c:2071 #, fuzzy msgid "Insert _GPL Notice" msgstr "插入GPL宣告" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:667 ../src/interface.c:2075 #, fuzzy msgid "Insert _BSD License Notice" msgstr "插入GPL宣告" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:671 ../src/interface.c:2079 msgid "Insert Dat_e" msgstr "插入日期(_e)" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:685 ../src/interface.c:2093 msgid "_Insert \"include <...>\"" msgstr "插入\"include <...>\"(_I)" -#: ../src/interface.c:613 +#: ../src/interface.c:704 #, fuzzy msgid "Preference_s" msgstr "偏好設定" -#: ../src/interface.c:621 +#: ../src/interface.c:712 ../src/keybindings.c:390 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "偏好設定" + +#: ../src/interface.c:720 msgid "_Search" msgstr "搜尋(_S)" -#: ../src/interface.c:632 +#: ../src/interface.c:731 msgid "Find _Next" msgstr "找下一個(_N)" -#: ../src/interface.c:636 +#: ../src/interface.c:735 msgid "Find _Previous" msgstr "找上一個(_P)" -#: ../src/interface.c:640 +#: ../src/interface.c:739 #, fuzzy msgid "Find in F_iles" msgstr "在一系列檔案中尋找(_i)" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:743 ../src/search.c:551 msgid "_Replace" msgstr "取代(_R)" -#: ../src/interface.c:657 +#: ../src/interface.c:756 #, fuzzy msgid "Find _Selected" msgstr "找下一個(_N)" -#: ../src/interface.c:661 +#: ../src/interface.c:760 #, fuzzy msgid "Find Pre_vious Selected" msgstr "尋找上一個" -#: ../src/interface.c:670 +#: ../src/interface.c:769 #, fuzzy msgid "Next _Message" msgstr "訊息" -#: ../src/interface.c:674 +#: ../src/interface.c:773 #, fuzzy msgid "Pr_evious Message" msgstr "訊息" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:782 ../src/interface.c:2145 #, fuzzy msgid "_Go to Line" msgstr "前往行數(_G)" -#: ../src/interface.c:698 +#: ../src/interface.c:797 msgid "Change _Font" msgstr "改變字型(_F)" -#: ../src/interface.c:711 +#: ../src/interface.c:810 msgid "To_ggle All Additional Widgets" msgstr "" -#: ../src/interface.c:715 +#: ../src/interface.c:814 msgid "Full_screen" msgstr "全螢幕(_s)" -#: ../src/interface.c:719 +#: ../src/interface.c:818 #, fuzzy msgid "Show Message _Window" msgstr "開啟訊息視窗(_W)" -#: ../src/interface.c:724 +#: ../src/interface.c:823 msgid "Show _Toolbar" msgstr "顯示工具列(_T)" -#: ../src/interface.c:729 +#: ../src/interface.c:828 msgid "Show Side_bar" msgstr "顯示側邊欄(_b)" -#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +#: ../src/interface.c:833 ../src/interface.c:4025 ../src/interface.c:5347 +#: ../src/keybindings.c:260 ../src/prefs.c:1531 msgid "Editor" msgstr "編輯器" -#: ../src/interface.c:741 +#: ../src/interface.c:840 msgid "Show _Markers Margin" msgstr "" -#: ../src/interface.c:746 +#: ../src/interface.c:845 msgid "Show _Line Numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:751 +#: ../src/interface.c:850 #, fuzzy msgid "Show _White Space" msgstr "顯示空白字元" -#: ../src/interface.c:755 +#: ../src/interface.c:854 #, fuzzy msgid "Show Line _Endings" msgstr "顯示行尾" -#: ../src/interface.c:759 +#: ../src/interface.c:858 #, fuzzy msgid "Show _Indentation Guides" msgstr "顯示隱藏檔案" -#: ../src/interface.c:780 +#: ../src/interface.c:879 msgid "_Document" msgstr "文件(_D)" -#: ../src/interface.c:787 +#: ../src/interface.c:886 #, fuzzy msgid "_Line Wrapping" msgstr "自動換行(_L)" -#: ../src/interface.c:792 +#: ../src/interface.c:891 #, fuzzy msgid "Line _Breaking" msgstr "換行" -#: ../src/interface.c:796 +#: ../src/interface.c:895 #, fuzzy msgid "_Auto-indentation" msgstr "自動縮排(_U)" -#: ../src/interface.c:801 +#: ../src/interface.c:900 msgid "In_dent Type" msgstr "" -#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +#: ../src/interface.c:907 ../src/interface.c:3633 ../src/interface.c:5245 msgid "_Tabs" msgstr "" -#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +#: ../src/interface.c:913 ../src/interface.c:3624 ../src/interface.c:5236 #, fuzzy msgid "_Spaces" msgstr "命名空間" -#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +#: ../src/interface.c:919 ../src/interface.c:3642 ../src/interface.c:5254 #, fuzzy msgid "T_abs and Spaces" msgstr "置換tab字元為空白(_R)" -#: ../src/interface.c:831 +#: ../src/interface.c:930 #, fuzzy msgid "Read _Only" msgstr "唯讀(_o)" -#: ../src/interface.c:835 +#: ../src/interface.c:934 msgid "_Write Unicode BOM" msgstr "" -#: ../src/interface.c:844 +#: ../src/interface.c:943 #, fuzzy msgid "Set File_type" msgstr "設定檔案類型(_t)" -#: ../src/interface.c:854 +#: ../src/interface.c:953 #, fuzzy msgid "Set _Encoding" msgstr "設定字元編碼(_e)" -#: ../src/interface.c:864 +#: ../src/interface.c:963 #, fuzzy msgid "Set Line E_ndings" msgstr "設定行結束符號(_n)" -#: ../src/interface.c:871 +#: ../src/interface.c:970 #, fuzzy msgid "Convert and Set to _CR/LF (Win)" msgstr "設定並轉換為CR/LF(Win)(_C)" -#: ../src/interface.c:877 +#: ../src/interface.c:976 #, fuzzy msgid "Convert and Set to _LF (Unix)" msgstr "設定並轉換為LF(Unix)(_L)" -#: ../src/interface.c:883 +#: ../src/interface.c:982 #, fuzzy msgid "Convert and Set to CR (_Mac)" msgstr "設定並轉換為CR(Mac)(_M)" -#: ../src/interface.c:894 +#: ../src/interface.c:993 msgid "_Strip Trailing Spaces" msgstr "" -#: ../src/interface.c:898 +#: ../src/interface.c:997 #, fuzzy msgid "_Replace Tabs by Spaces" msgstr "置換tab字元為空白(_R)" -#: ../src/interface.c:902 +#: ../src/interface.c:1001 #, fuzzy msgid "Replace Spaces b_y Tabs" msgstr "置換tab字元為空白(_R)" -#: ../src/interface.c:911 +#: ../src/interface.c:1010 #, fuzzy msgid "_Fold All" msgstr "收納全部(_F)" -#: ../src/interface.c:915 +#: ../src/interface.c:1014 #, fuzzy msgid "_Unfold All" msgstr "展開全部(_U)" -#: ../src/interface.c:924 +#: ../src/interface.c:1023 msgid "Remove _Markers" msgstr "" -#: ../src/interface.c:928 +#: ../src/interface.c:1027 msgid "Remove Error _Indicators" msgstr "" -#: ../src/interface.c:932 +#: ../src/interface.c:1031 #, fuzzy msgid "_Project" msgstr "建立物件(_o)" -#: ../src/interface.c:939 +#: ../src/interface.c:1038 #, fuzzy msgid "_New" msgstr "新增" -#: ../src/interface.c:947 +#: ../src/interface.c:1046 #, fuzzy msgid "_Open" msgstr "開啟" -#: ../src/interface.c:955 +#: ../src/interface.c:1054 #, fuzzy msgid "_Recent Projects" msgstr "建立物件" -#: ../src/interface.c:959 +#: ../src/interface.c:1058 #, fuzzy msgid "_Close" msgstr "關閉" -#: ../src/interface.c:980 +#: ../src/interface.c:1079 msgid "_Tools" msgstr "工具(_T)" -#: ../src/interface.c:987 +#: ../src/interface.c:1086 +msgid "_Reload Configuration" +msgstr "" + +#: ../src/interface.c:1094 +#, fuzzy +msgid "C_onfiguration Files" +msgstr "編譯失敗." + +#: ../src/interface.c:1107 #, fuzzy msgid "_Color Chooser" msgstr "顏色選擇程式(_C)" -#: ../src/interface.c:995 +#: ../src/interface.c:1115 msgid "_Word Count" msgstr "計算字數(_W)" -#: ../src/interface.c:999 +#: ../src/interface.c:1119 msgid "Load Ta_gs" msgstr "" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1123 ../src/interface.c:1130 msgid "_Help" msgstr "說明(_H)" -#: ../src/interface.c:1026 +#: ../src/interface.c:1138 msgid "_Website" msgstr "網站(_W)" -#: ../src/interface.c:1030 +#: ../src/interface.c:1142 #, fuzzy msgid "_Keyboard Shortcuts" msgstr "快速捷徑鍵(_K)" -#: ../src/interface.c:1034 +#: ../src/interface.c:1146 #, fuzzy msgid "_Debug Messages" msgstr "訊息" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1185 ../src/sidebar.c:130 msgid "Symbols" msgstr "符號" -#: ../src/interface.c:1087 +#: ../src/interface.c:1199 #, fuzzy msgid "Documents" msgstr "文件(_D)" -#: ../src/interface.c:1123 +#: ../src/interface.c:1235 msgid "Status" msgstr "狀態" -#: ../src/interface.c:1137 +#: ../src/interface.c:1249 msgid "Compiler" msgstr "編譯器" -#: ../src/interface.c:1152 +#: ../src/interface.c:1264 msgid "Messages" msgstr "訊息" -#: ../src/interface.c:1165 +#: ../src/interface.c:1277 msgid "Scribble" msgstr "" -#: ../src/interface.c:1727 ../src/interface.c:3286 -#, fuzzy -msgid "Images _and Text" -msgstr "圖示及文字" - -#: ../src/interface.c:1732 ../src/interface.c:3318 -#, fuzzy -msgid "_Images Only" -msgstr "只顯示圖示" - -#: ../src/interface.c:1737 ../src/interface.c:3310 -#, fuzzy -msgid "_Text Only" -msgstr "只顯示文字" - -#: ../src/interface.c:1748 ../src/interface.c:3302 -#, fuzzy -msgid "_Large Icons" -msgstr "大型圖示" - -#: ../src/interface.c:1753 ../src/interface.c:3294 -#, fuzzy -msgid "_Small Icons" -msgstr "小型圖示" - -#: ../src/interface.c:1758 ../src/interface.c:3326 -#, fuzzy -msgid "_Very Small Icons" -msgstr "小型圖示" - -#: ../src/interface.c:1769 +#: ../src/interface.c:1887 #, fuzzy -msgid "_Customize Toolbar" -msgstr "隱藏工具列" +msgid "_Toolbar Preferences" +msgstr "偏好設定" -#: ../src/interface.c:1777 +#: ../src/interface.c:1900 #, fuzzy msgid "_Hide Toolbar" msgstr "隱藏工具列" -#: ../src/interface.c:2094 +#: ../src/interface.c:2112 #, fuzzy msgid "Find _Usage" msgstr "尋找用法" -#: ../src/interface.c:2102 +#: ../src/interface.c:2120 #, fuzzy msgid "Find _Document Usage" msgstr "尋找用法" -#: ../src/interface.c:2110 +#: ../src/interface.c:2128 #, fuzzy msgid "Go to _Tag Definition" msgstr "前往輸入的行數" -#: ../src/interface.c:2114 +#: ../src/interface.c:2132 #, fuzzy msgid "Go to T_ag Declaration" msgstr "前往輸入的行數" -#: ../src/interface.c:2118 +#: ../src/interface.c:2136 #, fuzzy msgid "Conte_xt Action" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:2667 ../src/keybindings.c:337 +#: ../src/interface.c:2669 ../src/keybindings.c:387 msgid "Preferences" msgstr "偏好設定" -#: ../src/interface.c:2703 +#: ../src/interface.c:2705 msgid "Load files from the last session" msgstr "" -#: ../src/interface.c:2706 +#: ../src/interface.c:2708 msgid "Opens at startup the files from the last session" msgstr "" -#: ../src/interface.c:2708 +#: ../src/interface.c:2710 #, fuzzy msgid "Load virtual terminal support" msgstr "不要載入終端機支援" -#: ../src/interface.c:2710 +#: ../src/interface.c:2712 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" msgstr "" -#: ../src/interface.c:2712 +#: ../src/interface.c:2714 msgid "Enable plugin support" msgstr "" -#: ../src/interface.c:2716 +#: ../src/interface.c:2718 #, fuzzy msgid "Startup" msgstr "側面欄" -#: ../src/interface.c:2735 +#: ../src/interface.c:2737 msgid "Save window position and geometry" msgstr "" -#: ../src/interface.c:2738 +#: ../src/interface.c:2740 msgid "Saves the window position and geometry and restores it at the start" msgstr "" -#: ../src/interface.c:2740 +#: ../src/interface.c:2742 msgid "Confirm exit" msgstr "確定離開" -#: ../src/interface.c:2743 +#: ../src/interface.c:2745 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "顯示版本號並離開" -#: ../src/interface.c:2745 +#: ../src/interface.c:2747 #, fuzzy msgid "Shutdown" msgstr "字型" -#: ../src/interface.c:2766 +#: ../src/interface.c:2768 msgid "Startup path:" msgstr "" -#: ../src/interface.c:2778 +#: ../src/interface.c:2780 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." msgstr "" -#: ../src/interface.c:2791 +#: ../src/interface.c:2793 #, fuzzy msgid "Project files:" msgstr "屬性" -#: ../src/interface.c:2803 +#: ../src/interface.c:2805 msgid "Path to start in when opening project files" msgstr "" -#: ../src/interface.c:2816 +#: ../src/interface.c:2818 msgid "Extra plugin path:" msgstr "" -#: ../src/interface.c:2828 +#: ../src/interface.c:2830 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -#: ../src/interface.c:2841 +#: ../src/interface.c:2843 #, fuzzy msgid "Paths" msgstr "字型" -#: ../src/interface.c:2846 +#: ../src/interface.c:2848 #, fuzzy msgid "Startup" msgstr "狀態" -#: ../src/interface.c:2868 +#: ../src/interface.c:2871 msgid "Beep on errors or when compilation has finished" msgstr "" -#: ../src/interface.c:2871 +#: ../src/interface.c:2874 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" -#: ../src/interface.c:2873 +#: ../src/interface.c:2876 msgid "Switch to status message list at new message" msgstr "" -#: ../src/interface.c:2876 +#: ../src/interface.c:2879 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "" -#: ../src/interface.c:2878 +#: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" msgstr "" -#: ../src/interface.c:2881 +#: ../src/interface.c:2884 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "" -#: ../src/interface.c:2883 +#: ../src/interface.c:2886 msgid "Auto-focus widgets (focus follows mouse)" msgstr "" -#: ../src/interface.c:2886 +#: ../src/interface.c:2889 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." msgstr "" -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2891 +msgid "Use Windows File Open/Save dialogs" +msgstr "" + +#: ../src/interface.c:2894 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" + +#: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 #, fuzzy msgid "Miscellaneous" msgstr "顯示" -#: ../src/interface.c:2908 +#: ../src/interface.c:2915 msgid "Always wrap search and hide the Find dialog" msgstr "" -#: ../src/interface.c:2911 +#: ../src/interface.c:2918 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "" -#: ../src/interface.c:2913 +#: ../src/interface.c:2920 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2916 +#: ../src/interface.c:2923 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" -#: ../src/interface.c:2918 +#: ../src/interface.c:2925 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "在檔案中尋找的目錄不合法." -#: ../src/interface.c:2922 +#: ../src/interface.c:2929 #, fuzzy msgid "Search" msgstr "側面欄" -#: ../src/interface.c:2941 +#: ../src/interface.c:2948 #, fuzzy msgid "Use project-based session files" msgstr "屬性" -#: ../src/interface.c:2944 +#: ../src/interface.c:2951 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" -#: ../src/interface.c:2946 +#: ../src/interface.c:2953 msgid "Store project file inside the project base directory" msgstr "" -#: ../src/interface.c:2949 +#: ../src/interface.c:2956 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1699,214 +1783,273 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2951 +#: ../src/interface.c:2958 #, fuzzy msgid "Projects" msgstr "字型" -#: ../src/interface.c:2956 +#: ../src/interface.c:2963 #, fuzzy msgid "Miscellaneous" msgstr "顯示" -#: ../src/interface.c:2960 +#. TODO Find a better way to map the current notebook page to the +#. * corresponding chapter in the documentation, comparing translatable +#. * strings is easy to break. Maybe attach an identifying string to the +#. * tab label object. +#: ../src/interface.c:2967 ../src/prefs.c:1525 msgid "General" msgstr "一般" -#: ../src/interface.c:2983 +#: ../src/interface.c:3004 msgid "Show symbol list" msgstr "顯示符號列表" -#: ../src/interface.c:2986 +#: ../src/interface.c:3007 msgid "Toggle the symbol list on and off" msgstr "開啟/關閉符號列表" -#: ../src/interface.c:2988 +#: ../src/interface.c:3009 #, fuzzy msgid "Show documents list" msgstr "顯示開啟檔案列表" -#: ../src/interface.c:2991 +#: ../src/interface.c:3012 #, fuzzy msgid "Toggle the documents list on and off" msgstr "開啟/關閉符號列表" -#: ../src/interface.c:2993 +#: ../src/interface.c:3014 +#, fuzzy +msgid "Show sidebar" +msgstr "顯示側邊欄(_b)" + +#: ../src/interface.c:3022 +#, fuzzy +msgid "Position:" +msgstr "區塊" + +#: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 +#: ../src/interface.c:3228 ../src/interface.c:3246 +msgid "Left" +msgstr "左邊" + +#: ../src/interface.c:3033 ../src/interface.c:3157 ../src/interface.c:3211 +#: ../src/interface.c:3229 ../src/interface.c:3247 +msgid "Right" +msgstr "右邊" + +#: ../src/interface.c:3039 msgid "Sidebar" msgstr "側面欄" -#: ../src/interface.c:3014 +#: ../src/interface.c:3060 #, fuzzy msgid "Symbol list:" msgstr "顯示符號列表" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3067 ../src/interface.c:3197 #, fuzzy msgid "Message window:" msgstr "訊息視窗" -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3074 ../src/interface.c:3233 #, fuzzy msgid "Editor:" msgstr "編輯器" -#: ../src/interface.c:3040 +#: ../src/interface.c:3086 msgid "Sets the font for the message window" msgstr "" -#: ../src/interface.c:3048 +#: ../src/interface.c:3094 #, fuzzy msgid "Sets the font for the symbol list" msgstr "顯示符號列表" -#: ../src/interface.c:3056 +#: ../src/interface.c:3102 #, fuzzy msgid "Sets the editor font" msgstr "編輯器字型" -#: ../src/interface.c:3058 +#: ../src/interface.c:3104 msgid "Fonts" msgstr "字型" -#: ../src/interface.c:3077 +#: ../src/interface.c:3123 #, fuzzy msgid "Show editor tabs" msgstr "顯示檔案標籤列" -#: ../src/interface.c:3081 +#: ../src/interface.c:3127 #, fuzzy msgid "Show close buttons" msgstr "顯示顏色選擇器" -#: ../src/interface.c:3084 +#: ../src/interface.c:3130 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" msgstr "" -#: ../src/interface.c:3090 +#: ../src/interface.c:3136 msgid "Placement of new file tabs:" msgstr "" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "左邊" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3152 msgid "File tabs will be placed on the left of the notebook" msgstr "" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "右邊" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3160 msgid "File tabs will be placed on the right of the notebook" msgstr "" -#: ../src/interface.c:3110 +#: ../src/interface.c:3164 +#, fuzzy +msgid "Next to current" +msgstr "儲存目前檔案" + +#: ../src/interface.c:3169 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" + +#: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" msgstr "" -#: ../src/interface.c:3113 +#: ../src/interface.c:3174 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "" -#: ../src/interface.c:3115 +#: ../src/interface.c:3176 #, fuzzy msgid "Editor tabs" msgstr "字型" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3212 ../src/interface.c:3230 ../src/interface.c:3248 msgid "Top" msgstr "頂部" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3213 ../src/interface.c:3231 ../src/interface.c:3249 msgid "Bottom" msgstr "底部" -#: ../src/interface.c:3154 +#: ../src/interface.c:3215 #, fuzzy msgid "Sidebar:" msgstr "側面欄" -#: ../src/interface.c:3190 +#: ../src/interface.c:3251 #, fuzzy msgid "Tab positions" msgstr "位置:" -#: ../src/interface.c:3209 +#: ../src/interface.c:3270 #, fuzzy msgid "Show status bar" msgstr "顯示工具列" -#: ../src/interface.c:3212 +#: ../src/interface.c:3273 msgid "Whether to show the status bar at the bottom of the main window" msgstr "" -#: ../src/interface.c:3219 +#: ../src/interface.c:3280 ../src/prefs.c:1527 msgid "Interface" msgstr "介面" -#: ../src/interface.c:3242 +#: ../src/interface.c:3311 #, fuzzy msgid "Show T_oolbar" msgstr "顯示工具列" -#: ../src/interface.c:3246 +#: ../src/interface.c:3315 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3249 +#: ../src/interface.c:3318 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3251 +#: ../src/interface.c:3340 ../src/toolbar.c:930 #, fuzzy -msgid "Toolbar" +msgid "Customize Toolbar" +msgstr "顯示工具列(_T)" + +#: ../src/interface.c:3360 +msgid "System _Default" +msgstr "" + +#: ../src/interface.c:3368 +#, fuzzy +msgid "Images _and Text" +msgstr "圖示及文字" + +#: ../src/interface.c:3376 +#, fuzzy +msgid "_Images Only" +msgstr "只顯示圖示" + +#: ../src/interface.c:3384 +#, fuzzy +msgid "_Text Only" +msgstr "只顯示文字" + +#: ../src/interface.c:3392 +#, fuzzy +msgid "Icon Style" msgstr "字型" -#: ../src/interface.c:3272 +#: ../src/interface.c:3413 +msgid "S_ystem Default" +msgstr "" + +#: ../src/interface.c:3421 #, fuzzy -msgid "Icon style:" -msgstr "圖示風格" +msgid "_Small Icons" +msgstr "小型圖示" -#: ../src/interface.c:3279 +#: ../src/interface.c:3429 #, fuzzy -msgid "Icon size:" -msgstr "圖示大小" +msgid "_Very Small Icons" +msgstr "小型圖示" -#: ../src/interface.c:3334 -msgid "Appearance" -msgstr "外觀" +#: ../src/interface.c:3437 +#, fuzzy +msgid "_Large Icons" +msgstr "大型圖示" -#: ../src/interface.c:3359 ../src/toolbar.c:881 +#: ../src/interface.c:3445 #, fuzzy -msgid "Customize Toolbar" -msgstr "顯示工具列(_T)" +msgid "Icon Size" +msgstr "大小:" + +#: ../src/interface.c:3450 +#, fuzzy +msgid "Toolbar" +msgstr "字型" -#: ../src/interface.c:3363 +#: ../src/interface.c:3455 ../src/prefs.c:1529 msgid "Toolbar" msgstr "工具列" -#: ../src/interface.c:3390 +#: ../src/interface.c:3482 msgid "Line wrapping" msgstr "換行" -#: ../src/interface.c:3393 +#: ../src/interface.c:3485 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." msgstr "" -#: ../src/interface.c:3395 +#: ../src/interface.c:3487 msgid "Enable \"smart\" home key" msgstr "" -#: ../src/interface.c:3398 +#: ../src/interface.c:3490 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1915,562 +2058,578 @@ "its current position." msgstr "" -#: ../src/interface.c:3400 +#: ../src/interface.c:3492 msgid "Disable Drag and Drop" msgstr "" -#: ../src/interface.c:3403 +#: ../src/interface.c:3495 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" msgstr "" -#: ../src/interface.c:3405 +#: ../src/interface.c:3497 msgid "Enable folding" msgstr "啟用摺疊功能" -#: ../src/interface.c:3408 +#: ../src/interface.c:3500 msgid "Whether to enable folding the code" msgstr "要不要啟用程式碼的摺疊功能" -#: ../src/interface.c:3410 +#: ../src/interface.c:3502 msgid "Fold/unfold all children of a fold point" msgstr "" -#: ../src/interface.c:3413 +#: ../src/interface.c:3505 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." msgstr "" -#: ../src/interface.c:3415 +#: ../src/interface.c:3507 msgid "Use indicators to show compile errors" msgstr "" -#: ../src/interface.c:3418 +#: ../src/interface.c:3510 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "" -#: ../src/interface.c:3420 +#: ../src/interface.c:3512 msgid "Newline strips trailing spaces" msgstr "" -#: ../src/interface.c:3423 +#: ../src/interface.c:3515 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" -#: ../src/interface.c:3429 +#: ../src/interface.c:3521 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3443 +#: ../src/interface.c:3535 #, fuzzy msgid "Comment toggle marker:" msgstr "開啟側邊欄" -#: ../src/interface.c:3450 +#: ../src/interface.c:3542 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." msgstr "" -#: ../src/interface.c:3452 +#: ../src/interface.c:3544 msgid "Features" msgstr "功能" -#: ../src/interface.c:3457 +#: ../src/interface.c:3549 #, fuzzy msgid "Features" msgstr "功能" -#: ../src/interface.c:3489 ../src/interface.c:5057 +#: ../src/interface.c:3582 ../src/interface.c:5194 #, fuzzy msgid "Auto-indent mode:" msgstr "自動縮排" -#: ../src/interface.c:3502 ../src/interface.c:5070 +#: ../src/interface.c:3595 ../src/interface.c:5207 #, fuzzy msgid "Basic" msgstr "波羅的海語" -#: ../src/interface.c:3503 ../src/interface.c:5071 +#: ../src/interface.c:3596 ../src/interface.c:5208 msgid "Current chars" msgstr "" -#: ../src/interface.c:3504 ../src/interface.c:5072 +#: ../src/interface.c:3597 ../src/interface.c:5209 #, fuzzy msgid "Match braces" msgstr "跳至對應括號" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +#: ../src/interface.c:3599 ../src/interface.c:3925 ../src/interface.c:5211 #, fuzzy msgid "Type:" msgstr "型態" -#: ../src/interface.c:3513 ../src/interface.c:5081 +#: ../src/interface.c:3606 ../src/interface.c:5218 #, fuzzy msgid "Width:" msgstr "寫入:" -#: ../src/interface.c:3526 ../src/interface.c:5094 +#: ../src/interface.c:3619 ../src/interface.c:5231 msgid "The width in chars of a single indent" msgstr "" -#: ../src/interface.c:3536 ../src/interface.c:5104 +#: ../src/interface.c:3629 ../src/interface.c:5241 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3545 ../src/interface.c:5113 +#: ../src/interface.c:3638 ../src/interface.c:5250 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3554 ../src/interface.c:5122 +#: ../src/interface.c:3647 ../src/interface.c:5259 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -#: ../src/interface.c:3569 ../src/interface.c:5137 -#, fuzzy -msgid "Hard tab width:" -msgstr "Tab字符寬度：" - -#: ../src/interface.c:3577 ../src/interface.c:5145 -msgid "The width of a tab when Tabs & Spaces is set for a document" -msgstr "" - -#: ../src/interface.c:3587 ../src/interface.c:5155 +#: ../src/interface.c:3656 ../src/interface.c:5268 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -#: ../src/interface.c:3589 +#: ../src/interface.c:3658 #, fuzzy msgid "Tab key indents" msgstr "增加縮排" -#: ../src/interface.c:3592 +#: ../src/interface.c:3661 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3594 +#: ../src/interface.c:3663 #, fuzzy msgid "Indentation" msgstr "位置:" -#: ../src/interface.c:3599 ../src/interface.c:5157 +#: ../src/interface.c:3668 ../src/interface.c:5270 #, fuzzy msgid "Indentation" msgstr "位置:" -#: ../src/interface.c:3622 +#: ../src/interface.c:3691 #, fuzzy msgid "Snippet completion" msgstr "XML標籤自動補完" -#: ../src/interface.c:3625 +#: ../src/interface.c:3694 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" -#: ../src/interface.c:3627 +#: ../src/interface.c:3696 #, fuzzy msgid "XML tag autocompletion" msgstr "XML標籤自動補完" -#: ../src/interface.c:3630 +#: ../src/interface.c:3699 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" -#: ../src/interface.c:3632 +#: ../src/interface.c:3701 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3635 +#: ../src/interface.c:3704 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -#: ../src/interface.c:3637 +#: ../src/interface.c:3706 msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3709 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" -#: ../src/interface.c:3642 +#: ../src/interface.c:3711 msgid "Autocomplete all words in document" msgstr "" -#: ../src/interface.c:3646 +#: ../src/interface.c:3715 #, fuzzy msgid "Drop rest of word on completion" msgstr "XML標籤自動補完" -#: ../src/interface.c:3656 +#: ../src/interface.c:3725 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3732 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3670 +#: ../src/interface.c:3739 #, fuzzy msgid "Characters to type for autocompletion:" msgstr "XML標籤自動補完" -#: ../src/interface.c:3683 +#: ../src/interface.c:3752 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "" -#: ../src/interface.c:3692 +#: ../src/interface.c:3761 msgid "Display height in rows for the autocompletion list" msgstr "" -#: ../src/interface.c:3701 +#: ../src/interface.c:3770 msgid "Maximum number of entries to display in the autocompletion list" msgstr "" -#: ../src/interface.c:3704 +#: ../src/interface.c:3773 #, fuzzy msgid "Completions" msgstr "位置:" -#: ../src/interface.c:3724 +#: ../src/interface.c:3792 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3729 +#: ../src/interface.c:3797 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3731 +#: ../src/interface.c:3799 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3736 +#: ../src/interface.c:3804 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3738 +#: ../src/interface.c:3806 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3811 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3813 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3818 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3752 +#: ../src/interface.c:3820 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3757 +#: ../src/interface.c:3825 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3759 +#: ../src/interface.c:3827 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3764 +#: ../src/interface.c:3832 #, fuzzy msgid "Completions" msgstr "位置:" -#: ../src/interface.c:3787 +#: ../src/interface.c:3855 msgid "Invert syntax highlighting colors" msgstr "" -#: ../src/interface.c:3790 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3858 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -#: ../src/interface.c:3792 +#: ../src/interface.c:3860 msgid "Show indentation guides" msgstr "" -#: ../src/interface.c:3795 +#: ../src/interface.c:3863 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" -#: ../src/interface.c:3797 +#: ../src/interface.c:3865 msgid "Show white space" msgstr "顯示空白字元" -#: ../src/interface.c:3800 +#: ../src/interface.c:3868 msgid "Marks spaces with dots and tabs with arrows" msgstr "" -#: ../src/interface.c:3802 +#: ../src/interface.c:3870 msgid "Show line endings" msgstr "顯示行尾" -#: ../src/interface.c:3805 +#: ../src/interface.c:3873 #, fuzzy msgid "Shows the line ending character" msgstr "顯示行結束字元" -#: ../src/interface.c:3807 +#: ../src/interface.c:3875 #, fuzzy msgid "Show line numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:3810 +#: ../src/interface.c:3878 msgid "Shows or hides the Line Number margin" msgstr "" -#: ../src/interface.c:3812 +#: ../src/interface.c:3880 msgid "Show markers margin" msgstr "" -#: ../src/interface.c:3815 +#: ../src/interface.c:3883 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "" -#: ../src/interface.c:3817 +#: ../src/interface.c:3885 #, fuzzy msgid "Stop scrolling at last line" msgstr "編譯目前檔案" -#: ../src/interface.c:3820 +#: ../src/interface.c:3888 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3822 +#: ../src/interface.c:3890 msgid "Display" msgstr "顯示" -#: ../src/interface.c:3843 -msgid "Long line marker:" -msgstr "" +#: ../src/interface.c:3911 ../src/interface.c:5302 +#, fuzzy +msgid "Column:" +msgstr "公司" -#: ../src/interface.c:3850 -msgid "Long line marker color:" -msgstr "" +#: ../src/interface.c:3918 +#, fuzzy +msgid "Color:" +msgstr "顏色" -#: ../src/interface.c:3869 +#: ../src/interface.c:3937 msgid "Sets the color of the long line marker" msgstr "" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 -#: ../src/vte.c:769 ../src/vte.c:776 +#: ../src/interface.c:3938 ../src/toolbar.c:71 ../src/tools.c:717 +#: ../src/vte.c:765 ../src/vte.c:772 msgid "Color Chooser" msgstr "顏色選擇程式" -#: ../src/interface.c:3878 +#: ../src/interface.c:3946 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " "greater than 0 to specify the column where it should appear." msgstr "" -#: ../src/interface.c:3888 +#: ../src/interface.c:3956 msgid "Line" msgstr "行" -#: ../src/interface.c:3891 +#: ../src/interface.c:3959 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3963 msgid "Background" msgstr "背景" -#: ../src/interface.c:3898 +#: ../src/interface.c:3966 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " "proportional fonts)" msgstr "" -#: ../src/interface.c:3902 +#: ../src/interface.c:3970 +#, fuzzy +msgid "Enabled" +msgstr "啟用摺疊功能" + +#: ../src/interface.c:3976 ../src/interface.c:5342 +msgid "Long line marker" +msgstr "" + +#: ../src/interface.c:3995 ../src/interface.c:5309 msgid "Disabled" msgstr "已停用" -#: ../src/interface.c:3908 -msgid "Long line marker" +#: ../src/interface.c:3998 +msgid "Do not show virtual spaces" msgstr "" -#: ../src/interface.c:3913 +#: ../src/interface.c:4002 +msgid "Only for rectangular selections" +msgstr "" + +#: ../src/interface.c:4005 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" + +#: ../src/interface.c:4009 +msgid "Always" +msgstr "" + +#: ../src/interface.c:4012 +#, fuzzy +msgid "Always show virtual spaces beyond the end of lines" +msgstr "移除每行結束的空白及tab字元" + +#: ../src/interface.c:4016 +#, fuzzy +msgid "Virtual spaces" +msgstr "字型" + +#: ../src/interface.c:4021 #, fuzzy msgid "Display" msgstr "顯示" -#: ../src/interface.c:3944 +#: ../src/interface.c:4052 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3947 +#: ../src/interface.c:4055 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3961 +#: ../src/interface.c:4069 #, fuzzy msgid "Default end of line characters:" msgstr "預設編碼:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4076 msgid "New files" msgstr "新的檔案" -#: ../src/interface.c:3994 -#, fuzzy -msgid "Sets the default encoding for newly created files" -msgstr "預設編碼:" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4099 #, fuzzy msgid "Default encoding (new files):" msgstr "預設編碼:" -#: ../src/interface.c:4007 -#, fuzzy -msgid "Default encoding (existing files):" -msgstr "預設編碼:" - -#: ../src/interface.c:4019 +#: ../src/interface.c:4107 #, fuzzy -msgid "Sets the default encoding for opening existing files" +msgid "Sets the default encoding for newly created files" msgstr "預設編碼:" -#: ../src/interface.c:4025 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4113 +msgid "Use fixed encoding when opening non-Unicode files" msgstr "" -#: ../src/interface.c:4030 +#: ../src/interface.c:4116 msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" -#: ../src/interface.c:4032 +#: ../src/interface.c:4122 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "預設編碼:" + +#: ../src/interface.c:4130 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "預設編碼:" + +#: ../src/interface.c:4136 #, fuzzy msgid "Encodings" msgstr "編碼:" -#: ../src/interface.c:4051 +#: ../src/interface.c:4155 msgid "Ensure new line at file end" msgstr "" -#: ../src/interface.c:4054 +#: ../src/interface.c:4158 msgid "Ensures that at the end of the file is a new line" msgstr "" -#: ../src/interface.c:4056 +#: ../src/interface.c:4160 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "移除每行結束的空白及tab字元" -#: ../src/interface.c:4059 +#: ../src/interface.c:4163 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "移除每行結束的空白及tab字元" -#: ../src/interface.c:4061 ../src/keybindings.c:460 +#: ../src/interface.c:4165 ../src/keybindings.c:522 msgid "Replace tabs by space" msgstr "以空白字元替代tab字元" -#: ../src/interface.c:4064 +#: ../src/interface.c:4168 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "以空白字元替代tab字元" -#: ../src/interface.c:4066 +#: ../src/interface.c:4170 msgid "Saving files" msgstr "儲存檔案" -#: ../src/interface.c:4091 +#: ../src/interface.c:4195 msgid "Recent files list length:" msgstr "最近使用檔案清單長度:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4209 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" -#: ../src/interface.c:4109 +#: ../src/interface.c:4213 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4122 +#: ../src/interface.c:4226 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4235 ../src/prefs.c:1533 ../src/symbols.c:605 +#: ../plugins/filebrowser.c:1101 msgid "Files" msgstr "檔案" -#: ../src/interface.c:4164 -#, fuzzy -msgid "Make:" -msgstr "建立全部" - -#: ../src/interface.c:4171 +#: ../src/interface.c:4268 #, fuzzy msgid "Terminal:" msgstr "終端機" -#: ../src/interface.c:4178 +#: ../src/interface.c:4275 #, fuzzy msgid "Browser:" msgstr "瀏覽器" -#: ../src/interface.c:4190 -msgid "Path and options for the make tool" -msgstr "" - -#: ../src/interface.c:4197 +#: ../src/interface.c:4287 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" msgstr "" -#: ../src/interface.c:4204 +#: ../src/interface.c:4294 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" -#: ../src/interface.c:4236 +#: ../src/interface.c:4316 #, fuzzy msgid "Grep:" msgstr "群組:" -#: ../src/interface.c:4259 +#: ../src/interface.c:4339 #, fuzzy msgid "Tool paths" msgstr "字型" -#: ../src/interface.c:4280 +#: ../src/interface.c:4360 #, fuzzy msgid "Context action:" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:4291 +#: ../src/interface.c:4371 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2478,788 +2637,804 @@ "execution." msgstr "" -#: ../src/interface.c:4304 +#: ../src/interface.c:4384 #, fuzzy msgid "Commands" msgstr "字型" -#: ../src/interface.c:4309 ../src/keybindings.c:496 +#: ../src/interface.c:4389 ../src/keybindings.c:560 ../src/prefs.c:1535 msgid "Tools" msgstr "工具箱" -#: ../src/interface.c:4343 +#: ../src/interface.c:4427 msgid "email address of the developer" msgstr "" -#: ../src/interface.c:4350 +#: ../src/interface.c:4434 msgid "Initials of the developer name" msgstr "" -#: ../src/interface.c:4352 +#: ../src/interface.c:4436 msgid "Initial version:" msgstr "" -#: ../src/interface.c:4364 +#: ../src/interface.c:4448 msgid "Version number, which a new file initially has" msgstr "" -#: ../src/interface.c:4371 +#: ../src/interface.c:4455 msgid "Company name" msgstr "公司名稱" -#: ../src/interface.c:4373 +#: ../src/interface.c:4457 #, fuzzy msgid "Developer:" msgstr "開發者" -#: ../src/interface.c:4380 +#: ../src/interface.c:4464 #, fuzzy msgid "Company:" msgstr "公司" -#: ../src/interface.c:4387 +#: ../src/interface.c:4471 #, fuzzy msgid "Mail address:" msgstr "電子郵件位址" -#: ../src/interface.c:4394 +#: ../src/interface.c:4478 msgid "Initials:" msgstr "" -#: ../src/interface.c:4406 +#: ../src/interface.c:4490 msgid "The name of the developer" msgstr "開發者名字" -#: ../src/interface.c:4408 +#: ../src/interface.c:4492 #, fuzzy msgid "Year:" msgstr "側面欄" -#: ../src/interface.c:4415 +#: ../src/interface.c:4499 #, fuzzy msgid "Date:" msgstr "建立全部" -#: ../src/interface.c:4422 +#: ../src/interface.c:4506 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4434 +#: ../src/interface.c:4518 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -#: ../src/interface.c:4441 +#: ../src/interface.c:4525 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -#: ../src/interface.c:4448 +#: ../src/interface.c:4532 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -#: ../src/interface.c:4450 +#: ../src/interface.c:4534 #, fuzzy msgid "Template data" msgstr "功能" -#: ../src/interface.c:4455 +#: ../src/interface.c:4539 ../src/prefs.c:1537 msgid "Templates" msgstr "範本" -#: ../src/interface.c:4493 +#: ../src/interface.c:4577 #, fuzzy msgid "C_hange" msgstr "改變" -#: ../src/interface.c:4497 +#: ../src/interface.c:4581 #, fuzzy msgid "Keyboard shortcuts" msgstr "捷徑鍵" -#: ../src/interface.c:4502 +#: ../src/interface.c:4586 ../src/prefs.c:1539 msgid "Keybindings" msgstr "" -#: ../src/interface.c:4525 +#: ../src/interface.c:4620 #, fuzzy msgid "Command:" msgstr "指令" -#: ../src/interface.c:4532 +#: ../src/interface.c:4627 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" -#: ../src/interface.c:4542 +#: ../src/interface.c:4637 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4562 ../src/printing.c:380 +#: ../src/interface.c:4657 ../src/printing.c:381 #, fuzzy msgid "Print line numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:4565 ../src/printing.c:382 +#: ../src/interface.c:4660 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "" -#: ../src/interface.c:4567 ../src/printing.c:385 +#: ../src/interface.c:4662 ../src/printing.c:386 #, fuzzy msgid "Print page numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:4570 ../src/printing.c:387 +#: ../src/interface.c:4665 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" -#: ../src/interface.c:4572 ../src/printing.c:390 +#: ../src/interface.c:4667 ../src/printing.c:391 msgid "Print page header" msgstr "" -#: ../src/interface.c:4575 ../src/printing.c:392 +#: ../src/interface.c:4670 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." msgstr "" -#: ../src/interface.c:4592 ../src/printing.c:408 +#: ../src/interface.c:4687 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "" -#: ../src/interface.c:4595 +#: ../src/interface.c:4690 msgid "Print only the basename (without the path) of the printed file" msgstr "" -#: ../src/interface.c:4601 ../src/printing.c:416 +#: ../src/interface.c:4696 ../src/printing.c:417 #, fuzzy msgid "Date format:" msgstr "自定日期格式" -#: ../src/interface.c:4608 ../src/printing.c:422 +#: ../src/interface.c:4703 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " "with the ANSI C strftime function." msgstr "" -#: ../src/interface.c:4611 +#: ../src/interface.c:4706 msgid "Use native GTK printing" msgstr "" -#: ../src/interface.c:4617 +#: ../src/interface.c:4712 +#, fuzzy +msgid "Printing" +msgstr "編碼:" + +#: ../src/interface.c:4717 ../src/prefs.c:1541 #, fuzzy msgid "Printing" msgstr "列印" -#: ../src/interface.c:5040 +#: ../src/interface.c:5177 #, fuzzy msgid "Project Properties" msgstr "屬性" -#: ../src/keybindings.c:198 ../src/plugins.c:1099 +#: ../src/interface.c:5295 +#, fuzzy +msgid "Display:" +msgstr "顯示" + +#: ../src/interface.c:5317 +msgid "Custom" +msgstr "" + +#: ../src/interface.c:5325 +msgid "Use global settings" +msgstr "" + +#: ../src/keybindings.c:227 ../src/plugins.c:1171 #, fuzzy msgid "File" msgstr "檔案(_F)" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:230 msgid "New" msgstr "新增" -#: ../src/keybindings.c:203 +#: ../src/keybindings.c:232 msgid "Open" msgstr "開啟" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:235 #, fuzzy msgid "Open selected file" msgstr "開啟檔案" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:237 msgid "Save" msgstr "儲存" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:239 #, fuzzy msgid "Save as" msgstr "全部儲存" -#: ../src/keybindings.c:212 +#: ../src/keybindings.c:241 msgid "Save all" msgstr "全部儲存" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:244 msgid "Print" msgstr "列印" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:246 msgid "Close" msgstr "關閉" -#: ../src/keybindings.c:219 +#: ../src/keybindings.c:248 msgid "Close all" msgstr "全部關閉" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:251 msgid "Reload file" msgstr "重新載入檔案" -#: ../src/keybindings.c:224 ../src/project.c:495 +#: ../src/keybindings.c:253 +msgid "Re-open last closed tab" +msgstr "" + +#: ../src/keybindings.c:255 ../src/project.c:519 #, fuzzy msgid "Project" msgstr "建立物件(_o)" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:258 #, fuzzy msgid "Project properties" msgstr "屬性" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:263 msgid "Undo" msgstr "復原" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:265 msgid "Redo" msgstr "取消復原" -#: ../src/keybindings.c:236 -msgid "Duplicate line or selection" -msgstr "複製行或選擇區域" - -#: ../src/keybindings.c:239 -#, fuzzy -msgid "Delete current line(s)" -msgstr "關閉目前檔案" - -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:274 #, fuzzy msgid "Delete to line end" msgstr "關閉目前檔案" -#: ../src/keybindings.c:244 -#, fuzzy -msgid "Transpose current line" -msgstr "列印目前的檔案" - -#: ../src/keybindings.c:246 +#: ../src/keybindings.c:280 #, fuzzy msgid "Scroll to current line" msgstr "編譯目前檔案" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:282 #, fuzzy msgid "Scroll up the view by one line" msgstr "編譯目前檔案" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:284 msgid "Scroll down the view by one line" msgstr "" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:286 #, fuzzy msgid "Complete snippet" msgstr "自動補完文字" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:288 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:290 #, fuzzy msgid "Suppress snippet completion" msgstr "XML標籤自動補完" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:292 #, fuzzy msgid "Context Action" msgstr "在選擇區域中(_l)" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:294 msgid "Complete word" msgstr "自動補完文字" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:296 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:298 msgid "Show macro list" msgstr "顯示巨集清單" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:300 +#, fuzzy +msgid "Word part completion" +msgstr "XML標籤自動補完" + +#: ../src/keybindings.c:302 +#, fuzzy +msgid "Move line(s) up" +msgstr "將此行註解" + +#: ../src/keybindings.c:304 +#, fuzzy +msgid "Move line(s) down" +msgstr "將此行註解" + +#: ../src/keybindings.c:306 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:309 msgid "Cut" msgstr "" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:311 #, fuzzy msgid "Copy" msgstr "公司" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:313 msgid "Paste" msgstr "" -#: ../src/keybindings.c:276 -#, fuzzy -msgid "Copy current line(s)" -msgstr "編譯目前檔案" - -#: ../src/keybindings.c:278 -#, fuzzy -msgid "Cut current line(s)" -msgstr "關閉目前檔案" - -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:321 #, fuzzy msgid "Select" msgstr "全部選取" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:324 msgid "Select All" msgstr "全部選取" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:326 #, fuzzy msgid "Select current word" msgstr "儲存目前檔案" -#: ../src/keybindings.c:287 -#, fuzzy -msgid "Select current line(s)" -msgstr "儲存目前檔案" +#: ../src/keybindings.c:334 +msgid "Select to previous word part" +msgstr "" -#: ../src/keybindings.c:289 +#: ../src/keybindings.c:336 #, fuzzy -msgid "Select current paragraph" -msgstr "儲存目前檔案" +msgid "Select to next word part" +msgstr "開啟側邊欄" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:338 #, fuzzy msgid "Format" msgstr "格式(_F)" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:342 #, fuzzy msgid "Toggle Case of Selection" msgstr "註釋/取消註釋行" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:344 msgid "Toggle line commentation" msgstr "註釋/取消註釋行" -#: ../src/keybindings.c:300 +#: ../src/keybindings.c:347 #, fuzzy msgid "Comment line(s)" msgstr "將此行註解" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:349 #, fuzzy msgid "Uncomment line(s)" msgstr "將此行反註解" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:351 msgid "Increase indent" msgstr "增加縮排" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:354 msgid "Decrease indent" msgstr "減少縮排" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:357 #, fuzzy msgid "Increase indent by one space" msgstr "增加縮排" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:359 #, fuzzy msgid "Decrease indent by one space" msgstr "減少縮排" -#: ../src/keybindings.c:314 -msgid "Smart line indent" -msgstr "" - -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:363 #, fuzzy msgid "Send to Custom Command 1" msgstr "設定自定義日期格式" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:365 #, fuzzy msgid "Send to Custom Command 2" msgstr "設定自定義日期格式" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:367 #, fuzzy msgid "Send to Custom Command 3" msgstr "設定自定義日期格式" -#: ../src/keybindings.c:322 -#, fuzzy -msgid "Send Selection to Terminal" -msgstr "在選擇區域中(_l)" - -#: ../src/keybindings.c:324 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:375 #, fuzzy msgid "Insert" msgstr "插入日期/時間" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:378 msgid "Insert date" msgstr "插入日期/時間" -#: ../src/keybindings.c:332 -msgid "Insert alternative white space" -msgstr "" - -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:384 #, fuzzy msgid "Settings" msgstr "區塊" -#: ../src/keybindings.c:340 ../src/toolbar.c:350 +#: ../src/keybindings.c:392 ../src/toolbar.c:381 #, fuzzy msgid "Search" msgstr "搜尋(_S)" -#: ../src/keybindings.c:343 ../src/search.c:379 +#: ../src/keybindings.c:395 ../src/search.c:396 msgid "Find" msgstr "尋找" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:397 msgid "Find Next" msgstr "尋找下一個" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:399 msgid "Find Previous" msgstr "尋找上一個" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:402 #, fuzzy msgid "Find Next Selection" msgstr "在選擇區域中(_l)" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:404 #, fuzzy msgid "Find Previous Selection" msgstr "尋找上一個" -#: ../src/keybindings.c:354 ../src/search.c:514 +#: ../src/keybindings.c:406 ../src/search.c:541 msgid "Replace" msgstr "取代" -#: ../src/keybindings.c:356 ../src/search.c:686 +#: ../src/keybindings.c:408 ../src/search.c:715 #, fuzzy msgid "Find in Files" msgstr "在一系列檔案中尋找(_i)" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:411 #, fuzzy msgid "Next Message" msgstr "訊息" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:413 #, fuzzy msgid "Previous Message" msgstr "訊息" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:415 msgid "Find Usage" msgstr "尋找用法" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:417 #, fuzzy msgid "Find Document Usage" msgstr "尋找用法" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:419 #, fuzzy msgid "Mark All" msgstr "建立全部" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:421 #, fuzzy msgid "Go to" msgstr "前往行數" -#: ../src/keybindings.c:372 ../src/toolbar.c:66 +#: ../src/keybindings.c:424 ../src/toolbar.c:67 msgid "Navigate back a location" msgstr "" -#: ../src/keybindings.c:374 ../src/toolbar.c:67 +#: ../src/keybindings.c:426 ../src/toolbar.c:68 msgid "Navigate forward a location" msgstr "" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:431 #, fuzzy msgid "Go to matching brace" msgstr "跳至對應括號" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:434 #, fuzzy msgid "Toggle marker" msgstr "開啟側邊欄" -#: ../src/keybindings.c:385 -#, fuzzy -msgid "Go to next marker" -msgstr "開啟側邊欄" - -#: ../src/keybindings.c:388 -msgid "Go to previous marker" -msgstr "" - -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:442 msgid "Go to Tag Definition" msgstr "" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:444 msgid "Go to Tag Declaration" msgstr "" -#: ../src/keybindings.c:394 +#: ../src/keybindings.c:446 #, fuzzy msgid "Go to Start of Line" msgstr "前往行數" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:448 #, fuzzy msgid "Go to End of Line" msgstr "前往行數" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:450 #, fuzzy msgid "Go to End of Display Line" msgstr "前往行數" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:452 msgid "Go to Previous Word Part" msgstr "" -#: ../src/keybindings.c:402 +#: ../src/keybindings.c:454 #, fuzzy msgid "Go to Next Word Part" msgstr "開啟側邊欄" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:456 #, fuzzy msgid "View" msgstr "檢視(_V)" -#: ../src/keybindings.c:407 +#: ../src/keybindings.c:459 msgid "Toggle All Additional Widgets" msgstr "" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:462 msgid "Fullscreen" msgstr "全螢幕" -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:464 msgid "Toggle Messages Window" msgstr "開啟訊息視窗" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:467 msgid "Toggle Sidebar" msgstr "開啟側邊欄" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:469 msgid "Zoom In" msgstr "拉近" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:471 msgid "Zoom Out" msgstr "拉遠" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:473 +#, fuzzy +msgid "Zoom Reset" +msgstr "拉遠" + +#: ../src/keybindings.c:475 #, fuzzy msgid "Focus" msgstr "文件(_D)" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:478 msgid "Switch to Editor" msgstr "切換至編輯器" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:480 msgid "Switch to Scribble" msgstr "" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:482 msgid "Switch to VTE" msgstr "" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:484 #, fuzzy msgid "Switch to Search Bar" msgstr "切換至編輯器" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:486 #, fuzzy msgid "Switch to Sidebar" msgstr "切換至編輯器" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:488 #, fuzzy msgid "Switch to Compiler" msgstr "切換至編輯器" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:490 +#, fuzzy +msgid "Switch to Messages" +msgstr "切換至編輯器" + +#: ../src/keybindings.c:492 +#, fuzzy +msgid "Switch to Message Window" +msgstr "開啟訊息視窗(_W)" + +#: ../src/keybindings.c:494 +#, fuzzy +msgid "Switch to Sidebar Document List" +msgstr "切換到左邊文件" + +#: ../src/keybindings.c:496 +#, fuzzy +msgid "Switch to Sidebar Symbol List" +msgstr "切換至編輯器" + +#: ../src/keybindings.c:498 #, fuzzy msgid "Notebook tab" msgstr "指令" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:501 msgid "Switch to left document" msgstr "切換到左邊文件" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:503 msgid "Switch to right document" msgstr "切換到右邊文件" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:505 #, fuzzy msgid "Switch to last used document" msgstr "切換到左邊文件" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:507 #, fuzzy msgid "Move document left" msgstr "整個文件" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:509 #, fuzzy msgid "Move document right" msgstr "整個文件" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:511 #, fuzzy msgid "Move document first" msgstr "整個文件" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:513 #, fuzzy msgid "Move document last" msgstr "整個文件" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:515 #, fuzzy msgid "Document" msgstr "文件(_D)" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:518 #, fuzzy msgid "Toggle Line wrapping" msgstr "換行" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:520 #, fuzzy msgid "Toggle Line breaking" msgstr "切換行註譯狀態(_T)" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:524 #, fuzzy msgid "Replace spaces by tabs" msgstr "置換tab字元為空白(_R)" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:526 #, fuzzy msgid "Toggle current fold" msgstr "儲存目前檔案" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:528 msgid "Fold all" msgstr "全部折疊" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:530 msgid "Unfold all" msgstr "全部展開" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:532 msgid "Reload symbol list" msgstr "重新載入符號表" -#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +#: ../src/keybindings.c:534 +msgid "Remove Markers" +msgstr "" + +#: ../src/keybindings.c:536 +msgid "Remove Error Indicators" +msgstr "" + +#: ../src/keybindings.c:538 ../src/keybindings.c:543 ../src/project.c:477 +#: ../src/ui_utils.c:1815 msgid "Build" msgstr "建構" -#: ../src/keybindings.c:475 ../src/toolbar.c:68 +#: ../src/keybindings.c:541 ../src/toolbar.c:69 msgid "Compile" msgstr "編譯" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:545 msgid "Make all" msgstr "建立全部" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:548 msgid "Make custom target" msgstr "" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:550 msgid "Make object" msgstr "建立物件" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:552 msgid "Next error" msgstr "" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:554 #, fuzzy msgid "Previous error" msgstr "翻譯者" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:556 msgid "Run" msgstr "執行" -#: ../src/keybindings.c:492 -msgid "Run (alternative command)" -msgstr "執行(替代的指令)" - -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:558 msgid "Build options" msgstr "建構選項" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:563 #, fuzzy msgid "Show Color Chooser" msgstr "顯示顏色選擇器" -#: ../src/keybindings.c:501 ../src/keybindings.c:504 +#: ../src/keybindings.c:565 ../src/keybindings.c:568 #, fuzzy msgid "Help" msgstr "說明(_H)" -#: ../src/keybindings.c:799 +#: ../src/keybindings.c:856 #, fuzzy msgid "Keyboard Shortcuts" msgstr "快速捷徑鍵(_K)" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:868 msgid "The following keyboard shortcuts are configurable:" msgstr "" -#: ../src/keybindings.c:1583 +#: ../src/keybindings.c:1791 #, fuzzy msgid "Switch to Document" msgstr "切換到左邊文件" -#: ../src/keyfile.c:811 +#: ../src/keyfile.c:852 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" -#: ../src/keyfile.c:1015 +#: ../src/keyfile.c:1056 #, fuzzy msgid "Failed to load one or more session files." msgstr "不要載入前一作業階段的檔案" @@ -3269,100 +3444,114 @@ msgid "Debug Messages" msgstr "訊息" -#: ../src/main.c:124 +#: ../src/log.c:183 +#, fuzzy +msgid "Cl_ear" +msgstr "搜尋(_S)" + +#: ../src/main.c:122 #, fuzzy msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "在第一次開啟的檔案中設置初始行號" -#: ../src/main.c:125 +#: ../src/main.c:123 #, fuzzy msgid "Use an alternate configuration directory" msgstr "使用替代的組態文件目錄" -#: ../src/main.c:126 ../src/main.c:146 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:127 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "" -#: ../src/main.c:128 +#: ../src/main.c:125 #, fuzzy msgid "Generate global tags file (see documentation)" msgstr "不要載入自動完成資料(參見文件)" -#: ../src/main.c:129 +#: ../src/main.c:126 msgid "Don't preprocess C/C++ files when generating tags" msgstr "" -#: ../src/main.c:132 +#: ../src/main.c:128 #, fuzzy msgid "Don't open files in a running instance, force opening a new instance" msgstr "不要在一個運行中的程序中開啟檔案，強制開啟新的程序" -#: ../src/main.c:134 +#: ../src/main.c:129 +msgid "" +"Use this socket filename for communication with a running Geany instance" +msgstr "" + +#: ../src/main.c:130 +msgid "Return a list of open documents in a running Geany instance" +msgstr "" + +#: ../src/main.c:132 #, fuzzy msgid "Set initial line number for the first opened file" msgstr "在第一次開啟的檔案中設置初始行號" -#: ../src/main.c:135 +#: ../src/main.c:133 #, fuzzy msgid "Don't show message window at startup" msgstr "啟動時不要顯示訊息視窗" -#: ../src/main.c:136 +#: ../src/main.c:134 #, fuzzy msgid "Don't load auto completion data (see documentation)" msgstr "不要載入自動完成資料(參見文件)" -#: ../src/main.c:138 +#: ../src/main.c:136 msgid "Don't load plugins" msgstr "" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "Print Geany's installation prefix" msgstr "" -#: ../src/main.c:141 +#: ../src/main.c:139 msgid "Don't load the previous session's files" msgstr "不要載入前一作業階段的檔案" -#: ../src/main.c:143 +#: ../src/main.c:141 #, fuzzy msgid "Don't load terminal support" msgstr "不要載入終端機支援" -#: ../src/main.c:144 +#: ../src/main.c:142 #, fuzzy msgid "Filename of libvte.so" msgstr "libvte.so的檔案名字" -#: ../src/main.c:147 +#: ../src/main.c:144 +msgid "Be verbose" +msgstr "" + +#: ../src/main.c:145 #, fuzzy msgid "Show version and exit" msgstr "顯示版本號並離開" -#: ../src/main.c:470 +#: ../src/main.c:498 msgid "[FILES...]" msgstr "" -#: ../src/main.c:487 +#: ../src/main.c:515 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(在%s下以GTK %d.%d.%d, GLib %d.%d.%d編譯)" -#: ../src/main.c:592 +#: ../src/main.c:614 msgid "Move it now?" msgstr "" -#: ../src/main.c:594 +#: ../src/main.c:616 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:603 +#: ../src/main.c:625 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3371,14 +3560,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:613 +#: ../src/main.c:635 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:694 +#: ../src/main.c:716 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3389,52 +3578,57 @@ "如果沒有組態文件目錄Geany可能會發生問題.\n" "即使這樣仍然要啟動Geany嗎?" -#: ../src/main.c:780 ../src/socket.c:164 -#, fuzzy, c-format -msgid "Could not find file '%s'." -msgstr "無法開啟檔案%s(%s)" - -#: ../src/main.c:990 +#: ../src/main.c:1031 #, c-format msgid "This is Geany %s." msgstr "這是Geany %s." -#: ../src/main.c:992 +#: ../src/main.c:1033 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/main.c:1224 +#: ../src/main.c:1244 #, fuzzy msgid "Configuration files reloaded." msgstr "編譯失敗." -#: ../src/msgwindow.c:135 +#: ../src/msgwindow.c:147 msgid "Status messages" msgstr "" -#: ../src/msgwindow.c:515 +#: ../src/msgwindow.c:524 +#, fuzzy +msgid "C_opy" +msgstr "公司" + +#: ../src/msgwindow.c:533 #, fuzzy msgid "Copy _All" msgstr "全部關閉(_l)" -#: ../src/msgwindow.c:545 +#: ../src/msgwindow.c:563 #, fuzzy msgid "_Hide Message Window" msgstr "訊息視窗" -#: ../src/plugins.c:425 +#: ../src/msgwindow.c:619 +#, c-format +msgid "Could not find file '%s' - trying the current document path." +msgstr "" + +#: ../src/plugins.c:464 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:869 +#: ../src/plugins.c:906 msgid "_Plugin Manager" msgstr "" -#: ../src/plugins.c:1017 +#: ../src/plugins.c:1083 #, c-format msgid "" "Plugin: %s %s\n" @@ -3442,88 +3636,98 @@ "Author(s): %s" msgstr "" -#: ../src/plugins.c:1087 +#: ../src/plugins.c:1159 #, fuzzy msgid "Active" msgstr "動作" -#: ../src/plugins.c:1093 +#: ../src/plugins.c:1165 msgid "Plugin" msgstr "" -#: ../src/plugins.c:1117 +#: ../src/plugins.c:1189 msgid "No plugins available." msgstr "" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1269 msgid "Plugins" msgstr "" -#: ../src/plugins.c:1250 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." +#: ../src/plugins.c:1289 +msgid "Choose which plugins should be loaded at startup:" msgstr "" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1301 #, fuzzy msgid "Plugin details:" msgstr "位置:" -#: ../src/prefs.c:160 +#: ../src/pluginutils.c:207 +msgid "Configure Plugins" +msgstr "" + +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "" -#: ../src/prefs.c:166 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" -#: ../src/prefs.c:209 ../src/symbols.c:1848 +#: ../src/prefs.c:214 ../src/symbols.c:1866 #, fuzzy msgid "_Expand All" msgstr "全部搜尋" -#: ../src/prefs.c:214 ../src/symbols.c:1853 +#: ../src/prefs.c:219 ../src/symbols.c:1871 #, fuzzy msgid "_Collapse All" msgstr "全部關閉(_l)" -#: ../src/prefs.c:273 +#: ../src/prefs.c:278 msgid "Action" msgstr "動作" -#: ../src/prefs.c:278 +#: ../src/prefs.c:283 msgid "Shortcut" msgstr "捷徑" -#: ../src/prefs.c:1398 +#: ../src/prefs.c:1408 +msgid "_Allow" +msgstr "" + +#: ../src/prefs.c:1410 msgid "_Override" msgstr "" -#: ../src/prefs.c:1399 +#: ../src/prefs.c:1411 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1412 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" +#: ../src/prefs.c:1543 ../src/vte.c:269 ../src/vte.c:723 ../src/vte.c:728 +msgid "Terminal" +msgstr "終端機" + #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1514 +#: ../src/prefs.c:1619 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" #. page Templates -#: ../src/prefs.c:1519 +#: ../src/prefs.c:1624 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1628 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3531,7 +3735,7 @@ msgstr "" #. page Keybindings -#: ../src/prefs.c:1529 +#: ../src/prefs.c:1634 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3539,14 +3743,14 @@ msgstr "" #. page Printing -#: ../src/prefs.c:1534 +#: ../src/prefs.c:1639 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "" #. page Editor->Indentation -#: ../src/prefs.c:1540 +#: ../src/prefs.c:1645 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3560,45 +3764,45 @@ msgid "Text will be wrongly spaced." msgstr "" -#: ../src/printing.c:305 +#: ../src/printing.c:306 #, fuzzy, c-format msgid "Page %d of %d" msgstr "變更:" -#: ../src/printing.c:375 +#: ../src/printing.c:376 #, fuzzy msgid "Document Setup" msgstr "位置:" -#: ../src/printing.c:410 +#: ../src/printing.c:411 msgid "Print only the basename(without the path) of the printed file" msgstr "" -#: ../src/printing.c:526 +#: ../src/printing.c:527 #, fuzzy, c-format msgid "Page %d of %d" msgstr "變更:" -#: ../src/printing.c:776 -#, fuzzy, c-format -msgid "Printing of file %s was cancelled." -msgstr "行程(%s)失敗" +#: ../src/printing.c:781 +#, c-format +msgid "Did not send document %s to the printing subsystem." +msgstr "" -#: ../src/printing.c:778 ../src/printing.c:897 -#, fuzzy, c-format -msgid "File %s printed." -msgstr "檔案%s已儲存." +#: ../src/printing.c:783 +#, c-format +msgid "Document %s was sent to the printing subsystem." +msgstr "" -#: ../src/printing.c:827 +#: ../src/printing.c:835 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "行程(%s)失敗" -#: ../src/printing.c:867 +#: ../src/printing.c:875 msgid "Please set a print command in the preferences dialog first." msgstr "" -#: ../src/printing.c:875 +#: ../src/printing.c:883 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3606,615 +3810,637 @@ "%s" msgstr "" -#: ../src/printing.c:891 +#: ../src/printing.c:899 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "" +#: ../src/printing.c:905 +#, fuzzy, c-format +msgid "File %s printed." +msgstr "檔案%s已儲存." + #. "projects" is part of the default project base path so be careful when translating #. * please avoid special characters and spaces, look at the source for details or ask Frank -#: ../src/project.c:99 +#: ../src/project.c:98 msgid "projects" msgstr "" -#: ../src/project.c:118 +#: ../src/project.c:117 #, fuzzy msgid "New Project" msgstr "建立物件(_o)" -#: ../src/project.c:126 +#: ../src/project.c:125 msgid "C_reate" msgstr "" -#: ../src/project.c:140 ../src/project.c:386 +#: ../src/project.c:139 ../src/project.c:413 msgid "Name:" msgstr "" -#: ../src/project.c:149 ../src/project.c:399 +#: ../src/project.c:148 ../src/project.c:426 #, fuzzy msgid "Filename:" msgstr "越南文" -#: ../src/project.c:165 ../src/project.c:429 +#: ../src/project.c:164 ../src/project.c:456 msgid "Base path:" msgstr "" -#: ../src/project.c:171 ../src/project.c:438 +#: ../src/project.c:170 ../src/project.c:465 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 "" -#: ../src/project.c:174 ../src/project.c:441 +#: ../src/project.c:173 ../src/project.c:468 msgid "Choose Project Base Path" msgstr "" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#: ../src/project.c:231 ../src/project.c:263 ../src/project.c:957 #, fuzzy, c-format msgid "Project file \"%s\" could not be loaded." msgstr "無法建立組態文件目錄(%s)." -#: ../src/project.c:264 ../src/project.c:276 +#: ../src/project.c:257 ../src/project.c:269 #, fuzzy msgid "Open Project" msgstr "建立物件" -#: ../src/project.c:296 +#: ../src/project.c:289 #, fuzzy msgid "Project files" msgstr "屬性" -#: ../src/project.c:330 +#: ../src/project.c:339 #, c-format msgid "Project \"%s\" closed." msgstr "" -#: ../src/project.c:412 +#: ../src/project.c:439 #, fuzzy msgid "Description:" msgstr "區塊" -#: ../src/project.c:447 -msgid "Make in base path" +#: ../src/project.c:481 +msgid "Set the Build non-filetype working directories to use base path:" msgstr "" -#: ../src/project.c:452 +#: ../src/project.c:484 #, fuzzy -msgid "Run command:" -msgstr "指令" +msgid "Set" +msgstr "全部選取" -#: ../src/project.c:461 +#: ../src/project.c:486 msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." +"Set the working directories (on the Build tab) for the non-filetype build " +"commands to use the base path" msgstr "" -#: ../src/project.c:476 +#: ../src/project.c:501 #, fuzzy msgid "File patterns:" msgstr "中東語系(_M)" -#: ../src/project.c:578 +#: ../src/project.c:610 #, fuzzy msgid "Do you want to close it before proceeding?" msgstr "離開前您要存檔嗎?" -#: ../src/project.c:579 +#: ../src/project.c:611 #, c-format msgid "The '%s' project is already open." msgstr "" -#: ../src/project.c:623 +#: ../src/project.c:658 msgid "The specified project name is too short." msgstr "" -#: ../src/project.c:629 +#: ../src/project.c:664 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "" -#: ../src/project.c:637 +#: ../src/project.c:672 msgid "You have specified an invalid project filename." msgstr "" -#: ../src/project.c:660 +#: ../src/project.c:695 msgid "Create the project's base path directory?" msgstr "" -#: ../src/project.c:661 +#: ../src/project.c:696 #, c-format msgid "The path \"%s\" does not exist." msgstr "" -#: ../src/project.c:670 +#: ../src/project.c:705 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/project.c:682 +#: ../src/project.c:717 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/project.c:730 +#: ../src/project.c:794 #, c-format msgid "Project \"%s\" created." msgstr "" -#: ../src/project.c:732 +#: ../src/project.c:796 #, fuzzy, c-format msgid "Project \"%s\" saved." msgstr "檔案%s已儲存." #. initialise the dialog -#: ../src/project.c:798 ../src/project.c:809 +#: ../src/project.c:861 ../src/project.c:872 #, fuzzy msgid "Choose Project Filename" msgstr "屬性" -#. initialise the dialog -#: ../src/project.c:827 ../src/project.c:838 -msgid "Choose Project Run Command" -msgstr "" - -#: ../src/project.c:907 +#: ../src/project.c:947 #, c-format msgid "Project \"%s\" opened." msgstr "" -#: ../src/search.c:216 +#: ../src/search.c:233 msgid "_Use regular expressions" msgstr "使用正規式(_U)" -#: ../src/search.c:220 +#: ../src/search.c:237 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "使用類POSIX正規式. 使用正規式的詳細資訊請參考文件." -#: ../src/search.c:227 +#: ../src/search.c:244 #, fuzzy msgid "Search _backwards" msgstr "尋找倒退字元(_S)" -#: ../src/search.c:241 +#: ../src/search.c:258 msgid "Use _escape sequences" msgstr "使用反斜線跳脫字元" -#: ../src/search.c:246 +#: ../src/search.c:263 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" msgstr "" -#: ../src/search.c:255 ../src/search.c:781 +#: ../src/search.c:272 ../src/search.c:810 #, fuzzy msgid "C_ase sensitive" msgstr "區分大小寫(_C)" -#: ../src/search.c:260 ../src/search.c:787 +#: ../src/search.c:277 ../src/search.c:816 msgid "Match only a _whole word" msgstr "只符合整個字詞(_w)" -#: ../src/search.c:265 +#: ../src/search.c:282 #, fuzzy msgid "Match from s_tart of word" msgstr "只符合整個字詞(_w)" -#: ../src/search.c:386 +#: ../src/search.c:403 #, fuzzy msgid "_Previous" msgstr "找上一個(_P)" -#: ../src/search.c:392 +#: ../src/search.c:409 #, fuzzy msgid "_Next" msgstr "找下一個(_N)" -#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +#: ../src/search.c:413 ../src/search.c:562 ../src/search.c:740 #, fuzzy msgid "_Search for:" msgstr "搜尋:" #. Now add the multiple match options -#: ../src/search.c:424 +#: ../src/search.c:441 #, fuzzy msgid "_Find All" msgstr "全部搜尋" -#: ../src/search.c:431 +#: ../src/search.c:448 msgid "_Mark" msgstr "標記(_M)" -#: ../src/search.c:433 +#: ../src/search.c:450 msgid "Mark all matches in the current document" msgstr "" -#: ../src/search.c:438 ../src/search.c:595 +#: ../src/search.c:455 ../src/search.c:622 msgid "In Sessi_on" msgstr "在作業階段中(_o)" -#: ../src/search.c:443 ../src/search.c:600 +#: ../src/search.c:460 ../src/search.c:627 #, fuzzy msgid "_In Document" msgstr "文件(_D)" #. close window checkbox -#: ../src/search.c:449 ../src/search.c:613 +#: ../src/search.c:466 ../src/search.c:640 msgid "Close _dialog" msgstr "關閉對話方塊(_d)" -#: ../src/search.c:454 ../src/search.c:618 +#: ../src/search.c:471 ../src/search.c:645 msgid "Disable this option to keep the dialog open" msgstr "" -#: ../src/search.c:529 +#: ../src/search.c:556 #, fuzzy msgid "Replace & Fi_nd" msgstr "取代並尋找(_p)" -#: ../src/search.c:538 +#: ../src/search.c:565 #, fuzzy msgid "Replace wit_h:" msgstr "取代為:" #. Now add the multiple replace options -#: ../src/search.c:588 +#: ../src/search.c:615 #, fuzzy msgid "Re_place All" msgstr "全部取代" -#: ../src/search.c:605 +#: ../src/search.c:632 msgid "In Se_lection" msgstr "在選擇區域中(_l)" -#: ../src/search.c:607 +#: ../src/search.c:634 msgid "Replace all matches found in the currently selected text" msgstr "" -#: ../src/search.c:696 +#: ../src/search.c:725 #, fuzzy msgid "_Directory:" msgstr "目錄:" -#: ../src/search.c:727 +#: ../src/search.c:756 #, fuzzy msgid "E_ncoding:" msgstr "設定字元編碼:" -#: ../src/search.c:752 +#: ../src/search.c:781 #, fuzzy msgid "Fixed s_trings" msgstr "固定字串(_F)" -#: ../src/search.c:761 +#: ../src/search.c:790 msgid "_Grep regular expressions" msgstr "" -#: ../src/search.c:764 ../src/search.c:772 +#: ../src/search.c:793 ../src/search.c:801 msgid "See grep's manual page for more information" msgstr "" -#: ../src/search.c:769 +#: ../src/search.c:798 msgid "_Extended regular expressions" msgstr "擴展正規式" -#: ../src/search.c:776 +#: ../src/search.c:805 msgid "_Recurse in subfolders" msgstr "" -#: ../src/search.c:792 +#: ../src/search.c:821 msgid "_Invert search results" msgstr "" -#: ../src/search.c:797 +#: ../src/search.c:826 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -#: ../src/search.c:814 +#: ../src/search.c:843 msgid "E_xtra options:" msgstr "" -#: ../src/search.c:822 +#: ../src/search.c:851 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 +#: ../src/search.c:1130 ../src/search.c:1881 ../src/search.c:1884 #, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "找不到符合「%s」的內容." msgstr[1] "找不到符合「%s」的內容." -#: ../src/search.c:1203 -#, c-format -msgid "Replaced text in %u file." -msgid_plural "Replaced text in %u files." -msgstr[0] "" -msgstr[1] "" +#: ../src/search.c:1177 +#, fuzzy, c-format +msgid "Replaced %u matches in %u documents." +msgstr "轉換目前選擇區域的大/小寫" -#: ../src/search.c:1304 +#: ../src/search.c:1368 msgid "Invalid directory for find in files." msgstr "在檔案中尋找的目錄不合法." -#: ../src/search.c:1324 +#: ../src/search.c:1388 msgid "No text to find." msgstr "找不到文字." -#: ../src/search.c:1351 +#: ../src/search.c:1415 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" -#: ../src/search.c:1419 +#: ../src/search.c:1483 #, fuzzy msgid "Searching..." msgstr "搜尋(_S)" -#: ../src/search.c:1431 +#: ../src/search.c:1495 #, fuzzy, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s(在目錄: %s)" -#: ../src/search.c:1459 +#: ../src/search.c:1523 #, c-format msgid "Could not open directory (%s)" msgstr "無法開啟目錄(%s)" -#: ../src/search.c:1565 -msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +#: ../src/search.c:1601 +msgid "Search failed." +msgstr "搜尋失敗." -#: ../src/search.c:1586 +#: ../src/search.c:1621 #, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "搜尋結束." msgstr[1] "搜尋結束." -#: ../src/search.c:1594 +#: ../src/search.c:1629 msgid "No matches found." msgstr "找不到符合的內容." -#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +#: ../src/search.c:1661 +#, c-format +msgid "Bad regex: %s" +msgstr "" + +#. TODO maybe this message needs a rewording +#: ../src/socket.c:227 +msgid "" +"Geany tried to access the Unix Domain socket of another instance running as " +"another user.\n" +"This is a fatal error and Geany will now quit." +msgstr "" + +#: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" msgstr "章節" -#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +#: ../src/symbols.c:612 ../src/symbols.c:647 ../src/symbols.c:719 msgid "Section" msgstr "區塊" -#: ../src/symbols.c:598 +#: ../src/symbols.c:613 msgid "Sect1" msgstr "" -#: ../src/symbols.c:599 +#: ../src/symbols.c:614 msgid "Sect2" msgstr "" -#: ../src/symbols.c:600 +#: ../src/symbols.c:615 msgid "Sect3" msgstr "" -#: ../src/symbols.c:601 +#: ../src/symbols.c:616 msgid "Appendix" msgstr "附錄" -#. &(tv_iters.tag_macro), _("Macros"), -#. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:602 ../src/symbols.c:638 ../src/symbols.c:769 -#: ../src/symbols.c:783 ../src/symbols.c:795 ../src/symbols.c:807 -#: ../src/symbols.c:822 ../src/symbols.c:867 +#: ../src/symbols.c:617 ../src/symbols.c:652 ../src/symbols.c:668 +#: ../src/symbols.c:679 ../src/symbols.c:766 ../src/symbols.c:777 +#: ../src/symbols.c:789 ../src/symbols.c:803 ../src/symbols.c:815 +#: ../src/symbols.c:827 ../src/symbols.c:842 ../src/symbols.c:887 msgid "Other" msgstr "其他" -#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +#: ../src/symbols.c:623 ../src/symbols.c:835 ../src/symbols.c:867 msgid "Module" msgstr "模組" -#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 -#: ../src/symbols.c:820 ../src/symbols.c:832 +#: ../src/symbols.c:624 ../src/symbols.c:762 ../src/symbols.c:813 +#: ../src/symbols.c:825 ../src/symbols.c:840 ../src/symbols.c:852 #, fuzzy msgid "Types" msgstr "型態" -#: ../src/symbols.c:611 +#: ../src/symbols.c:625 #, fuzzy msgid "Type constructors" msgstr "自動補完文字" -#: ../src/symbols.c:612 ../src/symbols.c:624 ../src/symbols.c:645 -#: ../src/symbols.c:654 ../src/symbols.c:669 ../src/symbols.c:681 -#: ../src/symbols.c:734 ../src/symbols.c:748 ../src/symbols.c:779 -#: ../src/symbols.c:802 ../src/symbols.c:817 ../src/symbols.c:854 +#: ../src/symbols.c:626 ../src/symbols.c:638 ../src/symbols.c:659 +#: ../src/symbols.c:667 ../src/symbols.c:676 ../src/symbols.c:688 +#: ../src/symbols.c:697 ../src/symbols.c:750 ../src/symbols.c:799 +#: ../src/symbols.c:822 ../src/symbols.c:837 ../src/symbols.c:874 msgid "Functions" msgstr "函式" -#: ../src/symbols.c:617 ../src/symbols.c:623 +#: ../src/symbols.c:631 ../src/symbols.c:637 #, fuzzy msgid "Sections" msgstr "區塊" -#: ../src/symbols.c:618 +#: ../src/symbols.c:632 msgid "Keys" msgstr "" -#. &(tv_iters.tag_class), _("Constants"), -#. &(tv_iters.tag_member), _("Members"), -#. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:625 ../src/symbols.c:671 ../src/symbols.c:735 -#: ../src/symbols.c:752 ../src/symbols.c:781 ../src/symbols.c:794 -#: ../src/symbols.c:803 ../src/symbols.c:819 ../src/symbols.c:866 +#: ../src/symbols.c:639 ../src/symbols.c:690 ../src/symbols.c:751 +#: ../src/symbols.c:776 ../src/symbols.c:801 ../src/symbols.c:814 +#: ../src/symbols.c:823 ../src/symbols.c:839 ../src/symbols.c:886 msgid "Variables" msgstr "變數" -#: ../src/symbols.c:631 -msgid "Command" -msgstr "指令" - -#: ../src/symbols.c:632 +#: ../src/symbols.c:646 msgid "Environment" msgstr "系統環境" -#: ../src/symbols.c:634 ../src/symbols.c:702 +#: ../src/symbols.c:648 ../src/symbols.c:720 msgid "Subsection" msgstr "子區塊" -#: ../src/symbols.c:635 ../src/symbols.c:703 +#: ../src/symbols.c:649 ../src/symbols.c:721 msgid "Subsubsection" msgstr "子子區塊" -#: ../src/symbols.c:636 -msgid "Label" -msgstr "標籤" - -#: ../src/symbols.c:646 +#: ../src/symbols.c:660 #, fuzzy msgid "Structures" msgstr "狀態" -#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +#: ../src/symbols.c:675 ../src/symbols.c:759 ../src/symbols.c:784 +#: ../src/symbols.c:796 msgid "Package" msgstr "套件" -#: ../src/symbols.c:655 -msgid "My" -msgstr "我的" - -#: ../src/symbols.c:656 -msgid "Local" -msgstr "本地端" - -#: ../src/symbols.c:657 -msgid "Our" -msgstr "我們的" +#: ../src/symbols.c:677 ../src/symbols.c:826 ../src/symbols.c:849 +#, fuzzy +msgid "Labels" +msgstr "標籤" + +#: ../src/symbols.c:678 ../src/symbols.c:689 ../src/symbols.c:802 +#: ../src/symbols.c:824 +msgid "Constants" +msgstr "" -#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 -#: ../src/symbols.c:790 ../src/symbols.c:816 +#: ../src/symbols.c:686 ../src/symbols.c:785 ../src/symbols.c:797 +#: ../src/symbols.c:810 ../src/symbols.c:836 msgid "Interfaces" msgstr "介面" -#: ../src/symbols.c:668 ../src/symbols.c:692 ../src/symbols.c:711 -#: ../src/symbols.c:723 ../src/symbols.c:732 ../src/symbols.c:764 -#: ../src/symbols.c:778 ../src/symbols.c:791 ../src/symbols.c:853 +#: ../src/symbols.c:687 ../src/symbols.c:708 ../src/symbols.c:729 +#: ../src/symbols.c:739 ../src/symbols.c:748 ../src/symbols.c:786 +#: ../src/symbols.c:798 ../src/symbols.c:811 ../src/symbols.c:873 msgid "Classes" msgstr "類別" -#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 -msgid "Constants" -msgstr "" - -#: ../src/symbols.c:682 +#: ../src/symbols.c:698 msgid "Anchors" msgstr "" -#: ../src/symbols.c:683 +#: ../src/symbols.c:699 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:684 +#: ../src/symbols.c:700 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:685 +#: ../src/symbols.c:701 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:693 +#: ../src/symbols.c:709 #, fuzzy msgid "ID Selectors" msgstr "在選擇區域中(_l)" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Type Selectors" msgstr "自動補完文字" -#: ../src/symbols.c:710 +#: ../src/symbols.c:728 ../src/symbols.c:774 #, fuzzy msgid "Modules" msgstr "模組" -#: ../src/symbols.c:712 +#: ../src/symbols.c:730 msgid "Singletons" msgstr "" -#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 -#: ../src/symbols.c:765 ../src/symbols.c:792 +#: ../src/symbols.c:731 ../src/symbols.c:740 ../src/symbols.c:749 +#: ../src/symbols.c:787 ../src/symbols.c:812 msgid "Methods" msgstr "存取方法" -#: ../src/symbols.c:722 ../src/symbols.c:850 +#: ../src/symbols.c:738 ../src/symbols.c:870 msgid "Namespaces" msgstr "命名空間" -#: ../src/symbols.c:725 +#: ../src/symbols.c:741 #, fuzzy msgid "Procedures" msgstr "屬性" -#: ../src/symbols.c:736 +#: ../src/symbols.c:752 msgid "Imports" msgstr "" -#: ../src/symbols.c:766 ../src/symbols.c:855 -msgid "Members" -msgstr "成員" +#: ../src/symbols.c:760 +#, fuzzy +msgid "Entities" +msgstr "未命名" -#: ../src/symbols.c:806 ../src/symbols.c:829 +#: ../src/symbols.c:761 #, fuzzy -msgid "Labels" -msgstr "標籤" +msgid "Architectures" +msgstr "狀態" + +#: ../src/symbols.c:763 +#, fuzzy +msgid "Functions / Procedures" +msgstr "屬性" + +#: ../src/symbols.c:764 +#, fuzzy +msgid "Variables / Signals" +msgstr "變數" + +#: ../src/symbols.c:765 +msgid "Processes / Components" +msgstr "" + +#: ../src/symbols.c:773 +msgid "Events" +msgstr "" + +#: ../src/symbols.c:775 +#, fuzzy +msgid "Functions / Tasks" +msgstr "函式" -#: ../src/symbols.c:818 +#: ../src/symbols.c:788 ../src/symbols.c:875 +msgid "Members" +msgstr "成員" + +#: ../src/symbols.c:838 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:821 +#: ../src/symbols.c:841 msgid "Blocks" msgstr "" -#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +#: ../src/symbols.c:850 ../src/symbols.c:859 ../src/symbols.c:883 msgid "Macros" msgstr "巨集" -#: ../src/symbols.c:831 +#: ../src/symbols.c:851 #, fuzzy msgid "Defines" msgstr "行" -#: ../src/symbols.c:838 +#: ../src/symbols.c:858 msgid "Targets" msgstr "" -#: ../src/symbols.c:856 +#: ../src/symbols.c:876 #, fuzzy msgid "Structs" msgstr "狀態" -#: ../src/symbols.c:857 +#: ../src/symbols.c:877 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1337 +#: ../src/symbols.c:1365 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "" -#: ../src/symbols.c:1358 +#: ../src/symbols.c:1389 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" -#: ../src/symbols.c:1365 +#: ../src/symbols.c:1396 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" -#: ../src/symbols.c:1366 +#: ../src/symbols.c:1397 #, c-format msgid "" "Example:\n" @@ -4222,185 +4448,202 @@ "gtk/gtk.h\n" msgstr "" -#: ../src/symbols.c:1380 +#: ../src/symbols.c:1411 msgid "Load Tags" msgstr "" -#: ../src/symbols.c:1387 +#: ../src/symbols.c:1418 msgid "Geany tag files (*.tags)" msgstr "" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1407 +#: ../src/symbols.c:1438 #, fuzzy, c-format msgid "Loaded %s tags file '%s'." msgstr "無法開啟檔案%s(%s)" -#: ../src/symbols.c:1409 +#: ../src/symbols.c:1440 #, fuzzy, c-format msgid "Could not load tags file '%s'." msgstr "無法開啟檔案%s(%s)" -#: ../src/symbols.c:1555 +#: ../src/symbols.c:1573 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1557 +#: ../src/symbols.c:1575 #, c-format msgid "Definition of \"%s\" not found." msgstr "" -#: ../src/symbols.c:1863 +#: ../src/symbols.c:1881 #, fuzzy msgid "Sort by _Name" msgstr "外觀" -#: ../src/symbols.c:1870 +#: ../src/symbols.c:1888 #, fuzzy msgid "Sort by _Appearance" msgstr "外觀" +#: ../src/templates.c:278 +msgid "Old" +msgstr "" + #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:56 msgid "Save the current file" msgstr "儲存目前檔案" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:57 msgid "Save all open files" msgstr "儲存所有開啟的檔案" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:58 msgid "Reload the current file from disk" msgstr "從磁碟重新載入目前檔案" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:59 msgid "Close the current file" msgstr "關閉目前檔案" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:60 #, fuzzy msgid "Close all open files" msgstr "關閉所有開啟的檔案" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:61 #, fuzzy msgid "Cut the current selection" msgstr "轉換目前選擇區域的大/小寫" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:62 #, fuzzy msgid "Copy the current selection" msgstr "編譯目前檔案" -#: ../src/toolbar.c:62 +#: ../src/toolbar.c:63 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:63 +#: ../src/toolbar.c:64 #, fuzzy msgid "Delete the current selection" msgstr "轉換目前選擇區域的大/小寫" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:65 msgid "Undo the last modification" msgstr "取消執行上次操作" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:66 msgid "Redo the last modification" msgstr "重新執行上次操作" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:69 msgid "Compile the current file" msgstr "編譯目前檔案" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:70 msgid "Run or view the current file" msgstr "" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:71 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" -#: ../src/toolbar.c:71 +#: ../src/toolbar.c:72 msgid "Zoom in the text" msgstr "放大文字" -#: ../src/toolbar.c:72 +#: ../src/toolbar.c:73 msgid "Zoom out the text" msgstr "縮小文字" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:74 #, fuzzy msgid "Decrease indentation" msgstr "減少縮排" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:75 #, fuzzy msgid "Increase indentation" msgstr "增加縮排" -#: ../src/toolbar.c:75 ../src/toolbar.c:350 +#: ../src/toolbar.c:76 ../src/toolbar.c:381 msgid "Find the entered text in the current file" msgstr "在目前檔案中尋找輸入的文字" -#: ../src/toolbar.c:76 ../src/toolbar.c:358 +#: ../src/toolbar.c:77 ../src/toolbar.c:389 #, fuzzy msgid "Jump to the entered line number" msgstr "跳至指定行號" -#: ../src/toolbar.c:77 +#: ../src/toolbar.c:78 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:78 +#: ../src/toolbar.c:79 msgid "Quit Geany" msgstr "離開Geany" -#: ../src/toolbar.c:79 +#: ../src/toolbar.c:80 #, fuzzy msgid "Print document" msgstr "整個文件" -#: ../src/toolbar.c:80 +#: ../src/toolbar.c:81 #, fuzzy msgid "Replace text in the current document" msgstr "轉換目前選擇區域的大/小寫" -#. Create our custom actions -#: ../src/toolbar.c:334 +#: ../src/toolbar.c:357 msgid "Create a new file" msgstr "建立新檔案" -#: ../src/toolbar.c:339 +#: ../src/toolbar.c:358 +#, fuzzy +msgid "Create a new file from a template" +msgstr "建立新檔案" + +#: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "開啟舊檔" -#: ../src/toolbar.c:358 +#: ../src/toolbar.c:366 +#, fuzzy +msgid "Open a recent file" +msgstr "開啟檔案" + +#: ../src/toolbar.c:374 +msgid "Choose more build actions" +msgstr "" + +#: ../src/toolbar.c:389 #, fuzzy msgid "Goto" msgstr "前往行數" -#: ../src/toolbar.c:533 +#: ../src/toolbar.c:578 msgid "Separator" msgstr "" -#: ../src/toolbar.c:534 +#: ../src/toolbar.c:579 msgid "--- Separator ---" msgstr "" -#: ../src/toolbar.c:897 +#: ../src/toolbar.c:946 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../src/toolbar.c:913 +#: ../src/toolbar.c:962 msgid "Available Items" msgstr "" -#: ../src/toolbar.c:934 +#: ../src/toolbar.c:983 #, fuzzy msgid "Displayed Items" msgstr "顯示" @@ -4426,7 +4669,7 @@ msgid "Custom command failed: %s" msgstr "設定自定義日期格式" -#: ../src/tools.c:304 ../src/tools.c:538 +#: ../src/tools.c:304 ../src/tools.c:511 #, fuzzy msgid "Set Custom Commands" msgstr "設定自定義日期格式" @@ -4437,443 +4680,454 @@ "of the command replaces the current selection." msgstr "" -#: ../src/tools.c:506 ../src/tools.c:510 +#: ../src/tools.c:486 msgid "No custom commands defined." msgstr "" -#: ../src/tools.c:615 +#: ../src/tools.c:586 msgid "Word Count" msgstr "計算字數" -#: ../src/tools.c:625 +#: ../src/tools.c:596 msgid "selection" msgstr "選擇區域" -#: ../src/tools.c:631 +#: ../src/tools.c:602 msgid "whole document" msgstr "整個文件" -#: ../src/tools.c:640 +#: ../src/tools.c:611 #, fuzzy msgid "Range:" msgstr "改變" -#: ../src/tools.c:652 +#: ../src/tools.c:623 #, fuzzy msgid "Lines:" msgstr "行" -#: ../src/tools.c:666 +#: ../src/tools.c:637 msgid "Words:" msgstr "" -#: ../src/tools.c:680 +#: ../src/tools.c:651 #, fuzzy msgid "Characters:" msgstr "章節" -#: ../src/treeviews.c:177 +#: ../src/sidebar.c:186 msgid "No tags found" msgstr "" -#: ../src/treeviews.c:508 +#: ../src/sidebar.c:546 #, fuzzy msgid "Show S_ymbol List" msgstr "顯示符號列表" -#: ../src/treeviews.c:516 +#: ../src/sidebar.c:554 #, fuzzy msgid "Show _Document List" msgstr "顯示開啟檔案列表" -#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +#: ../src/sidebar.c:562 ../plugins/filebrowser.c:647 #, fuzzy msgid "H_ide Sidebar" msgstr "隱藏側面欄" -#: ../src/treeviews.c:591 +#: ../src/sidebar.c:631 #, fuzzy msgid "Show _Paths" msgstr "顯示工具列" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:188 +#: ../src/ui_utils.c:194 #, c-format -msgid "line: %d\t col: %d\t sel: %d\t " +msgid "line: %d / %d\t col: %d\t sel: %d\t " msgstr "" #. RO = read-only -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:200 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "OVR" msgstr "覆寫" -#: ../src/ui_utils.c:196 +#: ../src/ui_utils.c:202 msgid "INS" msgstr "插入" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:208 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:205 +#: ../src/ui_utils.c:211 msgid "SP" msgstr "" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:214 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:212 +#: ../src/ui_utils.c:218 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:215 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "設定字元編碼:" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:227 #, c-format msgid "filetype: %s" msgstr "" -#: ../src/ui_utils.c:225 +#: ../src/ui_utils.c:231 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:236 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:315 +#: ../src/ui_utils.c:321 #, c-format msgid "Font updated (%s)." msgstr "" -#: ../src/ui_utils.c:511 +#: ../src/ui_utils.c:517 msgid "C Standard Library" msgstr "C標準函式庫" -#: ../src/ui_utils.c:512 +#: ../src/ui_utils.c:518 msgid "ISO C99" msgstr "" -#: ../src/ui_utils.c:513 +#: ../src/ui_utils.c:519 msgid "C++ (C Standard Library)" msgstr "C++(C標準函式庫)" -#: ../src/ui_utils.c:514 +#: ../src/ui_utils.c:520 msgid "C++ Standard Library" msgstr "標準 C++ 函式庫" -#: ../src/ui_utils.c:515 +#: ../src/ui_utils.c:521 msgid "C++ STL" msgstr "" -#: ../src/ui_utils.c:579 +#: ../src/ui_utils.c:585 #, fuzzy msgid "_Set Custom Date Format" msgstr "設定自定義日期格式" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 #, fuzzy msgid "Select Folder" msgstr "選擇資料夾" -#: ../src/ui_utils.c:1644 +#: ../src/ui_utils.c:1659 #, fuzzy msgid "Select File" msgstr "全部選取" -#: ../src/ui_utils.c:1767 -#, fuzzy -msgid "C_onfiguration Files" -msgstr "編譯失敗." - -#: ../src/ui_utils.c:1785 +#: ../src/ui_utils.c:1813 #, fuzzy msgid "Save All" msgstr "全部儲存(_l)" -#: ../src/ui_utils.c:1786 +#: ../src/ui_utils.c:1814 #, fuzzy msgid "Close All" msgstr "全部關閉(_l)" -#: ../src/utils.c:324 +#: ../src/utils.c:338 msgid "Win (CRLF)" msgstr "" -#: ../src/utils.c:325 +#: ../src/utils.c:339 msgid "Mac (CR)" msgstr "" -#: ../src/utils.c:326 +#: ../src/utils.c:340 msgid "Unix (LF)" msgstr "" -#: ../src/vte.c:301 ../src/vte.c:726 -msgid "Terminal" -msgstr "終端機" - -#: ../src/vte.c:548 +#: ../src/vte.c:516 #, fuzzy msgid "_Set Path From Document" msgstr "切換到左邊文件" -#: ../src/vte.c:553 +#: ../src/vte.c:521 #, fuzzy msgid "_Restart Terminal" msgstr "終端機" -#: ../src/vte.c:576 +#: ../src/vte.c:544 msgid "_Input Methods" msgstr "輸入法(_I)" -#: ../src/vte.c:670 +#: ../src/vte.c:638 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." msgstr "" -#: ../src/vte.c:721 -#, fuzzy -msgid "Terminal plugin" -msgstr "終端模擬" - -#: ../src/vte.c:729 -msgid "" -"These settings for the virtual terminal emulator widget (VTE) only apply if " -"the VTE library could be loaded." +#: ../src/vte.c:736 +msgid "Font:" msgstr "" -#: ../src/vte.c:740 -#, fuzzy -msgid "Terminal font:" -msgstr "終端機字型" - -#: ../src/vte.c:750 +#: ../src/vte.c:746 #, fuzzy msgid "Sets the font for the terminal widget" msgstr "顯示符號列表" -#: ../src/vte.c:752 +#: ../src/vte.c:748 #, fuzzy msgid "Foreground color:" msgstr "前景顏色" -#: ../src/vte.c:758 +#: ../src/vte.c:754 #, fuzzy msgid "Background color:" msgstr "背景顏色" -#: ../src/vte.c:768 +#: ../src/vte.c:764 msgid "Sets the foreground color of the text in the terminal widget" msgstr "" -#: ../src/vte.c:775 +#: ../src/vte.c:771 msgid "Sets the background color of the text in the terminal widget" msgstr "" -#: ../src/vte.c:778 +#: ../src/vte.c:774 msgid "Scrollback lines:" msgstr "" -#: ../src/vte.c:790 +#: ../src/vte.c:786 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "" -#: ../src/vte.c:794 +#: ../src/vte.c:790 msgid "Shell:" msgstr "" -#: ../src/vte.c:802 +#: ../src/vte.c:798 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "" -#: ../src/vte.c:819 +#: ../src/vte.c:815 msgid "Scroll on keystroke" msgstr "" -#: ../src/vte.c:820 +#: ../src/vte.c:816 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "" -#: ../src/vte.c:823 +#: ../src/vte.c:819 msgid "Scroll on output" msgstr "輸出上捲動" -#: ../src/vte.c:824 +#: ../src/vte.c:820 msgid "Whether to scroll to the bottom when output is generated" msgstr "" -#: ../src/vte.c:827 +#: ../src/vte.c:823 msgid "Cursor blinks" msgstr "" -#: ../src/vte.c:828 +#: ../src/vte.c:824 #, fuzzy msgid "Whether to blink the cursor" msgstr "要不要啟用程式碼的摺疊功能" -#: ../src/vte.c:831 +#: ../src/vte.c:827 msgid "Override Geany keybindings" msgstr "" -#: ../src/vte.c:833 +#: ../src/vte.c:829 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" -#: ../src/vte.c:836 +#: ../src/vte.c:832 msgid "Disable menu shortcut key (F10 by default)" msgstr "關閉選單捷徑鍵(預設為 F10)" -#: ../src/vte.c:837 +#: ../src/vte.c:833 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " "within the VTE." msgstr "" -#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 +#: ../src/vte.c:836 ../plugins/filebrowser.c:1217 msgid "Follow the path of the current file" msgstr "" -#: ../src/vte.c:841 +#: ../src/vte.c:837 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" #. create check_skip_script checkbox before the check_skip_script checkbox to be able to #. * use the object for the toggled handler of check_skip_script checkbox -#: ../src/vte.c:846 +#: ../src/vte.c:842 msgid "Don't use run script" msgstr "" -#: ../src/vte.c:847 +#: ../src/vte.c:843 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" msgstr "" -#: ../src/vte.c:850 +#: ../src/vte.c:846 msgid "Execute programs in VTE" msgstr "" -#: ../src/vte.c:851 +#: ../src/vte.c:847 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" msgstr "" -#: ../src/win32.c:135 +#: ../src/win32.c:161 #, fuzzy msgid "Geany project files" msgstr "屬性" -#: ../src/win32.c:141 +#: ../src/win32.c:167 msgid "Executables" msgstr "" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 #, fuzzy msgid "Class Builder" msgstr "類別" -#: ../plugins/classbuilder.c:37 +#: ../plugins/classbuilder.c:36 msgid "Creates source files for new class types." msgstr "" -#: ../plugins/classbuilder.c:322 +#: ../plugins/classbuilder.c:372 msgid "Create Class" msgstr "" -#: ../plugins/classbuilder.c:332 +#: ../plugins/classbuilder.c:384 +#, fuzzy +msgid "Namespace" +msgstr "命名空間" + +#: ../plugins/classbuilder.c:393 +#, fuzzy +msgid "Namespace:" +msgstr "命名空間" + +#: ../plugins/classbuilder.c:402 #, fuzzy msgid "Class" msgstr "類別" -#: ../plugins/classbuilder.c:341 +#: ../plugins/classbuilder.c:411 #, fuzzy msgid "Class name:" msgstr "類別" -#: ../plugins/classbuilder.c:352 +#: ../plugins/classbuilder.c:424 #, fuzzy msgid "Header file:" msgstr "重新載入檔案" -#: ../plugins/classbuilder.c:361 +#: ../plugins/classbuilder.c:434 #, fuzzy msgid "Source file:" msgstr "C 原始檔" -#: ../plugins/classbuilder.c:367 +#: ../plugins/classbuilder.c:440 #, fuzzy msgid "Inheritance" msgstr "介面" -#: ../plugins/classbuilder.c:376 +#: ../plugins/classbuilder.c:449 msgid "Base class:" msgstr "" -#: ../plugins/classbuilder.c:389 +#: ../plugins/classbuilder.c:463 +#, fuzzy +msgid "Base source:" +msgstr "Pascal原始檔" + +#: ../plugins/classbuilder.c:465 msgid "Base header:" msgstr "" -#: ../plugins/classbuilder.c:397 +#: ../plugins/classbuilder.c:475 msgid "Global" msgstr "" -#: ../plugins/classbuilder.c:406 +#: ../plugins/classbuilder.c:485 #, fuzzy msgid "Base GType:" msgstr "型態" -#: ../plugins/classbuilder.c:414 +#: ../plugins/classbuilder.c:498 +msgid "Implements:" +msgstr "" + +#: ../plugins/classbuilder.c:505 #, fuzzy msgid "Options" msgstr "函式" -#: ../plugins/classbuilder.c:423 +#: ../plugins/classbuilder.c:514 #, fuzzy msgid "Create constructor" msgstr "自動補完文字" -#: ../plugins/classbuilder.c:427 +#: ../plugins/classbuilder.c:518 #, fuzzy msgid "Create destructor" msgstr "自動補完文字" -#: ../plugins/classbuilder.c:437 +#: ../plugins/classbuilder.c:526 +msgid "Is abstract" +msgstr "" + +#: ../plugins/classbuilder.c:529 +msgid "Is singleton" +msgstr "" + +#: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" msgstr "" -#: ../plugins/classbuilder.c:744 +#: ../plugins/classbuilder.c:1040 msgid "Create Cla_ss" msgstr "" -#: ../plugins/classbuilder.c:750 +#: ../plugins/classbuilder.c:1046 #, fuzzy msgid "_C++ Class" msgstr "類別" -#: ../plugins/classbuilder.c:753 +#: ../plugins/classbuilder.c:1049 #, fuzzy msgid "_GTK+ Class" msgstr "類別" +#: ../plugins/classbuilder.c:1052 +#, fuzzy +msgid "_PHP Class" +msgstr "類別" + #: ../plugins/htmlchars.c:38 #, fuzzy msgid "HTML Characters" @@ -4884,97 +5138,103 @@ msgstr "" #: ../plugins/htmlchars.c:39 ../plugins/export.c:38 -#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/filebrowser.c:44 ../plugins/saveactions.c:40 #: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "開發者名字" -#: ../plugins/htmlchars.c:72 +#: ../plugins/htmlchars.c:75 msgid "HTML characters" msgstr "" -#: ../plugins/htmlchars.c:78 +#: ../plugins/htmlchars.c:81 msgid "ISO 8859-1 characters" msgstr "" -#: ../plugins/htmlchars.c:176 +#: ../plugins/htmlchars.c:179 msgid "Greek characters" msgstr "" -#: ../plugins/htmlchars.c:231 +#: ../plugins/htmlchars.c:234 msgid "Mathematical characters" msgstr "" -#: ../plugins/htmlchars.c:272 +#: ../plugins/htmlchars.c:275 msgid "Technical characters" msgstr "" -#: ../plugins/htmlchars.c:280 +#: ../plugins/htmlchars.c:283 msgid "Arrow characters" msgstr "" -#: ../plugins/htmlchars.c:293 +#: ../plugins/htmlchars.c:296 msgid "Punctuation characters" msgstr "" -#: ../plugins/htmlchars.c:309 +#: ../plugins/htmlchars.c:312 msgid "Miscellaneous characters" msgstr "" -#: ../plugins/htmlchars.c:447 +#: ../plugins/htmlchars.c:367 ../plugins/filebrowser.c:1134 +#: ../plugins/saveactions.c:470 +#, fuzzy +msgid "Plugin configuration directory could not be created." +msgstr "無法建立組態文件目錄(%s)." + +#: ../plugins/htmlchars.c:482 #, fuzzy msgid "Special Characters" msgstr "章節" -#: ../plugins/htmlchars.c:449 +#: ../plugins/htmlchars.c:484 #, fuzzy msgid "_Insert" msgstr "插入日期/時間" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:493 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." msgstr "" -#: ../plugins/htmlchars.c:472 +#: ../plugins/htmlchars.c:507 #, fuzzy msgid "Character" msgstr "章節" -#: ../plugins/htmlchars.c:478 +#: ../plugins/htmlchars.c:513 msgid "HTML (name)" msgstr "" -#: ../plugins/htmlchars.c:678 +#: ../plugins/htmlchars.c:731 msgid "_Insert Special HTML Characters" msgstr "" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:690 +#: ../plugins/htmlchars.c:746 #, fuzzy msgid "HTML Replacement" msgstr "取代" -#: ../plugins/htmlchars.c:697 +#: ../plugins/htmlchars.c:753 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:762 msgid "Bulk replacement of special chars" msgstr "" -#: ../plugins/htmlchars.c:721 +#: ../plugins/htmlchars.c:777 msgid "Insert Special HTML Characters" msgstr "" -#: ../plugins/htmlchars.c:724 +#: ../plugins/htmlchars.c:780 #, fuzzy msgid "Replace special characters" msgstr "章節" -#: ../plugins/htmlchars.c:727 +#: ../plugins/htmlchars.c:783 #, fuzzy msgid "Toggle plugin status" msgstr "註釋/取消註釋行" @@ -5002,113 +5262,112 @@ "Renders the font size of the document together with the current zoom level" msgstr "" -#: ../plugins/export.c:267 +#: ../plugins/export.c:268 #, c-format msgid "Document successfully exported as '%s'." msgstr "" -#: ../plugins/export.c:269 +#: ../plugins/export.c:270 #, fuzzy, c-format msgid "File '%s' could not be written (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../plugins/export.c:316 +#: ../plugins/export.c:317 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "檔案 '%s' 已存在.是否真要覆寫?" -#: ../plugins/export.c:703 +#: ../plugins/export.c:704 msgid "_Export" msgstr "" #. HTML -#: ../plugins/export.c:710 +#: ../plugins/export.c:711 msgid "As _HTML" msgstr "" #. LaTeX -#: ../plugins/export.c:716 +#: ../plugins/export.c:717 msgid "As _LaTeX" msgstr "" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 #, fuzzy msgid "File Browser" msgstr "瀏覽器" -#: ../plugins/filebrowser.c:40 +#: ../plugins/filebrowser.c:43 msgid "Adds a file browser tab to the sidebar." msgstr "" -#: ../plugins/filebrowser.c:323 +#: ../plugins/filebrowser.c:360 msgid "Too many items selected!" msgstr "" -#: ../plugins/filebrowser.c:399 +#: ../plugins/filebrowser.c:436 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:555 +#: ../plugins/filebrowser.c:603 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:618 #, fuzzy msgid "_Find in Files" msgstr "在一系列檔案中尋找(_i)" -#: ../plugins/filebrowser.c:571 +#: ../plugins/filebrowser.c:628 #, fuzzy msgid "Show _Hidden Files" msgstr "顯示隱藏檔案" -#: ../plugins/filebrowser.c:763 +#: ../plugins/filebrowser.c:841 msgid "Up" msgstr "" -#: ../plugins/filebrowser.c:768 +#: ../plugins/filebrowser.c:846 msgid "Refresh" msgstr "" -#: ../plugins/filebrowser.c:773 +#: ../plugins/filebrowser.c:851 msgid "Home" msgstr "" -#: ../plugins/filebrowser.c:778 +#: ../plugins/filebrowser.c:856 #, fuzzy msgid "Set path from document" msgstr "切換到左邊文件" -#: ../plugins/filebrowser.c:786 +#: ../plugins/filebrowser.c:866 #, fuzzy msgid "Clear the filter" msgstr "關閉目前檔案" -#: ../plugins/filebrowser.c:800 +#: ../plugins/filebrowser.c:880 #, fuzzy msgid "Filter:" msgstr "檔案(_F)" -#: ../plugins/filebrowser.c:1019 +#: ../plugins/filebrowser.c:890 +msgid "Filter your files with usual wildcards" +msgstr "" + +#: ../plugins/filebrowser.c:1107 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1021 +#: ../plugins/filebrowser.c:1109 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 -#, fuzzy -msgid "Plugin configuration directory could not be created." -msgstr "無法建立組態文件目錄(%s)." - -#: ../plugins/filebrowser.c:1092 +#: ../plugins/filebrowser.c:1185 #, fuzzy msgid "External open command:" msgstr "指令" -#: ../plugins/filebrowser.c:1101 +#: ../plugins/filebrowser.c:1194 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5118,27 +5377,27 @@ "filename" msgstr "" -#: ../plugins/filebrowser.c:1107 +#: ../plugins/filebrowser.c:1202 #, fuzzy msgid "Show hidden files" msgstr "顯示隱藏檔案" -#: ../plugins/filebrowser.c:1113 +#: ../plugins/filebrowser.c:1208 #, fuzzy msgid "Hide object files" msgstr "屬性" -#: ../plugins/filebrowser.c:1117 +#: ../plugins/filebrowser.c:1212 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" msgstr "" -#: ../plugins/filebrowser.c:1128 +#: ../plugins/filebrowser.c:1223 msgid "Use the project's base directory" msgstr "" -#: ../plugins/filebrowser.c:1132 +#: ../plugins/filebrowser.c:1227 #, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" @@ -5252,38 +5511,113 @@ msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:277 +#: ../plugins/splitwindow.c:244 #, fuzzy msgid "Show the current document" msgstr "切換到左邊文件" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +#: ../plugins/splitwindow.c:261 ../plugins/splitwindow.c:389 +#: ../plugins/splitwindow.c:404 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:399 +#: ../plugins/splitwindow.c:371 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:379 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:384 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:427 +#: ../plugins/splitwindow.c:400 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:402 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:431 -msgid "Unsplit" -msgstr "" +#, fuzzy +#~ msgid "_View DVI File" +#~ msgstr "檢視DVI檔案" + +#, fuzzy +#~ msgid "V_iew PDF File" +#~ msgstr "檢視PDF檔案" + +#, fuzzy +#~ msgid "_Set Arguments" +#~ msgstr "設定參數" + +#~ msgid "Set Arguments" +#~ msgstr "設定參數" + +#~ msgid "Compile:" +#~ msgstr "編譯:" + +#~ msgid "Build:" +#~ msgstr "建構:" + +#~ msgid "Failed to execute the view program" +#~ msgstr "無法執行檢視程式" + +#, fuzzy +#~ msgid "_Customize Toolbar" +#~ msgstr "隱藏工具列" + +#, fuzzy +#~ msgid "Icon style:" +#~ msgstr "圖示風格" + +#, fuzzy +#~ msgid "Icon size:" +#~ msgstr "圖示大小" + +#~ msgid "Appearance" +#~ msgstr "外觀" + +#, fuzzy +#~ msgid "Hard tab width:" +#~ msgstr "Tab字符寬度：" + +#~ msgid "Duplicate line or selection" +#~ msgstr "複製行或選擇區域" + +#, fuzzy +#~ msgid "Send Selection to Terminal" +#~ msgstr "在選擇區域中(_l)" + +#~ msgid "Run (alternative command)" +#~ msgstr "執行(替代的指令)" + +#, fuzzy +#~ msgid "Printing of file %s was cancelled." +#~ msgstr "行程(%s)失敗" + +#, fuzzy +#~ msgid "Run command:" +#~ msgstr "指令" + +#~ msgid "My" +#~ msgstr "我的" + +#~ msgid "Local" +#~ msgstr "本地端" + +#~ msgid "Our" +#~ msgstr "我們的" + +#, fuzzy +#~ msgid "Terminal plugin" +#~ msgstr "終端模擬" + +#, fuzzy +#~ msgid "Terminal font:" +#~ msgstr "終端機字型" #~ msgid "Diff file" #~ msgstr "差異檔" @@ -5380,9 +5714,6 @@ #~ msgid "Unfolds all contracted code blocks" #~ msgstr "展開全部可以已摺疊的源碼區塊" -#~ msgid "Color" -#~ msgstr "顏色" - #~ msgid "Enter a line number and jump to it." #~ msgstr "輸入欲前往行號" @@ -5433,9 +5764,6 @@ #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "運行於偵錯模式(意即有詳細訊息)" -#~ msgid "Search failed." -#~ msgstr "搜尋失敗." - #, fuzzy #~ msgid "JavaScript functions" #~ msgstr "Java 原始檔" @@ -5563,10 +5891,6 @@ #~ msgstr "Ferite原始檔" #, fuzzy -#~ msgid "Haskell source file" -#~ msgstr "Pascal原始檔" - -#, fuzzy #~ msgid "Docbook source file" #~ msgstr "D原始檔" @@ -5631,10 +5955,6 @@ #~ msgstr "離開前您要存檔嗎?" #, fuzzy -#~ msgid "From _directory" -#~ msgstr "目錄:" - -#, fuzzy #~ msgid "Convert Selection to _Lower-case" #~ msgstr "把選擇區域轉成小寫(_l)" diff -Nru geany-0.18/README geany-0.19/README --- geany-0.18/README 2009-01-22 20:33:21.000000000 +0000 +++ geany-0.19/README 2010-01-01 22:55:18.000000000 +0000 @@ -102,7 +102,7 @@ -- -2005-2009 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2005-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com frank(at)frank(dot)uvena(dot)de diff -Nru geany-0.18/README.I18N geany-0.19/README.I18N --- geany-0.18/README.I18N 2008-11-27 19:46:58.000000000 +0000 +++ geany-0.19/README.I18N 2010-02-20 15:55:31.000000000 +0000 @@ -1,59 +1,59 @@ Quick Guide for new translations -------------------------------- -If you want to translate Geany into another language, please go to the -language statistics page (see below) to see whether your desired -language already exists. If it already exists, please read the -"Notes for updating translations" section. Otherwise, get the SVN -version of Geany, change to the po directory and start the new -translation with: +If you would like to translate Geany into another language, have a look at the +language statistics page at [1] first to see if your desired language already +exists. If it already exists, please read the "Notes for updating translations" +section. Otherwise, get the SVN version of Geany, change to the po directory and +start the new translation with: $ msginit -l ll_CC -o ll.po -i geany.pot -Fill in ll with the language code and CC with the country code. -For example, to translate Geany into Italian you would type: +Fill in ll with the language code and CC with the country code. For example, to +translate Geany into Italian you would type: $ msginit -l it_IT -o it.po -i geany.pot -This will create a file it.po. This file can be opened with a -text editor (like Geany ;-)) or you can also use a graphical -interface. I can suggest PoEdit (http://www.poedit.net/), but -there are several other GUIs. +This will create a file it.po. This file can be opened with a text editor +(e.g. Geany ;-)) or a graphical program like PoEdit [2]. There are also several +other GUI programs for working on translations. -Make sure you add your language to the file po/LINGUAS. -Just open the file with a text editor and add your code. +You don't need to modify the file po/LINGUAS, it is regenerated automatically on +the next build. When you have finished editing the file, check the file with: $ msgfmt -c --check-accelerators=_ it.po -Please take care of menu accelerators(strings containing a "_"). -The "_" character should also be in your translation. Additionally, -it would be nice if these accelerators are not twice for two strings -inside a dialog or sub menu. +Please take care of menu accelerators(strings containing a "_"). The "_" +character should also be in your translation. Additionally, it would be nice if +these accelerators are not twice for two strings inside a dialog or sub menu. -You can also use intl_stats.sh, e.g. by running the following command -in the top source directory of Geany: +You can also use intl_stats.sh, e.g. by running the following command in the top +source directory of Geany: $ po/intl_stats.sh -a it -This will print some information about the Italian translation -and checks for menu accelerators. +This will print some information about the Italian translation and checks for +menu accelerators. -Then send the file to Frank Lanitz and he will add the translation. - -It is a good idea to write to Frank before you start or while translating, -because he can give you some hints on translating and ensure that the -translation is not already in progress. +When you have finished your work - which doesn't mean you finished the +translation, you will not have to work alone - send the file to the translation +mailing list [3] or directly to Frank Lanitz [4] and he will add the translation +to Geany then. + +It is a good idea to let any translator and Frank know before you start or while +translating, because they can give you hints on translating and Frank can ensure +that a translation is not already in progress. Notes for updating translations ------------------------------- -If you want to update an existing translation, please contact Frank -Lanitz. He is supervising all translation issues and will contact the -maintainer of the translation you want to update to avoid any -conflicts. +If you want to update an existing translation, please contact the translation +mailing list [3] and/or Frank Lanitz [4] directly. He is supervising all +translation issues and will contact the maintainer of the translation you want +to update to avoid any conflicts. Some translation statistics can be found at: http://i18n.geany.org/ @@ -62,8 +62,11 @@ I18n mailing list ----------------- -There is also a mailing list dedicated to translation issues. Please -visit http://www.geany.org/Support/MailingList for more information. +There is also a mailing list dedicated to translation issues. Please visit +http://www.geany.org/Support/MailingList#geany-i18 for more information. -Contact: Frank Lanitz +[1] http://i18n.geany.org/ +[2] http://www.poedit.net/ +[3] http://www.geany.org/Support/MailingList#geany-i18 +[4] Frank Lanitz diff -Nru geany-0.18/README.Packagers geany-0.19/README.Packagers --- geany-0.18/README.Packagers 2009-06-18 15:20:07.000000000 +0100 +++ geany-0.19/README.Packagers 2010-01-01 22:55:18.000000000 +0000 @@ -42,7 +42,7 @@ The file COPYING is the GPLv2 license text and should(have to?) be included in your package. - Start Geany after it was installed out of your package. Pass the - command line argument "-d" to see whether Geany complains about + command line argument "-v" to see whether Geany complains about missing files. - Check whether the help menu item (Help->Help or F1) works and opens the local installed HTML documentation in your browser (if it opens @@ -82,7 +82,7 @@ -- -2008-2009 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2008-2010 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico(dot)troeger(at)uvena(dot)de nick(dot)treleaven(at)btinternet(dot)com frank(at)frank(dot)uvena(dot)de diff -Nru geany-0.18/scintilla/AutoComplete.cxx geany-0.19/scintilla/AutoComplete.cxx --- geany-0.18/scintilla/AutoComplete.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/AutoComplete.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -11,7 +11,7 @@ #include "Platform.h" -#include "PropSet.h" +#include "CharClassify.h" #include "AutoComplete.h" #ifdef SCI_NAMESPACE @@ -43,12 +43,12 @@ } } -bool AutoComplete::Active() { +bool AutoComplete::Active() const { return active; } -void AutoComplete::Start(Window &parent, int ctrlID, - int position, Point location, int startLen_, +void AutoComplete::Start(Window &parent, int ctrlID, + int position, Point location, int startLen_, int lineHeight, bool unicodeMode) { if (active) { Cancel(); @@ -82,7 +82,7 @@ separator = separator_; } -char AutoComplete::GetSeparator() { +char AutoComplete::GetSeparator() const { return separator; } @@ -90,7 +90,7 @@ typesep = separator_; } -char AutoComplete::GetTypesep() { +char AutoComplete::GetTypesep() const { return typesep; } diff -Nru geany-0.18/scintilla/AutoComplete.h geany-0.19/scintilla/AutoComplete.h --- geany-0.18/scintilla/AutoComplete.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/AutoComplete.h 2010-05-16 18:44:24.000000000 +0100 @@ -36,7 +36,7 @@ ~AutoComplete(); /// Is the auto completion list displayed? - bool Active(); + bool Active() const; /// Display the auto completion list positioned to be near a character position void Start(Window &parent, int ctrlID, int position, Point location, @@ -52,11 +52,11 @@ /// The separator character is used when interpreting the list in SetList void SetSeparator(char separator_); - char GetSeparator(); + char GetSeparator() const; /// The typesep character is used for seperating the word from the type void SetTypesep(char separator_); - char GetTypesep(); + char GetTypesep() const; /// The list string contains a sequence of words separated by the separator character void SetList(const char *list); diff -Nru geany-0.18/scintilla/CallTip.cxx geany-0.19/scintilla/CallTip.cxx --- geany-0.18/scintilla/CallTip.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/CallTip.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -68,7 +68,7 @@ } // We ignore tabs unless a tab width has been set. -bool CallTip::IsTabCharacter(char ch) { +bool CallTip::IsTabCharacter(char ch) const { return (tabSize > 0) && (ch == '\t'); } @@ -95,7 +95,7 @@ int maxEnd = 0; const int numEnds = 10; int ends[numEnds + 2]; - for (int i=0;i 0) @@ -254,11 +254,9 @@ const char *faceName, int size, int codePage_, int characterSet, Window &wParent) { clickPlace = 0; - if (val) - delete []val; + delete []val; + val = 0; val = new char[strlen(defn) + 1]; - if (!val) - return PRectangle(); strcpy(val, defn); codePage = codePage_; Surface *surfaceMeasure = Surface::Allocate(); diff -Nru geany-0.18/scintilla/CallTip.h geany-0.19/scintilla/CallTip.h --- geany-0.18/scintilla/CallTip.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/CallTip.h 2010-05-16 18:44:24.000000000 +0100 @@ -27,13 +27,13 @@ bool useStyleCallTip; // if true, STYLE_CALLTIP should be used // Private so CallTip objects can not be copied - CallTip(const CallTip &) {} - CallTip &operator=(const CallTip &) { return *this; } + CallTip(const CallTip &); + CallTip &operator=(const CallTip &); void DrawChunk(Surface *surface, int &x, const char *s, int posStart, int posEnd, int ytext, PRectangle rcClient, bool highlight, bool draw); int PaintContents(Surface *surfaceWindow, bool draw); - bool IsTabCharacter(char c); + bool IsTabCharacter(char c) const; int NextTabPos(int x); public: @@ -61,7 +61,7 @@ /// Setup the calltip and return a rectangle of the area required. PRectangle CallTipStart(int pos, Point pt, const char *defn, - const char *faceName, int size, int codePage_, + const char *faceName, int size, int codePage_, int characterSet, Window &wParent); void CallTipCancel(); diff -Nru geany-0.18/scintilla/CellBuffer.cxx geany-0.19/scintilla/CellBuffer.cxx --- geany-0.18/scintilla/CellBuffer.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/CellBuffer.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -44,9 +44,11 @@ starts.InsertText(line, delta); } -void LineVector::InsertLine(int line, int position) { +void LineVector::InsertLine(int line, int position, bool lineStart) { starts.InsertPartition(line, position); if (perLine) { + if ((line > 0) && lineStart) + line--; perLine->InsertLine(line); } } @@ -71,6 +73,7 @@ position = 0; data = 0; lenData = 0; + mayCoalesce = false; } Action::~Action() { @@ -150,8 +153,6 @@ // Run out of undo nodes so extend the array int lenActionsNew = lenActions * 2; Action *actionsNew = new Action[lenActionsNew]; - if (!actionsNew) - return; for (int act = 0; act <= currentAction; act++) actionsNew[act].Grab(&actions[act]); delete []actions; @@ -198,7 +199,7 @@ // Insertions must be immediately after to coalesce currentAction++; } else if (at == removeAction) { - if ((lengthData == 1) || (lengthData == 2)){ + if ((lengthData == 1) || (lengthData == 2)) { if ((position + lengthData) == actPrevious->position) { ; // Backspace -> OK } else if (position == actPrevious->position) { @@ -340,7 +341,7 @@ return substance.ValueAt(position); } -void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) { +void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) const { if (lengthRetrieve < 0) return; if (position < 0) @@ -350,17 +351,17 @@ lengthRetrieve, substance.Length()); return; } - + for (int i=0; i= 0); + if (val < 0) return false; return (val < size) ? bset[val] : valueAfter; } }; diff -Nru geany-0.18/scintilla/CharClassify.cxx geany-0.19/scintilla/CharClassify.cxx --- geany-0.18/scintilla/CharClassify.cxx 2006-03-11 02:33:39.000000000 +0000 +++ geany-0.19/scintilla/CharClassify.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -5,6 +5,7 @@ // Copyright 2006 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. +#include #include #include "CharClassify.h" @@ -41,3 +42,37 @@ } } } + +int CompareCaseInsensitive(const char *a, const char *b) { + while (*a && *b) { + if (*a != *b) { + char upperA = MakeUpperCase(*a); + char upperB = MakeUpperCase(*b); + if (upperA != upperB) + return upperA - upperB; + } + a++; + b++; + } + // Either *a or *b is nul + return *a - *b; +} + +int CompareNCaseInsensitive(const char *a, const char *b, size_t len) { + while (*a && *b && len) { + if (*a != *b) { + char upperA = MakeUpperCase(*a); + char upperB = MakeUpperCase(*b); + if (upperA != upperB) + return upperA - upperB; + } + a++; + b++; + len--; + } + if (len == 0) + return 0; + else + // Either *a or *b is nul + return *a - *b; +} diff -Nru geany-0.18/scintilla/CharClassify.h geany-0.19/scintilla/CharClassify.h --- geany-0.18/scintilla/CharClassify.h 2006-03-11 02:33:39.000000000 +0000 +++ geany-0.19/scintilla/CharClassify.h 2010-03-07 10:31:51.000000000 +0000 @@ -2,7 +2,7 @@ /** @file CharClassify.h ** Character classifications used by Document and RESearch. **/ -// Copyright 2006 by Neil Hodgson +// Copyright 2006-2009 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. #ifndef CHARCLASSIFY_H @@ -22,4 +22,16 @@ enum { maxChar=256 }; unsigned char charClass[maxChar]; // not type cc to save space }; + +// These functions are implemented because each platform calls them something different. +int CompareCaseInsensitive(const char *a, const char *b); +int CompareNCaseInsensitive(const char *a, const char *b, size_t len); + +inline char MakeUpperCase(char ch) { + if (ch < 'a' || ch > 'z') + return ch; + else + return static_cast(ch - 'a' + 'A'); +} + #endif diff -Nru geany-0.18/scintilla/ContractionState.cxx geany-0.19/scintilla/ContractionState.cxx --- geany-0.18/scintilla/ContractionState.cxx 2007-12-02 11:58:17.000000000 +0000 +++ geany-0.19/scintilla/ContractionState.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -232,11 +232,11 @@ void ContractionState::Check() const { #ifdef CHECK_CORRECTNESS - for (int vline = 0;vline < LinesDisplayed(); vline++) { + for (int vline = 0; vline < LinesDisplayed(); vline++) { const int lineDoc = DocFromDisplay(vline); PLATFORM_ASSERT(GetVisible(lineDoc)); } - for (int lineDoc = 0;lineDoc < LinesInDoc(); lineDoc++) { + for (int lineDoc = 0; lineDoc < LinesInDoc(); lineDoc++) { const int displayThis = DisplayFromDoc(lineDoc); const int displayNext = DisplayFromDoc(lineDoc + 1); const int height = displayNext - displayThis; diff -Nru geany-0.18/scintilla/Converter.h geany-0.19/scintilla/Converter.h --- geany-0.18/scintilla/Converter.h 2006-08-21 18:21:50.000000000 +0100 +++ geany-0.19/scintilla/Converter.h 2010-05-16 18:44:24.000000000 +0100 @@ -3,12 +3,7 @@ // Copyright 2004 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. -#include -#if GTK_MAJOR_VERSION >= 2 - typedef GIConv ConverterHandle; -#else - typedef iconv_t ConverterHandle; -#endif +typedef GIConv ConverterHandle; const ConverterHandle iconvhBad = (ConverterHandle)(-1); // Since various versions of iconv can not agree on whether the src argument // is char ** or const char ** provide a templatised adaptor. @@ -24,11 +19,7 @@ class Converter { ConverterHandle iconvh; void OpenHandle(const char *fullDestination, const char *charSetSource) { -#if GTK_MAJOR_VERSION >= 2 iconvh = g_iconv_open(fullDestination, charSetSource); -#else - iconvh = iconv_open(fullDestination, charSetSource); -#endif } bool Succeeded() const { return iconvh != iconvhBad; @@ -65,11 +56,7 @@ } void Close() { if (Succeeded()) { -#if GTK_MAJOR_VERSION >= 2 g_iconv_close(iconvh); -#else - iconv_close(iconvh); -#endif iconvh = iconvhBad; } } @@ -77,11 +64,7 @@ if (!Succeeded()) { return (size_t)(-1); } else { -#if GTK_MAJOR_VERSION >= 2 return iconv_adaptor(g_iconv, iconvh, src, srcleft, dst, dstleft); -#else - return iconv_adaptor(iconv, iconvh, src, srcleft, dst, dstleft); -#endif } } }; diff -Nru geany-0.18/scintilla/Decoration.h geany-0.19/scintilla/Decoration.h --- geany-0.18/scintilla/Decoration.h 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.19/scintilla/Decoration.h 2010-05-16 18:44:24.000000000 +0100 @@ -40,10 +40,10 @@ ~DecorationList(); void SetCurrentIndicator(int indicator); - int GetCurrentIndicator() { return currentIndicator; } + int GetCurrentIndicator() const { return currentIndicator; } void SetCurrentValue(int value); - int GetCurrentValue() { return currentValue; } + int GetCurrentValue() const { return currentValue; } // Returns true if some values may have changed bool FillRange(int &position, int value, int &fillLength); diff -Nru geany-0.18/scintilla/DocumentAccessor.cxx geany-0.19/scintilla/DocumentAccessor.cxx --- geany-0.18/scintilla/DocumentAccessor.cxx 2007-12-02 11:58:17.000000000 +0000 +++ geany-0.19/scintilla/DocumentAccessor.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -187,7 +187,7 @@ indent += SC_FOLDLEVELBASE; // if completely empty line or the start of a comment... if ((ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') || - (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) ) + (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos))) return indent | SC_FOLDLEVELWHITEFLAG; else return indent; diff -Nru geany-0.18/scintilla/DocumentAccessor.h geany-0.19/scintilla/DocumentAccessor.h --- geany-0.18/scintilla/DocumentAccessor.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/DocumentAccessor.h 2010-06-06 19:34:26.000000000 +0100 @@ -14,14 +14,15 @@ /** */ + class DocumentAccessor : public Accessor { // Private so DocumentAccessor objects can not be copied - DocumentAccessor(const DocumentAccessor &source) : Accessor(), props(source.props) {} - DocumentAccessor &operator=(const DocumentAccessor &) { return *this; } + DocumentAccessor(const DocumentAccessor &source); + DocumentAccessor &operator=(const DocumentAccessor &); protected: Document *pdoc; - PropSet &props; + PropertyGet &props; WindowID id; int lenDoc; @@ -37,9 +38,9 @@ void Fill(int position); public: - DocumentAccessor(Document *pdoc_, PropSet &props_, WindowID id_=0) : + DocumentAccessor(Document *pdoc_, PropertyGet &props_, WindowID id_=0) : Accessor(), pdoc(pdoc_), props(props_), id(id_), - lenDoc(-1), validLen(0), chFlags(0), chWhile(0), + lenDoc(-1), validLen(0), chFlags(0), chWhile(0), startSeg(0), startPosStyling(0), mask(127) { // Initialize the mask to be big enough for any lexer. } @@ -53,8 +54,8 @@ void Flush(); int GetLineState(int line); int SetLineState(int line, int state); - int GetPropertyInt(const char *key, int defaultValue=0) { - return props.GetInt(key, defaultValue); + int GetPropertyInt(const char *key, int defaultValue=0) { + return props.GetInt(key, defaultValue); } char *GetProperties() { return props.ToString(); @@ -62,7 +63,7 @@ WindowID GetWindow() { return id; } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); diff -Nru geany-0.18/scintilla/Document.cxx geany-0.19/scintilla/Document.cxx --- geany-0.18/scintilla/Document.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/Document.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -10,6 +10,17 @@ #include #include +#include +#include + +// With Borland C++ 5.5, including includes Windows.h leading to defining +// FindText to FindTextA which makes calls here to Document::FindText fail. +#ifdef __BORLANDC__ +#ifdef FindText +#undef FindText +#endif +#endif + #include "Platform.h" #include "Scintilla.h" @@ -22,6 +33,7 @@ #include "Decoration.h" #include "Document.h" #include "RESearch.h" +#include "UniConversion.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -140,13 +152,13 @@ NotifySavePoint(true); } -int Document::GetMark(int line) { - return static_cast(perLineData[ldMarkers])->MarkValue(line); +int Document::GetMark(int line) { + return static_cast(perLineData[ldMarkers])->MarkValue(line); } int Document::AddMark(int line, int markerNum) { if (line <= LinesTotal()) { - int prev = static_cast(perLineData[ldMarkers])-> + int prev = static_cast(perLineData[ldMarkers])-> AddMark(line, markerNum, LinesTotal()); DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); NotifyModified(mh); @@ -160,20 +172,20 @@ unsigned int m = valueSet; for (int i = 0; m; i++, m >>= 1) if (m & 1) - static_cast(perLineData[ldMarkers])-> + static_cast(perLineData[ldMarkers])-> AddMark(line, i, LinesTotal()); DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); NotifyModified(mh); } void Document::DeleteMark(int line, int markerNum) { - static_cast(perLineData[ldMarkers])->DeleteMark(line, markerNum, false); + static_cast(perLineData[ldMarkers])->DeleteMark(line, markerNum, false); DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); NotifyModified(mh); } void Document::DeleteMarkFromHandle(int markerHandle) { - static_cast(perLineData[ldMarkers])->DeleteMarkFromHandle(markerHandle); + static_cast(perLineData[ldMarkers])->DeleteMarkFromHandle(markerHandle); DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0); mh.line = -1; NotifyModified(mh); @@ -181,15 +193,15 @@ void Document::DeleteAllMarks(int markerNum) { for (int line = 0; line < LinesTotal(); line++) { - static_cast(perLineData[ldMarkers])->DeleteMark(line, markerNum, true); + static_cast(perLineData[ldMarkers])->DeleteMark(line, markerNum, true); } DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0); mh.line = -1; NotifyModified(mh); } -int Document::LineFromHandle(int markerHandle) { - return static_cast(perLineData[ldMarkers])->LineFromHandle(markerHandle); +int Document::LineFromHandle(int markerHandle) { + return static_cast(perLineData[ldMarkers])->LineFromHandle(markerHandle); } int Document::LineStart(int line) const { @@ -217,12 +229,16 @@ return LineEnd(LineFromPosition(position)); } +bool Document::IsLineEndPosition(int position) const { + return LineEnd(LineFromPosition(position)) == position; +} + int Document::VCHomePosition(int position) const { int line = LineFromPosition(position); int startPosition = LineStart(line); int endLine = LineEnd(line); int startText = startPosition; - while (startText < endLine && (cb.CharAt(startText) == ' ' || cb.CharAt(startText) == '\t' ) ) + while (startText < endLine && (cb.CharAt(startText) == ' ' || cb.CharAt(startText) == '\t')) startText++; if (position == startText) return startPosition; @@ -231,7 +247,7 @@ } int Document::SetLevel(int line, int level) { - int prev = static_cast(perLineData[ldLevels])->SetLevel(line, level, LinesTotal()); + int prev = static_cast(perLineData[ldLevels])->SetLevel(line, level, LinesTotal()); if (prev != level) { DocModification mh(SC_MOD_CHANGEFOLD | SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); @@ -242,12 +258,12 @@ return prev; } -int Document::GetLevel(int line) { - return static_cast(perLineData[ldLevels])->GetLevel(line); +int Document::GetLevel(int line) const { + return static_cast(perLineData[ldLevels])->GetLevel(line); } -void Document::ClearLevels() { - static_cast(perLineData[ldLevels])->ClearLevels(); +void Document::ClearLevels() { + static_cast(perLineData[ldLevels])->ClearLevels(); } static bool IsSubordinate(int levelStart, int levelTry) { @@ -433,7 +449,7 @@ while (posCheck < pos) { char mbstr[maxBytesInDBCSCharacter+1]; int i; - for(i=0;i= 0) && (line < LinesTotal())) { int lineStart = LineStart(line); int length = Length(); - for (int i = lineStart;i < length;i++) { + for (int i = lineStart; i < length; i++) { char ch = cb.CharAt(i); if (ch == ' ') indent++; @@ -757,10 +773,9 @@ CreateIndentation(linebuf, sizeof(linebuf), indent, tabInChars, !useTabs); int thisLineStart = LineStart(line); int indentPos = GetLineIndentPosition(line); - BeginUndoAction(); + UndoGroup ug(this); DeleteChars(thisLineStart, indentPos - thisLineStart); InsertCString(thisLineStart, linebuf); - EndUndoAction(); } } @@ -779,7 +794,7 @@ int column = 0; int line = LineFromPosition(pos); if ((line >= 0) && (line < LinesTotal())) { - for (int i = LineStart(line);i < pos;) { + for (int i = LineStart(line); i < pos;) { char ch = cb.CharAt(i); if (ch == '\t') { column = NextTab(column, tabInChars); @@ -801,8 +816,8 @@ int Document::FindColumn(int line, int column) { int position = LineStart(line); - int columnCurrent = 0; if ((line >= 0) && (line < LinesTotal())) { + int columnCurrent = 0; while ((columnCurrent < column) && (position < Length())) { char ch = cb.CharAt(position); if (ch == '\t') { @@ -867,7 +882,7 @@ } void Document::ConvertLineEnds(int eolModeSet) { - BeginUndoAction(); + UndoGroup ug(this); for (int pos = 0; pos < Length(); pos++) { if (cb.CharAt(pos) == '\r') { @@ -902,7 +917,6 @@ } } - EndUndoAction(); } bool Document::IsWhiteLine(int line) const { @@ -967,7 +981,7 @@ while (pos < (Length()) && (WordCharClass(cb.CharAt(pos)) == ccStart)) pos++; } - return MovePositionOutsideChar(pos, delta); + return MovePositionOutsideChar(pos, delta, true); } /** @@ -1065,16 +1079,6 @@ return IsWordStartAt(start) && IsWordEndAt(end); } -// The comparison and case changing functions here assume ASCII -// or extended ASCII such as the normal Windows code page. - -static inline char MakeUpperCase(char ch) { - if (ch < 'a' || ch > 'z') - return ch; - else - return static_cast(ch - 'a' + 'A'); -} - static inline char MakeLowerCase(char ch) { if (ch < 'A' || ch > 'Z') return ch; @@ -1082,79 +1086,170 @@ return static_cast(ch - 'A' + 'a'); } +static bool GoodTrailByte(int v) { + return (v >= 0x80) && (v < 0xc0); +} + +size_t Document::ExtractChar(int pos, char *bytes) { + unsigned char ch = static_cast(cb.CharAt(pos)); + size_t widthChar = UTF8CharLength(ch); + bytes[0] = ch; + for (size_t i=1; i(bytes[i]))) { // Bad byte + widthChar = 1; + } + } + return widthChar; +} + +CaseFolderTable::CaseFolderTable() { + for (size_t iChar=0; iChar(iChar); + } +} + +CaseFolderTable::~CaseFolderTable() { +} + +size_t CaseFolderTable::Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) { + if (lenMixed > sizeFolded) { + return 0; + } else { + for (size_t i=0; i(mixed[i])]; + } + return lenMixed; + } +} + +void CaseFolderTable::SetTranslation(char ch, char chTranslation) { + mapping[static_cast(ch)] = chTranslation; +} + +void CaseFolderTable::StandardASCII() { + for (size_t iChar=0; iChar= 'A' && iChar <= 'Z') { + mapping[iChar] = static_cast(iChar - 'A' + 'a'); + } else { + mapping[iChar] = static_cast(iChar); + } + } +} + +bool Document::MatchesWordOptions(bool word, bool wordStart, int pos, int length) { + return (!word && !wordStart) || + (word && IsWordAt(pos, pos + length)) || + (wordStart && IsWordStartAt(pos)); +} + /** * Find text in document, supporting both forward and backward * searches (just pass minPos > maxPos to do a backward search) * Has not been tested with backwards DBCS searches yet. */ -long Document::FindText(int minPos, int maxPos, const char *s, +long Document::FindText(int minPos, int maxPos, const char *search, bool caseSensitive, bool word, bool wordStart, bool regExp, int flags, - int *length) { + int *length, CaseFolder *pcf) { if (regExp) { if (!regex) regex = CreateRegexSearch(&charClass); - return regex->FindText(this, minPos, maxPos, s, caseSensitive, word, wordStart, flags, length); + return regex->FindText(this, minPos, maxPos, search, caseSensitive, word, wordStart, flags, length); } else { - bool forward = minPos <= maxPos; - int increment = forward ? 1 : -1; + const bool forward = minPos <= maxPos; + const int increment = forward ? 1 : -1; // Range endpoints should not be inside DBCS characters, but just in case, move them. - int startPos = MovePositionOutsideChar(minPos, increment, false); - int endPos = MovePositionOutsideChar(maxPos, increment, false); + const int startPos = MovePositionOutsideChar(minPos, increment, false); + const int endPos = MovePositionOutsideChar(maxPos, increment, false); // Compute actual search ranges needed - int lengthFind = *length; - if (lengthFind == -1) - lengthFind = static_cast(strlen(s)); - int endSearch = endPos; - if (startPos <= endPos) { - endSearch = endPos - lengthFind + 1; - } + const int lengthFind = (*length == -1) ? static_cast(strlen(search)) : *length; + const int endSearch = (startPos <= endPos) ? endPos - lengthFind + 1 : endPos; + //Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind); - char firstChar = s[0]; - if (!caseSensitive) - firstChar = static_cast(MakeUpperCase(firstChar)); + const int limitPos = Platform::Maximum(startPos, endPos); int pos = forward ? startPos : (startPos - 1); - while (forward ? (pos < endSearch) : (pos >= endSearch)) { - char ch = CharAt(pos); - if (caseSensitive) { - if (ch == firstChar) { - bool found = true; - if (pos + lengthFind > Platform::Maximum(startPos, endPos)) found = false; - for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) { - ch = CharAt(pos + posMatch); - if (ch != s[posMatch]) - found = false; - } - if (found) { - if ((!word && !wordStart) || - (word && IsWordAt(pos, pos + lengthFind)) || - (wordStart && IsWordStartAt(pos))) - return pos; - } + if (caseSensitive) { + while (forward ? (pos < endSearch) : (pos >= endSearch)) { + bool found = (pos + lengthFind) <= limitPos; + for (int indexSearch = 0; (indexSearch < lengthFind) && found; indexSearch++) { + found = CharAt(pos + indexSearch) == search[indexSearch]; } - } else { - if (MakeUpperCase(ch) == firstChar) { - bool found = true; - if (pos + lengthFind > Platform::Maximum(startPos, endPos)) found = false; - for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) { - ch = CharAt(pos + posMatch); - if (MakeUpperCase(ch) != MakeUpperCase(s[posMatch])) - found = false; + if (found && MatchesWordOptions(word, wordStart, pos, lengthFind)) { + return pos; + } + pos += increment; + if (dbcsCodePage && (pos >= 0)) { + // Have to use >= 0 as otherwise next statement would change + // -1 to 0 and make loop infinite. + // Ensure trying to match from start of character + pos = MovePositionOutsideChar(pos, increment, false); + } + } + } else if (SC_CP_UTF8 == dbcsCodePage) { + const size_t maxBytesCharacter = 4; + const size_t maxFoldingExpansion = 4; + std::vector searchThing(lengthFind * maxBytesCharacter * maxFoldingExpansion + 1); + const int lenSearch = pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind); + while (forward ? (pos < endSearch) : (pos >= endSearch)) { + int widthFirstCharacter = 0; + int indexDocument = 0; + int indexSearch = 0; + bool characterMatches = true; + while (characterMatches && + ((pos + indexDocument) < limitPos) && + (indexSearch < lenSearch)) { + char bytes[maxBytesCharacter + 1]; + bytes[maxBytesCharacter] = 0; + const int widthChar = ExtractChar(pos + indexDocument, bytes); + if (!widthFirstCharacter) + widthFirstCharacter = widthChar; + char folded[maxBytesCharacter * maxFoldingExpansion + 1]; + const int lenFlat = pcf->Fold(folded, sizeof(folded), bytes, widthChar); + folded[lenFlat] = 0; + // Does folded match the buffer + characterMatches = 0 == memcmp(folded, &searchThing[0] + indexSearch, lenFlat); + indexDocument += widthChar; + indexSearch += lenFlat; + } + if (characterMatches && (indexSearch == static_cast(lenSearch))) { + if (MatchesWordOptions(word, wordStart, pos, indexDocument)) { + *length = indexDocument; + return pos; } - if (found) { - if ((!word && !wordStart) || - (word && IsWordAt(pos, pos + lengthFind)) || - (wordStart && IsWordStartAt(pos))) - return pos; + } + if (forward) { + pos += widthFirstCharacter; + } else { + pos--; + if (pos > 0) { + // Ensure trying to match from start of character + pos = MovePositionOutsideChar(pos, increment, false); } } } - pos += increment; - if (dbcsCodePage && (pos >= 0)) { - // Ensure trying to match from start of character - pos = MovePositionOutsideChar(pos, increment, false); + } else { + CaseFolderTable caseFolder; + std::vector searchThing(lengthFind + 1); + pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind); + while (forward ? (pos < endSearch) : (pos >= endSearch)) { + bool found = (pos + lengthFind) <= limitPos; + for (int indexSearch = 0; (indexSearch < lengthFind) && found; indexSearch++) { + char ch = CharAt(pos + indexSearch); + char folded[2]; + pcf->Fold(folded, sizeof(folded), &ch, 1); + found = folded[0] == searchThing[indexSearch]; + } + if (found && MatchesWordOptions(word, wordStart, pos, lengthFind)) { + return pos; + } + pos += increment; + if (dbcsCodePage && (pos >= 0)) { + // Ensure trying to match from start of character + pos = MovePositionOutsideChar(pos, increment, false); + } } } } @@ -1264,7 +1359,7 @@ } int Document::SetLineState(int line, int state) { - int statePrevious = static_cast(perLineData[ldState])->SetLineState(line, state); + int statePrevious = static_cast(perLineData[ldState])->SetLineState(line, state); if (state != statePrevious) { DocModification mh(SC_MOD_CHANGELINESTATE, 0, 0, 0, 0, line); NotifyModified(mh); @@ -1272,59 +1367,59 @@ return statePrevious; } -int Document::GetLineState(int line) { - return static_cast(perLineData[ldState])->GetLineState(line); +int Document::GetLineState(int line) const { + return static_cast(perLineData[ldState])->GetLineState(line); } -int Document::GetMaxLineState() { - return static_cast(perLineData[ldState])->GetMaxLineState(); +int Document::GetMaxLineState() { + return static_cast(perLineData[ldState])->GetMaxLineState(); } StyledText Document::MarginStyledText(int line) { - LineAnnotation *pla = static_cast(perLineData[ldMargin]); - return StyledText(pla->Length(line), pla->Text(line), + LineAnnotation *pla = static_cast(perLineData[ldMargin]); + return StyledText(pla->Length(line), pla->Text(line), pla->MultipleStyles(line), pla->Style(line), pla->Styles(line)); } void Document::MarginSetText(int line, const char *text) { - static_cast(perLineData[ldMargin])->SetText(line, text); + static_cast(perLineData[ldMargin])->SetText(line, text); DocModification mh(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line); NotifyModified(mh); } void Document::MarginSetStyle(int line, int style) { - static_cast(perLineData[ldMargin])->SetStyle(line, style); + static_cast(perLineData[ldMargin])->SetStyle(line, style); } void Document::MarginSetStyles(int line, const unsigned char *styles) { - static_cast(perLineData[ldMargin])->SetStyles(line, styles); + static_cast(perLineData[ldMargin])->SetStyles(line, styles); } int Document::MarginLength(int line) const { - return static_cast(perLineData[ldMargin])->Length(line); + return static_cast(perLineData[ldMargin])->Length(line); } void Document::MarginClearAll() { int maxEditorLine = LinesTotal(); - for (int l=0;l(perLineData[ldMargin])->ClearAll(); + static_cast(perLineData[ldMargin])->ClearAll(); } bool Document::AnnotationAny() const { - return static_cast(perLineData[ldAnnotation])->AnySet(); + return static_cast(perLineData[ldAnnotation])->AnySet(); } StyledText Document::AnnotationStyledText(int line) { - LineAnnotation *pla = static_cast(perLineData[ldAnnotation]); - return StyledText(pla->Length(line), pla->Text(line), + LineAnnotation *pla = static_cast(perLineData[ldAnnotation]); + return StyledText(pla->Length(line), pla->Text(line), pla->MultipleStyles(line), pla->Style(line), pla->Styles(line)); } void Document::AnnotationSetText(int line, const char *text) { const int linesBefore = AnnotationLines(line); - static_cast(perLineData[ldAnnotation])->SetText(line, text); + static_cast(perLineData[ldAnnotation])->SetText(line, text); const int linesAfter = AnnotationLines(line); DocModification mh(SC_MOD_CHANGEANNOTATION, LineStart(line), 0, 0, 0, line); mh.annotationLinesAdded = linesAfter - linesBefore; @@ -1332,27 +1427,27 @@ } void Document::AnnotationSetStyle(int line, int style) { - static_cast(perLineData[ldAnnotation])->SetStyle(line, style); + static_cast(perLineData[ldAnnotation])->SetStyle(line, style); } void Document::AnnotationSetStyles(int line, const unsigned char *styles) { - static_cast(perLineData[ldAnnotation])->SetStyles(line, styles); + static_cast(perLineData[ldAnnotation])->SetStyles(line, styles); } int Document::AnnotationLength(int line) const { - return static_cast(perLineData[ldAnnotation])->Length(line); + return static_cast(perLineData[ldAnnotation])->Length(line); } int Document::AnnotationLines(int line) const { - return static_cast(perLineData[ldAnnotation])->Lines(line); + return static_cast(perLineData[ldAnnotation])->Lines(line); } void Document::AnnotationClearAll() { int maxEditorLine = LinesTotal(); - for (int l=0;l(perLineData[ldAnnotation])->ClearAll(); + static_cast(perLineData[ldAnnotation])->ClearAll(); } void Document::IncrementStyleClock() { @@ -1374,8 +1469,6 @@ return false; } WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers + 1]; - if (!pwNew) - return false; for (int j = 0; j < lenWatchers; j++) pwNew[j] = watchers[j]; pwNew[lenWatchers].watcher = watcher; @@ -1396,8 +1489,6 @@ lenWatchers = 0; } else { WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers]; - if (!pwNew) - return false; for (int j = 0; j < lenWatchers - 1; j++) { pwNew[j] = (j < i) ? watchers[j] : watchers[j + 1]; } @@ -1535,11 +1626,11 @@ int Document::ExtendStyleRange(int pos, int delta, bool singleLine) { int sStart = cb.StyleAt(pos); if (delta < 0) { - while (pos > 0 && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos))) ) + while (pos > 0 && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos)))) pos--; pos++; } else { - while (pos < (Length()) && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos))) ) + while (pos < (Length()) && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos)))) pos++; } return pos; @@ -1581,7 +1672,7 @@ int depth = 1; position = position + direction; while ((position >= 0) && (position < Length())) { - position = MovePositionOutsideChar(position, direction); + position = MovePositionOutsideChar(position, direction, true); char chAtPos = CharAt(position); char styAtPos = static_cast(StyleAt(position) & stylingBitsMask); if ((position > GetEndStyled()) || (styAtPos == styBrace)) { @@ -1612,7 +1703,7 @@ bool caseSensitive, bool word, bool wordStart, int flags, int *length); - virtual const char *SubstituteByPosition(Document* doc, const char *text, int *length); + virtual const char *SubstituteByPosition(Document *doc, const char *text, int *length); private: RESearch search; @@ -1727,7 +1818,7 @@ return pos; } -const char *BuiltinRegex::SubstituteByPosition(Document* doc, const char *text, int *length) { +const char *BuiltinRegex::SubstituteByPosition(Document *doc, const char *text, int *length) { delete []substituted; substituted = 0; DocumentIndexer di(doc, doc->Length()); @@ -1749,6 +1840,7 @@ case 'r': case 't': case 'v': + case '\\': i++; } lenResult++; @@ -1758,8 +1850,6 @@ } } substituted = new char[lenResult + 1]; - if (!substituted) - return 0; char *o = substituted; for (int j = 0; j < *length; j++) { if (text[j] == '\\') { @@ -1794,6 +1884,9 @@ case 'v': *o++ = '\v'; break; + case '\\': + *o++ = '\\'; + break; default: *o++ = '\\'; j--; diff -Nru geany-0.18/scintilla/Document.h geany-0.19/scintilla/Document.h --- geany-0.18/scintilla/Document.h 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/Document.h 2010-06-06 19:34:26.000000000 +0100 @@ -32,10 +32,10 @@ Range(Position pos=0) : start(pos), end(pos) { - }; + } Range(Position start_, Position end_) : start(start_), end(end_) { - }; + } bool Valid() const { return (start != invalidPosition) && (end != invalidPosition); @@ -81,17 +81,17 @@ */ class RegexSearchBase { public: - virtual ~RegexSearchBase(){} + virtual ~RegexSearchBase() {} - virtual long FindText(Document* doc, int minPos, int maxPos, const char *s, + virtual long FindText(Document *doc, int minPos, int maxPos, const char *s, bool caseSensitive, bool word, bool wordStart, int flags, int *length) = 0; ///@return String with the substitutions, must remain valid until the next call or destruction - virtual const char *SubstituteByPosition(Document* doc, const char *text, int *length) = 0; + virtual const char *SubstituteByPosition(Document *doc, const char *text, int *length) = 0; }; /// Factory function for RegexSearchBase -extern RegexSearchBase* CreateRegexSearch(CharClassify *charClassTable); +extern RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable); struct StyledText { size_t length; @@ -99,7 +99,7 @@ bool multipleStyles; size_t style; const unsigned char *styles; - StyledText( size_t length_, const char *text_, bool multipleStyles_, int style_, const unsigned char *styles_) : + StyledText(size_t length_, const char *text_, bool multipleStyles_, int style_, const unsigned char *styles_) : length(length_), text(text_), multipleStyles(multipleStyles_), style(style_), styles(styles_) { } // Return number of bytes from start to before '\n' or end of text. @@ -115,6 +115,24 @@ } }; +class CaseFolder { +public: + virtual ~CaseFolder() { + } + virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) = 0; +}; + +class CaseFolderTable : public CaseFolder { +protected: + char mapping[256]; +public: + CaseFolderTable(); + virtual ~CaseFolderTable(); + virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed); + void SetTranslation(char ch, char chTranslation); + void StandardASCII(); +}; + /** */ class Document : PerLine { @@ -147,11 +165,11 @@ int lenWatchers; // ldSize is not real data - it is for dimensions and loops - enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize }; + enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize }; PerLine *perLineData[ldSize]; bool matchesValid; - RegexSearchBase* regex; + RegexSearchBase *regex; public: int stylingBits; @@ -225,10 +243,10 @@ void DelCharBack(int pos); char CharAt(int position) { return cb.CharAt(position); } - void GetCharRange(char *buffer, int position, int lengthRetrieve) { + void GetCharRange(char *buffer, int position, int lengthRetrieve) const { cb.GetCharRange(buffer, position, lengthRetrieve); } - char StyleAt(int position) { return cb.StyleAt(position); } + char StyleAt(int position) const { return cb.StyleAt(position); } int GetMark(int line); int AddMark(int line, int markerNum); void AddMarkSet(int line, int valueSet); @@ -239,10 +257,11 @@ int LineStart(int line) const; int LineEnd(int line) const; int LineEndPosition(int position) const; + bool IsLineEndPosition(int position) const; int VCHomePosition(int position) const; int SetLevel(int line, int level); - int GetLevel(int line); + int GetLevel(int line) const; void ClearLevels(); int GetLastChild(int lineParent, int level=-1); int GetFoldParent(int line); @@ -253,9 +272,10 @@ int NextWordEnd(int pos, int delta); int Length() const { return cb.Length(); } void Allocate(int newSize) { cb.Allocate(newSize); } - long FindText(int minPos, int maxPos, const char *s, - bool caseSensitive, bool word, bool wordStart, bool regExp, int flags, int *length); - long FindText(int iMessage, unsigned long wParam, long lParam); + size_t ExtractChar(int pos, char *bytes); + bool MatchesWordOptions(bool word, bool wordStart, int pos, int length); + long FindText(int minPos, int maxPos, const char *search, bool caseSensitive, bool word, + bool wordStart, bool regExp, int flags, int *length, CaseFolder *pcf); const char *SubstituteByPosition(const char *text, int *length); int LinesTotal() const; @@ -274,7 +294,7 @@ void DecorationFillRange(int position, int value, int fillLength); int SetLineState(int line, int state); - int GetLineState(int line); + int GetLineState(int line) const; int GetMaxLineState(); StyledText MarginStyledText(int line); @@ -319,6 +339,27 @@ void NotifyModified(DocModification mh); }; +class UndoGroup { + Document *pdoc; + bool groupNeeded; +public: + UndoGroup(Document *pdoc_, bool groupNeeded_=true) : + pdoc(pdoc_), groupNeeded(groupNeeded_) { + if (groupNeeded) { + pdoc->BeginUndoAction(); + } + } + ~UndoGroup() { + if (groupNeeded) { + pdoc->EndUndoAction(); + } + } + bool Needed() const { + return groupNeeded; + } +}; + + /** * To optimise processing of document modifications by DocWatchers, a hint is passed indicating the * scope of the change. diff -Nru geany-0.18/scintilla/Editor.cxx geany-0.19/scintilla/Editor.cxx --- geany-0.18/scintilla/Editor.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/Editor.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -10,6 +10,19 @@ #include #include +#include +#include +#include +#include + +// With Borland C++ 5.5, including includes Windows.h leading to defining +// FindText to FindTextA which makes calls here to Document::FindText fail. +#ifdef __BORLANDC__ +#ifdef FindText +#undef FindText +#endif +#endif + #include "Platform.h" #include "Scintilla.h" @@ -28,6 +41,7 @@ #include "CharClassify.h" #include "Decoration.h" #include "Document.h" +#include "Selection.h" #include "PositionCache.h" #include "Editor.h" @@ -39,7 +53,7 @@ return whether this modification represents an operation that may reasonably be deferred (not done now OR [possibly] at all) */ -static bool CanDeferToLastStep(const DocModification& mh) { +static bool CanDeferToLastStep(const DocModification &mh) { if (mh.modificationType & (SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE)) return true; // CAN skip if (!(mh.modificationType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO))) @@ -49,7 +63,7 @@ return false; // PRESUMABLY must do } -static bool CanEliminate(const DocModification& mh) { +static bool CanEliminate(const DocModification &mh) { return (mh.modificationType & (SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE)) != 0; } @@ -58,7 +72,7 @@ return whether this modification represents the FINAL step in a [possibly lengthy] multi-step Undo/Redo sequence */ -static bool IsLastStep(const DocModification& mh) { +static bool IsLastStep(const DocModification &mh) { return (mh.modificationType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO)) != 0 && (mh.modificationType & SC_MULTISTEPUNDOREDO) != 0 @@ -108,18 +122,14 @@ ptMouseLast.y = 0; inDragDrop = ddNone; dropWentOutside = false; - posDrag = invalidPosition; - posDrop = invalidPosition; + posDrag = SelectionPosition(invalidPosition); + posDrop = SelectionPosition(invalidPosition); selectionType = selChar; lastXChosen = 0; lineAnchor = 0; originalAnchorPos = 0; - selType = selStream; - moveExtendsSelection = false; - xStartSelect = 0; - xEndSelect = 0; primarySelection = true; caretXPolicy = CARET_SLOP | CARET_EVEN; @@ -139,6 +149,12 @@ verticalScrollBarVisible = true; endAtLastLine = true; caretSticky = false; + multipleSelection = false; + additionalSelectionTyping = false; + multiPasteMode = SC_MULTIPASTE_ONCE; + additionalCaretsBlink = true; + additionalCaretsVisible = true; + virtualSpaceOptions = SCVS_NONE; pixmapLine = Surface::Allocate(); pixmapSelMargin = Surface::Allocate(); @@ -146,9 +162,6 @@ pixmapIndentGuide = Surface::Allocate(); pixmapIndentGuideHighlight = Surface::Allocate(); - currentPos = 0; - anchor = 0; - targetStart = 0; targetEnd = 0; searchFlags = 0; @@ -227,10 +240,6 @@ palette.Release(); llc.Invalidate(LineLayout::llInvalid); posCache.Clear(); - if (selType == selRectangle) { - xStartSelect = XFromPosition(anchor); - xEndSelect = XFromPosition(currentPos); - } } void Editor::InvalidateStyleRedraw() { @@ -263,6 +272,7 @@ wrapAddIndent = vs.aveCharWidth; // must indent to show start visual } SetScrollBars(); + SetRectangularRange(); } } @@ -328,7 +338,7 @@ class AutoLineLayout { LineLayoutCache &llc; LineLayout *ll; - AutoLineLayout &operator=(const AutoLineLayout &) { return * this; } + AutoLineLayout &operator=(const AutoLineLayout &); public: AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) : llc(llc_), ll(ll_) {} ~AutoLineLayout() { @@ -347,98 +357,25 @@ } }; -#ifdef SCI_NAMESPACE -namespace Scintilla { -#endif - -/** - * Allows to iterate through the lines of a selection. - * Althought it can be called for a stream selection, in most cases - * it is inefficient and it should be used only for - * a rectangular or a line selection. - */ -class SelectionLineIterator { -private: - Editor *ed; - int line; ///< Current line within the iteration. - bool forward; ///< True if iterating by increasing line number, false otherwise. - int selStart, selEnd; ///< Positions of the start and end of the selection relative to the start of the document. - int minX, maxX; ///< Left and right of selection rectangle. - -public: - int lineStart, lineEnd; ///< Line numbers, first and last lines of the selection. - int startPos, endPos; ///< Positions of the beginning and end of the selection on the current line. - - void Reset() { - if (forward) { - line = lineStart; - } else { - line = lineEnd; - } - } - - SelectionLineIterator(Editor *ed_, bool forward_ = true) : line(0), startPos(0), endPos(0) { - ed = ed_; - forward = forward_; - selStart = ed->SelectionStart(); - selEnd = ed->SelectionEnd(); - lineStart = ed->pdoc->LineFromPosition(selStart); - lineEnd = ed->pdoc->LineFromPosition(selEnd); - // Left of rectangle - minX = Platform::Minimum(ed->xStartSelect, ed->xEndSelect); - // Right of rectangle - maxX = Platform::Maximum(ed->xStartSelect, ed->xEndSelect); - Reset(); - } - ~SelectionLineIterator() {} - - void SetAt(int line) { - if (line < lineStart || line > lineEnd) { - startPos = endPos = INVALID_POSITION; - } else { - if (ed->selType == ed->selRectangle) { - // Measure line and return character closest to minX - startPos = ed->PositionFromLineX(line, minX); - // Measure line and return character closest to maxX - endPos = ed->PositionFromLineX(line, maxX); - } else if (ed->selType == ed->selLines) { - startPos = ed->pdoc->LineStart(line); - endPos = ed->pdoc->LineStart(line + 1); - } else { // Stream selection, here only for completion - if (line == lineStart) { - startPos = selStart; - } else { - startPos = ed->pdoc->LineStart(line); - } - if (line == lineEnd) { - endPos = selEnd; - } else { - endPos = ed->pdoc->LineStart(line + 1); - } - } - } - } - bool Iterate() { - SetAt(line); - if (forward) { - line++; - } else { - line--; - } - return startPos != INVALID_POSITION; +SelectionPosition Editor::ClampPositionIntoDocument(SelectionPosition sp) const { + if (sp.Position() < 0) { + return SelectionPosition(0); + } else if (sp.Position() > pdoc->Length()) { + return SelectionPosition(pdoc->Length()); + } else { + // If not at end of line then set offset to 0 + if (!pdoc->IsLineEndPosition(sp.Position())) + sp.SetVirtualSpace(0); + return sp; } -}; - -#ifdef SCI_NAMESPACE } -#endif -Point Editor::LocationFromPosition(int pos) { +Point Editor::LocationFromPosition(SelectionPosition pos) { Point pt; RefreshStyleData(); - if (pos == INVALID_POSITION) + if (pos.Position() == INVALID_POSITION) return pt; - int line = pdoc->LineFromPosition(pos); + int line = pdoc->LineFromPosition(pos.Position()); int lineVisible = cs.DisplayFromDoc(line); //Platform::DebugPrintf("line=%d\n", line); AutoSurface surface(this); @@ -449,7 +386,7 @@ pt.x = 0; unsigned int posLineStart = pdoc->LineStart(line); LayoutLine(line, surface, vs, ll, wrapWidth); - int posInLine = pos - posLineStart; + int posInLine = pos.Position() - posLineStart; // In case of very long line put x at arbitrary large position if (posInLine > ll->maxLineLength) { pt.x = ll->positions[ll->maxLineLength] - ll->positions[ll->LineStart(ll->lines)]; @@ -470,14 +407,24 @@ } pt.x += vs.fixedColumnWidth - xOffset; } + pt.x += pos.VirtualSpace() * static_cast(vs.styles[ll->EndLineStyle()].spaceWidth); return pt; } +Point Editor::LocationFromPosition(int pos) { + return LocationFromPosition(SelectionPosition(pos)); +} + int Editor::XFromPosition(int pos) { Point pt = LocationFromPosition(pos); return pt.x - vs.fixedColumnWidth + xOffset; } +int Editor::XFromPosition(SelectionPosition sp) { + Point pt = LocationFromPosition(sp); + return pt.x - vs.fixedColumnWidth + xOffset; +} + int Editor::LineFromLocation(Point pt) { return cs.DocFromDisplay(pt.y / vs.lineHeight + topLine); } @@ -487,16 +434,16 @@ posTopLine = pdoc->LineStart(cs.DocFromDisplay(topLine)); } -int Editor::PositionFromLocation(Point pt, bool canReturnInvalid, bool charPosition) { +SelectionPosition Editor::SPositionFromLocation(Point pt, bool canReturnInvalid, bool charPosition, bool virtualSpace) { RefreshStyleData(); if (canReturnInvalid) { PRectangle rcClient = GetTextRectangle(); if (!rcClient.Contains(pt)) - return INVALID_POSITION; + return SelectionPosition(INVALID_POSITION); if (pt.x < vs.fixedColumnWidth) - return INVALID_POSITION; + return SelectionPosition(INVALID_POSITION); if (pt.y < 0) - return INVALID_POSITION; + return SelectionPosition(INVALID_POSITION); } pt.x = pt.x - vs.fixedColumnWidth + xOffset; int visibleLine = pt.y / vs.lineHeight + topLine; @@ -507,11 +454,11 @@ visibleLine = 0; int lineDoc = cs.DocFromDisplay(visibleLine); if (canReturnInvalid && (lineDoc < 0)) - return INVALID_POSITION; + return SelectionPosition(INVALID_POSITION); if (lineDoc >= pdoc->LinesTotal()) - return canReturnInvalid ? INVALID_POSITION : pdoc->Length(); + return SelectionPosition(canReturnInvalid ? INVALID_POSITION : pdoc->Length()); unsigned int posLineStart = pdoc->LineStart(lineDoc); - int retVal = canReturnInvalid ? INVALID_POSITION : static_cast(posLineStart); + SelectionPosition retVal(canReturnInvalid ? INVALID_POSITION : static_cast(posLineStart)); AutoSurface surface(this); AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc)); if (surface && ll) { @@ -531,29 +478,38 @@ while (i < lineEnd) { if (charPosition) { if ((pt.x + subLineStart) < (ll->positions[i + 1])) { - return pdoc->MovePositionOutsideChar(i + posLineStart, 1); + return SelectionPosition(pdoc->MovePositionOutsideChar(i + posLineStart, 1)); } } else { if ((pt.x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { - return pdoc->MovePositionOutsideChar(i + posLineStart, 1); + return SelectionPosition(pdoc->MovePositionOutsideChar(i + posLineStart, 1)); } } i++; } - if (canReturnInvalid) { + if (virtualSpace) { + const int spaceWidth = static_cast(vs.styles[ll->EndLineStyle()].spaceWidth); + int spaceOffset = (pt.x + subLineStart - ll->positions[lineEnd] + spaceWidth / 2) / + spaceWidth; + return SelectionPosition(lineEnd + posLineStart, spaceOffset); + } else if (canReturnInvalid) { if (pt.x < (ll->positions[lineEnd] - subLineStart)) { - return pdoc->MovePositionOutsideChar(lineEnd + posLineStart, 1); + return SelectionPosition(pdoc->MovePositionOutsideChar(lineEnd + posLineStart, 1)); } } else { - return lineEnd + posLineStart; + return SelectionPosition(lineEnd + posLineStart); } } if (!canReturnInvalid) - return ll->numCharsInLine + posLineStart; + return SelectionPosition(ll->numCharsInLine + posLineStart); } return retVal; } +int Editor::PositionFromLocation(Point pt, bool canReturnInvalid, bool charPosition) { + return SPositionFromLocation(pt, canReturnInvalid, charPosition, false).Position(); +} + /** * Find the document position corresponding to an x coordinate on a particular document line. * Ensure is between whole characters when document is in multi-byte or UTF-8 mode. @@ -569,7 +525,7 @@ if (surface && ll) { unsigned int posLineStart = pdoc->LineStart(lineDoc); LayoutLine(lineDoc, surface, vs, ll, wrapWidth); - retVal = ll->numCharsInLine + posLineStart; + retVal = ll->numCharsBeforeEOL + posLineStart; int subLine = 0; int lineStart = ll->LineStart(subLine); int lineEnd = ll->LineLastVisible(subLine); @@ -592,6 +548,45 @@ } /** + * Find the document position corresponding to an x coordinate on a particular document line. + * Ensure is between whole characters when document is in multi-byte or UTF-8 mode. + */ +SelectionPosition Editor::SPositionFromLineX(int lineDoc, int x) { + RefreshStyleData(); + if (lineDoc >= pdoc->LinesTotal()) + return SelectionPosition(pdoc->Length()); + //Platform::DebugPrintf("Position of (%d,%d) line = %d top=%d\n", pt.x, pt.y, line, topLine); + AutoSurface surface(this); + AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc)); + int retVal = 0; + if (surface && ll) { + unsigned int posLineStart = pdoc->LineStart(lineDoc); + LayoutLine(lineDoc, surface, vs, ll, wrapWidth); + int subLine = 0; + int lineStart = ll->LineStart(subLine); + int lineEnd = ll->LineLastVisible(subLine); + int subLineStart = ll->positions[lineStart]; + + if (ll->wrapIndent != 0) { + if (lineStart != 0) // Wrapped + x -= ll->wrapIndent; + } + int i = ll->FindBefore(x + subLineStart, lineStart, lineEnd); + while (i < lineEnd) { + if ((x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { + retVal = pdoc->MovePositionOutsideChar(i + posLineStart, 1); + return SelectionPosition(retVal); + } + i++; + } + const int spaceWidth = static_cast(vs.styles[ll->EndLineStyle()].spaceWidth); + int spaceOffset = (x + subLineStart - ll->positions[lineEnd] + spaceWidth / 2) / spaceWidth; + return SelectionPosition(lineEnd + posLineStart, spaceOffset); + } + return SelectionPosition(retVal); +} + +/** * If painting then abandon the painting because a wider redraw is needed. * @return true if calling code should stop drawing. */ @@ -628,7 +623,7 @@ //wMain.InvalidateAll(); } -void Editor::RedrawSelMargin(int line) { +void Editor::RedrawSelMargin(int line, bool allAfter) { if (!AbandonPaint()) { if (vs.maskInLine) { Redraw(); @@ -639,7 +634,8 @@ int position = pdoc->LineStart(line); PRectangle rcLine = RectangleFromRange(position, position); rcSelMargin.top = rcLine.top; - rcSelMargin.bottom = rcLine.bottom; + if (!allAfter) + rcSelMargin.bottom = rcLine.bottom; } wMain.InvalidateRectangle(rcSelMargin); } @@ -676,80 +672,125 @@ } int Editor::CurrentPosition() { - return currentPos; + return sel.MainCaret(); } bool Editor::SelectionEmpty() { - return anchor == currentPos; + return sel.Empty(); } -int Editor::SelectionStart() { - return Platform::Minimum(currentPos, anchor); +SelectionPosition Editor::SelectionStart() { + return sel.RangeMain().Start(); } -int Editor::SelectionEnd() { - return Platform::Maximum(currentPos, anchor); +SelectionPosition Editor::SelectionEnd() { + return sel.RangeMain().End(); } void Editor::SetRectangularRange() { - if (selType == selRectangle) { - xStartSelect = XFromPosition(anchor); - xEndSelect = XFromPosition(currentPos); + if (sel.IsRectangular()) { + int xAnchor = XFromPosition(sel.Rectangular().anchor); + int xCaret = XFromPosition(sel.Rectangular().caret); + if (sel.selType == Selection::selThin) { + xCaret = xAnchor; + } + int lineAnchor = pdoc->LineFromPosition(sel.Rectangular().anchor.Position()); + int lineCaret = pdoc->LineFromPosition(sel.Rectangular().caret.Position()); + int increment = (lineCaret > lineAnchor) ? 1 : -1; + for (int line=lineAnchor; line != lineCaret+increment; line += increment) { + SelectionRange range(SPositionFromLineX(line, xCaret), SPositionFromLineX(line, xAnchor)); + if ((virtualSpaceOptions & SCVS_RECTANGULARSELECTION) == 0) + range.ClearVirtualSpace(); + if (line == lineAnchor) + sel.SetSelection(range); + else + sel.AddSelection(range); + } + } +} + +void Editor::ThinRectangularRange() { + if (sel.IsRectangular()) { + sel.selType = Selection::selThin; + if (sel.Rectangular().caret < sel.Rectangular().anchor) { + sel.Rectangular() = SelectionRange(sel.Range(sel.Count()-1).caret, sel.Range(0).anchor); + } else { + sel.Rectangular() = SelectionRange(sel.Range(sel.Count()-1).anchor, sel.Range(0).caret); + } + SetRectangularRange(); } } -void Editor::InvalidateSelection(int currentPos_, int anchor_, bool invalidateWholeSelection) { - if (anchor != anchor_ || selType == selRectangle) { +void Editor::InvalidateSelection(SelectionRange newMain, bool invalidateWholeSelection) { + if (sel.Count() > 1 || !(sel.RangeMain().anchor == newMain.anchor) || sel.IsRectangular()) { invalidateWholeSelection = true; } - int firstAffected = currentPos; - if (invalidateWholeSelection) { - if (firstAffected > anchor) - firstAffected = anchor; - if (firstAffected > anchor_) - firstAffected = anchor_; - } - if (firstAffected > currentPos_) - firstAffected = currentPos_; - int lastAffected = currentPos; + int firstAffected = Platform::Minimum(sel.RangeMain().Start().Position(), newMain.Start().Position()); + // +1 for lastAffected ensures caret repainted + int lastAffected = Platform::Maximum(newMain.caret.Position()+1, newMain.anchor.Position()); + lastAffected = Platform::Maximum(lastAffected, sel.RangeMain().End().Position()); if (invalidateWholeSelection) { - if (lastAffected < anchor) - lastAffected = anchor; - if (lastAffected < anchor_) - lastAffected = anchor_; + for (size_t r=0; rClampPositionIntoDocument(currentPos_); - anchor_ = pdoc->ClampPositionIntoDocument(anchor_); - if ((currentPos != currentPos_) || (anchor != anchor_)) { - InvalidateSelection(currentPos_, anchor_, true); - currentPos = currentPos_; - anchor = anchor_; +void Editor::SetSelection(SelectionPosition currentPos_, SelectionPosition anchor_) { + SelectionRange rangeNew(ClampPositionIntoDocument(currentPos_), + ClampPositionIntoDocument(anchor_)); + if (sel.Count() > 1 || !(sel.RangeMain() == rangeNew)) { + InvalidateSelection(rangeNew); } + sel.RangeMain() = rangeNew; SetRectangularRange(); ClaimSelection(); } +void Editor::SetSelection(int currentPos_, int anchor_) { + SetSelection(SelectionPosition(currentPos_), SelectionPosition(anchor_)); +} + +// Just move the caret on the main selection +void Editor::SetSelection(SelectionPosition currentPos_) { + currentPos_ = ClampPositionIntoDocument(currentPos_); + if (sel.Count() > 1 || !(sel.RangeMain().caret == currentPos_)) { + InvalidateSelection(SelectionRange(currentPos_)); + } + if (sel.IsRectangular()) { + sel.Rectangular() = + SelectionRange(SelectionPosition(currentPos_), sel.Rectangular().anchor); + SetRectangularRange(); + } else { + sel.RangeMain() = + SelectionRange(SelectionPosition(currentPos_), sel.RangeMain().anchor); + } + ClaimSelection(); +} + void Editor::SetSelection(int currentPos_) { - currentPos_ = pdoc->ClampPositionIntoDocument(currentPos_); - if (currentPos != currentPos_) { - InvalidateSelection(currentPos_, anchor, false); - currentPos = currentPos_; + SetSelection(SelectionPosition(currentPos_)); +} + +void Editor::SetEmptySelection(SelectionPosition currentPos_) { + SelectionRange rangeNew(ClampPositionIntoDocument(currentPos_)); + if (sel.Count() > 1 || !(sel.RangeMain() == rangeNew)) { + InvalidateSelection(rangeNew); } + sel.Clear(); + sel.RangeMain() = rangeNew; SetRectangularRange(); ClaimSelection(); + } void Editor::SetEmptySelection(int currentPos_) { - selType = selStream; - moveExtendsSelection = false; - SetSelection(currentPos_, currentPos_); + SetEmptySelection(SelectionPosition(currentPos_)); } bool Editor::RangeContainsProtected(int start, int end) const { @@ -769,69 +810,94 @@ } bool Editor::SelectionContainsProtected() { - // DONE, but untested...: make support rectangular selection - bool scp = false; - if (selType == selStream) { - scp = RangeContainsProtected(anchor, currentPos); - } else { - SelectionLineIterator lineIterator(this); - while (lineIterator.Iterate()) { - if (RangeContainsProtected(lineIterator.startPos, lineIterator.endPos)) { - scp = true; - break; - } + for (size_t r=0; rMovePositionOutsideChar(pos, moveDir, checkLineEnd); + return MovePositionOutsideChar(SelectionPosition(pos), moveDir, checkLineEnd).Position(); +} + +SelectionPosition Editor::MovePositionOutsideChar(SelectionPosition pos, int moveDir, bool checkLineEnd) const { + int posMoved = pdoc->MovePositionOutsideChar(pos.Position(), moveDir, checkLineEnd); + if (posMoved != pos.Position()) + pos.SetPosition(posMoved); if (vs.ProtectionActive()) { int mask = pdoc->stylingBitsMask; if (moveDir > 0) { - if ((pos > 0) && vs.styles[pdoc->StyleAt(pos - 1) & mask].IsProtected()) { - while ((pos < pdoc->Length()) && - (vs.styles[pdoc->StyleAt(pos) & mask].IsProtected())) - pos++; + if ((pos.Position() > 0) && vs.styles[pdoc->StyleAt(pos.Position() - 1) & mask].IsProtected()) { + while ((pos.Position() < pdoc->Length()) && + (vs.styles[pdoc->StyleAt(pos.Position()) & mask].IsProtected())) + pos.Add(1); } } else if (moveDir < 0) { - if (vs.styles[pdoc->StyleAt(pos) & mask].IsProtected()) { - while ((pos > 0) && - (vs.styles[pdoc->StyleAt(pos - 1) & mask].IsProtected())) - pos--; + if (vs.styles[pdoc->StyleAt(pos.Position()) & mask].IsProtected()) { + while ((pos.Position() > 0) && + (vs.styles[pdoc->StyleAt(pos.Position() - 1) & mask].IsProtected())) + pos.Add(-1); } } } return pos; } -int Editor::MovePositionTo(int newPos, selTypes sel, bool ensureVisible) { - int delta = newPos - currentPos; - newPos = pdoc->ClampPositionIntoDocument(newPos); +int Editor::MovePositionTo(SelectionPosition newPos, Selection::selTypes selt, bool ensureVisible) { + bool simpleCaret = (sel.Count() == 1) && sel.Empty(); + SelectionPosition spCaret = sel.Last(); + + int delta = newPos.Position() - sel.MainCaret(); + newPos = ClampPositionIntoDocument(newPos); newPos = MovePositionOutsideChar(newPos, delta); - if (sel != noSel) { - selType = sel; + if (!multipleSelection && sel.IsRectangular() && (selt == Selection::selStream)) { + // Can't turn into multiple selection so clear additional selections + InvalidateSelection(SelectionRange(newPos), true); + SelectionRange rangeMain = sel.RangeMain(); + sel.SetSelection(rangeMain); + } + if (!sel.IsRectangular() && (selt == Selection::selRectangle)) { + // Switching to rectangular + SelectionRange rangeMain = sel.RangeMain(); + sel.Clear(); + sel.Rectangular() = rangeMain; } - if (sel != noSel || moveExtendsSelection) { + if (selt != Selection::noSel) { + sel.selType = selt; + } + if (selt != Selection::noSel || sel.MoveExtends()) { SetSelection(newPos); } else { SetEmptySelection(newPos); } ShowCaretAtCurrentPosition(); if (ensureVisible) { - EnsureCaretVisible(); + XYScrollPosition newXY = XYScrollToMakeVisible(true, true, true); + if (simpleCaret && (newXY.xOffset == xOffset)) { + // simple vertical scroll then invalidate + ScrollTo(newXY.topLine); + InvalidateSelection(SelectionRange(spCaret), true); + } else { + SetXYScroll(newXY); + } } return 0; } -int Editor::MovePositionSoVisible(int pos, int moveDir) { - pos = pdoc->ClampPositionIntoDocument(pos); +int Editor::MovePositionTo(int newPos, Selection::selTypes selt, bool ensureVisible) { + return MovePositionTo(SelectionPosition(newPos), selt, ensureVisible); +} + +SelectionPosition Editor::MovePositionSoVisible(SelectionPosition pos, int moveDir) { + pos = ClampPositionIntoDocument(pos); pos = MovePositionOutsideChar(pos, moveDir); - int lineDoc = pdoc->LineFromPosition(pos); + int lineDoc = pdoc->LineFromPosition(pos.Position()); if (cs.GetVisible(lineDoc)) { return pos; } else { @@ -839,21 +905,29 @@ if (moveDir > 0) { // lineDisplay is already line before fold as lines in fold use display line of line after fold lineDisplay = Platform::Clamp(lineDisplay, 0, cs.LinesDisplayed()); - return pdoc->LineStart(cs.DocFromDisplay(lineDisplay)); + return SelectionPosition(pdoc->LineStart(cs.DocFromDisplay(lineDisplay))); } else { lineDisplay = Platform::Clamp(lineDisplay - 1, 0, cs.LinesDisplayed()); - return pdoc->LineEnd(cs.DocFromDisplay(lineDisplay)); + return SelectionPosition(pdoc->LineEnd(cs.DocFromDisplay(lineDisplay))); } } } +SelectionPosition Editor::MovePositionSoVisible(int pos, int moveDir) { + return MovePositionSoVisible(SelectionPosition(pos), moveDir); +} + +Point Editor::PointMainCaret() { + return LocationFromPosition(sel.Range(sel.Main()).caret); +} + /** * Choose the x position that the caret will try to stick to * as it moves up and down. */ void Editor::SetLastXChosen() { - Point pt = LocationFromPosition(currentPos); - lastXChosen = pt.x; + Point pt = PointMainCaret(); + lastXChosen = pt.x + xOffset; } void Editor::ScrollTo(int line, bool moveThumb) { @@ -862,9 +936,11 @@ // Try to optimise small scrolls int linesToMove = topLine - topLineNew; SetTopLine(topLineNew); - ShowCaretAtCurrentPosition(); - // Perform redraw rather than scroll if many lines would be redrawn anyway. + // Optimize by styling the view as this will invalidate any needed area + // which could abort the initial paint if discovered later. + StyleToPositionInView(PositionAfterArea(GetClientRectangle())); #ifndef UNDER_CE + // Perform redraw rather than scroll if many lines would be redrawn anyway. if ((abs(linesToMove) <= 10) && (paintState == notPainting)) { ScrollText(linesToMove); } else { @@ -897,16 +973,16 @@ void Editor::MoveCaretInsideView(bool ensureVisible) { PRectangle rcClient = GetTextRectangle(); - Point pt = LocationFromPosition(currentPos); + Point pt = PointMainCaret(); if (pt.y < rcClient.top) { - MovePositionTo(PositionFromLocation( - Point(lastXChosen, rcClient.top)), - noSel, ensureVisible); + MovePositionTo(SPositionFromLocation( + Point(lastXChosen - xOffset, rcClient.top)), + Selection::noSel, ensureVisible); } else if ((pt.y + vs.lineHeight - 1) > rcClient.bottom) { int yOfLastLineFullyDisplayed = rcClient.top + (LinesOnScreen() - 1) * vs.lineHeight; - MovePositionTo(PositionFromLocation( - Point(lastXChosen, rcClient.top + yOfLastLineFullyDisplayed)), - noSel, ensureVisible); + MovePositionTo(SPositionFromLocation( + Point(lastXChosen - xOffset, rcClient.top + yOfLastLineFullyDisplayed)), + Selection::noSel, ensureVisible); } } @@ -974,29 +1050,24 @@ 1 | 1 | 0 | 1 | No, kept out of UZ | moved by one position 1 | 1 | 1 | 1 | No, kept out of UZ | moved to put caret at 3UZ of the margin */ -void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) { - //Platform::DebugPrintf("EnsureCaretVisible %d %s\n", xOffset, useMargin ? " margin" : " "); + +Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const bool useMargin, const bool vert, const bool horiz) { PRectangle rcClient = GetTextRectangle(); - //int rcClientFullWidth = rcClient.Width(); - int posCaret = currentPos; - if (posDrag >= 0) { - posCaret = posDrag; - } - Point pt = LocationFromPosition(posCaret); - Point ptBottomCaret = pt; - ptBottomCaret.y += vs.lineHeight - 1; - int lineCaret = DisplayFromPosition(posCaret); - bool bSlop, bStrict, bJump, bEven; + const SelectionPosition posCaret = posDrag.IsValid() ? posDrag : sel.RangeMain().caret; + const Point pt = LocationFromPosition(posCaret); + const Point ptBottomCaret(pt.x, pt.y + vs.lineHeight - 1); + const int lineCaret = DisplayFromPosition(posCaret.Position()); + + XYScrollPosition newXY(xOffset, topLine); // Vertical positioning if (vert && (pt.y < rcClient.top || ptBottomCaret.y > rcClient.bottom || (caretYPolicy & CARET_STRICT) != 0)) { - int linesOnScreen = LinesOnScreen(); - int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2; - int newTopLine = topLine; - bSlop = (caretYPolicy & CARET_SLOP) != 0; - bStrict = (caretYPolicy & CARET_STRICT) != 0; - bJump = (caretYPolicy & CARET_JUMPS) != 0; - bEven = (caretYPolicy & CARET_EVEN) != 0; + const int linesOnScreen = LinesOnScreen(); + const int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2; + const bool bSlop = (caretYPolicy & CARET_SLOP) != 0; + const bool bStrict = (caretYPolicy & CARET_STRICT) != 0; + const bool bJump = (caretYPolicy & CARET_JUMPS) != 0; + const bool bEven = (caretYPolicy & CARET_EVEN) != 0; // It should be possible to scroll the window to show the caret, // but this fails to remove the caret on GTK+ @@ -1029,10 +1100,10 @@ } if (lineCaret < topLine + yMarginT) { // Caret goes too high - newTopLine = lineCaret - yMoveT; + newXY.topLine = lineCaret - yMoveT; } else if (lineCaret > topLine + linesOnScreen - 1 - yMarginB) { // Caret goes too low - newTopLine = lineCaret - linesOnScreen + 1 + yMoveB; + newXY.topLine = lineCaret - linesOnScreen + 1 + yMoveB; } } else { // Not strict yMoveT = bJump ? caretYSlop * 3 : caretYSlop; @@ -1044,10 +1115,10 @@ } if (lineCaret < topLine) { // Caret goes too high - newTopLine = lineCaret - yMoveT; + newXY.topLine = lineCaret - yMoveT; } else if (lineCaret > topLine + linesOnScreen - 1) { // Caret goes too low - newTopLine = lineCaret - linesOnScreen + 1 + yMoveB; + newXY.topLine = lineCaret - linesOnScreen + 1 + yMoveB; } } } else { // No slop @@ -1055,41 +1126,35 @@ // Minimal move if (lineCaret < topLine) { // Caret goes too high - newTopLine = lineCaret; + newXY.topLine = lineCaret; } else if (lineCaret > topLine + linesOnScreen - 1) { // Caret goes too low if (bEven) { - newTopLine = lineCaret - linesOnScreen + 1; + newXY.topLine = lineCaret - linesOnScreen + 1; } else { - newTopLine = lineCaret; + newXY.topLine = lineCaret; } } } else { // Strict or going out of display if (bEven) { // Always center caret - newTopLine = lineCaret - halfScreen; + newXY.topLine = lineCaret - halfScreen; } else { // Always put caret on top of display - newTopLine = lineCaret; + newXY.topLine = lineCaret; } } } - newTopLine = Platform::Clamp(newTopLine, 0, MaxScrollPos()); - if (newTopLine != topLine) { - Redraw(); - SetTopLine(newTopLine); - SetVerticalScrollPos(); - } + newXY.topLine = Platform::Clamp(newXY.topLine, 0, MaxScrollPos()); } // Horizontal positioning if (horiz && (wrapState == eWrapNone)) { - int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2; - int xOffsetNew = xOffset; - bSlop = (caretXPolicy & CARET_SLOP) != 0; - bStrict = (caretXPolicy & CARET_STRICT) != 0; - bJump = (caretXPolicy & CARET_JUMPS) != 0; - bEven = (caretXPolicy & CARET_EVEN) != 0; + const int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2; + const bool bSlop = (caretXPolicy & CARET_SLOP) != 0; + const bool bStrict = (caretXPolicy & CARET_STRICT) != 0; + const bool bJump = (caretXPolicy & CARET_JUMPS) != 0; + const bool bEven = (caretXPolicy & CARET_EVEN) != 0; if (bSlop) { // A margin is defined int xMoveL, xMoveR; @@ -1118,18 +1183,18 @@ if (pt.x < rcClient.left + xMarginL) { // Caret is on the left of the display if (bJump && bEven) { - xOffsetNew -= xMoveL; + newXY.xOffset -= xMoveL; } else { // Move just enough to allow to display the caret - xOffsetNew -= (rcClient.left + xMarginL) - pt.x; + newXY.xOffset -= (rcClient.left + xMarginL) - pt.x; } } else if (pt.x >= rcClient.right - xMarginR) { // Caret is on the right of the display if (bJump && bEven) { - xOffsetNew += xMoveR; + newXY.xOffset += xMoveR; } else { // Move just enough to allow to display the caret - xOffsetNew += pt.x - (rcClient.right - xMarginR) + 1; + newXY.xOffset += pt.x - (rcClient.right - xMarginR) + 1; } } } else { // Not strict @@ -1142,10 +1207,10 @@ } if (pt.x < rcClient.left) { // Caret is on the left of the display - xOffsetNew -= xMoveL; + newXY.xOffset -= xMoveL; } else if (pt.x >= rcClient.right) { // Caret is on the right of the display - xOffsetNew += xMoveR; + newXY.xOffset += xMoveR; } } } else { // No slop @@ -1154,54 +1219,69 @@ // Strict or going out of display if (bEven) { // Center caret - xOffsetNew += pt.x - rcClient.left - halfScreen; + newXY.xOffset += pt.x - rcClient.left - halfScreen; } else { // Put caret on right - xOffsetNew += pt.x - rcClient.right + 1; + newXY.xOffset += pt.x - rcClient.right + 1; } } else { // Move just enough to allow to display the caret if (pt.x < rcClient.left) { // Caret is on the left of the display if (bEven) { - xOffsetNew -= rcClient.left - pt.x; + newXY.xOffset -= rcClient.left - pt.x; } else { - xOffsetNew += pt.x - rcClient.right + 1; + newXY.xOffset += pt.x - rcClient.right + 1; } } else if (pt.x >= rcClient.right) { // Caret is on the right of the display - xOffsetNew += pt.x - rcClient.right + 1; + newXY.xOffset += pt.x - rcClient.right + 1; } } } // In case of a jump (find result) largely out of display, adjust the offset to display the caret - if (pt.x + xOffset < rcClient.left + xOffsetNew) { - xOffsetNew = pt.x + xOffset - rcClient.left; - } else if (pt.x + xOffset >= rcClient.right + xOffsetNew) { - xOffsetNew = pt.x + xOffset - rcClient.right + 1; + if (pt.x + xOffset < rcClient.left + newXY.xOffset) { + newXY.xOffset = pt.x + xOffset - rcClient.left; + } else if (pt.x + xOffset >= rcClient.right + newXY.xOffset) { + newXY.xOffset = pt.x + xOffset - rcClient.right + 1; if (vs.caretStyle == CARETSTYLE_BLOCK) { // Ensure we can see a good portion of the block caret - xOffsetNew += vs.aveCharWidth; + newXY.xOffset += vs.aveCharWidth; } } - if (xOffsetNew < 0) { - xOffsetNew = 0; + if (newXY.xOffset < 0) { + newXY.xOffset = 0; + } + } + + return newXY; +} + +void Editor::SetXYScroll(XYScrollPosition newXY) { + if ((newXY.topLine != topLine) || (newXY.xOffset != xOffset)) { + if (newXY.topLine != topLine) { + SetTopLine(newXY.topLine); + SetVerticalScrollPos(); } - if (xOffset != xOffsetNew) { - xOffset = xOffsetNew; - if (xOffsetNew > 0) { + if (newXY.xOffset != xOffset) { + xOffset = newXY.xOffset; + if (newXY.xOffset > 0) { PRectangle rcText = GetTextRectangle(); if (horizontalScrollBarVisible && - rcText.Width() + xOffset > scrollWidth) { + rcText.Width() + xOffset > scrollWidth) { scrollWidth = xOffset + rcText.Width(); SetScrollBars(); } } SetHorizontalScrollPos(); - Redraw(); } + Redraw(); + UpdateSystemCaret(); } - UpdateSystemCaret(); +} + +void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) { + SetXYScroll(XYScrollToMakeVisible(useMargin, vert, horiz)); } void Editor::ShowCaretAtCurrentPosition() { @@ -1222,10 +1302,13 @@ } void Editor::InvalidateCaret() { - if (posDrag >= 0) - InvalidateRange(posDrag, posDrag + 1); - else - InvalidateRange(currentPos, currentPos + 1); + if (posDrag.IsValid()) { + InvalidateRange(posDrag.Position(), posDrag.Position() + 1); + } else { + for (size_t r=0; rlines; } - return cs.SetHeight(lineToWrap, linesWrapped + + return cs.SetHeight(lineToWrap, linesWrapped + (vs.annotationVisible ? pdoc->AnnotationLines(lineToWrap) : 0)); } // Check if wrapping needed and perform any needed wrapping. // fullwrap: if true, all lines which need wrapping will be done, // in this single call. -// priorityWrapLineStart: If greater than zero, all lines starting from +// priorityWrapLineStart: If greater than or equal to zero, all lines starting from // here to 1 page + 100 lines past will be wrapped (even if there are // more lines under wrapping process in idle). // If it is neither fullwrap, nor priorityWrap, then 1 page + 100 lines will be @@ -1294,7 +1377,7 @@ if (wrapWidth != LineLayout::wrapWidthInfinite) { wrapWidth = LineLayout::wrapWidthInfinite; for (int lineDoc = 0; lineDoc < pdoc->LinesTotal(); lineDoc++) { - cs.SetHeight(lineDoc, 1 + + cs.SetHeight(lineDoc, 1 + (vs.annotationVisible ? pdoc->AnnotationLines(lineDoc) : 0)); } wrapOccurred = true; @@ -1368,7 +1451,7 @@ void Editor::LinesJoin() { if (!RangeContainsProtected(targetStart, targetEnd)) { - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); bool prevNonWS = true; for (int pos = targetStart; pos < targetEnd; pos++) { if (IsEOLChar(pdoc->CharAt(pos))) { @@ -1383,7 +1466,6 @@ prevNonWS = pdoc->CharAt(pos) != ' '; } } - pdoc->EndUndoAction(); } } @@ -1406,7 +1488,7 @@ int lineStart = pdoc->LineFromPosition(targetStart); int lineEnd = pdoc->LineFromPosition(targetEnd); const char *eol = StringFromEOLMode(pdoc->eolMode); - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); for (int line = lineStart; line <= lineEnd; line++) { AutoSurface surface(this); AutoLineLayout ll(llc, RetrieveLineLayout(line)); @@ -1421,7 +1503,6 @@ } lineEnd = pdoc->LineFromPosition(targetEnd); } - pdoc->EndUndoAction(); } } @@ -1439,7 +1520,7 @@ bool ValidStyledText(ViewStyle &vs, size_t styleOffset, const StyledText &st) { if (st.multipleStyles) { - for (size_t iStyle=0;iStyleMarginStyledText(lineDoc); if (stMargin.text && ValidStyledText(vs, vs.marginStyleOffset, stMargin)) { - surface->FillRectangle(rcMarker, + surface->FillRectangle(rcMarker, vs.styles[stMargin.StyleAt(0)+vs.marginStyleOffset].back.allocated); if (vs.ms[margin].style == SC_MARGIN_RTEXT) { int width = WidestLineWidth(surface, vs, vs.marginStyleOffset, stMargin); rcMarker.left = rcMarker.right - width - 3; } - DrawStyledText(surface, vs, vs.marginStyleOffset, rcMarker, rcMarker.top + vs.maxAscent, + DrawStyledText(surface, vs, vs.marginStyleOffset, rcMarker, rcMarker.top + vs.maxAscent, stMargin, 0, stMargin.length); } } @@ -1757,7 +1838,7 @@ int posLineStart = pdoc->LineStart(lineNumber); int posLineEnd = pdoc->LineStart(lineNumber + 1); PLATFORM_ASSERT(posLineEnd >= posLineStart); - int lineCaret = pdoc->LineFromPosition(currentPos); + int lineCaret = pdoc->LineFromPosition(sel.MainCaret()); return llc.Retrieve(lineNumber, lineCaret, posLineEnd - posLineStart, pdoc->GetStyleClock(), LinesOnScreen() + 1, pdoc->LinesTotal()); @@ -1768,6 +1849,7 @@ } bool BadUTF(const char *s, int len, int &trailBytes) { + // For the rules: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 if (trailBytes) { trailBytes--; return false; @@ -1784,6 +1866,23 @@ if (len < 4) return true; if (GoodTrailByte(us[1]) && GoodTrailByte(us[2]) && GoodTrailByte(us[3])) { + if (*us == 0xf4) { + // Check if encoding a value beyond the last Unicode character 10FFFF + if (us[1] > 0x8f) { + return true; + } else if (us[1] == 0x8f) { + if (us[2] > 0xbf) { + return true; + } else if (us[2] == 0xbf) { + if (us[3] > 0xbf) { + return true; + } + } + } + } else if ((*us == 0xf0) && ((us[1] & 0xf0) == 0x80)) { + // Overlong + return true; + } trailBytes = 3; return false; } else { @@ -1794,6 +1893,22 @@ if (len < 3) return true; if (GoodTrailByte(us[1]) && GoodTrailByte(us[2])) { + if ((*us == 0xe0) && ((us[1] & 0xe0) == 0x80)) { + // Overlong + return true; + } + if ((*us == 0xed) && ((us[1] & 0xe0) == 0xa0)) { + // Surrogate + return true; + } + if ((*us == 0xef) && (us[1] == 0xbf) && (us[2] == 0xbe)) { + // U+FFFE + return true; + } + if ((*us == 0xef) && (us[1] == 0xbf) && (us[2] == 0xbf)) { + // U+FFFF + return true; + } trailBytes = 2; return false; } else { @@ -1884,6 +1999,7 @@ ll->widthLine = LineLayout::wrapWidthInfinite; ll->lines = 1; int numCharsInLine = 0; + int numCharsBeforeEOL = 0; if (vstyle.edgeState == EDGE_BACKGROUND) { ll->edgeColumn = pdoc->FindColumn(line, theEdge); if (ll->edgeColumn >= posLineStart) { @@ -1910,6 +2026,8 @@ else if (vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower) ll->chars[numCharsInLine] = static_cast(tolower(chDoc)); numCharsInLine++; + if (!IsEOLChar(chDoc)) + numCharsBeforeEOL++; } } ll->xHighlightGuide = 0; @@ -1959,8 +2077,8 @@ } lastSegItalics = false; } else if (isBadUTF) { - char hexits[3]; - sprintf(hexits, "%2X", ll->chars[charInLine] & 0xff); + char hexits[4]; + sprintf(hexits, "x%2X", ll->chars[charInLine] & 0xff); ll->positions[charInLine + 1] = surface->WidthText(ctrlCharsFont, hexits, istrlen(hexits)) + 3; } else { // Regular character @@ -1992,6 +2110,7 @@ ll->positions[startseg] += 2; } ll->numCharsInLine = numCharsInLine; + ll->numCharsBeforeEOL = numCharsBeforeEOL; ll->validity = LineLayout::llPositions; } // Hard to cope when too narrow, so just assume there is space @@ -2072,15 +2191,21 @@ } } -ColourAllocated Editor::SelectionBackground(ViewStyle &vsDraw) { - return primarySelection ? vsDraw.selbackground.allocated : vsDraw.selbackground2.allocated; +ColourAllocated Editor::SelectionBackground(ViewStyle &vsDraw, bool main) { + return main ? + (primarySelection ? vsDraw.selbackground.allocated : vsDraw.selbackground2.allocated) : + vsDraw.selAdditionalBackground.allocated; } ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackground, - ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll) { - if (inSelection) { + ColourAllocated background, int inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll) { + if (inSelection == 1) { if (vsDraw.selbackset && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { - return SelectionBackground(vsDraw); + return SelectionBackground(vsDraw, true); + } + } else if (inSelection == 2) { + if (vsDraw.selbackset && (vsDraw.selAdditionalAlpha == SC_ALPHA_NOALPHA)) { + return SelectionBackground(vsDraw, false); } } else { if ((vsDraw.edgeState == EDGE_BACKGROUND) && @@ -2183,35 +2308,103 @@ bool overrideBackground, ColourAllocated background, bool drawWrapMarkEnd, ColourAllocated wrapColour) { - int styleMask = pdoc->stylingBitsMask; + const int posLineStart = pdoc->LineStart(line); + const int styleMask = pdoc->stylingBitsMask; PRectangle rcSegment = rcLine; + const bool lastSubLine = subLine == (ll->lines - 1); + int virtualSpace = 0; + if (lastSubLine) { + const int spaceWidth = static_cast(vsDraw.styles[ll->EndLineStyle()].spaceWidth); + virtualSpace = sel.VirtualSpaceFor(pdoc->LineEnd(line)) * spaceWidth; + } + // Fill in a PRectangle representing the end of line characters + int xEol = ll->positions[lineEnd] - subLineStart; - rcSegment.left = xEol + xStart; - rcSegment.right = xEol + vsDraw.aveCharWidth + xStart; - int posLineEnd = pdoc->LineStart(line + 1); - bool eolInSelection = (subLine == (ll->lines - 1)) && - (posLineEnd > ll->selStart) && (posLineEnd <= ll->selEnd) && (ll->selStart != ll->selEnd); - if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { - surface->FillRectangle(rcSegment, SelectionBackground(vsDraw)); + // Fill the virtual space and show selections within it + if (virtualSpace) { + rcSegment.left = xEol + xStart; + rcSegment.right = xEol + xStart + virtualSpace; + surface->FillRectangle(rcSegment, overrideBackground ? background : vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + if (!hideSelection && ((vsDraw.selAlpha == SC_ALPHA_NOALPHA) || (vsDraw.selAdditionalAlpha == SC_ALPHA_NOALPHA))) { + SelectionSegment virtualSpaceRange(SelectionPosition(pdoc->LineEnd(line)), SelectionPosition(pdoc->LineEnd(line), sel.VirtualSpaceFor(pdoc->LineEnd(line)))); + for (size_t r=0; r(vsDraw.styles[ll->EndLineStyle()].spaceWidth); + rcSegment.left = xStart + ll->positions[portion.start.Position() - posLineStart] - subLineStart + portion.start.VirtualSpace() * spaceWidth; + rcSegment.right = xStart + ll->positions[portion.end.Position() - posLineStart] - subLineStart + portion.end.VirtualSpace() * spaceWidth; + rcSegment.left = Platform::Maximum(rcSegment.left, rcLine.left); + rcSegment.right = Platform::Minimum(rcSegment.right, rcLine.right); + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, r == sel.Main())); + } + } + } + } + } + + int posAfterLineEnd = pdoc->LineStart(line + 1); + int eolInSelection = (subLine == (ll->lines - 1)) ? sel.InSelectionForEOL(posAfterLineEnd) : 0; + int alpha = (eolInSelection == 1) ? vsDraw.selAlpha : vsDraw.selAdditionalAlpha; + + // Draw the [CR], [LF], or [CR][LF] blobs if visible line ends are on + int blobsWidth = 0; + if (lastSubLine) { + for (int eolPos=ll->numCharsBeforeEOL; eolPosnumCharsInLine; eolPos++) { + rcSegment.left = xStart + ll->positions[eolPos] - subLineStart + virtualSpace; + rcSegment.right = xStart + ll->positions[eolPos+1] - subLineStart + virtualSpace; + blobsWidth += rcSegment.Width(); + const char *ctrlChar = ControlCharacterString(ll->chars[eolPos]); + int inSelection = 0; + bool inHotspot = false; + int styleMain = ll->styles[eolPos]; + ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, eolPos, ll); + ColourAllocated textFore = vsDraw.styles[styleMain].fore.allocated; + if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1)) { + if (alpha == SC_ALPHA_NOALPHA) { + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1)); + } else { + surface->FillRectangle(rcSegment, textBack); + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha); + } + } else { + surface->FillRectangle(rcSegment, textBack); + } + DrawTextBlob(surface, vsDraw, rcSegment, ctrlChar, textBack, textFore, twoPhaseDraw); + } + } + + // Draw the eol-is-selected rectangle + rcSegment.left = xEol + xStart + virtualSpace + blobsWidth; + rcSegment.right = xEol + xStart + virtualSpace + blobsWidth + vsDraw.aveCharWidth; + + if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) { + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1)); } else { if (overrideBackground) { surface->FillRectangle(rcSegment, background); - } else { + } else if (line < pdoc->LinesTotal() - 1) { + surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + } else if (vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].eolFilled) { surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + } else { + surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated); } - if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha != SC_ALPHA_NOALPHA)) { - SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + if (!hideSelection && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) { + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha); } } - rcSegment.left = xEol + vsDraw.aveCharWidth + xStart; + // Fill the remainder of the line + rcSegment.left = xEol + xStart + virtualSpace + blobsWidth + vsDraw.aveCharWidth; rcSegment.right = rcLine.right; - if (vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { - surface->FillRectangle(rcSegment, SelectionBackground(vsDraw)); + if (!hideSelection && vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha == SC_ALPHA_NOALPHA)) { + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw, eolInSelection == 1)); } else { if (overrideBackground) { surface->FillRectangle(rcSegment, background); @@ -2220,8 +2413,8 @@ } else { surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated); } - if (vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha != SC_ALPHA_NOALPHA)) { - SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + if (!hideSelection && vsDraw.selEOLFilled && eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (alpha != SC_ALPHA_NOALPHA)) { + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, eolInSelection == 1), alpha); } } @@ -2229,7 +2422,7 @@ PRectangle rcPlace = rcSegment; if (wrapVisualFlagsLocation & SC_WRAPVISUALFLAGLOC_END_BY_TEXT) { - rcPlace.left = xEol + xStart; + rcPlace.left = xEol + xStart + virtualSpace; rcPlace.right = rcPlace.left + vsDraw.aveCharWidth; } else { // draw left of the right text margin, to avoid clipping by the current clip rect @@ -2336,21 +2529,21 @@ } PRectangle rcText = rcSegment; if (vs.annotationVisible == ANNOTATION_BOXED) { - surface->FillRectangle(rcText, + surface->FillRectangle(rcText, vsDraw.styles[stAnnotation.StyleAt(start) + vsDraw.annotationStyleOffset].back.allocated); rcText.left += vsDraw.spaceWidth; } - DrawStyledText(surface, vsDraw, vsDraw.annotationStyleOffset, rcText, rcText.top + vsDraw.maxAscent, + DrawStyledText(surface, vsDraw, vsDraw.annotationStyleOffset, rcText, rcText.top + vsDraw.maxAscent, stAnnotation, start, lengthAnnotation); if (vs.annotationVisible == ANNOTATION_BOXED) { surface->MoveTo(rcSegment.left, rcSegment.top); surface->LineTo(rcSegment.left, rcSegment.bottom); surface->MoveTo(rcSegment.right, rcSegment.top); surface->LineTo(rcSegment.right, rcSegment.bottom); - if (subLine == ll->lines){ + if (subLine == ll->lines) { surface->MoveTo(rcSegment.left, rcSegment.top); surface->LineTo(rcSegment.right, rcSegment.top); - } + } if (subLine == ll->lines+annotationLines-1) { surface->MoveTo(rcSegment.left, rcSegment.bottom - 1); surface->LineTo(rcSegment.right, rcSegment.bottom - 1); @@ -2427,6 +2620,9 @@ if (subLine < ll->lines) { lineStart = ll->LineStart(subLine); lineEnd = ll->LineStart(subLine + 1); + if (subLine == ll->lines - 1) { + lineEnd = ll->numCharsBeforeEOL; + } } ColourAllocated wrapColour = vsDraw.styles[STYLE_DEFAULT].fore.allocated; @@ -2478,10 +2674,15 @@ } } + bool selBackDrawn = vsDraw.selbackset && + ((vsDraw.selAlpha == SC_ALPHA_NOALPHA) || (vsDraw.selAdditionalAlpha == SC_ALPHA_NOALPHA)); + // Does not take margin into account but not significant int xStartVisible = subLineStart - xStart; - BreakFinder bfBack(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible); + ll->psel = &sel; + + BreakFinder bfBack(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible, selBackDrawn); int next = bfBack.First(); // Background drawing loop @@ -2502,7 +2703,7 @@ rcSegment.right = Platform::Minimum(rcSegment.right, rcLine.right); int styleMain = ll->styles[i]; - bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd); + const int inSelection = hideSelection ? 0 : sel.CharacterInSelection(iDoc); bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd); ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll); if (ll->chars[i] == '\t') { @@ -2571,7 +2772,8 @@ inIndentation = subLine == 0; // Do not handle indentation except on first subline. // Foreground drawing loop - BreakFinder bfFore(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible); + BreakFinder bfFore(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible, + ((!twoPhaseDraw && selBackDrawn) || vsDraw.selforeset)); next = bfFore.First(); while (next < lineEnd) { @@ -2595,9 +2797,9 @@ if (vsDraw.hotspotForegroundSet) textFore = vsDraw.hotspotForeground.allocated; } - bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd); + const int inSelection = hideSelection ? 0 : sel.CharacterInSelection(iDoc); if (inSelection && (vsDraw.selforeset)) { - textFore = vsDraw.selforeground.allocated; + textFore = (inSelection == 1) ? vsDraw.selforeground.allocated : vsDraw.selAdditionalForeground.allocated; } bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd); ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll); @@ -2644,8 +2846,9 @@ cc, 1, textBack, textFore); } } else if ((i == startseg) && (static_cast(ll->chars[i]) >= 0x80) && IsUnicodeMode()) { - char hexits[3]; - sprintf(hexits, "%2X", ll->chars[i] & 0xff); + // A single byte >= 0x80 in UTF-8 is a bad byte and is displayed as its hex value + char hexits[4]; + sprintf(hexits, "x%2X", ll->chars[i] & 0xff); DrawTextBlob(surface, vsDraw, rcSegment, hexits, textBack, textFore, twoPhaseDraw); } else { // Normal text display @@ -2679,8 +2882,8 @@ surface->FillRectangle(rcSpace, textBack); } PRectangle rcDot(xmid + xStart - subLineStart, rcSegment.top + vsDraw.lineHeight / 2, 0, 0); - rcDot.right = rcDot.left + 1; - rcDot.bottom = rcDot.top + 1; + rcDot.right = rcDot.left + vs.whitespaceSize; + rcDot.bottom = rcDot.top + vs.whitespaceSize; surface->FillRectangle(rcDot, textFore); } } @@ -2697,7 +2900,7 @@ } } } - if (ll->hsStart != -1 && vsDraw.hotspotUnderline && iDoc >= ll->hsStart && iDoc < ll->hsEnd ) { + if (ll->hsStart != -1 && vsDraw.hotspotUnderline && iDoc >= ll->hsStart && iDoc < ll->hsEnd) { PRectangle rcUL = rcSegment; rcUL.top = rcUL.top + vsDraw.maxAscent + 1; rcUL.bottom = rcUL.top + 1; @@ -2718,6 +2921,8 @@ if ((vsDraw.viewIndentationGuides == ivLookForward || vsDraw.viewIndentationGuides == ivLookBoth) && (subLine == 0)) { int indentSpace = pdoc->GetLineIndentation(line); + int xStartText = ll->positions[pdoc->GetLineIndentPosition(line) - posLineStart]; + // Find the most recent line with some text int lineLastWithText = line; @@ -2725,6 +2930,7 @@ lineLastWithText--; } if (lineLastWithText < line) { + xStartText = 100000; // Don't limit to visible indentation on empty line // This line is empty, so use indentation of last line with text int indentLastWithText = pdoc->GetLineIndentation(lineLastWithText); int isFoldHeader = pdoc->GetLevel(lineLastWithText) & SC_FOLDLEVELHEADERFLAG; @@ -2754,8 +2960,10 @@ for (int indentPos = pdoc->IndentSize(); indentPos < indentSpace; indentPos += pdoc->IndentSize()) { int xIndent = indentPos * vsDraw.spaceWidth; - DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcSegment, - (ll->xHighlightGuide == xIndent)); + if (xIndent < xStartText) { + DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcSegment, + (ll->xHighlightGuide == xIndent)); + } } } @@ -2767,15 +2975,28 @@ xStart, subLine, subLineStart, overrideBackground, background, drawWrapMarkEnd, wrapColour); } - if ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) && (ll->selStart >= 0) && (ll->selEnd >= 0)) { - int startPosSel = (ll->selStart < posLineStart) ? posLineStart : ll->selStart; - int endPosSel = (ll->selEnd < (lineEnd + posLineStart)) ? ll->selEnd : (lineEnd + posLineStart); - if (startPosSel < endPosSel) { - rcSegment.left = xStart + ll->positions[startPosSel - posLineStart] - subLineStart; - rcSegment.right = xStart + ll->positions[endPosSel - posLineStart] - subLineStart; - rcSegment.left = Platform::Maximum(rcSegment.left, rcLine.left); - rcSegment.right = Platform::Minimum(rcSegment.right, rcLine.right); - SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + if (!hideSelection && ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) || (vsDraw.selAdditionalAlpha != SC_ALPHA_NOALPHA))) { + // For each selection draw + int virtualSpaces = 0; + if (subLine == (ll->lines - 1)) { + virtualSpaces = sel.VirtualSpaceFor(pdoc->LineEnd(line)); + } + SelectionPosition posStart(posLineStart); + SelectionPosition posEnd(posLineStart + lineEnd, virtualSpaces); + SelectionSegment virtualSpaceRange(posStart, posEnd); + for (size_t r=0; r(vsDraw.styles[ll->EndLineStyle()].spaceWidth); + rcSegment.left = xStart + ll->positions[portion.start.Position() - posLineStart] - subLineStart + portion.start.VirtualSpace() * spaceWidth; + rcSegment.right = xStart + ll->positions[portion.end.Position() - posLineStart] - subLineStart + portion.end.VirtualSpace() * spaceWidth; + rcSegment.left = Platform::Maximum(rcSegment.left, rcLine.left); + rcSegment.right = Platform::Minimum(rcSegment.right, rcLine.right); + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw, r == sel.Main()), alpha); + } + } } } @@ -2809,7 +3030,8 @@ } } -void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, int xStart, int offset, int posCaret, PRectangle rcCaret) { +void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, + int xStart, int offset, int posCaret, PRectangle rcCaret, ColourAllocated caretColour) { int lineStart = ll->LineStart(subLine); int posBefore = posCaret; @@ -2868,7 +3090,7 @@ surface->DrawTextClipped(rcCaret, vsDraw.styles[styleMain].font, rcCaret.top + vsDraw.maxAscent, ll->chars + offsetFirstChar, numCharsToDraw, vsDraw.styles[styleMain].back.allocated, - vsDraw.caretcolour.allocated); + caretColour); } void Editor::RefreshPixMaps(Surface *surfaceWindow) { @@ -2937,10 +3159,95 @@ } } +void Editor::DrawCarets(Surface *surface, ViewStyle &vsDraw, int lineDoc, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine) { + // When drag is active it is the only caret drawn + bool drawDrag = posDrag.IsValid(); + if (hideSelection && !drawDrag) + return; + const int posLineStart = pdoc->LineStart(lineDoc); + // For each selection draw + for (size_t r=0; (r(vsDraw.styles[ll->EndLineStyle()].spaceWidth); + const int virtualOffset = posCaret.VirtualSpace() * spaceWidth; + if (ll->InLine(offset, subLine) && offset <= ll->numCharsBeforeEOL) { + int xposCaret = ll->positions[offset] + virtualOffset - ll->positions[ll->LineStart(subLine)]; + if (ll->wrapIndent != 0) { + int lineStart = ll->LineStart(subLine); + if (lineStart != 0) // Wrapped + xposCaret += ll->wrapIndent; + } + bool caretBlinkState = (caret.active && caret.on) || (!additionalCaretsBlink && !mainCaret); + bool caretVisibleState = additionalCaretsVisible || mainCaret; + if ((xposCaret >= 0) && (vsDraw.caretWidth > 0) && (vsDraw.caretStyle != CARETSTYLE_INVISIBLE) && + ((posDrag.IsValid()) || (caretBlinkState && caretVisibleState))) { + bool caretAtEOF = false; + bool caretAtEOL = false; + bool drawBlockCaret = false; + int widthOverstrikeCaret; + int caretWidthOffset = 0; + PRectangle rcCaret = rcLine; + + if (posCaret.Position() == pdoc->Length()) { // At end of document + caretAtEOF = true; + widthOverstrikeCaret = vsDraw.aveCharWidth; + } else if ((posCaret.Position() - posLineStart) >= ll->numCharsInLine) { // At end of line + caretAtEOL = true; + widthOverstrikeCaret = vsDraw.aveCharWidth; + } else { + widthOverstrikeCaret = ll->positions[offset + 1] - ll->positions[offset]; + } + if (widthOverstrikeCaret < 3) // Make sure its visible + widthOverstrikeCaret = 3; + + if (xposCaret > 0) + caretWidthOffset = 1; // Move back so overlaps both character cells. + xposCaret += xStart; + if (posDrag.IsValid()) { + /* Dragging text, use a line caret */ + rcCaret.left = xposCaret - caretWidthOffset; + rcCaret.right = rcCaret.left + vsDraw.caretWidth; + } else if (inOverstrike) { + /* Overstrike (insert mode), use a modified bar caret */ + rcCaret.top = rcCaret.bottom - 2; + rcCaret.left = xposCaret + 1; + rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1; + } else if (vsDraw.caretStyle == CARETSTYLE_BLOCK) { + /* Block caret */ + rcCaret.left = xposCaret; + if (!caretAtEOL && !caretAtEOF && (ll->chars[offset] != '\t') && !(IsControlCharacter(ll->chars[offset]))) { + drawBlockCaret = true; + rcCaret.right = xposCaret + widthOverstrikeCaret; + } else { + rcCaret.right = xposCaret + vsDraw.aveCharWidth; + } + } else { + /* Line caret */ + rcCaret.left = xposCaret - caretWidthOffset; + rcCaret.right = rcCaret.left + vsDraw.caretWidth; + } + ColourAllocated caretColour = mainCaret ? vsDraw.caretcolour.allocated : vsDraw.additionalCaretColour.allocated; + if (drawBlockCaret) { + DrawBlockCaret(surface, vsDraw, ll, subLine, xStart, offset, posCaret.Position(), rcCaret, caretColour); + } else { + surface->FillRectangle(rcCaret, caretColour); + } + } + } + if (drawDrag) + break; + } +} + void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { //Platform::DebugPrintf("Paint:%1d (%3d,%3d) ... (%3d,%3d)\n", // paintingAllText, rcArea.left, rcArea.top, rcArea.right, rcArea.bottom); + StyleToPositionInView(PositionAfterArea(rcArea)); + pixmapLine->Release(); RefreshStyleData(); RefreshPixMaps(surfaceWindow); @@ -2953,13 +3260,6 @@ pixmapLine->SetPalette(&palette, !hasFocus); int screenLinePaintFirst = rcArea.top / vs.lineHeight; - // The area to be painted plus one extra line is styled. - // The extra line is to determine when a style change, such as starting a comment flows on to other lines. - int lineStyleLast = topLine + (rcArea.bottom - 1) / vs.lineHeight + 1; - //Platform::DebugPrintf("Paint lines = %d .. %d\n", topLine + screenLinePaintFirst, lineStyleLast); - int endPosPaint = pdoc->Length(); - if (lineStyleLast < cs.LinesDisplayed()) - endPosPaint = pdoc->LineStart(cs.DocFromDisplay(lineStyleLast) + 1); int xStart = vs.fixedColumnWidth - xOffset; int ypos = 0; @@ -2967,8 +3267,6 @@ ypos += screenLinePaintFirst * vs.lineHeight; int yposScreen = screenLinePaintFirst * vs.lineHeight; - // Ensure we are styled as far as we are painting. - pdoc->EnsureStyledTo(endPosPaint); bool paintAbandonedByStyling = paintState == paintAbandoned; if (needUpdateUI) { // Deselect palette by selecting a temporary palette @@ -2989,7 +3287,7 @@ // lines first). int startLineToWrap = cs.DocFromDisplay(topLine) - 5; if (startLineToWrap < 0) - startLineToWrap = -1; + startLineToWrap = 0; if (WrapLines(false, startLineToWrap)) { // The wrapping process has changed the height of some lines so // abandon this paint for a complete repaint. @@ -3000,12 +3298,14 @@ } PLATFORM_ASSERT(pixmapSelPattern->Initialised()); - PaintSelMargin(surfaceWindow, rcArea); + if (paintState != paintAbandoned) { + PaintSelMargin(surfaceWindow, rcArea); - PRectangle rcRightMargin = rcClient; - rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth; - if (rcArea.Intersects(rcRightMargin)) { - surfaceWindow->FillRectangle(rcRightMargin, vs.styles[STYLE_DEFAULT].back.allocated); + PRectangle rcRightMargin = rcClient; + rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth; + if (rcArea.Intersects(rcRightMargin)) { + surfaceWindow->FillRectangle(rcRightMargin, vs.styles[STYLE_DEFAULT].back.allocated); + } } if (paintState == paintAbandoned) { @@ -3036,10 +3336,10 @@ int visibleLine = topLine + screenLinePaintFirst; - int posCaret = currentPos; - if (posDrag >= 0) + SelectionPosition posCaret = sel.RangeMain().caret; + if (posDrag.IsValid()) posCaret = posDrag; - int lineCaret = pdoc->LineFromPosition(posCaret); + int lineCaret = pdoc->LineFromPosition(posCaret.Position()); // Remove selection margin from drawing area so text will not be drawn // on it in unbuffered mode. @@ -3055,7 +3355,6 @@ //ElapsedTime etWhole; int lineDocPrevious = -1; // Used to avoid laying out one document line multiple times AutoLineLayout ll(llc, 0); - SelectionLineIterator lineIterator(this); while (visibleLine < cs.LinesDisplayed() && yposScreen < rcArea.bottom) { int lineDoc = cs.DocFromDisplay(visibleLine); @@ -3069,8 +3368,6 @@ //ElapsedTime et; if (lineDoc != lineDocPrevious) { ll.Set(0); - // For rectangular selection this accesses the layout cache so should be after layout returned. - lineIterator.SetAt(lineDoc); ll.Set(RetrieveLineLayout(lineDoc)); LayoutLine(lineDoc, surface, vs, ll, wrapWidth); lineDocPrevious = lineDoc; @@ -3078,17 +3375,8 @@ //durLayout += et.Duration(true); if (ll) { - if (selType == selStream) { - ll->selStart = SelectionStart(); - ll->selEnd = SelectionEnd(); - } else { - ll->selStart = lineIterator.startPos; - ll->selEnd = lineIterator.endPos; - } ll->containsCaret = lineDoc == lineCaret; if (hideSelection) { - ll->selStart = -1; - ll->selEnd = -1; ll->containsCaret = false; } @@ -3132,71 +3420,7 @@ } } - // Draw the Caret - if (lineDoc == lineCaret) { - int offset = Platform::Minimum(posCaret - rangeLine.start, ll->maxLineLength); - if (ll->InLine(offset, subLine)) { - int xposCaret = ll->positions[offset] - ll->positions[ll->LineStart(subLine)] + xStart; - - if (ll->wrapIndent != 0) { - int lineStart = ll->LineStart(subLine); - if (lineStart != 0) // Wrapped - xposCaret += ll->wrapIndent; - } - if ((xposCaret >= 0) && (vs.caretWidth > 0) && (vs.caretStyle != CARETSTYLE_INVISIBLE) && - ((posDrag >= 0) || (caret.active && caret.on))) { - bool caretAtEOF = false; - bool caretAtEOL = false; - bool drawBlockCaret = false; - int widthOverstrikeCaret; - int caretWidthOffset = 0; - PRectangle rcCaret = rcLine; - - if (posCaret == pdoc->Length()) { // At end of document - caretAtEOF = true; - widthOverstrikeCaret = vs.aveCharWidth; - } else if ((posCaret - rangeLine.start) >= ll->numCharsInLine) { // At end of line - caretAtEOL = true; - widthOverstrikeCaret = vs.aveCharWidth; - } else { - widthOverstrikeCaret = ll->positions[offset + 1] - ll->positions[offset]; - } - if (widthOverstrikeCaret < 3) // Make sure its visible - widthOverstrikeCaret = 3; - - if (offset > ll->LineStart(subLine)) - caretWidthOffset = 1; // Move back so overlaps both character cells. - if (posDrag >= 0) { - /* Dragging text, use a line caret */ - rcCaret.left = xposCaret - caretWidthOffset; - rcCaret.right = rcCaret.left + vs.caretWidth; - } else if (inOverstrike) { - /* Overstrike (insert mode), use a modified bar caret */ - rcCaret.top = rcCaret.bottom - 2; - rcCaret.left = xposCaret + 1; - rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1; - } else if (vs.caretStyle == CARETSTYLE_BLOCK) { - /* Block caret */ - rcCaret.left = xposCaret; - if (!caretAtEOL && !caretAtEOF && (ll->chars[offset] != '\t') && !(IsControlCharacter(ll->chars[offset]))) { - drawBlockCaret = true; - rcCaret.right = xposCaret + widthOverstrikeCaret; - } else { - rcCaret.right = xposCaret + vs.aveCharWidth; - } - } else { - /* Line caret */ - rcCaret.left = xposCaret - caretWidthOffset; - rcCaret.right = rcCaret.left + vs.caretWidth; - } - if (drawBlockCaret) { - DrawBlockCaret(surface, vs, ll, subLine, xStart, offset, posCaret, rcCaret); - } else { - surface->FillRectangle(rcCaret, vs.caretcolour.allocated); - } - } - } - } + DrawCarets(surface, vs, lineDoc, xStart, rcLine, ll, subLine); if (bufferedDraw) { Point from(vs.fixedColumnWidth, 0); @@ -3204,6 +3428,9 @@ rcClient.right, yposScreen + vs.lineHeight); surfaceWindow->Copy(rcCopyArea, from, *pixmapLine); } + + lineWidthMaxSeen = Platform::Maximum( + lineWidthMaxSeen, ll->positions[ll->numCharsInLine]); //durCopy += et.Duration(true); } @@ -3214,8 +3441,6 @@ yposScreen += vs.lineHeight; visibleLine++; - lineWidthMaxSeen = Platform::Maximum( - lineWidthMaxSeen, ll->positions[ll->numCharsInLine]); //gdk_flush(); } ll.Set(0); @@ -3298,12 +3523,13 @@ vsPrint.selbackset = false; vsPrint.selforeset = false; vsPrint.selAlpha = SC_ALPHA_NOALPHA; + vsPrint.selAdditionalAlpha = SC_ALPHA_NOALPHA; vsPrint.whitespaceBackgroundSet = false; vsPrint.whitespaceForegroundSet = false; vsPrint.showCaretLineBackground = false; // Set colours for printing according to users settings - for (size_t sty = 0;sty < vsPrint.stylesSize;sty++) { + for (size_t sty = 0; sty < vsPrint.stylesSize; sty++) { if (printColourMode == SC_PRINT_INVERTLIGHT) { vsPrint.styles[sty].fore.desired = InvertedLight(vsPrint.styles[sty].fore.desired); vsPrint.styles[sty].back.desired = InvertedLight(vsPrint.styles[sty].back.desired); @@ -3358,7 +3584,7 @@ int nPrintPos = pfr->chrg.cpMin; int visibleLine = 0; - int widthPrint = pfr->rc.Width() - vsPrint.fixedColumnWidth; + int widthPrint = pfr->rc.right - pfr->rc.left - vsPrint.fixedColumnWidth; if (printWrapState == eWrapNone) widthPrint = LineLayout::wrapWidthInfinite; @@ -3375,8 +3601,6 @@ LineLayout ll(8000); LayoutLine(lineDoc, surfaceMeasure, vsPrint, &ll, widthPrint); - ll.selStart = -1; - ll.selEnd = -1; ll.containsCaret = false; PRectangle rcLine; @@ -3499,6 +3723,15 @@ } } +int Editor::InsertSpace(int position, unsigned int spaces) { + if (spaces > 0) { + std::string spaceText(spaces, ' '); + pdoc->InsertString(position, spaceText.c_str(), spaces); + position += spaces; + } + return position; +} + void Editor::AddChar(char ch) { char s[2]; s[0] = ch; @@ -3506,63 +3739,64 @@ AddCharUTF(s, 1); } +void Editor::FilterSelections() { + if (!additionalSelectionTyping && (sel.Count() > 1)) { + SelectionRange rangeOnly = sel.RangeMain(); + InvalidateSelection(rangeOnly, true); + sel.SetSelection(rangeOnly); + } +} + // AddCharUTF inserts an array of bytes which may or may not be in UTF-8. void Editor::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) { - bool wasSelection = currentPos != anchor; - if(wasSelection && selType == selRectangle ) { - int startPos; - int endPos; - - int c1 = pdoc->GetColumn(currentPos); - int c2 = pdoc->GetColumn(anchor); - int offset = c1 < c2 ? c1 : c2; - - pdoc->BeginUndoAction(); - SelectionLineIterator lineIterator(this, false); - while (lineIterator.Iterate()) { - startPos = lineIterator.startPos; - endPos = lineIterator.endPos; - - if(pdoc->GetColumn(endPos) >= offset){ - unsigned int chars = endPos - startPos; - if (0 != chars) { - pdoc->DeleteChars(startPos, chars); - } - pdoc->InsertString(startPos, s, len); - } - } - anchor += len; - currentPos += len; - SetRectangularRange(); - pdoc->EndUndoAction(); - - } else { - ClearSelection(); - bool charReplaceAction = false; - if (inOverstrike && !wasSelection && !RangeContainsProtected(currentPos, currentPos + 1)) { - if (currentPos < (pdoc->Length())) { - if (!IsEOLChar(pdoc->CharAt(currentPos))) { - charReplaceAction = true; - pdoc->BeginUndoAction(); - pdoc->DelChar(currentPos); + FilterSelections(); + { + UndoGroup ug(pdoc, (sel.Count() > 1) || !sel.Empty() || inOverstrike); + for (size_t r=0; rDeleteChars(positionInsert, sel.Range(r).Length()); + sel.Range(r).ClearVirtualSpace(); + } else { + // Range is all virtual so collapse to start of virtual space + sel.Range(r).MinimizeVirtualSpace(); + } + } else if (inOverstrike) { + if (positionInsert < pdoc->Length()) { + if (!IsEOLChar(pdoc->CharAt(positionInsert))) { + pdoc->DelChar(positionInsert); + sel.Range(r).ClearVirtualSpace(); + } + } + } + positionInsert = InsertSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); + if (pdoc->InsertString(positionInsert, s, len)) { + sel.Range(r).caret.SetPosition(positionInsert + len); + sel.Range(r).anchor.SetPosition(positionInsert + len); + } + sel.Range(r).ClearVirtualSpace(); + // If in wrap mode rewrap current line so EnsureCaretVisible has accurate information + if (wrapState != eWrapNone) { + AutoSurface surface(this); + if (surface) { + if (WrapOneLine(surface, pdoc->LineFromPosition(positionInsert))) { + SetScrollBars(); + SetVerticalScrollPos(); + Redraw(); + } + } } } } - if (pdoc->InsertString(currentPos, s, len)) { - SetEmptySelection(currentPos + len); - } - if (charReplaceAction) { - pdoc->EndUndoAction(); - } } - // If in wrap mode rewrap current line so EnsureCaretVisible has accurate information if (wrapState != eWrapNone) { - AutoSurface surface(this); - if (surface) { - WrapOneLine(surface, pdoc->LineFromPosition(currentPos)); - } SetScrollBars(); } + ThinRectangularRange(); + // If in wrap mode rewrap current line so EnsureCaretVisible has accurate information EnsureCaretVisible(); // Avoid blinking during rapid typing: ShowCaretAtCurrentPosition(); @@ -3606,48 +3840,76 @@ } NotifyChar(byte); } + + if (recordingMacro) { + NotifyMacroRecord(SCI_REPLACESEL, 0, reinterpret_cast(s)); + } } -void Editor::ClearSelection() { - if (!SelectionContainsProtected()) { - int startPos = SelectionStart(); - if (selType == selStream) { - unsigned int chars = SelectionEnd() - startPos; - if (0 != chars) { - pdoc->BeginUndoAction(); - pdoc->DeleteChars(startPos, chars); - pdoc->EndUndoAction(); - } - } else { - pdoc->BeginUndoAction(); - SelectionLineIterator lineIterator(this, false); - while (lineIterator.Iterate()) { - startPos = lineIterator.startPos; - unsigned int chars = lineIterator.endPos - startPos; - if (0 != chars) { - pdoc->DeleteChars(startPos, chars); +void Editor::InsertPaste(SelectionPosition selStart, const char *text, int len) { + if (multiPasteMode == SC_MULTIPASTE_ONCE) { + selStart = SelectionPosition(InsertSpace(selStart.Position(), selStart.VirtualSpace())); + if (pdoc->InsertString(selStart.Position(), text, len)) { + SetEmptySelection(selStart.Position() + len); + } + } else { + // SC_MULTIPASTE_EACH + for (size_t r=0; rDeleteChars(positionInsert, sel.Range(r).Length()); + sel.Range(r).ClearVirtualSpace(); + } else { + // Range is all virtual so collapse to start of virtual space + sel.Range(r).MinimizeVirtualSpace(); + } + } + positionInsert = InsertSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); + if (pdoc->InsertString(positionInsert, text, len)) { + sel.Range(r).caret.SetPosition(positionInsert + len); + sel.Range(r).anchor.SetPosition(positionInsert + len); } + sel.Range(r).ClearVirtualSpace(); } - pdoc->EndUndoAction(); - selType = selStream; } - SetEmptySelection(startPos); } } -void Editor::ClearAll() { - pdoc->BeginUndoAction(); - if (0 != pdoc->Length()) { - pdoc->DeleteChars(0, pdoc->Length()); +void Editor::ClearSelection() { + if (!sel.IsRectangular()) + FilterSelections(); + UndoGroup ug(pdoc); + for (size_t r=0; rDeleteChars(sel.Range(r).Start().Position(), + sel.Range(r).Length()); + sel.Range(r) = sel.Range(r).Start(); + } + } } - if (!pdoc->IsReadOnly()) { - cs.Clear(); - pdoc->AnnotationClearAll(); - pdoc->MarginClearAll(); + ThinRectangularRange(); + sel.RemoveDuplicates(); + ClaimSelection(); +} + +void Editor::ClearAll() { + { + UndoGroup ug(pdoc); + if (0 != pdoc->Length()) { + pdoc->DeleteChars(0, pdoc->Length()); + } + if (!pdoc->IsReadOnly()) { + cs.Clear(); + pdoc->AnnotationClearAll(); + pdoc->MarginClearAll(); + } } - pdoc->EndUndoAction(); - anchor = 0; - currentPos = 0; + sel.Clear(); SetTopLine(0); SetVerticalScrollPos(); InvalidateStyleRedraw(); @@ -3684,15 +3946,20 @@ } } -void Editor::PasteRectangular(int pos, const char *ptr, int len) { +void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, int len) { if (pdoc->IsReadOnly() || SelectionContainsProtected()) { return; } - currentPos = pos; - int xInsert = XFromPosition(currentPos); - int line = pdoc->LineFromPosition(currentPos); + sel.Clear(); + sel.RangeMain() = SelectionRange(pos); + int line = pdoc->LineFromPosition(sel.MainCaret()); + UndoGroup ug(pdoc); + sel.RangeMain().caret = SelectionPosition( + InsertSpace(sel.RangeMain().caret.Position(), sel.RangeMain().caret.VirtualSpace())); + int xInsert = XFromPosition(sel.RangeMain().caret); bool prevCr = false; - pdoc->BeginUndoAction(); + while ((len > 0) && IsEOLChar(ptr[len-1])) + len--; for (int i = 0; i < len; i++) { if (IsEOLChar(ptr[i])) { if ((ptr[i] == '\r') || (!prevCr)) @@ -3704,21 +3971,20 @@ pdoc->InsertChar(pdoc->Length(), '\n'); } // Pad the end of lines with spaces if required - currentPos = PositionFromLineX(line, xInsert); - if ((XFromPosition(currentPos) < xInsert) && (i + 1 < len)) { - while (XFromPosition(currentPos) < xInsert) { - pdoc->InsertChar(currentPos, ' '); - currentPos++; + sel.RangeMain().caret.SetPosition(PositionFromLineX(line, xInsert)); + if ((XFromPosition(sel.MainCaret()) < xInsert) && (i + 1 < len)) { + while (XFromPosition(sel.MainCaret()) < xInsert) { + pdoc->InsertChar(sel.MainCaret(), ' '); + sel.RangeMain().caret.Add(1); } } prevCr = ptr[i] == '\r'; } else { - pdoc->InsertString(currentPos, ptr + i, 1); - currentPos++; + pdoc->InsertString(sel.MainCaret(), ptr + i, 1); + sel.RangeMain().caret.Add(1); prevCr = false; } } - pdoc->EndUndoAction(); SetEmptySelection(pos); } @@ -3727,44 +3993,33 @@ } void Editor::Clear() { - bool wasSelection = currentPos != anchor; - if(wasSelection && selType == selRectangle ) { - int startPos; - int endPos; - - int c1 = pdoc->GetColumn(currentPos); - int c2 = pdoc->GetColumn(anchor); - int offset = c1 < c2 ? c1 : c2; - - pdoc->BeginUndoAction(); - SelectionLineIterator lineIterator(this, false); - while (lineIterator.Iterate()) { - startPos = lineIterator.startPos; - endPos = lineIterator.endPos; - - if(pdoc->GetColumn(endPos) >= offset){ - unsigned int chars = endPos - startPos; - if (0 != chars) { - pdoc->DeleteChars(startPos, chars); - } else - pdoc->DelChar(startPos); - } - } - SetRectangularRange(); - pdoc->EndUndoAction(); - - } else if (currentPos == anchor) { - if (!RangeContainsProtected(currentPos, currentPos + 1)) { - DelChar(); + // If multiple selections, don't delete EOLS + if (sel.Empty()) { + UndoGroup ug(pdoc, sel.Count() > 1); + for (size_t r=0; rCharAt(sel.Range(r).caret.Position()))) { + pdoc->DelChar(sel.Range(r).caret.Position()); + sel.Range(r).ClearVirtualSpace(); + } // else multiple selection so don't eat line ends + } else { + sel.Range(r).ClearVirtualSpace(); + } } } else { ClearSelection(); } - if( !wasSelection ) - SetEmptySelection(currentPos); + sel.RemoveDuplicates(); } void Editor::SelectAll() { + sel.Clear(); SetSelection(0, pdoc->Length()); Redraw(); } @@ -3789,65 +4044,54 @@ } void Editor::DelChar() { - if (!RangeContainsProtected(currentPos, currentPos + 1)) { - pdoc->DelChar(currentPos); + if (!RangeContainsProtected(sel.MainCaret(), sel.MainCaret() + 1)) { + pdoc->DelChar(sel.MainCaret()); } // Avoid blinking during rapid typing: ShowCaretAtCurrentPosition(); } void Editor::DelCharBack(bool allowLineStartDeletion) { - bool wasSelection = currentPos != anchor; - if(wasSelection && selType == selRectangle ) { - int startPos; - int endPos; - - int c1 = pdoc->GetColumn(currentPos); - int c2 = pdoc->GetColumn(anchor); - int offset = c1 < c2 ? c1 : c2; - - pdoc->BeginUndoAction(); - SelectionLineIterator lineIterator(this, false); - while (lineIterator.Iterate()) { - startPos = lineIterator.startPos; - endPos = lineIterator.endPos; - - if(pdoc->GetColumn(endPos) >= offset){ - unsigned int chars = endPos - startPos; - if (0 != chars) { - pdoc->DeleteChars(startPos, chars); - } else - pdoc->DelCharBack(startPos); - } - } - SetRectangularRange(); - pdoc->EndUndoAction(); - - } else if (currentPos == anchor) { - if (!RangeContainsProtected(currentPos - 1, currentPos)) { - int lineCurrentPos = pdoc->LineFromPosition(currentPos); - if (allowLineStartDeletion || (pdoc->LineStart(lineCurrentPos) != currentPos)) { - if (pdoc->GetColumn(currentPos) <= pdoc->GetLineIndentation(lineCurrentPos) && - pdoc->GetColumn(currentPos) > 0 && pdoc->backspaceUnindents) { - pdoc->BeginUndoAction(); - int indentation = pdoc->GetLineIndentation(lineCurrentPos); - int indentationStep = pdoc->IndentSize(); - if (indentation % indentationStep == 0) { - pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep); - } else { - pdoc->SetLineIndentation(lineCurrentPos, indentation - (indentation % indentationStep)); - } - SetEmptySelection(pdoc->GetLineIndentPosition(lineCurrentPos)); - pdoc->EndUndoAction(); + if (!sel.IsRectangular()) + FilterSelections(); + if (sel.IsRectangular()) + allowLineStartDeletion = false; + UndoGroup ug(pdoc, (sel.Count() > 1) || !sel.Empty()); + if (sel.Empty()) { + for (size_t r=0; rDelCharBack(currentPos); + int lineCurrentPos = pdoc->LineFromPosition(sel.Range(r).caret.Position()); + if (allowLineStartDeletion || (pdoc->LineStart(lineCurrentPos) != sel.Range(r).caret.Position())) { + if (pdoc->GetColumn(sel.Range(r).caret.Position()) <= pdoc->GetLineIndentation(lineCurrentPos) && + pdoc->GetColumn(sel.Range(r).caret.Position()) > 0 && pdoc->backspaceUnindents) { + UndoGroup ugInner(pdoc, !ug.Needed()); + int indentation = pdoc->GetLineIndentation(lineCurrentPos); + int indentationStep = pdoc->IndentSize(); + if (indentation % indentationStep == 0) { + pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep); + } else { + pdoc->SetLineIndentation(lineCurrentPos, indentation - (indentation % indentationStep)); + } + // SetEmptySelection + sel.Range(r) = SelectionRange(pdoc->GetLineIndentPosition(lineCurrentPos), + pdoc->GetLineIndentPosition(lineCurrentPos)); + } else { + pdoc->DelCharBack(sel.Range(r).caret.Position()); + } + } } + } else { + sel.Range(r).ClearVirtualSpace(); } } } else { ClearSelection(); - SetEmptySelection(currentPos); } + sel.RemoveDuplicates(); // Avoid blinking during rapid typing: ShowCaretAtCurrentPosition(); } @@ -3861,7 +4105,7 @@ NotifyParent(scn); } -void Editor::NotifyStyleNeeded(Document*, void *, int endStyleNeeded) { +void Editor::NotifyStyleNeeded(Document *, void *, int endStyleNeeded) { NotifyStyleToNeeded(endStyleNeeded); } @@ -3870,12 +4114,6 @@ scn.nmhdr.code = SCN_CHARADDED; scn.ch = ch; NotifyParent(scn); - if (recordingMacro) { - char txt[2]; - txt[0] = static_cast(ch); - txt[1] = '\0'; - NotifyMacroRecord(SCI_REPLACESEL, 0, reinterpret_cast(txt)); - } } void Editor::NotifySavePoint(bool isSavePoint) { @@ -3992,12 +4230,12 @@ } // Notifications from document -void Editor::NotifyModifyAttempt(Document*, void *) { +void Editor::NotifyModifyAttempt(Document *, void *) { //Platform::DebugPrintf("** Modify Attempt\n"); NotifyModifyAttempt(); } -void Editor::NotifySavePoint(Document*, void *, bool atSavePoint) { +void Editor::NotifySavePoint(Document *, void *, bool atSavePoint) { //Platform::DebugPrintf("** Save Point %s\n", atSavePoint ? "On" : "Off"); NotifySavePoint(atSavePoint); } @@ -4040,7 +4278,7 @@ } } -void Editor::NotifyModified(Document*, DocModification mh, void *) { +void Editor::NotifyModified(Document *, DocModification mh, void *) { needUpdateUI = true; if (paintState == painting) { CheckForChangeOutsidePaint(Range(mh.position, mh.position + mh.length)); @@ -4072,13 +4310,11 @@ } else { // Move selection and brace highlights if (mh.modificationType & SC_MOD_INSERTTEXT) { - currentPos = MovePositionForInsertion(currentPos, mh.position, mh.length); - anchor = MovePositionForInsertion(anchor, mh.position, mh.length); + sel.MovePositions(true, mh.position, mh.length); braces[0] = MovePositionForInsertion(braces[0], mh.position, mh.length); braces[1] = MovePositionForInsertion(braces[1], mh.position, mh.length); } else if (mh.modificationType & SC_MOD_DELETETEXT) { - currentPos = MovePositionForDeletion(currentPos, mh.position, mh.length); - anchor = MovePositionForDeletion(anchor, mh.position, mh.length); + sel.MovePositions(false, mh.position, mh.length); braces[0] = MovePositionForDeletion(braces[0], mh.position, mh.length); braces[1] = MovePositionForDeletion(braces[1], mh.position, mh.length); } @@ -4122,12 +4358,14 @@ // TODO: could invalidate from mh.startModification to end of screen //InvalidateRange(mh.position, mh.position + mh.length); if (paintState == notPainting && !CanDeferToLastStep(mh)) { + QueueStyling(pdoc->Length()); Redraw(); } } else { //Platform::DebugPrintf("** %x Line Changed %d .. %d\n", this, // mh.position, mh.position + mh.length); if (paintState == notPainting && mh.length && !CanEliminate(mh)) { + QueueStyling(mh.position + mh.length); InvalidateRange(mh.position, mh.position + mh.length); } } @@ -4141,7 +4379,7 @@ if ((paintState == notPainting) || !PaintContainsMargin()) { if (mh.modificationType & SC_MOD_CHANGEFOLD) { // Fold changes can affect the drawing of following lines so redraw whole margin - RedrawSelMargin(); + RedrawSelMargin(mh.line-1, true); } else { RedrawSelMargin(mh.line); } @@ -4310,69 +4548,81 @@ * If stuttered = true and not already at first/last row, move to first/last row of window. * If stuttered = true and already at first/last row, scroll as normal. */ -void Editor::PageMove(int direction, selTypes sel, bool stuttered) { +void Editor::PageMove(int direction, Selection::selTypes selt, bool stuttered) { int topLineNew, newPos; // I consider only the caretYSlop, and ignore the caretYPolicy-- is that a problem? - int currentLine = pdoc->LineFromPosition(currentPos); + int currentLine = pdoc->LineFromPosition(sel.MainCaret()); int topStutterLine = topLine + caretYSlop; int bottomStutterLine = pdoc->LineFromPosition(PositionFromLocation( - Point(lastXChosen, direction * vs.lineHeight * LinesToScroll()))) + Point(lastXChosen - xOffset, direction * vs.lineHeight * LinesToScroll()))) - caretYSlop - 1; if (stuttered && (direction < 0 && currentLine > topStutterLine)) { topLineNew = topLine; - newPos = PositionFromLocation(Point(lastXChosen, vs.lineHeight * caretYSlop)); + newPos = PositionFromLocation(Point(lastXChosen - xOffset, vs.lineHeight * caretYSlop)); } else if (stuttered && (direction > 0 && currentLine < bottomStutterLine)) { topLineNew = topLine; - newPos = PositionFromLocation(Point(lastXChosen, vs.lineHeight * (LinesToScroll() - caretYSlop))); + newPos = PositionFromLocation(Point(lastXChosen - xOffset, vs.lineHeight * (LinesToScroll() - caretYSlop))); } else { - Point pt = LocationFromPosition(currentPos); + Point pt = LocationFromPosition(sel.MainCaret()); topLineNew = Platform::Clamp( topLine + direction * LinesToScroll(), 0, MaxScrollPos()); newPos = PositionFromLocation( - Point(lastXChosen, pt.y + direction * (vs.lineHeight * LinesToScroll()))); + Point(lastXChosen - xOffset, pt.y + direction * (vs.lineHeight * LinesToScroll()))); } if (topLineNew != topLine) { SetTopLine(topLineNew); - MovePositionTo(newPos, sel); + MovePositionTo(SelectionPosition(newPos), selt); Redraw(); SetVerticalScrollPos(); } else { - MovePositionTo(newPos, sel); + MovePositionTo(SelectionPosition(newPos), selt); } } -void Editor::ChangeCaseOfSelection(bool makeUpperCase) { - pdoc->BeginUndoAction(); - int startCurrent = currentPos; - int startAnchor = anchor; - if (selType == selStream) { - pdoc->ChangeCase(Range(SelectionStart(), SelectionEnd()), - makeUpperCase); - SetSelection(startCurrent, startAnchor); - } else { - SelectionLineIterator lineIterator(this, false); - while (lineIterator.Iterate()) { - pdoc->ChangeCase( - Range(lineIterator.startPos, lineIterator.endPos), - makeUpperCase); +void Editor::ChangeCaseOfSelection(int caseMapping) { + UndoGroup ug(pdoc); + for (size_t r=0; r 0) { + std::string sText(text, rangeBytes); + + std::string sMapped = CaseMapString(sText, caseMapping); + + if (sMapped != sText) { + size_t firstDifference = 0; + while (sMapped[firstDifference] == sText[firstDifference]) + firstDifference++; + size_t lastDifference = sMapped.size() - 1; + while (sMapped[lastDifference] == sText[lastDifference]) + lastDifference--; + size_t endSame = sMapped.size() - 1 - lastDifference; + pdoc->DeleteChars(currentNoVS.Start().Position() + firstDifference, + rangeBytes - firstDifference - endSame); + pdoc->InsertString(currentNoVS.Start().Position() + firstDifference, + sMapped.c_str() + firstDifference, lastDifference - firstDifference + 1); + // Automatic movement changes selection so reset to exactly the same as it was. + sel.Range(r) = current; + } } - // Would be nicer to keep the rectangular selection but this is complex - SetEmptySelection(startCurrent); + delete []text; } - pdoc->EndUndoAction(); } void Editor::LineTranspose() { - int line = pdoc->LineFromPosition(currentPos); + int line = pdoc->LineFromPosition(sel.MainCaret()); if (line > 0) { - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); int startPrev = pdoc->LineStart(line - 1); int endPrev = pdoc->LineEnd(line - 1); int start = pdoc->LineStart(line); @@ -4385,37 +4635,54 @@ pdoc->DeleteChars(startPrev, len1); pdoc->InsertString(startPrev, line2, len2); pdoc->InsertString(start - len1 + len2, line1, len1); - MovePositionTo(start - len1 + len2); + MovePositionTo(SelectionPosition(start - len1 + len2)); delete []line1; delete []line2; - pdoc->EndUndoAction(); } } void Editor::Duplicate(bool forLine) { - int start = SelectionStart(); - int end = SelectionEnd(); - if (start == end) { + if (sel.Empty()) { forLine = true; } + UndoGroup ug(pdoc, sel.Count() > 1); + SelectionPosition last; + const char *eol = ""; + int eolLen = 0; if (forLine) { - int line = pdoc->LineFromPosition(currentPos); - start = pdoc->LineStart(line); - end = pdoc->LineEnd(line); + eol = StringFromEOLMode(pdoc->eolMode); + eolLen = istrlen(eol); } - char *text = CopyRange(start, end); - if (forLine) { - const char *eol = StringFromEOLMode(pdoc->eolMode); - pdoc->InsertCString(end, eol); - pdoc->InsertString(end + istrlen(eol), text, end - start); - } else { - pdoc->InsertString(end, text, end - start); + for (size_t r=0; rLineFromPosition(sel.Range(r).caret.Position()); + start = SelectionPosition(pdoc->LineStart(line)); + end = SelectionPosition(pdoc->LineEnd(line)); + } + char *text = CopyRange(start.Position(), end.Position()); + if (forLine) + pdoc->InsertString(end.Position(), eol, eolLen); + pdoc->InsertString(end.Position() + eolLen, text, SelectionRange(end, start).Length()); + delete []text; + } + if (sel.Count() && sel.IsRectangular()) { + SelectionPosition last = sel.Last(); + if (forLine) { + int line = pdoc->LineFromPosition(last.Position()); + last = SelectionPosition(last.Position() + pdoc->LineStart(line+1) - pdoc->LineStart(line)); + } + if (sel.Rectangular().anchor > sel.Rectangular().caret) + sel.Rectangular().anchor = last; + else + sel.Rectangular().caret = last; + SetRectangularRange(); } - delete []text; } void Editor::CancelModes() { - moveExtendsSelection = false; + sel.SetMoveExtends(false); } void Editor::NewLine() { @@ -4426,10 +4693,16 @@ } else if (pdoc->eolMode == SC_EOL_CR) { eol = "\r"; } // else SC_EOL_LF -> "\n" already set - if (pdoc->InsertCString(currentPos, eol)) { - SetEmptySelection(currentPos + istrlen(eol)); + if (pdoc->InsertCString(sel.MainCaret(), eol)) { + SetEmptySelection(sel.MainCaret() + istrlen(eol)); while (*eol) { NotifyChar(*eol); + if (recordingMacro) { + char txt[2]; + txt[0] = *eol; + txt[1] = '\0'; + NotifyMacroRecord(SCI_REPLACESEL, 0, reinterpret_cast(txt)); + } eol++; } } @@ -4440,41 +4713,50 @@ ShowCaretAtCurrentPosition(); } -void Editor::CursorUpOrDown(int direction, selTypes sel) { - Point pt = LocationFromPosition(currentPos); - int lineDoc = pdoc->LineFromPosition(currentPos); +void Editor::CursorUpOrDown(int direction, Selection::selTypes selt) { + SelectionPosition caretToUse = sel.Range(sel.Main()).caret; + if (sel.IsRectangular()) { + if (selt == Selection::noSel) { + caretToUse = (direction > 0) ? sel.Limits().end : sel.Limits().start; + } else { + caretToUse = sel.Rectangular().caret; + } + } + Point pt = LocationFromPosition(caretToUse); + int lineDoc = pdoc->LineFromPosition(caretToUse.Position()); Point ptStartLine = LocationFromPosition(pdoc->LineStart(lineDoc)); int subLine = (pt.y - ptStartLine.y) / vs.lineHeight; int commentLines = vs.annotationVisible ? pdoc->AnnotationLines(lineDoc) : 0; - int posNew = PositionFromLocation( - Point(lastXChosen, pt.y + direction * vs.lineHeight)); + SelectionPosition posNew = SPositionFromLocation( + Point(lastXChosen - xOffset, pt.y + direction * vs.lineHeight), false, false, UserVirtualSpace()); if ((direction > 0) && (subLine >= (cs.GetHeight(lineDoc) - 1 - commentLines))) { - posNew = PositionFromLocation( - Point(lastXChosen, pt.y + (commentLines + 1) * vs.lineHeight)); + posNew = SPositionFromLocation( + Point(lastXChosen - xOffset, pt.y + (commentLines + 1) * vs.lineHeight), false, false, UserVirtualSpace()); } if (direction < 0) { // Line wrapping may lead to a location on the same line, so // seek back if that is the case. // There is an equivalent case when moving down which skips // over a line but as that does not trap the user it is fine. - Point ptNew = LocationFromPosition(posNew); - while ((posNew > 0) && (pt.y == ptNew.y)) { - posNew--; - ptNew = LocationFromPosition(posNew); + Point ptNew = LocationFromPosition(posNew.Position()); + while ((posNew.Position() > 0) && (pt.y == ptNew.y)) { + posNew.Add(- 1); + posNew.SetVirtualSpace(0); + ptNew = LocationFromPosition(posNew.Position()); } } - MovePositionTo(posNew, sel); + MovePositionTo(posNew, selt); } -void Editor::ParaUpOrDown(int direction, selTypes sel) { - int lineDoc, savedPos = currentPos; +void Editor::ParaUpOrDown(int direction, Selection::selTypes selt) { + int lineDoc, savedPos = sel.MainCaret(); do { - MovePositionTo(direction > 0 ? pdoc->ParaDown(currentPos) : pdoc->ParaUp(currentPos), sel); - lineDoc = pdoc->LineFromPosition(currentPos); + MovePositionTo(SelectionPosition(direction > 0 ? pdoc->ParaDown(sel.MainCaret()) : pdoc->ParaUp(sel.MainCaret())), selt); + lineDoc = pdoc->LineFromPosition(sel.MainCaret()); if (direction > 0) { - if (currentPos >= pdoc->Length() && !cs.GetVisible(lineDoc)) { - if (sel == noSel) { - MovePositionTo(pdoc->LineEndPosition(savedPos)); + if (sel.MainCaret() >= pdoc->Length() && !cs.GetVisible(lineDoc)) { + if (selt == Selection::noSel) { + MovePositionTo(SelectionPosition(pdoc->LineEndPosition(savedPos))); } break; } @@ -4520,16 +4802,16 @@ CursorUpOrDown(1); break; case SCI_LINEDOWNEXTEND: - CursorUpOrDown(1, selStream); + CursorUpOrDown(1, Selection::selStream); break; case SCI_LINEDOWNRECTEXTEND: - CursorUpOrDown(1, selRectangle); + CursorUpOrDown(1, Selection::selRectangle); break; case SCI_PARADOWN: ParaUpOrDown(1); break; case SCI_PARADOWNEXTEND: - ParaUpOrDown(1, selStream); + ParaUpOrDown(1, Selection::selStream); break; case SCI_LINESCROLLDOWN: ScrollTo(topLine + 1); @@ -4539,144 +4821,182 @@ CursorUpOrDown(-1); break; case SCI_LINEUPEXTEND: - CursorUpOrDown(-1, selStream); + CursorUpOrDown(-1, Selection::selStream); break; case SCI_LINEUPRECTEXTEND: - CursorUpOrDown(-1, selRectangle); + CursorUpOrDown(-1, Selection::selRectangle); break; case SCI_PARAUP: ParaUpOrDown(-1); break; case SCI_PARAUPEXTEND: - ParaUpOrDown(-1, selStream); + ParaUpOrDown(-1, Selection::selStream); break; case SCI_LINESCROLLUP: ScrollTo(topLine - 1); MoveCaretInsideView(false); break; case SCI_CHARLEFT: - if (SelectionEmpty() || moveExtendsSelection) { - MovePositionTo(MovePositionSoVisible(currentPos - 1, -1)); + if (SelectionEmpty() || sel.MoveExtends()) { + if ((sel.Count() == 1) && pdoc->IsLineEndPosition(sel.MainCaret()) && sel.RangeMain().caret.VirtualSpace()) { + SelectionPosition spCaret = sel.RangeMain().caret; + spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1); + MovePositionTo(spCaret); + } else { + MovePositionTo(MovePositionSoVisible( + SelectionPosition((sel.LimitsForRectangularElseMain().start).Position() - 1), -1)); + } } else { - MovePositionTo(SelectionStart()); + MovePositionTo(sel.LimitsForRectangularElseMain().start); } SetLastXChosen(); break; case SCI_CHARLEFTEXTEND: - MovePositionTo(MovePositionSoVisible(currentPos - 1, -1), selStream); + if (pdoc->IsLineEndPosition(sel.MainCaret()) && sel.RangeMain().caret.VirtualSpace()) { + SelectionPosition spCaret = sel.RangeMain().caret; + spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1); + MovePositionTo(spCaret, Selection::selStream); + } else { + MovePositionTo(MovePositionSoVisible(SelectionPosition(sel.MainCaret() - 1), -1), Selection::selStream); + } SetLastXChosen(); break; case SCI_CHARLEFTRECTEXTEND: - MovePositionTo(MovePositionSoVisible(currentPos - 1, -1), selRectangle); + if (pdoc->IsLineEndPosition(sel.MainCaret()) && sel.RangeMain().caret.VirtualSpace()) { + SelectionPosition spCaret = sel.RangeMain().caret; + spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1); + MovePositionTo(spCaret, Selection::selRectangle); + } else { + MovePositionTo(MovePositionSoVisible(SelectionPosition(sel.MainCaret() - 1), -1), Selection::selRectangle); + } SetLastXChosen(); break; case SCI_CHARRIGHT: - if (SelectionEmpty() || moveExtendsSelection) { - MovePositionTo(MovePositionSoVisible(currentPos + 1, 1)); + if (SelectionEmpty() || sel.MoveExtends()) { + if ((virtualSpaceOptions & SCVS_USERACCESSIBLE) && pdoc->IsLineEndPosition(sel.MainCaret())) { + SelectionPosition spCaret = sel.RangeMain().caret; + spCaret.SetVirtualSpace(spCaret.VirtualSpace() + 1); + MovePositionTo(spCaret); + } else { + MovePositionTo(MovePositionSoVisible( + SelectionPosition((sel.LimitsForRectangularElseMain().end).Position() + 1), 1)); + } } else { - MovePositionTo(SelectionEnd()); + MovePositionTo(sel.LimitsForRectangularElseMain().end); } SetLastXChosen(); break; case SCI_CHARRIGHTEXTEND: - MovePositionTo(MovePositionSoVisible(currentPos + 1, 1), selStream); + if ((virtualSpaceOptions & SCVS_USERACCESSIBLE) && pdoc->IsLineEndPosition(sel.MainCaret())) { + SelectionPosition spCaret = sel.RangeMain().caret; + spCaret.SetVirtualSpace(spCaret.VirtualSpace() + 1); + MovePositionTo(spCaret, Selection::selStream); + } else { + MovePositionTo(MovePositionSoVisible(SelectionPosition(sel.MainCaret() + 1), 1), Selection::selStream); + } SetLastXChosen(); break; case SCI_CHARRIGHTRECTEXTEND: - MovePositionTo(MovePositionSoVisible(currentPos + 1, 1), selRectangle); + if ((virtualSpaceOptions & SCVS_RECTANGULARSELECTION) && pdoc->IsLineEndPosition(sel.MainCaret())) { + SelectionPosition spCaret = sel.RangeMain().caret; + spCaret.SetVirtualSpace(spCaret.VirtualSpace() + 1); + MovePositionTo(spCaret, Selection::selRectangle); + } else { + MovePositionTo(MovePositionSoVisible(SelectionPosition(sel.MainCaret() + 1), 1), Selection::selRectangle); + } SetLastXChosen(); break; case SCI_WORDLEFT: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, -1), -1)); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(sel.MainCaret(), -1), -1)); SetLastXChosen(); break; case SCI_WORDLEFTEXTEND: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, -1), -1), selStream); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(sel.MainCaret(), -1), -1), Selection::selStream); SetLastXChosen(); break; case SCI_WORDRIGHT: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, 1), 1)); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(sel.MainCaret(), 1), 1)); SetLastXChosen(); break; case SCI_WORDRIGHTEXTEND: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, 1), 1), selStream); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(sel.MainCaret(), 1), 1), Selection::selStream); SetLastXChosen(); break; case SCI_WORDLEFTEND: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, -1), -1)); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(sel.MainCaret(), -1), -1)); SetLastXChosen(); break; case SCI_WORDLEFTENDEXTEND: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, -1), -1), selStream); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(sel.MainCaret(), -1), -1), Selection::selStream); SetLastXChosen(); break; case SCI_WORDRIGHTEND: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, 1), 1)); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(sel.MainCaret(), 1), 1)); SetLastXChosen(); break; case SCI_WORDRIGHTENDEXTEND: - MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, 1), 1), selStream); + MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(sel.MainCaret(), 1), 1), Selection::selStream); SetLastXChosen(); break; case SCI_HOME: - MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(currentPos))); + MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(sel.MainCaret()))); SetLastXChosen(); break; case SCI_HOMEEXTEND: - MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(currentPos)), selStream); + MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(sel.MainCaret())), Selection::selStream); SetLastXChosen(); break; case SCI_HOMERECTEXTEND: - MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(currentPos)), selRectangle); + MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(sel.MainCaret())), Selection::selRectangle); SetLastXChosen(); break; case SCI_LINEEND: - MovePositionTo(pdoc->LineEndPosition(currentPos)); + MovePositionTo(pdoc->LineEndPosition(sel.MainCaret())); SetLastXChosen(); break; case SCI_LINEENDEXTEND: - MovePositionTo(pdoc->LineEndPosition(currentPos), selStream); + MovePositionTo(pdoc->LineEndPosition(sel.MainCaret()), Selection::selStream); SetLastXChosen(); break; case SCI_LINEENDRECTEXTEND: - MovePositionTo(pdoc->LineEndPosition(currentPos), selRectangle); + MovePositionTo(pdoc->LineEndPosition(sel.MainCaret()), Selection::selRectangle); SetLastXChosen(); break; case SCI_HOMEWRAP: { - int homePos = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1); - if (currentPos <= homePos) - homePos = pdoc->LineStart(pdoc->LineFromPosition(currentPos)); + SelectionPosition homePos = MovePositionSoVisible(StartEndDisplayLine(sel.MainCaret(), true), -1); + if (sel.RangeMain().caret <= homePos) + homePos = SelectionPosition(pdoc->LineStart(pdoc->LineFromPosition(sel.MainCaret()))); MovePositionTo(homePos); SetLastXChosen(); } break; case SCI_HOMEWRAPEXTEND: { - int homePos = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1); - if (currentPos <= homePos) - homePos = pdoc->LineStart(pdoc->LineFromPosition(currentPos)); - MovePositionTo(homePos, selStream); + SelectionPosition homePos = MovePositionSoVisible(StartEndDisplayLine(sel.MainCaret(), true), -1); + if (sel.RangeMain().caret <= homePos) + homePos = SelectionPosition(pdoc->LineStart(pdoc->LineFromPosition(sel.MainCaret()))); + MovePositionTo(homePos, Selection::selStream); SetLastXChosen(); } break; case SCI_LINEENDWRAP: { - int endPos = MovePositionSoVisible(StartEndDisplayLine(currentPos, false), 1); - int realEndPos = pdoc->LineEndPosition(currentPos); + SelectionPosition endPos = MovePositionSoVisible(StartEndDisplayLine(sel.MainCaret(), false), 1); + SelectionPosition realEndPos = SelectionPosition(pdoc->LineEndPosition(sel.MainCaret())); if (endPos > realEndPos // if moved past visible EOLs - || currentPos >= endPos) // if at end of display line already + || sel.RangeMain().caret >= endPos) // if at end of display line already endPos = realEndPos; MovePositionTo(endPos); SetLastXChosen(); } break; case SCI_LINEENDWRAPEXTEND: { - int endPos = MovePositionSoVisible(StartEndDisplayLine(currentPos, false), 1); - int realEndPos = pdoc->LineEndPosition(currentPos); + SelectionPosition endPos = MovePositionSoVisible(StartEndDisplayLine(sel.MainCaret(), false), 1); + SelectionPosition realEndPos = SelectionPosition(pdoc->LineEndPosition(sel.MainCaret())); if (endPos > realEndPos // if moved past visible EOLs - || currentPos >= endPos) // if at end of display line already + || sel.RangeMain().caret >= endPos) // if at end of display line already endPos = realEndPos; - MovePositionTo(endPos, selStream); + MovePositionTo(endPos, Selection::selStream); SetLastXChosen(); } break; @@ -4685,7 +5005,7 @@ SetLastXChosen(); break; case SCI_DOCUMENTSTARTEXTEND: - MovePositionTo(0, selStream); + MovePositionTo(0, Selection::selStream); SetLastXChosen(); break; case SCI_DOCUMENTEND: @@ -4693,38 +5013,38 @@ SetLastXChosen(); break; case SCI_DOCUMENTENDEXTEND: - MovePositionTo(pdoc->Length(), selStream); + MovePositionTo(pdoc->Length(), Selection::selStream); SetLastXChosen(); break; case SCI_STUTTEREDPAGEUP: - PageMove(-1, noSel, true); + PageMove(-1, Selection::noSel, true); break; case SCI_STUTTEREDPAGEUPEXTEND: - PageMove(-1, selStream, true); + PageMove(-1, Selection::selStream, true); break; case SCI_STUTTEREDPAGEDOWN: - PageMove(1, noSel, true); + PageMove(1, Selection::noSel, true); break; case SCI_STUTTEREDPAGEDOWNEXTEND: - PageMove(1, selStream, true); + PageMove(1, Selection::selStream, true); break; case SCI_PAGEUP: PageMove(-1); break; case SCI_PAGEUPEXTEND: - PageMove(-1, selStream); + PageMove(-1, Selection::selStream); break; case SCI_PAGEUPRECTEXTEND: - PageMove(-1, selRectangle); + PageMove(-1, Selection::selRectangle); break; case SCI_PAGEDOWN: PageMove(1); break; case SCI_PAGEDOWNEXTEND: - PageMove(1, selStream); + PageMove(1, Selection::selStream); break; case SCI_PAGEDOWNRECTEXTEND: - PageMove(1, selRectangle); + PageMove(1, Selection::selRectangle); break; case SCI_EDITTOGGLEOVERTYPE: inOverstrike = !inOverstrike; @@ -4773,21 +5093,21 @@ AddChar('\f'); break; case SCI_VCHOME: - MovePositionTo(pdoc->VCHomePosition(currentPos)); + MovePositionTo(pdoc->VCHomePosition(sel.MainCaret())); SetLastXChosen(); break; case SCI_VCHOMEEXTEND: - MovePositionTo(pdoc->VCHomePosition(currentPos), selStream); + MovePositionTo(pdoc->VCHomePosition(sel.MainCaret()), Selection::selStream); SetLastXChosen(); break; case SCI_VCHOMERECTEXTEND: - MovePositionTo(pdoc->VCHomePosition(currentPos), selRectangle); + MovePositionTo(pdoc->VCHomePosition(sel.MainCaret()), Selection::selRectangle); SetLastXChosen(); break; case SCI_VCHOMEWRAP: { - int homePos = pdoc->VCHomePosition(currentPos); - int viewLineStart = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1); - if ((viewLineStart < currentPos) && (viewLineStart > homePos)) + SelectionPosition homePos = SelectionPosition(pdoc->VCHomePosition(sel.MainCaret())); + SelectionPosition viewLineStart = MovePositionSoVisible(StartEndDisplayLine(sel.MainCaret(), true), -1); + if ((viewLineStart < sel.RangeMain().caret) && (viewLineStart > homePos)) homePos = viewLineStart; MovePositionTo(homePos); @@ -4795,12 +5115,12 @@ } break; case SCI_VCHOMEWRAPEXTEND: { - int homePos = pdoc->VCHomePosition(currentPos); - int viewLineStart = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1); - if ((viewLineStart < currentPos) && (viewLineStart > homePos)) + SelectionPosition homePos = SelectionPosition(pdoc->VCHomePosition(sel.MainCaret())); + SelectionPosition viewLineStart = MovePositionSoVisible(StartEndDisplayLine(sel.MainCaret(), true), -1); + if ((viewLineStart < sel.RangeMain().caret) && (viewLineStart > homePos)) homePos = viewLineStart; - MovePositionTo(homePos, selStream); + MovePositionTo(homePos, Selection::selStream); SetLastXChosen(); } break; @@ -4819,44 +5139,52 @@ } break; case SCI_DELWORDLEFT: { - int startWord = pdoc->NextWordStart(currentPos, -1); - pdoc->DeleteChars(startWord, currentPos - startWord); + int startWord = pdoc->NextWordStart(sel.MainCaret(), -1); + pdoc->DeleteChars(startWord, sel.MainCaret() - startWord); + sel.RangeMain().ClearVirtualSpace(); SetLastXChosen(); } break; case SCI_DELWORDRIGHT: { - int endWord = pdoc->NextWordStart(currentPos, 1); - pdoc->DeleteChars(currentPos, endWord - currentPos); + UndoGroup ug(pdoc); + sel.RangeMain().caret = SelectionPosition( + InsertSpace(sel.RangeMain().caret.Position(), sel.RangeMain().caret.VirtualSpace())); + int endWord = pdoc->NextWordStart(sel.MainCaret(), 1); + pdoc->DeleteChars(sel.MainCaret(), endWord - sel.MainCaret()); } break; case SCI_DELWORDRIGHTEND: { - int endWord = pdoc->NextWordEnd(currentPos, 1); - pdoc->DeleteChars(currentPos, endWord - currentPos); + UndoGroup ug(pdoc); + sel.RangeMain().caret = SelectionPosition( + InsertSpace(sel.RangeMain().caret.Position(), sel.RangeMain().caret.VirtualSpace())); + int endWord = pdoc->NextWordEnd(sel.MainCaret(), 1); + pdoc->DeleteChars(sel.MainCaret(), endWord - sel.MainCaret()); } break; case SCI_DELLINELEFT: { - int line = pdoc->LineFromPosition(currentPos); + int line = pdoc->LineFromPosition(sel.MainCaret()); int start = pdoc->LineStart(line); - pdoc->DeleteChars(start, currentPos - start); + pdoc->DeleteChars(start, sel.MainCaret() - start); + sel.RangeMain().ClearVirtualSpace(); SetLastXChosen(); } break; case SCI_DELLINERIGHT: { - int line = pdoc->LineFromPosition(currentPos); + int line = pdoc->LineFromPosition(sel.MainCaret()); int end = pdoc->LineEnd(line); - pdoc->DeleteChars(currentPos, end - currentPos); + pdoc->DeleteChars(sel.MainCaret(), end - sel.MainCaret()); } break; case SCI_LINECOPY: { - int lineStart = pdoc->LineFromPosition(SelectionStart()); - int lineEnd = pdoc->LineFromPosition(SelectionEnd()); + int lineStart = pdoc->LineFromPosition(SelectionStart().Position()); + int lineEnd = pdoc->LineFromPosition(SelectionEnd().Position()); CopyRangeToClipboard(pdoc->LineStart(lineStart), pdoc->LineStart(lineEnd + 1)); } break; case SCI_LINECUT: { - int lineStart = pdoc->LineFromPosition(SelectionStart()); - int lineEnd = pdoc->LineFromPosition(SelectionEnd()); + int lineStart = pdoc->LineFromPosition(SelectionStart().Position()); + int lineEnd = pdoc->LineFromPosition(SelectionEnd().Position()); int start = pdoc->LineStart(lineStart); int end = pdoc->LineStart(lineEnd + 1); SetSelection(start, end); @@ -4865,7 +5193,7 @@ } break; case SCI_LINEDELETE: { - int line = pdoc->LineFromPosition(currentPos); + int line = pdoc->LineFromPosition(sel.MainCaret()); int start = pdoc->LineStart(line); int end = pdoc->LineStart(line + 1); pdoc->DeleteChars(start, end - start); @@ -4881,45 +5209,45 @@ Duplicate(false); break; case SCI_LOWERCASE: - ChangeCaseOfSelection(false); + ChangeCaseOfSelection(cmLower); break; case SCI_UPPERCASE: - ChangeCaseOfSelection(true); + ChangeCaseOfSelection(cmUpper); break; case SCI_WORDPARTLEFT: - MovePositionTo(MovePositionSoVisible(pdoc->WordPartLeft(currentPos), -1)); + MovePositionTo(MovePositionSoVisible(pdoc->WordPartLeft(sel.MainCaret()), -1)); SetLastXChosen(); break; case SCI_WORDPARTLEFTEXTEND: - MovePositionTo(MovePositionSoVisible(pdoc->WordPartLeft(currentPos), -1), selStream); + MovePositionTo(MovePositionSoVisible(pdoc->WordPartLeft(sel.MainCaret()), -1), Selection::selStream); SetLastXChosen(); break; case SCI_WORDPARTRIGHT: - MovePositionTo(MovePositionSoVisible(pdoc->WordPartRight(currentPos), 1)); + MovePositionTo(MovePositionSoVisible(pdoc->WordPartRight(sel.MainCaret()), 1)); SetLastXChosen(); break; case SCI_WORDPARTRIGHTEXTEND: - MovePositionTo(MovePositionSoVisible(pdoc->WordPartRight(currentPos), 1), selStream); + MovePositionTo(MovePositionSoVisible(pdoc->WordPartRight(sel.MainCaret()), 1), Selection::selStream); SetLastXChosen(); break; case SCI_HOMEDISPLAY: MovePositionTo(MovePositionSoVisible( - StartEndDisplayLine(currentPos, true), -1)); + StartEndDisplayLine(sel.MainCaret(), true), -1)); SetLastXChosen(); break; case SCI_HOMEDISPLAYEXTEND: MovePositionTo(MovePositionSoVisible( - StartEndDisplayLine(currentPos, true), -1), selStream); + StartEndDisplayLine(sel.MainCaret(), true), -1), Selection::selStream); SetLastXChosen(); break; case SCI_LINEENDDISPLAY: MovePositionTo(MovePositionSoVisible( - StartEndDisplayLine(currentPos, false), 1)); + StartEndDisplayLine(sel.MainCaret(), false), 1)); SetLastXChosen(); break; case SCI_LINEENDDISPLAYEXTEND: MovePositionTo(MovePositionSoVisible( - StartEndDisplayLine(currentPos, false), 1), selStream); + StartEndDisplayLine(sel.MainCaret(), false), 1), Selection::selStream); SetLastXChosen(); break; } @@ -4955,78 +5283,105 @@ } void Editor::Indent(bool forwards) { - //Platform::DebugPrintf("INdent %d\n", forwards); - int lineOfAnchor = pdoc->LineFromPosition(anchor); - int lineCurrentPos = pdoc->LineFromPosition(currentPos); - if (lineOfAnchor == lineCurrentPos) { - if (forwards) { - pdoc->BeginUndoAction(); - ClearSelection(); - if (pdoc->GetColumn(currentPos) <= pdoc->GetColumn(pdoc->GetLineIndentPosition(lineCurrentPos)) && - pdoc->tabIndents) { - int indentation = pdoc->GetLineIndentation(lineCurrentPos); - int indentationStep = pdoc->IndentSize(); - pdoc->SetLineIndentation(lineCurrentPos, indentation + indentationStep - indentation % indentationStep); - SetEmptySelection(pdoc->GetLineIndentPosition(lineCurrentPos)); + for (size_t r=0; rLineFromPosition(sel.Range(r).anchor.Position()); + int caretPosition = sel.Range(r).caret.Position(); + int lineCurrentPos = pdoc->LineFromPosition(caretPosition); + if (lineOfAnchor == lineCurrentPos) { + if (forwards) { + UndoGroup ug(pdoc); + pdoc->DeleteChars(sel.Range(r).Start().Position(), sel.Range(r).Length()); + caretPosition = sel.Range(r).caret.Position(); + if (pdoc->GetColumn(caretPosition) <= pdoc->GetColumn(pdoc->GetLineIndentPosition(lineCurrentPos)) && + pdoc->tabIndents) { + int indentation = pdoc->GetLineIndentation(lineCurrentPos); + int indentationStep = pdoc->IndentSize(); + pdoc->SetLineIndentation(lineCurrentPos, indentation + indentationStep - indentation % indentationStep); + sel.Range(r) = SelectionRange(pdoc->GetLineIndentPosition(lineCurrentPos)); + } else { + if (pdoc->useTabs) { + pdoc->InsertChar(caretPosition, '\t'); + sel.Range(r) = SelectionRange(caretPosition+1); + } else { + int numSpaces = (pdoc->tabInChars) - + (pdoc->GetColumn(caretPosition) % (pdoc->tabInChars)); + if (numSpaces < 1) + numSpaces = pdoc->tabInChars; + for (int i = 0; i < numSpaces; i++) { + pdoc->InsertChar(caretPosition + i, ' '); + } + sel.Range(r) = SelectionRange(caretPosition+numSpaces); + } + } } else { - if (pdoc->useTabs) { - pdoc->InsertChar(currentPos, '\t'); - SetEmptySelection(currentPos + 1); + if (pdoc->GetColumn(caretPosition) <= pdoc->GetLineIndentation(lineCurrentPos) && + pdoc->tabIndents) { + UndoGroup ug(pdoc); + int indentation = pdoc->GetLineIndentation(lineCurrentPos); + int indentationStep = pdoc->IndentSize(); + pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep); + sel.Range(r) = SelectionRange(pdoc->GetLineIndentPosition(lineCurrentPos)); } else { - int numSpaces = (pdoc->tabInChars) - - (pdoc->GetColumn(currentPos) % (pdoc->tabInChars)); - if (numSpaces < 1) - numSpaces = pdoc->tabInChars; - for (int i = 0; i < numSpaces; i++) { - pdoc->InsertChar(currentPos + i, ' '); - } - SetEmptySelection(currentPos + numSpaces); - } - } - pdoc->EndUndoAction(); - } else { - if (pdoc->GetColumn(currentPos) <= pdoc->GetLineIndentation(lineCurrentPos) && - pdoc->tabIndents) { - pdoc->BeginUndoAction(); - int indentation = pdoc->GetLineIndentation(lineCurrentPos); - int indentationStep = pdoc->IndentSize(); - pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep); - SetEmptySelection(pdoc->GetLineIndentPosition(lineCurrentPos)); - pdoc->EndUndoAction(); + int newColumn = ((pdoc->GetColumn(caretPosition) - 1) / pdoc->tabInChars) * + pdoc->tabInChars; + if (newColumn < 0) + newColumn = 0; + int newPos = caretPosition; + while (pdoc->GetColumn(newPos) > newColumn) + newPos--; + sel.Range(r) = SelectionRange(newPos); + } + } + } else { // Multiline + int anchorPosOnLine = sel.Range(r).anchor.Position() - pdoc->LineStart(lineOfAnchor); + int currentPosPosOnLine = caretPosition - pdoc->LineStart(lineCurrentPos); + // Multiple lines selected so indent / dedent + int lineTopSel = Platform::Minimum(lineOfAnchor, lineCurrentPos); + int lineBottomSel = Platform::Maximum(lineOfAnchor, lineCurrentPos); + if (pdoc->LineStart(lineBottomSel) == sel.Range(r).anchor.Position() || pdoc->LineStart(lineBottomSel) == caretPosition) + lineBottomSel--; // If not selecting any characters on a line, do not indent + { + UndoGroup ug(pdoc); + pdoc->Indent(forwards, lineBottomSel, lineTopSel); + } + if (lineOfAnchor < lineCurrentPos) { + if (currentPosPosOnLine == 0) + sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor)); + else + sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos + 1), pdoc->LineStart(lineOfAnchor)); } else { - int newColumn = ((pdoc->GetColumn(currentPos) - 1) / pdoc->tabInChars) * - pdoc->tabInChars; - if (newColumn < 0) - newColumn = 0; - int newPos = currentPos; - while (pdoc->GetColumn(newPos) > newColumn) - newPos--; - SetEmptySelection(newPos); + if (anchorPosOnLine == 0) + sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor)); + else + sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor + 1)); } } - } else { - int anchorPosOnLine = anchor - pdoc->LineStart(lineOfAnchor); - int currentPosPosOnLine = currentPos - pdoc->LineStart(lineCurrentPos); - // Multiple lines selected so indent / dedent - int lineTopSel = Platform::Minimum(lineOfAnchor, lineCurrentPos); - int lineBottomSel = Platform::Maximum(lineOfAnchor, lineCurrentPos); - if (pdoc->LineStart(lineBottomSel) == anchor || pdoc->LineStart(lineBottomSel) == currentPos) - lineBottomSel--; // If not selecting any characters on a line, do not indent - pdoc->BeginUndoAction(); - pdoc->Indent(forwards, lineBottomSel, lineTopSel); - pdoc->EndUndoAction(); - if (lineOfAnchor < lineCurrentPos) { - if (currentPosPosOnLine == 0) - SetSelection(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor)); - else - SetSelection(pdoc->LineStart(lineCurrentPos + 1), pdoc->LineStart(lineOfAnchor)); + } +} + +class CaseFolderASCII : public CaseFolderTable { +public: + CaseFolderASCII() { + StandardASCII(); + } + ~CaseFolderASCII() { + } + virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) { + if (lenMixed > sizeFolded) { + return 0; } else { - if (anchorPosOnLine == 0) - SetSelection(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor)); - else - SetSelection(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor + 1)); + for (size_t i=0; i(mixed[i])]; + } + return lenMixed; } } +}; + + +CaseFolder *Editor::CaseFolderForEncoding() { + // Simple default that only maps ASCII upper case to lower case. + return new CaseFolderASCII(); } /** @@ -5040,13 +5395,15 @@ Sci_TextToFind *ft = reinterpret_cast(lParam); int lengthFound = istrlen(ft->lpstrText); + std::auto_ptr pcf(CaseFolderForEncoding()); int pos = pdoc->FindText(ft->chrg.cpMin, ft->chrg.cpMax, ft->lpstrText, (wParam & SCFIND_MATCHCASE) != 0, (wParam & SCFIND_WHOLEWORD) != 0, (wParam & SCFIND_WORDSTART) != 0, (wParam & SCFIND_REGEXP) != 0, wParam, - &lengthFound); + &lengthFound, + pcf.get()); if (pos != -1) { ft->chrgText.cpMin = pos; ft->chrgText.cpMax = pos + lengthFound; @@ -5066,7 +5423,7 @@ * operation is self-contained. */ void Editor::SearchAnchor() { - searchAnchor = SelectionStart(); + searchAnchor = SelectionStart().Position(); } /** @@ -5083,6 +5440,7 @@ const char *txt = reinterpret_cast(lParam); int pos; int lengthFound = istrlen(txt); + std::auto_ptr pcf(CaseFolderForEncoding()); if (iMessage == SCI_SEARCHNEXT) { pos = pdoc->FindText(searchAnchor, pdoc->Length(), txt, (wParam & SCFIND_MATCHCASE) != 0, @@ -5090,7 +5448,8 @@ (wParam & SCFIND_WORDSTART) != 0, (wParam & SCFIND_REGEXP) != 0, wParam, - &lengthFound); + &lengthFound, + pcf.get()); } else { pos = pdoc->FindText(searchAnchor, 0, txt, (wParam & SCFIND_MATCHCASE) != 0, @@ -5098,9 +5457,9 @@ (wParam & SCFIND_WORDSTART) != 0, (wParam & SCFIND_REGEXP) != 0, wParam, - &lengthFound); + &lengthFound, + pcf.get()); } - if (pos != -1) { SetSelection(pos, pos + lengthFound); } @@ -5108,19 +5467,39 @@ return pos; } +std::string Editor::CaseMapString(const std::string &s, int caseMapping) { + std::string ret(s); + for (size_t i=0; i= 'a' && ret[i] <= 'z') + ret[i] = static_cast(ret[i] - 'a' + 'A'); + break; + case cmLower: + if (ret[i] >= 'A' && ret[i] <= 'Z') + ret[i] = static_cast(ret[i] - 'A' + 'a'); + break; + } + } + return ret; +} + /** * Search for text in the target range of the document. * @return The position of the found text, -1 if not found. */ long Editor::SearchInTarget(const char *text, int length) { int lengthFound = length; + + std::auto_ptr pcf(CaseFolderForEncoding()); int pos = pdoc->FindText(targetStart, targetEnd, text, (searchFlags & SCFIND_MATCHCASE) != 0, (searchFlags & SCFIND_WHOLEWORD) != 0, (searchFlags & SCFIND_WORDSTART) != 0, (searchFlags & SCFIND_REGEXP) != 0, searchFlags, - &lengthFound); + &lengthFound, + pcf.get()); if (pos != -1) { targetStart = pos; targetEnd = pos + lengthFound; @@ -5151,85 +5530,71 @@ if (start < end) { int len = end - start; text = new char[len + 1]; - if (text) { - for (int i = 0; i < len; i++) { - text[i] = pdoc->CharAt(start + i); - } - text[len] = '\0'; + for (int i = 0; i < len; i++) { + text[i] = pdoc->CharAt(start + i); } + text[len] = '\0'; } return text; } -void Editor::CopySelectionFromRange(SelectionText *ss, bool allowLineCopy, int start, int end) { - bool isLine = allowLineCopy && (start == end); - if (isLine) { - int currentLine = pdoc->LineFromPosition(currentPos); - start = pdoc->LineStart(currentLine); - end = pdoc->LineEnd(currentLine); - - char *text = CopyRange(start, end); - int textLen = text ? strlen(text) : 0; - // include room for \r\n\0 - textLen += 3; - char *textWithEndl = new char[textLen]; - textWithEndl[0] = '\0'; - if (text) - strncat(textWithEndl, text, textLen); - if (pdoc->eolMode != SC_EOL_LF) - strncat(textWithEndl, "\r", textLen); - if (pdoc->eolMode != SC_EOL_CR) - strncat(textWithEndl, "\n", textLen); - ss->Set(textWithEndl, strlen(textWithEndl), - pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false, true); - delete []text; - } else { - ss->Set(CopyRange(start, end), end - start + 1, - pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false, false); - } -} - void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) { - if (selType == selStream) { - CopySelectionFromRange(ss, allowLineCopy, SelectionStart(), SelectionEnd()); - } else { - char *text = 0; - int size = 0; - SelectionLineIterator lineIterator(this); - while (lineIterator.Iterate()) { - size += lineIterator.endPos - lineIterator.startPos; - if (selType != selLines) { - size++; - if (pdoc->eolMode == SC_EOL_CRLF) { - size++; - } + if (sel.Empty()) { + if (allowLineCopy) { + int currentLine = pdoc->LineFromPosition(sel.MainCaret()); + int start = pdoc->LineStart(currentLine); + int end = pdoc->LineEnd(currentLine); + + char *text = CopyRange(start, end); + int textLen = text ? strlen(text) : 0; + // include room for \r\n\0 + textLen += 3; + char *textWithEndl = new char[textLen]; + textWithEndl[0] = '\0'; + if (text) + strncat(textWithEndl, text, textLen); + if (pdoc->eolMode != SC_EOL_LF) + strncat(textWithEndl, "\r", textLen); + if (pdoc->eolMode != SC_EOL_CR) + strncat(textWithEndl, "\n", textLen); + ss->Set(textWithEndl, strlen(textWithEndl) + 1, + pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false, true); + delete []text; + } + } else { + int delimiterLength = 0; + if (sel.selType == Selection::selRectangle) { + if (pdoc->eolMode == SC_EOL_CRLF) { + delimiterLength = 2; + } else { + delimiterLength = 1; } } - if (size > 0) { - text = new char[size + 1]; - if (text) { - int j = 0; - lineIterator.Reset(); - while (lineIterator.Iterate()) { - for (int i = lineIterator.startPos; - i < lineIterator.endPos; - i++) { - text[j++] = pdoc->CharAt(i); - } - if (selType != selLines) { - if (pdoc->eolMode != SC_EOL_LF) { - text[j++] = '\r'; - } - if (pdoc->eolMode != SC_EOL_CR) { - text[j++] = '\n'; - } - } + int size = sel.Length() + delimiterLength * sel.Count(); + char *text = new char[size + 1]; + int j = 0; + std::vector rangesInOrder = sel.RangesCopy(); + if (sel.selType == Selection::selRectangle) + std::sort(rangesInOrder.begin(), rangesInOrder.end()); + for (size_t r=0; rCharAt(i); + } + if (sel.selType == Selection::selRectangle) { + if (pdoc->eolMode != SC_EOL_LF) { + text[j++] = '\r'; + } + if (pdoc->eolMode != SC_EOL_CR) { + text[j++] = '\n'; } - text[size] = '\0'; } } + text[size] = '\0'; ss->Set(text, size + 1, pdoc->dbcsCodePage, - vs.styles[STYLE_DEFAULT].characterSet, selType == selRectangle, selType == selLines); + vs.styles[STYLE_DEFAULT].characterSet, sel.IsRectangular(), sel.selType == Selection::selLines); } } @@ -5249,12 +5614,12 @@ CopyToClipboard(selectedText); } -void Editor::SetDragPosition(int newPos) { - if (newPos >= 0) { +void Editor::SetDragPosition(SelectionPosition newPos) { + if (newPos.Position() >= 0) { newPos = MovePositionOutsideChar(newPos, 1); posDrop = newPos; } - if (posDrag != newPos) { + if (!(posDrag == newPos)) { caret.on = true; SetTicking(true); InvalidateCaret(); @@ -5283,41 +5648,40 @@ //DisplayCursor(Window::cursorArrow); } -void Editor::DropAt(int position, const char *value, bool moving, bool rectangular) { +void Editor::DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular) { //Platform::DebugPrintf("DropAt %d %d\n", inDragDrop, position); if (inDragDrop == ddDragging) dropWentOutside = false; - int positionWasInSelection = PositionInSelection(position); + bool positionWasInSelection = PositionInSelection(position.Position()); bool positionOnEdgeOfSelection = (position == SelectionStart()) || (position == SelectionEnd()); - if ((inDragDrop != ddDragging) || !(0 == positionWasInSelection) || + if ((inDragDrop != ddDragging) || !(positionWasInSelection) || (positionOnEdgeOfSelection && !moving)) { - int selStart = SelectionStart(); - int selEnd = SelectionEnd(); + SelectionPosition selStart = SelectionStart(); + SelectionPosition selEnd = SelectionEnd(); - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); - int positionAfterDeletion = position; + SelectionPosition positionAfterDeletion = position; if ((inDragDrop == ddDragging) && moving) { // Remove dragged out text - if (rectangular || selType == selLines) { - SelectionLineIterator lineIterator(this); - while (lineIterator.Iterate()) { - if (position >= lineIterator.startPos) { - if (position > lineIterator.endPos) { - positionAfterDeletion -= lineIterator.endPos - lineIterator.startPos; + if (rectangular || sel.selType == Selection::selLines) { + for (size_t r=0; r= sel.Range(r).Start()) { + if (position > sel.Range(r).End()) { + positionAfterDeletion.Add(-sel.Range(r).Length()); } else { - positionAfterDeletion -= position - lineIterator.startPos; + positionAfterDeletion.Add(-SelectionRange(position, sel.Range(r).Start()).Length()); } } } } else { if (position > selStart) { - positionAfterDeletion -= selEnd - selStart; + positionAfterDeletion.Add(-SelectionRange(selEnd, selStart).Length()); } } ClearSelection(); @@ -5326,15 +5690,16 @@ if (rectangular) { PasteRectangular(position, value, istrlen(value)); - pdoc->EndUndoAction(); // Should try to select new rectangle but it may not be a rectangle now so just select the drop position SetEmptySelection(position); } else { - position = MovePositionOutsideChar(position, currentPos - position); - if (pdoc->InsertCString(position, value)) { - SetSelection(position + istrlen(value), position); + position = MovePositionOutsideChar(position, sel.MainCaret() - position.Position()); + position = SelectionPosition(InsertSpace(position.Position(), position.VirtualSpace())); + if (pdoc->InsertCString(position.Position(), value)) { + SelectionPosition posAfterInsertion = position; + posAfterInsertion.Add(istrlen(value)); + SetSelection(posAfterInsertion, position); } - pdoc->EndUndoAction(); } } else if (inDragDrop == ddDragging) { SetEmptySelection(position); @@ -5342,62 +5707,39 @@ } /** - * @return -1 if given position is before the selection, - * 1 if position is after the selection, - * 0 if position is inside the selection, + * @return true if given position is inside the selection, */ -int Editor::PositionInSelection(int pos) { - pos = MovePositionOutsideChar(pos, currentPos - pos); - if (pos < SelectionStart()) { - return -1; - } - if (pos > SelectionEnd()) { - return 1; - } - if (selType == selStream) { - return 0; - } else { - SelectionLineIterator lineIterator(this); - lineIterator.SetAt(pdoc->LineFromPosition(pos)); - if (pos < lineIterator.startPos) { - return -1; - } else if (pos > lineIterator.endPos) { - return 1; - } else { - return 0; - } +bool Editor::PositionInSelection(int pos) { + pos = MovePositionOutsideChar(pos, sel.MainCaret() - pos); + for (size_t r=0; rLineFromPosition(pos)); - selStart = lineIterator.startPos; - selEnd = lineIterator.endPos; - } - if (pos == selStart) { - // see if just before selection - Point locStart = LocationFromPosition(pos); - if (pt.x < locStart.x) { - return false; - } - } - if (pos == selEnd) { - // see if just after selection - Point locEnd = LocationFromPosition(pos); - if (pt.x > locEnd.x) { - return false; + SelectionPosition pos = SPositionFromLocation(pt); + int xPos = XFromPosition(pos); + for (size_t r=0; r xPos) { + hit = false; + } } + if (hit) + return true; } - return true; } return false; } @@ -5437,28 +5779,37 @@ } } +void Editor::MouseLeave() { + SetHotSpotRange(NULL); +} + +static bool AllowVirtualSpace(int virtualSpaceOptions, bool rectangular) { + return ((virtualSpaceOptions & SCVS_USERACCESSIBLE) != 0) + || (rectangular && ((virtualSpaceOptions & SCVS_RECTANGULARSELECTION) != 0)); +} + void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) { //Platform::DebugPrintf("ButtonDown %d %d = %d alt=%d %d\n", curTime, lastClickTime, curTime - lastClickTime, alt, inDragDrop); ptMouseLast = pt; - int newPos = PositionFromLocation(pt); - newPos = MovePositionOutsideChar(newPos, currentPos - newPos); + SelectionPosition newPos = SPositionFromLocation(pt, false, false, AllowVirtualSpace(virtualSpaceOptions, alt)); + newPos = MovePositionOutsideChar(newPos, sel.MainCaret() - newPos.Position()); inDragDrop = ddNone; - moveExtendsSelection = false; + sel.SetMoveExtends(false); bool processed = NotifyMarginClick(pt, shift, ctrl, alt); if (processed) return; - NotifyIndicatorClick(true, newPos, shift, ctrl, alt); + NotifyIndicatorClick(true, newPos.Position(), shift, ctrl, alt); bool inSelMargin = PointInSelMargin(pt); if (shift & !inSelMargin) { - SetSelection(newPos); + SetSelection(newPos.Position()); } if (((curTime - lastClickTime) < Platform::DoubleClickTime()) && Close(pt, lastClick)) { //Platform::DebugPrintf("Double click %d %d = %d\n", curTime, lastClickTime, curTime - lastClickTime); SetMouseCapture(true); - SetEmptySelection(newPos); + SetEmptySelection(newPos.Position()); bool doubleClick = false; // Stop mouse button bounce changing selection type if (!Platform::MouseButtonBounce() || curTime != lastClickTime) { @@ -5469,16 +5820,16 @@ selectionType = selLine; } else { selectionType = selChar; - originalAnchorPos = currentPos; + originalAnchorPos = sel.MainCaret(); } } if (selectionType == selWord) { - if (currentPos >= originalAnchorPos) { // Moved forward - SetSelection(pdoc->ExtendWordSelect(currentPos, 1), + if (sel.MainCaret() >= originalAnchorPos) { // Moved forward + SetSelection(pdoc->ExtendWordSelect(sel.MainCaret(), 1), pdoc->ExtendWordSelect(originalAnchorPos, -1)); } else { // Moved backward - SetSelection(pdoc->ExtendWordSelect(currentPos, -1), + SetSelection(pdoc->ExtendWordSelect(sel.MainCaret(), -1), pdoc->ExtendWordSelect(originalAnchorPos, 1)); } } else if (selectionType == selLine) { @@ -5486,17 +5837,17 @@ SetSelection(pdoc->LineStart(lineAnchor + 1), pdoc->LineStart(lineAnchor)); //Platform::DebugPrintf("Triple click: %d - %d\n", anchor, currentPos); } else { - SetEmptySelection(currentPos); + SetEmptySelection(sel.MainCaret()); } //Platform::DebugPrintf("Double click: %d - %d\n", anchor, currentPos); if (doubleClick) { NotifyDoubleClick(pt, shift, ctrl, alt); - if (PositionIsHotspot(newPos)) - NotifyHotSpotDoubleClicked(newPos, shift, ctrl, alt); + if (PositionIsHotspot(newPos.Position())) + NotifyHotSpotDoubleClicked(newPos.Position(), shift, ctrl, alt); } } else { // Single click if (inSelMargin) { - selType = selStream; + sel.selType = Selection::selStream; if (ctrl) { SelectAll(); lastClickTime = curTime; @@ -5510,21 +5861,21 @@ pdoc->LineStart(lineAnchor)); } else { // Single shift+click in margin: select from line anchor to clicked line - if (anchor > currentPos) - lineAnchor = pdoc->LineFromPosition(anchor - 1); + if (sel.MainAnchor() > sel.MainCaret()) + lineAnchor = pdoc->LineFromPosition(sel.MainAnchor() - 1); else - lineAnchor = pdoc->LineFromPosition(anchor); + lineAnchor = pdoc->LineFromPosition(sel.MainAnchor()); int lineStart = LineFromLocation(pt); LineSelection(lineStart, lineAnchor); //lineAnchor = lineStart; // Keep the same anchor for ButtonMove } - SetDragPosition(invalidPosition); + SetDragPosition(SelectionPosition(invalidPosition)); SetMouseCapture(true); selectionType = selLine; } else { if (PointIsHotspot(pt)) { - NotifyHotSpotClicked(newPos, shift, ctrl, alt); + NotifyHotSpotClicked(newPos.Position(), shift, ctrl, alt); } if (!shift) { if (PointInSelection(pt) && !SelectionEmpty()) @@ -5534,19 +5885,35 @@ } SetMouseCapture(true); if (inDragDrop != ddInitial) { - SetDragPosition(invalidPosition); + SetDragPosition(SelectionPosition(invalidPosition)); if (!shift) { - SetEmptySelection(newPos); + if (ctrl && multipleSelection) { + SelectionRange range(newPos); + sel.TentativeSelection(range); + InvalidateSelection(range, true); + } else { + InvalidateSelection(SelectionRange(newPos), true); + if (sel.Count() > 1) + Redraw(); + sel.Clear(); + sel.selType = alt ? Selection::selRectangle : Selection::selStream; + SetSelection(newPos, newPos); + } } - selType = alt ? selRectangle : selStream; + SelectionPosition anchorCurrent = newPos; + if (shift) + anchorCurrent = sel.IsRectangular() ? + sel.Rectangular().anchor : sel.RangeMain().anchor; + sel.selType = alt ? Selection::selRectangle : Selection::selStream; selectionType = selChar; - originalAnchorPos = currentPos; + originalAnchorPos = sel.MainCaret(); + sel.Rectangular() = SelectionRange(newPos, anchorCurrent); SetRectangularRange(); } } } lastClickTime = curTime; - lastXChosen = pt.x; + lastXChosen = pt.x + xOffset; ShowCaretAtCurrentPosition(); } @@ -5594,7 +5961,7 @@ } } -void Editor::GetHotSpotRange(int& hsStart_, int& hsEnd_) { +void Editor::GetHotSpotRange(int &hsStart_, int &hsEnd_) { hsStart_ = hsStart; hsEnd_ = hsEnd; } @@ -5604,8 +5971,9 @@ DwellEnd(true); } - int movePos = PositionFromLocation(pt); - movePos = MovePositionOutsideChar(movePos, currentPos - movePos); + SelectionPosition movePos = SPositionFromLocation(pt, false, false, + AllowVirtualSpace(virtualSpaceOptions, sel.IsRectangular())); + movePos = MovePositionOutsideChar(movePos, sel.MainCaret() - movePos.Position()); if (inDragDrop == ddInitial) { if (DragThreshold(ptMouseLast, pt)) { @@ -5628,14 +5996,23 @@ autoScrollTimer.ticksToWait = autoScrollDelay; // Adjust selection - if (posDrag >= 0) { + if (posDrag.IsValid()) { SetDragPosition(movePos); } else { if (selectionType == selChar) { - SetSelection(movePos); + if (sel.IsRectangular()) { + sel.Rectangular() = SelectionRange(movePos, sel.Rectangular().anchor); + SetSelection(movePos, sel.RangeMain().anchor); + } else if (sel.Count() > 1) { + SelectionRange range(movePos, sel.RangeMain().anchor); + sel.TentativeSelection(range); + InvalidateSelection(range, true); + } else { + SetSelection(movePos, sel.RangeMain().anchor); + } } else if (selectionType == selWord) { // Continue selecting by word - if (movePos == originalAnchorPos) { // Didn't move + if (movePos.Position() == originalAnchorPos) { // Didn't move // No need to do anything. Previously this case was lumped // in with "Moved forward", but that can be harmful in this // case: a handler for the NotifyDoubleClick re-adjusts @@ -5645,11 +6022,11 @@ // the ButtonMove() called via Tick() for auto-scrolling // could result in the fancier word selection adjustment // being unmade. - } else if (movePos > originalAnchorPos) { // Moved forward - SetSelection(pdoc->ExtendWordSelect(movePos, 1), + } else if (movePos.Position() > originalAnchorPos) { // Moved forward + SetSelection(pdoc->ExtendWordSelect(movePos.Position(), 1), pdoc->ExtendWordSelect(originalAnchorPos, -1)); } else { // Moved backward - SetSelection(pdoc->ExtendWordSelect(movePos, -1), + SetSelection(pdoc->ExtendWordSelect(movePos.Position(), -1), pdoc->ExtendWordSelect(originalAnchorPos, 1)); } } else { @@ -5658,10 +6035,6 @@ LineSelection(lineMove, lineAnchor); } } - // While dragging to make rectangular selection, we don't want the current - // position to jump to the end of smaller or empty lines. - //xEndSelect = pt.x - vs.fixedColumnWidth + xOffset; - xEndSelect = XFromPosition(movePos); // Autoscroll PRectangle rcClient = GetClientRectangle(); @@ -5679,13 +6052,14 @@ } EnsureCaretVisible(false, false, true); - if (hsStart != -1 && !PositionIsHotspot(movePos)) + if (hsStart != -1 && !PositionIsHotspot(movePos.Position())) SetHotSpotRange(NULL); } else { if (vs.fixedColumnWidth > 0) { // There is a margin if (PointInSelMargin(pt)) { DisplayCursor(Window::cursorReverseArrow); + SetHotSpotRange(NULL); return; // No need to test for selection } } @@ -5704,11 +6078,12 @@ void Editor::ButtonUp(Point pt, unsigned int curTime, bool ctrl) { //Platform::DebugPrintf("ButtonUp %d %d\n", HaveMouseCapture(), inDragDrop); - int newPos = PositionFromLocation(pt); - newPos = MovePositionOutsideChar(newPos, currentPos - newPos); + SelectionPosition newPos = SPositionFromLocation(pt, false, false, + AllowVirtualSpace(virtualSpaceOptions, sel.IsRectangular())); + newPos = MovePositionOutsideChar(newPos, sel.MainCaret() - newPos.Position()); if (inDragDrop == ddInitial) { inDragDrop = ddNone; - SetEmptySelection(newPos); + SetEmptySelection(newPos.Position()); } if (HaveMouseCapture()) { if (PointInSelMargin(pt)) { @@ -5719,31 +6094,29 @@ } ptMouseLast = pt; SetMouseCapture(false); - int newPos = PositionFromLocation(pt); - newPos = MovePositionOutsideChar(newPos, currentPos - newPos); - NotifyIndicatorClick(false, newPos, false, false, false); + NotifyIndicatorClick(false, newPos.Position(), false, false, false); if (inDragDrop == ddDragging) { - int selStart = SelectionStart(); - int selEnd = SelectionEnd(); + SelectionPosition selStart = SelectionStart(); + SelectionPosition selEnd = SelectionEnd(); if (selStart < selEnd) { if (drag.len) { if (ctrl) { - if (pdoc->InsertString(newPos, drag.s, drag.len)) { - SetSelection(newPos, newPos + drag.len); + if (pdoc->InsertString(newPos.Position(), drag.s, drag.len)) { + SetSelection(newPos.Position(), newPos.Position() + drag.len); } } else if (newPos < selStart) { - pdoc->DeleteChars(selStart, drag.len); - if (pdoc->InsertString(newPos, drag.s, drag.len)) { - SetSelection(newPos, newPos + drag.len); + pdoc->DeleteChars(selStart.Position(), drag.len); + if (pdoc->InsertString(newPos.Position(), drag.s, drag.len)) { + SetSelection(newPos.Position(), newPos.Position() + drag.len); } } else if (newPos > selEnd) { - pdoc->DeleteChars(selStart, drag.len); - newPos -= drag.len; - if (pdoc->InsertString(newPos, drag.s, drag.len)) { - SetSelection(newPos, newPos + drag.len); + pdoc->DeleteChars(selStart.Position(), drag.len); + newPos.Add(-drag.len); + if (pdoc->InsertString(newPos.Position(), drag.s, drag.len)) { + SetSelection(newPos.Position(), newPos.Position() + drag.len); } } else { - SetEmptySelection(newPos); + SetEmptySelection(newPos.Position()); } drag.Free(); } @@ -5751,14 +6124,21 @@ } } else { if (selectionType == selChar) { - SetSelection(newPos); + if (sel.Count() > 1) { + sel.RangeMain() = + SelectionRange(newPos, sel.Range(sel.Count() - 1).anchor); + InvalidateSelection(sel.RangeMain(), true); + } else { + SetSelection(newPos, sel.RangeMain().anchor); + } } + sel.CommitTentative(); } SetRectangularRange(); lastClickTime = curTime; lastClick = pt; - lastXChosen = pt.x; - if (selType == selStream) { + lastXChosen = pt.x + xOffset; + if (sel.selType == Selection::selStream) { SetLastXChosen(); } inDragDrop = ddNone; @@ -5833,6 +6213,48 @@ } } +int Editor::PositionAfterArea(PRectangle rcArea) { + // The start of the document line after the display line after the area + // This often means that the line after a modification is restyled which helps + // detect multiline comment additions and heals single line comments + int lineAfter = topLine + (rcArea.bottom - 1) / vs.lineHeight + 1; + if (lineAfter < cs.LinesDisplayed()) + return pdoc->LineStart(cs.DocFromDisplay(lineAfter) + 1); + else + return pdoc->Length(); +} + +// Style to a position within the view. If this causes a change at end of last line then +// affects later lines so style all the viewed text. +void Editor::StyleToPositionInView(Position pos) { + int endWindow = PositionAfterArea(GetClientRectangle()); + if (pos > endWindow) + pos = endWindow; + int styleAtEnd = pdoc->StyleAt(pos-1); + pdoc->EnsureStyledTo(pos); + if ((endWindow > pos) && (styleAtEnd != pdoc->StyleAt(pos-1))) { + // Style at end of line changed so is multi-line change like starting a comment + // so require rest of window to be styled. + pdoc->EnsureStyledTo(endWindow); + } +} + +void Editor::IdleStyling() { + // Style the line after the modification as this allows modifications that change just the + // line of the modification to heal instead of propagating to the rest of the window. + StyleToPositionInView(pdoc->LineStart(pdoc->LineFromPosition(styleNeeded.upTo) + 2)); + + if (needUpdateUI) { + NotifyUpdateUI(); + needUpdateUI = false; + } + styleNeeded.Reset(); +} + +void Editor::QueueStyling(int upTo) { + styleNeeded.NeedUpTo(upTo); +} + bool Editor::PaintContains(PRectangle rc) { if (rc.Empty()) { return true; @@ -5907,9 +6329,7 @@ pdoc->AddRef(); // Ensure all positions within document - selType = selStream; - currentPos = 0; - anchor = 0; + sel.Clear(); targetStart = 0; targetEnd = 0; @@ -5980,7 +6400,7 @@ if (lineMaxSubord > line) { cs.SetVisible(line + 1, lineMaxSubord, false); - int lineCurrent = pdoc->LineFromPosition(currentPos); + int lineCurrent = pdoc->LineFromPosition(sel.MainCaret()); if (lineCurrent > line && lineCurrent <= lineMaxSubord) { // This does not re-expand the fold EnsureCaretVisible(); @@ -6048,14 +6468,31 @@ } } +int Editor::GetTag(char *tagValue, int tagNumber) { + char name[3] = "\\?"; + const char *text = 0; + int length = 0; + if ((tagNumber >= 1) && (tagNumber <= 9)) { + name[1] = static_cast(tagNumber + '0'); + length = 2; + text = pdoc->SubstituteByPosition(name, &length); + } + if (tagValue) { + if (text) + memcpy(tagValue, text, length + 1); + else + *tagValue = '\0'; + } + return length; +} + int Editor::ReplaceTarget(bool replacePatterns, const char *text, int length) { - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); if (length == -1) length = istrlen(text); if (replacePatterns) { text = pdoc->SubstituteByPosition(text, &length); if (!text) { - pdoc->EndUndoAction(); return 0; } } @@ -6064,7 +6501,6 @@ targetEnd = targetStart; pdoc->InsertString(targetStart, text, length); targetEnd = targetStart + length; - pdoc->EndUndoAction(); return length; } @@ -6095,20 +6531,18 @@ // The buffer consists of alternating character bytes and style bytes size_t textLength = appendLength / 2; char *text = new char[textLength]; - if (text) { - size_t i; - for (i = 0;i < textLength;i++) { - text[i] = buffer[i*2]; - } - pdoc->InsertString(CurrentPosition(), text, textLength); - for (i = 0;i < textLength;i++) { - text[i] = buffer[i*2+1]; - } - pdoc->StartStyling(CurrentPosition(), static_cast(0xff)); - pdoc->SetStyles(textLength, text); - delete []text; + size_t i; + for (i = 0; i < textLength; i++) { + text[i] = buffer[i*2]; + } + pdoc->InsertString(CurrentPosition(), text, textLength); + for (i = 0; i < textLength; i++) { + text[i] = buffer[i*2+1]; } - SetEmptySelection(currentPos + textLength); + pdoc->StartStyling(CurrentPosition(), static_cast(0xff)); + pdoc->SetStyles(textLength, text); + delete []text; + SetEmptySelection(sel.MainCaret() + textLength); } static bool ValidMargin(unsigned long wParam) { @@ -6183,6 +6617,8 @@ case SCI_STYLEGETSIZE: return vs.styles[wParam].size; case SCI_STYLEGETFONT: + if (!vs.styles[wParam].fontName) + return 0; if (lParam != 0) strcpy(CharPtrFromSPtr(lParam), vs.styles[wParam].fontName); return strlen(vs.styles[wParam].fontName); @@ -6202,6 +6638,15 @@ return 0; } +sptr_t Editor::StringResult(sptr_t lParam, const char *val) { + const int n = strlen(val); + if (lParam != 0) { + char *ptr = reinterpret_cast(lParam); + strcpy(ptr, val); + } + return n; // Not including NUL +} + sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { //Platform::DebugPrintf("S start wnd proc %d %d %d\n",iMessage, wParam, lParam); @@ -6227,11 +6672,10 @@ case SCI_SETTEXT: { if (lParam == 0) return 0; - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); pdoc->DeleteChars(0, pdoc->Length()); SetEmptySelection(0); pdoc->InsertCString(0, CharPtrFromSPtr(lParam)); - pdoc->EndUndoAction(); return 1; } @@ -6288,6 +6732,10 @@ case SCI_GETFIRSTVISIBLELINE: return topLine; + case SCI_SETFIRSTVISIBLELINE: + ScrollTo(wParam); + break; + case SCI_GETLINE: { // Risk of overwriting the end of the buffer int lineStart = pdoc->LineStart(wParam); int lineEnd = pdoc->LineStart(wParam + 1); @@ -6318,41 +6766,30 @@ nEnd = pdoc->Length(); if (nStart < 0) nStart = nEnd; // Remove selection - selType = selStream; + InvalidateSelection(SelectionRange(nStart, nEnd)); + sel.Clear(); + sel.selType = Selection::selStream; SetSelection(nEnd, nStart); EnsureCaretVisible(); } break; case SCI_GETSELTEXT: { - if (lParam == 0) { - if (selType == selStream) { - return 1 + SelectionEnd() - SelectionStart(); - } else { - // TODO: why is selLines handled the slow way? - int size = 0; - int extraCharsPerLine = 0; - if (selType != selLines) - extraCharsPerLine = (pdoc->eolMode == SC_EOL_CRLF) ? 2 : 1; - SelectionLineIterator lineIterator(this); - while (lineIterator.Iterate()) { - size += lineIterator.endPos + extraCharsPerLine - lineIterator.startPos; - } - - return 1 + size; - } - } SelectionText selectedText; CopySelectionRange(&selectedText); - char *ptr = CharPtrFromSPtr(lParam); - int iChar = 0; - if (selectedText.len) { - for (; iChar < selectedText.len; iChar++) - ptr[iChar] = selectedText.s[iChar]; + if (lParam == 0) { + return selectedText.len ? selectedText.len : 1; } else { - ptr[0] = '\0'; + char *ptr = CharPtrFromSPtr(lParam); + int iChar = 0; + if (selectedText.len) { + for (; iChar < selectedText.len; iChar++) + ptr[iChar] = selectedText.s[iChar]; + } else { + ptr[0] = '\0'; + } + return iChar; } - return iChar; } case SCI_LINEFROMPOSITION: @@ -6362,7 +6799,7 @@ case SCI_POSITIONFROMLINE: if (static_cast(wParam) < 0) - wParam = pdoc->LineFromPosition(SelectionStart()); + wParam = pdoc->LineFromPosition(SelectionStart().Position()); if (wParam == 0) return 0; // Even if there is no text, there is a first line that starts at 0 if (static_cast(wParam) > pdoc->LinesTotal()) @@ -6381,12 +6818,11 @@ case SCI_REPLACESEL: { if (lParam == 0) return 0; - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); ClearSelection(); char *replacement = CharPtrFromSPtr(lParam); - pdoc->InsertCString(currentPos, replacement); - pdoc->EndUndoAction(); - SetEmptySelection(currentPos + istrlen(replacement)); + pdoc->InsertCString(sel.MainCaret(), replacement); + SetEmptySelection(sel.MainCaret() + istrlen(replacement)); EnsureCaretVisible(); } break; @@ -6406,12 +6842,12 @@ return targetEnd; case SCI_TARGETFROMSELECTION: - if (currentPos < anchor) { - targetStart = currentPos; - targetEnd = anchor; + if (sel.MainCaret() < sel.MainAnchor()) { + targetStart = sel.MainCaret(); + targetEnd = sel.MainAnchor(); } else { - targetStart = anchor; - targetEnd = currentPos; + targetStart = sel.MainAnchor(); + targetEnd = sel.MainCaret(); } break; @@ -6434,6 +6870,9 @@ case SCI_GETSEARCHFLAGS: return searchFlags; + case SCI_GETTAG: + return GetTag(CharPtrFromSPtr(lParam), wParam); + case SCI_POSITIONBEFORE: return pdoc->MovePositionOutsideChar(wParam - 1, -1, true); @@ -6536,7 +6975,7 @@ if (lParam == 0) return 0; pdoc->InsertString(CurrentPosition(), CharPtrFromSPtr(lParam), wParam); - SetEmptySelection(currentPos + wParam); + SetEmptySelection(sel.MainCaret() + wParam); return 0; } @@ -6624,32 +7063,44 @@ return pdoc->CharAt(wParam); case SCI_SETCURRENTPOS: - SetSelection(wParam, anchor); + if (sel.IsRectangular()) { + sel.Rectangular().caret.SetPosition(wParam); + SetRectangularRange(); + Redraw(); + } else { + SetSelection(wParam, sel.MainAnchor()); + } break; case SCI_GETCURRENTPOS: - return currentPos; + return sel.IsRectangular() ? sel.Rectangular().caret.Position() : sel.MainCaret(); case SCI_SETANCHOR: - SetSelection(currentPos, wParam); + if (sel.IsRectangular()) { + sel.Rectangular().anchor.SetPosition(wParam); + SetRectangularRange(); + Redraw(); + } else { + SetSelection(sel.MainCaret(), wParam); + } break; case SCI_GETANCHOR: - return anchor; + return sel.IsRectangular() ? sel.Rectangular().anchor.Position() : sel.MainAnchor(); case SCI_SETSELECTIONSTART: - SetSelection(Platform::Maximum(currentPos, wParam), wParam); + SetSelection(Platform::Maximum(sel.MainCaret(), wParam), wParam); break; case SCI_GETSELECTIONSTART: - return Platform::Minimum(anchor, currentPos); + return sel.LimitsForRectangularElseMain().start.Position(); case SCI_SETSELECTIONEND: - SetSelection(wParam, Platform::Minimum(anchor, wParam)); + SetSelection(wParam, Platform::Minimum(sel.MainAnchor(), wParam)); break; case SCI_GETSELECTIONEND: - return Platform::Maximum(anchor, currentPos); + return sel.LimitsForRectangularElseMain().end.Position(); case SCI_SETPRINTMAGNIFICATION: printMagnification = wParam; @@ -6722,6 +7173,14 @@ Redraw(); break; + case SCI_GETWHITESPACESIZE: + return vs.whitespaceSize; + + case SCI_SETWHITESPACESIZE: + vs.whitespaceSize = static_cast(wParam); + Redraw(); + break; + case SCI_POSITIONFROMPOINT: return PositionFromLocation(Point(wParam, lParam), false, false); @@ -6745,7 +7204,7 @@ break; case SCI_GETCURLINE: { - int lineCurrentPos = pdoc->LineFromPosition(currentPos); + int lineCurrentPos = pdoc->LineFromPosition(sel.MainCaret()); int lineStart = pdoc->LineStart(lineCurrentPos); unsigned int lineEnd = pdoc->LineStart(lineCurrentPos + 1); if (lParam == 0) { @@ -6758,7 +7217,7 @@ ptr[iPlace++] = pdoc->CharAt(iChar); } ptr[iPlace] = '\0'; - return currentPos - lineStart; + return sel.MainCaret() - lineStart; } case SCI_GETENDSTYLED: @@ -6800,6 +7259,15 @@ InvalidateStyleRedraw(); break; + case SCI_SETFONTQUALITY: + vs.extraFontFlag &= ~SC_EFF_QUALITY_MASK; + vs.extraFontFlag |= (wParam & SC_EFF_QUALITY_MASK); + InvalidateStyleRedraw(); + break; + + case SCI_GETFONTQUALITY: + return (vs.extraFontFlag & SC_EFF_QUALITY_MASK); + case SCI_SETTABWIDTH: if (wParam > 0) { pdoc->tabInChars = wParam; @@ -6891,9 +7359,11 @@ return wrapState; case SCI_SETWRAPVISUALFLAGS: - wrapVisualFlags = wParam; - InvalidateStyleRedraw(); - ReconfigureScrollBars(); + if (wrapVisualFlags != static_cast(wParam)) { + wrapVisualFlags = wParam; + InvalidateStyleRedraw(); + ReconfigureScrollBars(); + } break; case SCI_GETWRAPVISUALFLAGS: @@ -6908,18 +7378,22 @@ return wrapVisualFlagsLocation; case SCI_SETWRAPSTARTINDENT: - wrapVisualStartIndent = wParam; - InvalidateStyleRedraw(); - ReconfigureScrollBars(); + if (wrapVisualStartIndent != static_cast(wParam)) { + wrapVisualStartIndent = wParam; + InvalidateStyleRedraw(); + ReconfigureScrollBars(); + } break; case SCI_GETWRAPSTARTINDENT: return wrapVisualStartIndent; case SCI_SETWRAPINDENTMODE: - wrapIndentMode = wParam; - InvalidateStyleRedraw(); - ReconfigureScrollBars(); + if (wrapIndentMode != static_cast(wParam)) { + wrapIndentMode = wParam; + InvalidateStyleRedraw(); + ReconfigureScrollBars(); + } break; case SCI_GETWRAPINDENTMODE: @@ -7371,17 +7845,20 @@ case SCI_SETSELFORE: vs.selforeset = wParam != 0; vs.selforeground.desired = ColourDesired(lParam); + vs.selAdditionalForeground.desired = ColourDesired(lParam); InvalidateStyleRedraw(); break; case SCI_SETSELBACK: vs.selbackset = wParam != 0; vs.selbackground.desired = ColourDesired(lParam); + vs.selAdditionalBackground.desired = ColourDesired(lParam); InvalidateStyleRedraw(); break; case SCI_SETSELALPHA: vs.selAlpha = wParam; + vs.selAdditionalAlpha = wParam; InvalidateStyleRedraw(); break; @@ -7703,7 +8180,7 @@ case SCI_CONVERTEOLS: pdoc->ConvertLineEnds(wParam); - SetSelection(currentPos, anchor); // Ensure selection inside document + SetSelection(sel.MainCaret(), sel.MainAnchor()); // Ensure selection inside document return 0; case SCI_SETLENGTHFORENCODE: @@ -7711,48 +8188,56 @@ return 0; case SCI_SELECTIONISRECTANGLE: - return selType == selRectangle ? 1 : 0; + return sel.selType == Selection::selRectangle ? 1 : 0; case SCI_SETSELECTIONMODE: { switch (wParam) { case SC_SEL_STREAM: - moveExtendsSelection = !moveExtendsSelection || (selType != selStream); - selType = selStream; + sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::selStream)); + sel.selType = Selection::selStream; break; case SC_SEL_RECTANGLE: - moveExtendsSelection = !moveExtendsSelection || (selType != selRectangle); - selType = selRectangle; + sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::selRectangle)); + sel.selType = Selection::selRectangle; break; case SC_SEL_LINES: - moveExtendsSelection = !moveExtendsSelection || (selType != selLines); - selType = selLines; + sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::selLines)); + sel.selType = Selection::selLines; + break; + case SC_SEL_THIN: + sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::selThin)); + sel.selType = Selection::selThin; break; default: - moveExtendsSelection = !moveExtendsSelection || (selType != selStream); - selType = selStream; + sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::selStream)); + sel.selType = Selection::selStream; } - InvalidateSelection(currentPos, anchor, true); + InvalidateSelection(sel.RangeMain(), true); } case SCI_GETSELECTIONMODE: - switch (selType) { - case selStream: + switch (sel.selType) { + case Selection::selStream: return SC_SEL_STREAM; - case selRectangle: + case Selection::selRectangle: return SC_SEL_RECTANGLE; - case selLines: + case Selection::selLines: return SC_SEL_LINES; + case Selection::selThin: + return SC_SEL_THIN; default: // ?! return SC_SEL_STREAM; } - case SCI_GETLINESELSTARTPOSITION: { - SelectionLineIterator lineIterator(this); - lineIterator.SetAt(wParam); - return lineIterator.startPos; - } + case SCI_GETLINESELSTARTPOSITION: case SCI_GETLINESELENDPOSITION: { - SelectionLineIterator lineIterator(this); - lineIterator.SetAt(wParam); - return lineIterator.endPos; + SelectionSegment segmentLine(SelectionPosition(pdoc->LineStart(wParam)), + SelectionPosition(pdoc->LineEnd(wParam))); + for (size_t r=0; rAddUndoAction(wParam, lParam & UNDO_MAY_COALESCE); break; + case SCI_SETMULTIPLESELECTION: + multipleSelection = wParam != 0; + InvalidateCaret(); + break; + + case SCI_GETMULTIPLESELECTION: + return multipleSelection; + + case SCI_SETADDITIONALSELECTIONTYPING: + additionalSelectionTyping = wParam != 0; + InvalidateCaret(); + break; + + case SCI_GETADDITIONALSELECTIONTYPING: + return additionalSelectionTyping; + + case SCI_SETMULTIPASTE: + multiPasteMode = wParam; + break; + + case SCI_GETMULTIPASTE: + return multiPasteMode; + + case SCI_SETADDITIONALCARETSBLINK: + additionalCaretsBlink = wParam != 0; + InvalidateCaret(); + break; + + case SCI_GETADDITIONALCARETSBLINK: + return additionalCaretsBlink; + + case SCI_SETADDITIONALCARETSVISIBLE: + additionalCaretsVisible = wParam != 0; + InvalidateCaret(); + break; + + case SCI_GETADDITIONALCARETSVISIBLE: + return additionalCaretsVisible; + + case SCI_GETSELECTIONS: + return sel.Count(); + + case SCI_CLEARSELECTIONS: + sel.Clear(); + Redraw(); + break; + + case SCI_SETSELECTION: + sel.SetSelection(SelectionRange(wParam, lParam)); + Redraw(); + break; + + case SCI_ADDSELECTION: + sel.AddSelection(SelectionRange(wParam, lParam)); + Redraw(); + break; + + case SCI_SETMAINSELECTION: + sel.SetMain(wParam); + Redraw(); + break; + + case SCI_GETMAINSELECTION: + return sel.Main(); + + case SCI_SETSELECTIONNCARET: + sel.Range(wParam).caret.SetPosition(lParam); + Redraw(); + break; + + case SCI_GETSELECTIONNCARET: + return sel.Range(wParam).caret.Position(); + + case SCI_SETSELECTIONNANCHOR: + sel.Range(wParam).anchor.SetPosition(lParam); + Redraw(); + break; + case SCI_GETSELECTIONNANCHOR: + return sel.Range(wParam).anchor.Position(); + + case SCI_SETSELECTIONNCARETVIRTUALSPACE: + sel.Range(wParam).caret.SetVirtualSpace(lParam); + Redraw(); + break; + + case SCI_GETSELECTIONNCARETVIRTUALSPACE: + return sel.Range(wParam).caret.VirtualSpace(); + + case SCI_SETSELECTIONNANCHORVIRTUALSPACE: + sel.Range(wParam).anchor.SetVirtualSpace(lParam); + Redraw(); + break; + + case SCI_GETSELECTIONNANCHORVIRTUALSPACE: + return sel.Range(wParam).anchor.VirtualSpace(); + + case SCI_SETSELECTIONNSTART: + sel.Range(wParam).anchor.SetPosition(lParam); + Redraw(); + break; + + case SCI_GETSELECTIONNSTART: + return sel.Range(wParam).Start().Position(); + + case SCI_SETSELECTIONNEND: + sel.Range(wParam).caret.SetPosition(lParam); + Redraw(); + break; + + case SCI_GETSELECTIONNEND: + return sel.Range(wParam).End().Position(); + + case SCI_SETRECTANGULARSELECTIONCARET: + if (!sel.IsRectangular()) + sel.Clear(); + sel.selType = Selection::selRectangle; + sel.Rectangular().caret.SetPosition(wParam); + SetRectangularRange(); + Redraw(); + break; + + case SCI_GETRECTANGULARSELECTIONCARET: + return sel.Rectangular().caret.Position(); + + case SCI_SETRECTANGULARSELECTIONANCHOR: + if (!sel.IsRectangular()) + sel.Clear(); + sel.selType = Selection::selRectangle; + sel.Rectangular().anchor.SetPosition(wParam); + SetRectangularRange(); + Redraw(); + break; + + case SCI_GETRECTANGULARSELECTIONANCHOR: + return sel.Rectangular().anchor.Position(); + + case SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE: + if (!sel.IsRectangular()) + sel.Clear(); + sel.selType = Selection::selRectangle; + sel.Rectangular().caret.SetVirtualSpace(wParam); + SetRectangularRange(); + Redraw(); + break; + + case SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE: + return sel.Rectangular().caret.VirtualSpace(); + + case SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE: + if (!sel.IsRectangular()) + sel.Clear(); + sel.selType = Selection::selRectangle; + sel.Rectangular().anchor.SetVirtualSpace(wParam); + SetRectangularRange(); + Redraw(); + break; + + case SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE: + return sel.Rectangular().anchor.VirtualSpace(); + + case SCI_SETVIRTUALSPACEOPTIONS: + virtualSpaceOptions = wParam; + break; + + case SCI_GETVIRTUALSPACEOPTIONS: + return virtualSpaceOptions; + + case SCI_SETADDITIONALSELFORE: + vs.selAdditionalForeground.desired = ColourDesired(wParam); + InvalidateStyleRedraw(); + break; + + case SCI_SETADDITIONALSELBACK: + vs.selAdditionalBackground.desired = ColourDesired(wParam); + InvalidateStyleRedraw(); + break; + + case SCI_SETADDITIONALSELALPHA: + vs.selAdditionalAlpha = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETADDITIONALSELALPHA: + return vs.selAdditionalAlpha; + + case SCI_SETADDITIONALCARETFORE: + vs.additionalCaretColour.desired = ColourDesired(wParam); + InvalidateStyleRedraw(); + break; + + case SCI_GETADDITIONALCARETFORE: + return vs.additionalCaretColour.desired.AsLong(); + + case SCI_ROTATESELECTION: + sel.RotateMain(); + InvalidateSelection(sel.RangeMain(), true); + break; + + case SCI_SWAPMAINANCHORCARET: + InvalidateSelection(sel.RangeMain()); + sel.RangeMain() = SelectionRange(sel.RangeMain().anchor, sel.RangeMain().caret); + break; + default: return DefWndProc(iMessage, wParam, lParam); } diff -Nru geany-0.18/scintilla/Editor.h geany-0.19/scintilla/Editor.h --- geany-0.18/scintilla/Editor.h 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/Editor.h 2010-06-06 19:34:26.000000000 +0100 @@ -46,6 +46,26 @@ }; /** + * When platform has a way to generate an event before painting, + * accumulate needed styling range in StyleNeeded to avoid unnecessary work. + */ +class StyleNeeded { +public: + bool active; + Position upTo; + + StyleNeeded() : active(false), upTo(0) {} + void Reset() { + active = false; + upTo = 0; + } + void NeedUpTo(Position pos) { + if (upTo < pos) + upTo = pos; + } +}; + +/** * Hold a piece of text selected for copying or dragging. * The text is expected to hold a terminating '\0' and this is counted in len. */ @@ -78,14 +98,11 @@ } void Copy(const char *s_, int len_, int codePage_, int characterSet_, bool rectangular_, bool lineCopy_) { delete []s; + s = 0; s = new char[len_]; - if (s) { - len = len_; - for (int i = 0; i < len_; i++) { - s[i] = s_[i]; - } - } else { - len = 0; + len = len_; + for (int i = 0; i < len_; i++) { + s[i] = s_[i]; } codePage = codePage_; characterSet = characterSet_; @@ -101,8 +118,8 @@ */ class Editor : public DocWatcher { // Private so Editor objects can not be copied - Editor(const Editor &) : DocWatcher() {} - Editor &operator=(const Editor &) { return *this; } + Editor(const Editor &); + Editor &operator=(const Editor &); protected: // ScintillaBase subclass needs access to much of Editor @@ -143,6 +160,13 @@ bool verticalScrollBarVisible; bool endAtLastLine; bool caretSticky; + bool multipleSelection; + bool additionalSelectionTyping; + int multiPasteMode; + bool additionalCaretsBlink; + bool additionalCaretsVisible; + + int virtualSpaceOptions; Surface *pixmapLine; Surface *pixmapSelMargin; @@ -171,13 +195,11 @@ Point ptMouseLast; enum { ddNone, ddInitial, ddDragging } inDragDrop; bool dropWentOutside; - int posDrag; - int posDrop; + SelectionPosition posDrag; + SelectionPosition posDrop; int lastXChosen; int lineAnchor; int originalAnchorPos; - int currentPos; - int anchor; int targetStart; int targetEnd; int searchFlags; @@ -195,15 +217,12 @@ enum { notPainting, painting, paintAbandoned } paintState; PRectangle rcPaint; bool paintingAllText; - + StyleNeeded styleNeeded; + int modEventMask; SelectionText drag; - enum selTypes { noSel, selStream, selRectangle, selLines }; - selTypes selType; - bool moveExtendsSelection; - int xStartSelect; ///< x position of start of rectangular selection - int xEndSelect; ///< x position of end of rectangular selection + Selection sel; bool primarySelection; int caretXPolicy; @@ -259,9 +278,14 @@ int LinesOnScreen(); int LinesToScroll(); int MaxScrollPos(); + SelectionPosition ClampPositionIntoDocument(SelectionPosition sp) const; + Point LocationFromPosition(SelectionPosition pos); Point LocationFromPosition(int pos); int XFromPosition(int pos); + int XFromPosition(SelectionPosition sp); + SelectionPosition SPositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false, bool virtualSpace=true); int PositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false); + SelectionPosition SPositionFromLineX(int lineDoc, int x); int PositionFromLineX(int line, int x); int LineFromLocation(Point pt); void SetTopLine(int topLineNew); @@ -269,24 +293,35 @@ bool AbandonPaint(); void RedrawRect(PRectangle rc); void Redraw(); - void RedrawSelMargin(int line=-1); + void RedrawSelMargin(int line=-1, bool allAfter=false); PRectangle RectangleFromRange(int start, int end); void InvalidateRange(int start, int end); + bool UserVirtualSpace() const { + return ((virtualSpaceOptions & SCVS_USERACCESSIBLE) != 0); + } int CurrentPosition(); bool SelectionEmpty(); - int SelectionStart(); - int SelectionEnd(); + SelectionPosition SelectionStart(); + SelectionPosition SelectionEnd(); void SetRectangularRange(); - void InvalidateSelection(int currentPos_, int anchor_, bool invalidateWholeSelection); + void ThinRectangularRange(); + void InvalidateSelection(SelectionRange newMain, bool invalidateWholeSelection=false); + void SetSelection(SelectionPosition currentPos_, SelectionPosition anchor_); void SetSelection(int currentPos_, int anchor_); + void SetSelection(SelectionPosition currentPos_); void SetSelection(int currentPos_); + void SetEmptySelection(SelectionPosition currentPos_); void SetEmptySelection(int currentPos_); bool RangeContainsProtected(int start, int end) const; bool SelectionContainsProtected(); int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true) const; - int MovePositionTo(int newPos, selTypes sel=noSel, bool ensureVisible=true); - int MovePositionSoVisible(int pos, int moveDir); + SelectionPosition MovePositionOutsideChar(SelectionPosition pos, int moveDir, bool checkLineEnd=true) const; + int MovePositionTo(SelectionPosition newPos, Selection::selTypes sel=Selection::noSel, bool ensureVisible=true); + int MovePositionTo(int newPos, Selection::selTypes sel=Selection::noSel, bool ensureVisible=true); + SelectionPosition MovePositionSoVisible(SelectionPosition pos, int moveDir); + SelectionPosition MovePositionSoVisible(int pos, int moveDir); + Point PointMainCaret(); void SetLastXChosen(); void ScrollTo(int line, bool moveThumb=true); @@ -294,6 +329,14 @@ void HorizontalScrollTo(int xPos); void MoveCaretInsideView(bool ensureVisible=true); int DisplayFromPosition(int pos); + + struct XYScrollPosition { + int xOffset; + int topLine; + XYScrollPosition(int xOffset_, int topLine_) : xOffset(xOffset_), topLine(topLine_) {} + }; + XYScrollPosition XYScrollToMakeVisible(const bool useMargin, const bool vert, const bool horiz); + void SetXYScroll(XYScrollPosition newXY); void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true); void ShowCaretAtCurrentPosition(); void DropCaret(); @@ -311,8 +354,8 @@ LineLayout *RetrieveLineLayout(int lineNumber); void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll, int width=LineLayout::wrapWidthInfinite); - ColourAllocated SelectionBackground(ViewStyle &vsDraw); - ColourAllocated TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll); + ColourAllocated SelectionBackground(ViewStyle &vsDraw, bool main); + ColourAllocated TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, int inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll); void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight); void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourAllocated wrapColour); void DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll, @@ -324,8 +367,11 @@ void DrawAnnotation(Surface *surface, ViewStyle &vsDraw, int line, int xStart, PRectangle rcLine, LineLayout *ll, int subLine); void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, - PRectangle rcLine, LineLayout *ll, int subLine=0); - void DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, int xStart, int offset, int posCaret, PRectangle rcCaret); + PRectangle rcLine, LineLayout *ll, int subLine); + void DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, + int xStart, int offset, int posCaret, PRectangle rcCaret, ColourAllocated caretColour); + void DrawCarets(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine); void RefreshPixMaps(Surface *surfaceWindow); void Paint(Surface *surfaceWindow, PRectangle rcArea); long FormatRange(bool draw, Sci_RangeToFormat *pfr); @@ -338,13 +384,16 @@ void SetScrollBars(); void ChangeSize(); + void FilterSelections(); + int InsertSpace(int position, unsigned int spaces); void AddChar(char ch); virtual void AddCharUTF(char *s, unsigned int len, bool treatAsDBCS=false); + void InsertPaste(SelectionPosition selStart, const char *text, int len); void ClearSelection(); void ClearAll(); void ClearDocumentStyle(); void Cut(); - void PasteRectangular(int pos, const char *ptr, int len); + void PasteRectangular(SelectionPosition pos, const char *ptr, int len); virtual void Copy() = 0; virtual void CopyAllowLine(); virtual bool CanPaste(); @@ -384,14 +433,16 @@ void NotifyStyleNeeded(Document *doc, void *userData, int endPos); void NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lParam); - void PageMove(int direction, selTypes sel=noSel, bool stuttered = false); - void ChangeCaseOfSelection(bool makeUpperCase); + void PageMove(int direction, Selection::selTypes sel=Selection::noSel, bool stuttered = false); + enum { cmSame, cmUpper, cmLower } caseMap; + virtual std::string CaseMapString(const std::string &s, int caseMapping); + void ChangeCaseOfSelection(int caseMapping); void LineTranspose(); void Duplicate(bool forLine); virtual void CancelModes(); void NewLine(); - void CursorUpOrDown(int direction, selTypes sel=noSel); - void ParaUpOrDown(int direction, selTypes sel=noSel); + void CursorUpOrDown(int direction, Selection::selTypes sel=Selection::noSel); + void ParaUpOrDown(int direction, Selection::selTypes sel=Selection::noSel); int StartEndDisplayLine(int pos, bool start); virtual int KeyCommand(unsigned int iMessage); virtual int KeyDefault(int /* key */, int /*modifiers*/); @@ -402,6 +453,7 @@ void Indent(bool forwards); + virtual CaseFolder *CaseFolderForEncoding(); long FindText(uptr_t wParam, sptr_t lParam); void SearchAnchor(); long SearchText(unsigned int iMessage, uptr_t wParam, sptr_t lParam); @@ -410,22 +462,21 @@ virtual void CopyToClipboard(const SelectionText &selectedText) = 0; char *CopyRange(int start, int end); - void CopySelectionFromRange(SelectionText *ss, bool allowLineCopy, int start, int end); void CopySelectionRange(SelectionText *ss, bool allowLineCopy=false); void CopyRangeToClipboard(int start, int end); void CopyText(int length, const char *text); - void SetDragPosition(int newPos); + void SetDragPosition(SelectionPosition newPos); virtual void DisplayCursor(Window::Cursor c); virtual bool DragThreshold(Point ptStart, Point ptNow); virtual void StartDrag(); - void DropAt(int position, const char *value, bool moving, bool rectangular); - /** PositionInSelection returns 0 if position in selection, -1 if position before selection, and 1 if after. - * Before means either before any line of selection or before selection on its line, with a similar meaning to after. */ - int PositionInSelection(int pos); + void DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular); + /** PositionInSelection returns true if position in selection. */ + bool PositionInSelection(int pos); bool PointInSelection(Point pt); bool PointInSelMargin(Point pt); void LineSelection(int lineCurrent_, int lineAnchor_); void DwellEnd(bool mouseMoved); + void MouseLeave(); virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt); void ButtonMove(Point pt); void ButtonUp(Point pt, unsigned int curTime, bool ctrl); @@ -438,6 +489,11 @@ virtual bool HaveMouseCapture() = 0; void SetFocusState(bool focusState); + int PositionAfterArea(PRectangle rcArea); + void StyleToPositionInView(Position pos); + void IdleStyling(); + virtual void QueueStyling(int upTo); + virtual bool PaintContains(PRectangle rc); bool PaintContainsMargin(); void CheckForChangeOutsidePaint(Range r); @@ -445,18 +501,19 @@ void SetAnnotationHeights(int start, int end); void SetDocPointer(Document *document); - + void SetAnnotationVisible(int visible); void Expand(int &line, bool doExpand); void ToggleContraction(int line); void EnsureLineVisible(int lineDoc, bool enforcePolicy); + int GetTag(char *tagValue, int tagNumber); int ReplaceTarget(bool replacePatterns, const char *text, int length=-1); bool PositionIsHotspot(int position); bool PointIsHotspot(Point pt); void SetHotSpotRange(Point *pt); - void GetHotSpotRange(int& hsStart, int& hsEnd); + void GetHotSpotRange(int &hsStart, int &hsEnd); int CodePage() const; virtual bool ValidCodePage(int /* codePage */) const { return true; } @@ -469,6 +526,8 @@ static const char *StringFromEOLMode(int eolMode); + static sptr_t StringResult(sptr_t lParam, const char *val); + public: // Public so the COM thunks can access it. bool IsUnicodeMode() const; diff -Nru geany-0.18/scintilla/ExternalLexer.cxx geany-0.19/scintilla/ExternalLexer.cxx --- geany-0.18/scintilla/ExternalLexer.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.19/scintilla/ExternalLexer.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -10,6 +10,8 @@ #include #include +#include + #include "Platform.h" #include "Scintilla.h" @@ -38,8 +40,8 @@ while (val[dim]) dim++; char **wls = new char * [dim + 1]; - for (int i = 0;i < dim;i++) { - SString words; + for (int i = 0; i < dim; i++) { + std::string words; words = ""; for (int n = 0; n < val[i]->len; n++) { words += val[i]->words[n]; @@ -112,7 +114,7 @@ // //------------------------------------------ -LexerLibrary::LexerLibrary(const char* ModuleName) { +LexerLibrary::LexerLibrary(const char *ModuleName) { // Initialise some members... first = NULL; last = NULL; @@ -193,18 +195,15 @@ /// Return the single LexerManager instance... LexerManager *LexerManager::GetInstance() { - if(!theInstance) + if (!theInstance) theInstance = new LexerManager; return theInstance; } /// Delete any LexerManager instance... -void LexerManager::DeleteInstance() -{ - if(theInstance) { - delete theInstance; - theInstance = NULL; - } +void LexerManager::DeleteInstance() { + delete theInstance; + theInstance = NULL; } /// protected constructor - this is a singleton... @@ -217,13 +216,15 @@ Clear(); } -void LexerManager::Load(const char* path) -{ +void LexerManager::Load(const char *path) { LoadLexerLibrary(path); } -void LexerManager::LoadLexerLibrary(const char* module) -{ +void LexerManager::LoadLexerLibrary(const char *module) { + for (LexerLibrary *ll = first; ll; ll= ll->next) { + if (strcmp(ll->m_sModuleName.c_str(), module) == 0) + return; + } LexerLibrary *lib = new LexerLibrary(module); if (NULL != first) { last->next = lib; @@ -234,8 +235,7 @@ } } -void LexerManager::Clear() -{ +void LexerManager::Clear() { if (NULL != first) { LexerLibrary *cur = first; LexerLibrary *next; @@ -255,8 +255,7 @@ // //------------------------------------------ -LMMinder::~LMMinder() -{ +LMMinder::~LMMinder() { LexerManager::DeleteInstance(); } diff -Nru geany-0.18/scintilla/ExternalLexer.h geany-0.19/scintilla/ExternalLexer.h --- geany-0.18/scintilla/ExternalLexer.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/ExternalLexer.h 2010-06-06 19:34:26.000000000 +0100 @@ -23,7 +23,7 @@ char *words[], WindowID window, char *props); typedef void (EXT_LEXER_DECL *ExtFoldFunction)(unsigned int lexer, unsigned int startPos, int length, int initStyle, char *words[], WindowID window, char *props); -typedef void* (EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index); +typedef void*(EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index); typedef int (EXT_LEXER_DECL *GetLexerCountFn)(); typedef void (EXT_LEXER_DECL *GetLexerNameFn)(unsigned int Index, char *name, int buflength); @@ -37,11 +37,12 @@ int externalLanguage; char name[100]; public: - ExternalLexerModule(int language_, LexerFunction fnLexer_, - const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_){ + ExternalLexerModule(int language_, LexerFunction fnLexer_, + const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_) { strncpy(name, languageName_, sizeof(name)); + name[sizeof(name)-1] = '\0'; languageName = name; - }; + } virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const; virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle, @@ -63,30 +64,30 @@ LexerMinder *last; public: - LexerLibrary(const char* ModuleName); + LexerLibrary(const char *ModuleName); ~LexerLibrary(); void Release(); - + LexerLibrary *next; - SString m_sModuleName; + std::string m_sModuleName; }; /// LexerManager manages external lexers, contains LexerLibrarys. class LexerManager { public: ~LexerManager(); - + static LexerManager *GetInstance(); static void DeleteInstance(); - - void Load(const char* path); + + void Load(const char *path); void Clear(); private: LexerManager(); static LexerManager *theInstance; - void LoadLexerLibrary(const char* module); + void LoadLexerLibrary(const char *module); LexerLibrary *first; LexerLibrary *last; }; diff -Nru geany-0.18/scintilla/include/KeyWords.h geany-0.19/scintilla/include/KeyWords.h --- geany-0.18/scintilla/include/KeyWords.h 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/include/KeyWords.h 2010-03-07 10:31:51.000000000 +0000 @@ -9,6 +9,29 @@ namespace Scintilla { #endif +/** + */ +class WordList { +public: + // Each word contains at least one character - a empty word acts as sentinel at the end. + char **words; + char *list; + int len; + bool onlyLineEnds; ///< Delimited by any white space or only line ends + bool sorted; + int starts[256]; + WordList(bool onlyLineEnds_ = false) : + words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), + sorted(false) + {} + ~WordList() { Clear(); } + operator bool() { return len ? true : false; } + void Clear(); + void Set(const char *s); + bool InList(const char *s); + bool InListAbbreviated(const char *s, const char marker); +}; + typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler); diff -Nru geany-0.18/scintilla/include/Makefile.in geany-0.19/scintilla/include/Makefile.in --- geany-0.18/scintilla/include/Makefile.in 2009-08-16 18:29:21.000000000 +0100 +++ geany-0.19/scintilla/include/Makefile.in 2010-06-12 13:14:29.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@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 @@ -36,12 +38,19 @@ DIST_COMMON = $(noinst_HEADERS) $(scintilla_include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -49,9 +58,23 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +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__installdirs = "$(DESTDIR)$(scintilla_includedir)" -scintilla_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(noinst_HEADERS) $(scintilla_include_HEADERS) ETAGS = etags CTAGS = ctags @@ -59,6 +82,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -136,6 +160,8 @@ 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@ @@ -228,9 +254,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scintilla/include/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scintilla/include/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scintilla/include/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu scintilla/include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -248,6 +274,7 @@ 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 @@ -257,20 +284,23 @@ install-scintilla_includeHEADERS: $(scintilla_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(scintilla_includedir)" || $(MKDIR_P) "$(DESTDIR)$(scintilla_includedir)" - @list='$(scintilla_include_HEADERS)'; for p in $$list; do \ + @list='$(scintilla_include_HEADERS)'; test -n "$(scintilla_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(scintilla_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(scintilla_includedir)/$$f'"; \ - $(scintilla_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(scintilla_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(scintilla_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(scintilla_includedir)" || exit $$?; \ done uninstall-scintilla_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(scintilla_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(scintilla_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(scintilla_includedir)/$$f"; \ - done + @list='$(scintilla_include_HEADERS)'; test -n "$(scintilla_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(scintilla_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(scintilla_includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -284,7 +314,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -292,29 +322,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -335,13 +370,17 @@ 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -372,6 +411,7 @@ 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" @@ -390,6 +430,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -398,18 +440,28 @@ 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 @@ -445,6 +497,7 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-scintilla_includeHEADERS + # 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-0.18/scintilla/include/Platform.h geany-0.19/scintilla/include/Platform.h --- geany-0.18/scintilla/include/Platform.h 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/include/Platform.h 2010-06-06 19:34:26.000000000 +0100 @@ -295,7 +295,7 @@ virtual ~Font(); virtual void Create(const char *faceName, int characterSet, int size, - bool bold, bool italic, bool extraFontFlag=false); + bool bold, bool italic, int extraFontFlag=0); virtual void Release(); FontID GetID() { return fid; } @@ -314,8 +314,8 @@ Surface(const Surface &) {} Surface &operator=(const Surface &) { return *this; } public: - Surface() {}; - virtual ~Surface() {}; + Surface() {} + virtual ~Surface() {} static Surface *Allocate(); virtual void Init(WindowID wid)=0; @@ -474,7 +474,7 @@ */ class DynamicLibrary { public: - virtual ~DynamicLibrary() {}; + virtual ~DynamicLibrary() {} /// @return Pointer to function "name", or NULL on failure. virtual Function FindFunction(const char *name) = 0; diff -Nru geany-0.18/scintilla/include/PropSet.h geany-0.19/scintilla/include/PropSet.h --- geany-0.18/scintilla/include/PropSet.h 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/include/PropSet.h 2010-03-07 10:31:51.000000000 +0000 @@ -1,104 +1,26 @@ // Scintilla source code edit control /** @file PropSet.h - ** A Java style properties file module. + ** An interface to the methods needed for access to property sets inside lexers. **/ -// Copyright 1998-2002 by Neil Hodgson +// Copyright 1998-2009 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. #ifndef PROPSET_H #define PROPSET_H -#include "SString.h" - -bool EqualCaseInsensitive(const char *a, const char *b); - -bool isprefix(const char *target, const char *prefix); #ifdef SCI_NAMESPACE namespace Scintilla { #endif -struct Property { - unsigned int hash; - char *key; - char *val; - Property *next; - Property() : hash(0), key(0), val(0), next(0) {} -}; - -/** - */ -class PropSet { -protected: - enum { hashRoots=31 }; - Property *props[hashRoots]; - Property *enumnext; - int enumhash; - static unsigned int HashString(const char *s, size_t len) { - unsigned int ret = 0; - while (len--) { - ret <<= 4; - ret ^= *s; - s++; - } - return ret; - } - +class PropertyGet { public: - PropSet *superPS; - PropSet(); - ~PropSet(); - void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1); - void Set(const char *keyVal); - void Unset(const char *key, int lenKey=-1); - void SetMultiple(const char *s); - SString Get(const char *key) const; - SString GetExpanded(const char *key) const; - SString Expand(const char *withVars, int maxExpands=100) const; - int GetInt(const char *key, int defaultValue=0) const; - void Clear(); - char *ToString() const; // Caller must delete[] the return value - -private: - // copy-value semantics not implemented - PropSet(const PropSet ©); - void operator=(const PropSet &assign); + virtual char *ToString() const=0; // Caller must delete[] the return value + virtual int GetInt(const char *key, int defaultValue=0) const=0; + virtual ~PropertyGet() {} }; -/** - */ -class WordList { -public: - // Each word contains at least one character - a empty word acts as sentinel at the end. - char **words; - char *list; - int len; - bool onlyLineEnds; ///< Delimited by any white space or only line ends - bool sorted; - int starts[256]; - WordList(bool onlyLineEnds_ = false) : - words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), - sorted(false) - {} - ~WordList() { Clear(); } - operator bool() { return len ? true : false; } - void Clear(); - void Set(const char *s); - bool InList(const char *s); - bool InListAbbreviated(const char *s, const char marker); -}; - -inline bool IsAlphabetic(unsigned int ch) { - return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z')); -} - #ifdef SCI_NAMESPACE } #endif -#ifdef _MSC_VER -// Visual C++ doesn't like the private copy idiom for disabling -// the default copy constructor and operator=, but it's fine. -#pragma warning(disable: 4511 4512) -#endif - #endif diff -Nru geany-0.18/scintilla/include/SciLexer.h geany-0.19/scintilla/include/SciLexer.h --- geany-0.18/scintilla/include/SciLexer.h 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/scintilla/include/SciLexer.h 2010-06-06 19:34:26.000000000 +0100 @@ -637,6 +637,7 @@ #define SCE_CSS_EXTENDED_IDENTIFIER 19 #define SCE_CSS_EXTENDED_PSEUDOCLASS 20 #define SCE_CSS_EXTENDED_PSEUDOELEMENT 21 +#define SCE_CSS_MEDIA 22 #define SCE_POV_DEFAULT 0 #define SCE_POV_COMMENT 1 #define SCE_POV_COMMENTLINE 2 @@ -789,8 +790,19 @@ #define SCE_ERLANG_CHARACTER 9 #define SCE_ERLANG_MACRO 10 #define SCE_ERLANG_RECORD 11 -#define SCE_ERLANG_SEPARATOR 12 +#define SCE_ERLANG_PREPROC 12 #define SCE_ERLANG_NODE_NAME 13 +#define SCE_ERLANG_COMMENT_FUNCTION 14 +#define SCE_ERLANG_COMMENT_MODULE 15 +#define SCE_ERLANG_COMMENT_DOC 16 +#define SCE_ERLANG_COMMENT_DOC_MACRO 17 +#define SCE_ERLANG_ATOM_QUOTED 18 +#define SCE_ERLANG_MACRO_QUOTED 19 +#define SCE_ERLANG_RECORD_QUOTED 20 +#define SCE_ERLANG_NODE_NAME_QUOTED 21 +#define SCE_ERLANG_BIFS 22 +#define SCE_ERLANG_MODULES 23 +#define SCE_ERLANG_MODULES_ATT 24 #define SCE_ERLANG_UNKNOWN 31 #define SCE_MSSQL_DEFAULT 0 #define SCE_MSSQL_COMMENT 1 @@ -1070,11 +1082,19 @@ #define SCE_FS_DATE 16 #define SCE_FS_STRINGEOL 17 #define SCE_FS_CONSTANT 18 -#define SCE_FS_ASM 19 -#define SCE_FS_LABEL 20 -#define SCE_FS_ERROR 21 -#define SCE_FS_HEXNUMBER 22 -#define SCE_FS_BINNUMBER 23 +#define SCE_FS_WORDOPERATOR 19 +#define SCE_FS_DISABLEDCODE 20 +#define SCE_FS_DEFAULT_C 21 +#define SCE_FS_COMMENTDOC_C 22 +#define SCE_FS_COMMENTLINEDOC_C 23 +#define SCE_FS_KEYWORD_C 24 +#define SCE_FS_KEYWORD2_C 25 +#define SCE_FS_NUMBER_C 26 +#define SCE_FS_STRING_C 27 +#define SCE_FS_PREPROCESSOR_C 28 +#define SCE_FS_OPERATOR_C 29 +#define SCE_FS_IDENTIFIER_C 30 +#define SCE_FS_STRINGEOL_C 31 #define SCE_CSOUND_DEFAULT 0 #define SCE_CSOUND_COMMENT 1 #define SCE_CSOUND_NUMBER 2 @@ -1097,7 +1117,6 @@ #define SCE_INNO_PARAMETER 3 #define SCE_INNO_SECTION 4 #define SCE_INNO_PREPROC 5 -#define SCE_INNO_PREPROC_INLINE 6 #define SCE_INNO_INLINE_EXPANSION 6 #define SCE_INNO_COMMENT_PASCAL 7 #define SCE_INNO_KEYWORD_PASCAL 8 @@ -1278,28 +1297,6 @@ #define SCE_MYSQL_USER2 19 #define SCE_MYSQL_USER3 20 #define SCE_MYSQL_HIDDENCOMMAND 21 -#define SCE_MARKDOWN_DEFAULT 0 -#define SCE_MARKDOWN_LINE_BEGIN 1 -#define SCE_MARKDOWN_STRONG1 2 -#define SCE_MARKDOWN_STRONG2 3 -#define SCE_MARKDOWN_EM1 4 -#define SCE_MARKDOWN_EM2 5 -#define SCE_MARKDOWN_HEADER1 6 -#define SCE_MARKDOWN_HEADER2 7 -#define SCE_MARKDOWN_HEADER3 8 -#define SCE_MARKDOWN_HEADER4 9 -#define SCE_MARKDOWN_HEADER5 10 -#define SCE_MARKDOWN_HEADER6 11 -#define SCE_MARKDOWN_PRECHAR 12 -#define SCE_MARKDOWN_ULIST_ITEM 13 -#define SCE_MARKDOWN_OLIST_ITEM 14 -#define SCE_MARKDOWN_BLOCKQUOTE 15 -#define SCE_MARKDOWN_STRIKEOUT 16 -#define SCE_MARKDOWN_HRULE 17 -#define SCE_MARKDOWN_LINK 18 -#define SCE_MARKDOWN_CODE 19 -#define SCE_MARKDOWN_CODE2 20 -#define SCE_MARKDOWN_CODEBK 21 #define SCE_PO_DEFAULT 0 #define SCE_PO_COMMENT 1 #define SCE_PO_MSGID 2 @@ -1366,6 +1363,28 @@ #define SCE_SML_COMMENT1 13 #define SCE_SML_COMMENT2 14 #define SCE_SML_COMMENT3 15 +#define SCE_MARKDOWN_DEFAULT 0 +#define SCE_MARKDOWN_LINE_BEGIN 1 +#define SCE_MARKDOWN_STRONG1 2 +#define SCE_MARKDOWN_STRONG2 3 +#define SCE_MARKDOWN_EM1 4 +#define SCE_MARKDOWN_EM2 5 +#define SCE_MARKDOWN_HEADER1 6 +#define SCE_MARKDOWN_HEADER2 7 +#define SCE_MARKDOWN_HEADER3 8 +#define SCE_MARKDOWN_HEADER4 9 +#define SCE_MARKDOWN_HEADER5 10 +#define SCE_MARKDOWN_HEADER6 11 +#define SCE_MARKDOWN_PRECHAR 12 +#define SCE_MARKDOWN_ULIST_ITEM 13 +#define SCE_MARKDOWN_OLIST_ITEM 14 +#define SCE_MARKDOWN_BLOCKQUOTE 15 +#define SCE_MARKDOWN_STRIKEOUT 16 +#define SCE_MARKDOWN_HRULE 17 +#define SCE_MARKDOWN_LINK 18 +#define SCE_MARKDOWN_CODE 19 +#define SCE_MARKDOWN_CODE2 20 +#define SCE_MARKDOWN_CODEBK 21 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif diff -Nru geany-0.18/scintilla/include/Scintilla.h geany-0.19/scintilla/include/Scintilla.h --- geany-0.18/scintilla/include/Scintilla.h 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/include/Scintilla.h 2010-05-16 18:44:24.000000000 +0100 @@ -11,17 +11,21 @@ #ifndef SCINTILLA_H #define SCINTILLA_H -#if LCCWIN -typedef BOOL bool; +#ifdef __cplusplus +extern "C" { #endif -#if PLAT_WIN +#if defined(_WIN32) /* Return false on failure: */ -bool Scintilla_RegisterClasses(void *hInstance); -bool Scintilla_ReleaseResources(); +int Scintilla_RegisterClasses(void *hInstance); +int Scintilla_ReleaseResources(); #endif int Scintilla_LinkLexers(); +#ifdef __cplusplus +} +#endif + /* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to * hold a pointer and sptr_t, a signed integer large enough to hold a pointer. * May need to be changed for 64 bit platforms. */ @@ -254,6 +258,8 @@ #define SCI_INDICGETUNDER 2511 #define SCI_SETWHITESPACEFORE 2084 #define SCI_SETWHITESPACEBACK 2085 +#define SCI_SETWHITESPACESIZE 2086 +#define SCI_GETWHITESPACESIZE 2087 #define SCI_SETSTYLEBITS 2090 #define SCI_GETSTYLEBITS 2091 #define SCI_SETLINESTATE 2092 @@ -468,6 +474,19 @@ #define SCI_APPENDTEXT 2282 #define SCI_GETTWOPHASEDRAW 2283 #define SCI_SETTWOPHASEDRAW 2284 +#define SC_EFF_QUALITY_MASK 0xF +#define SC_EFF_QUALITY_DEFAULT 0 +#define SC_EFF_QUALITY_NON_ANTIALIASED 1 +#define SC_EFF_QUALITY_ANTIALIASED 2 +#define SC_EFF_QUALITY_LCD_OPTIMIZED 3 +#define SCI_SETFONTQUALITY 2611 +#define SCI_GETFONTQUALITY 2612 +#define SCI_SETFIRSTVISIBLELINE 2613 +#define SC_MULTIPASTE_ONCE 0 +#define SC_MULTIPASTE_EACH 1 +#define SCI_SETMULTIPASTE 2614 +#define SCI_GETMULTIPASTE 2615 +#define SCI_GETTAG 2616 #define SCI_TARGETFROMSELECTION 2287 #define SCI_LINESJOIN 2288 #define SCI_LINESSPLIT 2289 @@ -617,6 +636,7 @@ #define SC_SEL_STREAM 0 #define SC_SEL_RECTANGLE 1 #define SC_SEL_LINES 2 +#define SC_SEL_THIN 3 #define SCI_SETSELECTIONMODE 2422 #define SCI_GETSELECTIONMODE 2423 #define SCI_GETLINESELSTARTPOSITION 2424 @@ -641,6 +661,7 @@ #define SCI_SETWHITESPACECHARS 2443 #define SCI_SETCHARSDEFAULT 2444 #define SCI_AUTOCGETCURRENT 2445 +#define SCI_AUTOCGETCURRENTTEXT 2610 #define SCI_ALLOCATE 2446 #define SCI_TARGETASUTF8 2447 #define SCI_SETLENGTHFORENCODE 2448 @@ -713,6 +734,55 @@ #define SCI_ADDUNDOACTION 2560 #define SCI_CHARPOSITIONFROMPOINT 2561 #define SCI_CHARPOSITIONFROMPOINTCLOSE 2562 +#define SCI_SETMULTIPLESELECTION 2563 +#define SCI_GETMULTIPLESELECTION 2564 +#define SCI_SETADDITIONALSELECTIONTYPING 2565 +#define SCI_GETADDITIONALSELECTIONTYPING 2566 +#define SCI_SETADDITIONALCARETSBLINK 2567 +#define SCI_GETADDITIONALCARETSBLINK 2568 +#define SCI_SETADDITIONALCARETSVISIBLE 2608 +#define SCI_GETADDITIONALCARETSVISIBLE 2609 +#define SCI_GETSELECTIONS 2570 +#define SCI_CLEARSELECTIONS 2571 +#define SCI_SETSELECTION 2572 +#define SCI_ADDSELECTION 2573 +#define SCI_SETMAINSELECTION 2574 +#define SCI_GETMAINSELECTION 2575 +#define SCI_SETSELECTIONNCARET 2576 +#define SCI_GETSELECTIONNCARET 2577 +#define SCI_SETSELECTIONNANCHOR 2578 +#define SCI_GETSELECTIONNANCHOR 2579 +#define SCI_SETSELECTIONNCARETVIRTUALSPACE 2580 +#define SCI_GETSELECTIONNCARETVIRTUALSPACE 2581 +#define SCI_SETSELECTIONNANCHORVIRTUALSPACE 2582 +#define SCI_GETSELECTIONNANCHORVIRTUALSPACE 2583 +#define SCI_SETSELECTIONNSTART 2584 +#define SCI_GETSELECTIONNSTART 2585 +#define SCI_SETSELECTIONNEND 2586 +#define SCI_GETSELECTIONNEND 2587 +#define SCI_SETRECTANGULARSELECTIONCARET 2588 +#define SCI_GETRECTANGULARSELECTIONCARET 2589 +#define SCI_SETRECTANGULARSELECTIONANCHOR 2590 +#define SCI_GETRECTANGULARSELECTIONANCHOR 2591 +#define SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE 2592 +#define SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE 2593 +#define SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2594 +#define SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2595 +#define SCVS_NONE 0 +#define SCVS_RECTANGULARSELECTION 1 +#define SCVS_USERACCESSIBLE 2 +#define SCI_SETVIRTUALSPACEOPTIONS 2596 +#define SCI_GETVIRTUALSPACEOPTIONS 2597 +#define SCI_SETRECTANGULARSELECTIONMODIFIER 2598 +#define SCI_GETRECTANGULARSELECTIONMODIFIER 2599 +#define SCI_SETADDITIONALSELFORE 2600 +#define SCI_SETADDITIONALSELBACK 2601 +#define SCI_SETADDITIONALSELALPHA 2602 +#define SCI_GETADDITIONALSELALPHA 2603 +#define SCI_SETADDITIONALCARETFORE 2604 +#define SCI_GETADDITIONALCARETFORE 2605 +#define SCI_ROTATESELECTION 2606 +#define SCI_SWAPMAINANCHORCARET 2607 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 #define SCI_SETLEXER 4001 @@ -727,6 +797,7 @@ #define SCI_GETPROPERTYEXPANDED 4009 #define SCI_GETPROPERTYINT 4010 #define SCI_GETSTYLEBITSNEEDED 4011 +#define SCI_GETLEXERLANGUAGE 4012 #define SC_MOD_INSERTTEXT 0x1 #define SC_MOD_DELETETEXT 0x2 #define SC_MOD_CHANGESTYLE 0x4 @@ -774,6 +845,7 @@ #define SCMOD_SHIFT 1 #define SCMOD_CTRL 2 #define SCMOD_ALT 4 +#define SCMOD_SUPER 8 #define SCN_STYLENEEDED 2000 #define SCN_CHARADDED 2001 #define SCN_SAVEPOINTREACHED 2002 @@ -830,23 +902,28 @@ #define TextRange Sci_TextRange #define TextToFind Sci_TextToFind -#ifdef PLATFORM_H +typedef void *Sci_SurfaceID; + +struct Sci_Rectangle { + int left; + int top; + int right; + int bottom; +}; /* This structure is used in printing and requires some of the graphics types * from Platform.h. Not needed by most client code. */ struct Sci_RangeToFormat { - SurfaceID hdc; - SurfaceID hdcTarget; - PRectangle rc; - PRectangle rcPage; - Sci_CharacterRange chrg; + Sci_SurfaceID hdc; + Sci_SurfaceID hdcTarget; + struct Sci_Rectangle rc; + struct Sci_Rectangle rcPage; + struct Sci_CharacterRange chrg; }; #define RangeToFormat Sci_RangeToFormat -#endif - struct Sci_NotifyHeader { /* Compatible with Windows NMHDR. * hwndFrom is really an environment specific window handle or pointer diff -Nru geany-0.18/scintilla/include/Scintilla.iface geany-0.19/scintilla/include/Scintilla.iface --- geany-0.18/scintilla/include/Scintilla.iface 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/scintilla/include/Scintilla.iface 2010-06-06 19:34:26.000000000 +0100 @@ -477,10 +477,10 @@ # Set a style to be a hotspot or not. set void StyleSetHotSpot=2409(int style, bool hotspot) -# Set the foreground colour of the selection and whether to use this setting. +# Set the foreground colour of the main and additional selections and whether to use this setting. fun void SetSelFore=2067(bool useSetting, colour fore) -# Set the background colour of the selection and whether to use this setting. +# Set the background colour of the main and additional selections and whether to use this setting. fun void SetSelBack=2068(bool useSetting, colour back) # Get the alpha of the selection. @@ -571,6 +571,12 @@ # Set the background colour of all whitespace and whether to use this setting. fun void SetWhitespaceBack=2085(bool useSetting, colour back) +# Set the size of the dots used to mark space characters. +set void SetWhitespaceSize=2086(int size,) + +# Get the size of the dots used to mark space characters. +get int GetWhitespaceSize=2087(,) + # Divide each styling byte into lexical class bits (default: 5) and indicator # bits (default: 3). If a lexer requires more than 32 lexical states, then this # is used to expand the possible states. @@ -1199,6 +1205,37 @@ # and then the foreground. This avoids chopping off characters that overlap the next run. set void SetTwoPhaseDraw=2284(bool twoPhase,) +# Control font anti-aliasing. + +enu FontQuality=SC_EFF_ +val SC_EFF_QUALITY_MASK=0xF +val SC_EFF_QUALITY_DEFAULT=0 +val SC_EFF_QUALITY_NON_ANTIALIASED=1 +val SC_EFF_QUALITY_ANTIALIASED=2 +val SC_EFF_QUALITY_LCD_OPTIMIZED=3 + +# Choose the quality level for text from the FontQuality enumeration. +set void SetFontQuality=2611(int fontQuality,) + +# Retrieve the quality level for text. +get int GetFontQuality=2612(,) + +# Scroll so that a display line is at the top of the display. +set void SetFirstVisibleLine=2613(int lineDisplay,) + +enu MultiPaste=SC_MULTIPASTE_ +val SC_MULTIPASTE_ONCE=0 +val SC_MULTIPASTE_EACH=1 + +# Change the effect of pasting when there are multiple selections. +set void SetMultiPaste=2614(int multiPaste,) + +# Retrieve the effect of pasting when there are multiple selections.. +get int GetMultiPaste=2615(,) + +# Retrieve the value of a tag from a regular expression search. +fun int GetTag=2616(int tagNumber, stringresult tagValue) + # Make the target range start and end be the same as the selection range start and end. fun void TargetFromSelection=2287(,) @@ -1637,8 +1674,9 @@ val SC_SEL_STREAM=0 val SC_SEL_RECTANGLE=1 val SC_SEL_LINES=2 +val SC_SEL_THIN=3 -# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or +# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or # by lines (SC_SEL_LINES). set void SetSelectionMode=2422(int mode,) @@ -1717,6 +1755,10 @@ # Get currently selected item position in the auto-completion list fun int AutoCGetCurrent=2445(,) +# Get currently selected item text in the auto-completion list +# Returns the length of the item text +fun int AutoCGetCurrentText=2610(, stringresult s) + # Enlarge the document to a particular size of text bytes. fun void Allocate=2446(int bytes,) @@ -1926,6 +1968,122 @@ # Return INVALID_POSITION if not close to text. fun position CharPositionFromPointClose=2562(int x, int y) +# Set whether multiple selections can be made +set void SetMultipleSelection=2563(bool multipleSelection,) + +# Whether multiple selections can be made +get bool GetMultipleSelection=2564(,) + +# Set whether typing can be performed into multiple selections +set void SetAdditionalSelectionTyping=2565(bool additionalSelectionTyping,) + +# Whether typing can be performed into multiple selections +get bool GetAdditionalSelectionTyping=2566(,) + +# Set whether additional carets will blink +set void SetAdditionalCaretsBlink=2567(bool additionalCaretsBlink,) + +# Whether additional carets will blink +get bool GetAdditionalCaretsBlink=2568(,) + +# Set whether additional carets are visible +set void SetAdditionalCaretsVisible=2608(bool additionalCaretsBlink,) + +# Whether additional carets are visible +get bool GetAdditionalCaretsVisible=2609(,) + +# How many selections are there? +get int GetSelections=2570(,) + +# Clear selections to a single empty stream selection +fun void ClearSelections=2571(,) + +# Set a simple selection +fun int SetSelection=2572(int caret,int anchor) + +# Add a selection +fun int AddSelection=2573(int caret,int anchor) + +# Set the main selection +set void SetMainSelection=2574(int selection,) + +# Which selection is the main selection +get int GetMainSelection=2575(,) + +set void SetSelectionNCaret=2576(int selection, position pos) +get position GetSelectionNCaret=2577(int selection,) +set void SetSelectionNAnchor=2578(int selection, position posAnchor) +get position GetSelectionNAnchor=2579(int selection,) +set void SetSelectionNCaretVirtualSpace=2580(int selection, int space) +get int GetSelectionNCaretVirtualSpace=2581(int selection,) +set void SetSelectionNAnchorVirtualSpace=2582(int selection, int space) +get int GetSelectionNAnchorVirtualSpace=2583(int selection,) + +# Sets the position that starts the selection - this becomes the anchor. +set void SetSelectionNStart=2584(int selection, position pos) + +# Returns the position at the start of the selection. +get position GetSelectionNStart=2585(int selection,) + +# Sets the position that ends the selection - this becomes the currentPosition. +set void SetSelectionNEnd=2586(int selection, position pos,) + +# Returns the position at the end of the selection. +get position GetSelectionNEnd=2587(int selection,) + +set void SetRectangularSelectionCaret=2588(position pos,) +get position GetRectangularSelectionCaret=2589(,) +set void SetRectangularSelectionAnchor=2590(position posAnchor,) +get position GetRectangularSelectionAnchor=2591(,) +set void SetRectangularSelectionCaretVirtualSpace=2592(int space,) +get int GetRectangularSelectionCaretVirtualSpace=2593(,) +set void SetRectangularSelectionAnchorVirtualSpace=2594(int space,) +get int GetRectangularSelectionAnchorVirtualSpace=2595(,) + +enu VirtualSpace=SCVS_ +val SCVS_NONE=0 +val SCVS_RECTANGULARSELECTION=1 +val SCVS_USERACCESSIBLE=2 + +set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,) +get int GetVirtualSpaceOptions=2597(,) + +# On GTK+, allow selecting the modifier key to use for mouse-based +# rectangular selection. Often the window manager requires Alt+Mouse Drag +# for moving windows. +# Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER. + +set void SetRectangularSelectionModifier=2598(int modifier,) + +# Get the modifier key used for rectangular selection. +get int GetRectangularSelectionModifier=2599(,) + +# Set the foreground colour of additional selections. +# Must have previously called SetSelFore with non-zero first argument for this to have an effect. +set void SetAdditionalSelFore=2600(colour fore,) + +# Set the background colour of additional selections. +# Must have previously called SetSelBack with non-zero first argument for this to have an effect. +set void SetAdditionalSelBack=2601(colour back,) + +# Set the alpha of the selection. +set void SetAdditionalSelAlpha=2602(int alpha,) + +# Get the alpha of the selection. +get int GetAdditionalSelAlpha=2603(,) + +# Set the foreground colour of additional carets. +set void SetAdditionalCaretFore=2604(colour fore,) + +# Get the foreground colour of additional carets. +get colour GetAdditionalCaretFore=2605(,) + +# Set the main selection to the next selection. +fun void RotateSelection=2606(,) + +# Swap that caret and anchor of the main selection. +fun void SwapMainAnchorCaret=2607(,) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) @@ -1970,6 +2128,10 @@ # Retrieve the number of bits the current lexer needs for styling. get int GetStyleBitsNeeded=4011(,) +# Retrieve the name of the lexer. +# Return the length of the text. +get int GetLexerLanguage=4012(, stringresult text) + # Notifications # Type of modification and the action which caused the modification. # These are defined as a bit mask to make it easy to specify which notifications are wanted. @@ -2035,6 +2197,7 @@ val SCMOD_SHIFT=1 val SCMOD_CTRL=2 val SCMOD_ALT=4 +val SCMOD_SUPER=8 ################################################ # For SciLexer.h @@ -2743,6 +2906,7 @@ val SCE_CSS_EXTENDED_IDENTIFIER=19 val SCE_CSS_EXTENDED_PSEUDOCLASS=20 val SCE_CSS_EXTENDED_PSEUDOELEMENT=21 +val SCE_CSS_MEDIA=22 # Lexical states for SCLEX_POV lex POV=SCLEX_POV SCE_POV_ val SCE_POV_DEFAULT=0 @@ -2918,8 +3082,19 @@ val SCE_ERLANG_CHARACTER=9 val SCE_ERLANG_MACRO=10 val SCE_ERLANG_RECORD=11 -val SCE_ERLANG_SEPARATOR=12 +val SCE_ERLANG_PREPROC=12 val SCE_ERLANG_NODE_NAME=13 +val SCE_ERLANG_COMMENT_FUNCTION=14 +val SCE_ERLANG_COMMENT_MODULE=15 +val SCE_ERLANG_COMMENT_DOC=16 +val SCE_ERLANG_COMMENT_DOC_MACRO=17 +val SCE_ERLANG_ATOM_QUOTED=18 +val SCE_ERLANG_MACRO_QUOTED=19 +val SCE_ERLANG_RECORD_QUOTED=20 +val SCE_ERLANG_NODE_NAME_QUOTED=21 +val SCE_ERLANG_BIFS=22 +val SCE_ERLANG_MODULES=23 +val SCE_ERLANG_MODULES_ATT=24 val SCE_ERLANG_UNKNOWN=31 # Lexical states for SCLEX_OCTAVE are identical to MatLab lex Octave=SCLEX_OCTAVE SCE_MATLAB_ @@ -3214,7 +3389,7 @@ val SCE_ST_CHARACTER=15 val SCE_ST_SPEC_SEL=16 # Lexical states for SCLEX_FLAGSHIP (clipper) -lex FlagShip=SCLEX_FLAGSHIP SCE_B_ +lex FlagShip=SCLEX_FLAGSHIP SCE_FS_ val SCE_FS_DEFAULT=0 val SCE_FS_COMMENT=1 val SCE_FS_COMMENTLINE=2 @@ -3234,11 +3409,19 @@ val SCE_FS_DATE=16 val SCE_FS_STRINGEOL=17 val SCE_FS_CONSTANT=18 -val SCE_FS_ASM=19 -val SCE_FS_LABEL=20 -val SCE_FS_ERROR=21 -val SCE_FS_HEXNUMBER=22 -val SCE_FS_BINNUMBER=23 +val SCE_FS_WORDOPERATOR=19 +val SCE_FS_DISABLEDCODE=20 +val SCE_FS_DEFAULT_C=21 +val SCE_FS_COMMENTDOC_C=22 +val SCE_FS_COMMENTLINEDOC_C=23 +val SCE_FS_KEYWORD_C=24 +val SCE_FS_KEYWORD2_C=25 +val SCE_FS_NUMBER_C=26 +val SCE_FS_STRING_C=27 +val SCE_FS_PREPROCESSOR_C=28 +val SCE_FS_OPERATOR_C=29 +val SCE_FS_IDENTIFIER_C=30 +val SCE_FS_STRINGEOL_C=31 # Lexical states for SCLEX_CSOUND lex Csound=SCLEX_CSOUND SCE_CSOUND_ val SCE_CSOUND_DEFAULT=0 @@ -3265,7 +3448,6 @@ val SCE_INNO_PARAMETER=3 val SCE_INNO_SECTION=4 val SCE_INNO_PREPROC=5 -val SCE_INNO_PREPROC_INLINE=6 val SCE_INNO_INLINE_EXPANSION=6 val SCE_INNO_COMMENT_PASCAL=7 val SCE_INNO_KEYWORD_PASCAL=8 diff -Nru geany-0.18/scintilla/include/ScintillaWidget.h geany-0.19/scintilla/include/ScintillaWidget.h --- geany-0.18/scintilla/include/ScintillaWidget.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.19/scintilla/include/ScintillaWidget.h 2010-05-16 18:44:24.000000000 +0100 @@ -9,7 +9,7 @@ #ifndef SCINTILLAWIDGET_H #define SCINTILLAWIDGET_H -#if PLAT_GTK +#if defined(GTK) #ifdef __cplusplus extern "C" { @@ -34,21 +34,13 @@ void (* notify) (ScintillaObject *ttt); }; -#if GLIB_MAJOR_VERSION < 2 -GtkType scintilla_get_type (void); -#else GType scintilla_get_type (void); -#endif GtkWidget* scintilla_new (void); void scintilla_set_id (ScintillaObject *sci, uptr_t id); sptr_t scintilla_send_message (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam); void scintilla_release_resources(void); -#if GTK_MAJOR_VERSION < 2 -#define SCINTILLA_NOTIFY "notify" -#else #define SCINTILLA_NOTIFY "sci-notify" -#endif #ifdef __cplusplus } diff -Nru geany-0.18/scintilla/include/WindowAccessor.h geany-0.19/scintilla/include/WindowAccessor.h --- geany-0.18/scintilla/include/WindowAccessor.h 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/include/WindowAccessor.h 2010-06-06 19:34:26.000000000 +0100 @@ -12,13 +12,14 @@ /** */ + class WindowAccessor : public Accessor { // Private so WindowAccessor objects can not be copied WindowAccessor(const WindowAccessor &source) : Accessor(), props(source.props) {} WindowAccessor &operator=(const WindowAccessor &) { return *this; } protected: WindowID id; - PropSet &props; + PropertyGet &props; int lenDoc; char styleBuf[bufferSize]; @@ -30,7 +31,7 @@ bool InternalIsLeadByte(char ch); void Fill(int position); public: - WindowAccessor(WindowID id_, PropSet &props_) : + WindowAccessor(WindowID id_, PropertyGet &props_) : Accessor(), id(id_), props(props_), lenDoc(-1), validLen(0), chFlags(0), chWhile(0) { } @@ -52,7 +53,7 @@ } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); diff -Nru geany-0.18/scintilla/KeyWords.cxx geany-0.19/scintilla/KeyWords.cxx --- geany-0.18/scintilla/KeyWords.cxx 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/scintilla/KeyWords.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -23,6 +23,192 @@ using namespace Scintilla; #endif +/** + * Creates an array that points into each word in the string and puts \0 terminators + * after each word. + */ +static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = false) { + int prev = '\n'; + int words = 0; + // For rapid determination of whether a character is a separator, build + // a look up table. + bool wordSeparator[256]; + for (int i=0;i<256; i++) { + wordSeparator[i] = false; + } + wordSeparator['\r'] = true; + wordSeparator['\n'] = true; + if (!onlyLineEnds) { + wordSeparator[' '] = true; + wordSeparator['\t'] = true; + } + for (int j = 0; wordlist[j]; j++) { + int curr = static_cast(wordlist[j]); + if (!wordSeparator[curr] && wordSeparator[prev]) + words++; + prev = curr; + } + char **keywords = new char *[words + 1]; + if (keywords) { + words = 0; + prev = '\0'; + size_t slen = strlen(wordlist); + for (size_t k = 0; k < slen; k++) { + if (!wordSeparator[static_cast(wordlist[k])]) { + if (!prev) { + keywords[words] = &wordlist[k]; + words++; + } + } else { + wordlist[k] = '\0'; + } + prev = wordlist[k]; + } + keywords[words] = &wordlist[slen]; + *len = words; + } else { + *len = 0; + } + return keywords; +} + +void WordList::Clear() { + if (words) { + delete []list; + delete []words; + } + words = 0; + list = 0; + len = 0; + sorted = false; +} + +void WordList::Set(const char *s) { + list = new char[strlen(s) + 1]; + strcpy(list, s); + sorted = false; + words = ArrayFromWordList(list, &len, onlyLineEnds); +} + +extern "C" int cmpString(const void *a1, const void *a2) { + // Can't work out the correct incantation to use modern casts here + return strcmp(*(char**)(a1), *(char**)(a2)); +} + +static void SortWordList(char **words, unsigned int len) { + qsort(reinterpret_cast(words), len, sizeof(*words), + cmpString); +} + +bool WordList::InList(const char *s) { + if (0 == words) + return false; + if (!sorted) { + sorted = true; + SortWordList(words, len); + for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++) + starts[k] = -1; + for (int l = len - 1; l >= 0; l--) { + unsigned char indexChar = words[l][0]; + starts[indexChar] = l; + } + } + unsigned char firstChar = s[0]; + int j = starts[firstChar]; + if (j >= 0) { + while ((unsigned char)words[j][0] == firstChar) { + if (s[1] == words[j][1]) { + const char *a = words[j] + 1; + const char *b = s + 1; + while (*a && *a == *b) { + a++; + b++; + } + if (!*a && !*b) + return true; + } + j++; + } + } + j = starts['^']; + if (j >= 0) { + while (words[j][0] == '^') { + const char *a = words[j] + 1; + const char *b = s; + while (*a && *a == *b) { + a++; + b++; + } + if (!*a) + return true; + j++; + } + } + return false; +} + +/** similar to InList, but word s can be a substring of keyword. + * eg. the keyword define is defined as def~ine. This means the word must start + * with def to be a keyword, but also defi, defin and define are valid. + * The marker is ~ in this case. + */ +bool WordList::InListAbbreviated(const char *s, const char marker) { + if (0 == words) + return false; + if (!sorted) { + sorted = true; + SortWordList(words, len); + for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++) + starts[k] = -1; + for (int l = len - 1; l >= 0; l--) { + unsigned char indexChar = words[l][0]; + starts[indexChar] = l; + } + } + unsigned char firstChar = s[0]; + int j = starts[firstChar]; + if (j >= 0) { + while (words[j][0] == firstChar) { + bool isSubword = false; + int start = 1; + if (words[j][1] == marker) { + isSubword = true; + start++; + } + if (s[1] == words[j][start]) { + const char *a = words[j] + start; + const char *b = s + 1; + while (*a && *a == *b) { + a++; + if (*a == marker) { + isSubword = true; + a++; + } + b++; + } + if ((!*a || isSubword) && !*b) + return true; + } + j++; + } + } + j = starts['^']; + if (j >= 0) { + while (words[j][0] == '^') { + const char *a = words[j] + 1; + const char *b = s; + while (*a && *a == *b) { + a++; + b++; + } + if (!*a) + return true; + j++; + } + } + return false; +} + const LexerModule *LexerModule::base = 0; int LexerModule::nextLanguage = SCLEX_AUTOMATIC+1; @@ -141,7 +327,7 @@ //++Autogenerated -- run src/LexGen.py to regenerate //**\(\tLINK_LEXER(\*);\n\) - LINK_LEXER(lmAda); +LINK_LEXER(lmAda); LINK_LEXER(lmAsm); LINK_LEXER(lmBash); LINK_LEXER(lmCaml); @@ -172,6 +358,7 @@ LINK_LEXER(lmSQL); LINK_LEXER(lmTCL); LINK_LEXER(lmVHDL); + LINK_LEXER(lmVerilog); LINK_LEXER(lmXML); LINK_LEXER(lmYAML); diff -Nru geany-0.18/scintilla/LexAda.cxx geany-0.19/scintilla/LexAda.cxx --- geany-0.18/scintilla/LexAda.cxx 2009-01-04 16:00:50.000000000 +0000 +++ geany-0.19/scintilla/LexAda.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -10,6 +10,8 @@ #include #include +#include + #include "Platform.h" #include "Accessor.h" @@ -17,7 +19,6 @@ #include "PropSet.h" #include "KeyWords.h" #include "SciLexer.h" -#include "SString.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -62,8 +63,8 @@ static inline bool IsNumberStartCharacter(int ch); static inline bool IsNumberCharacter(int ch); static inline bool IsSeparatorOrDelimiterCharacter(int ch); -static bool IsValidIdentifier(const SString& identifier); -static bool IsValidNumber(const SString& number); +static bool IsValidIdentifier(const std::string& identifier); +static bool IsValidNumber(const std::string& number); static inline bool IsWordStartCharacter(int ch); static inline bool IsWordCharacter(int ch); @@ -117,7 +118,7 @@ sc.Forward(); sc.Forward(); - SString identifier; + std::string identifier; while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) { identifier += static_cast(tolower(sc.ch)); @@ -144,7 +145,7 @@ static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) { apostropheStartsAttribute = true; - SString number; + std::string number; sc.SetState(SCE_ADA_NUMBER); // Get all characters up to a delimiter or a separator, including points, but excluding @@ -192,7 +193,7 @@ apostropheStartsAttribute = true; sc.SetState(SCE_ADA_IDENTIFIER); - SString word; + std::string word; while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) { word += static_cast(tolower(sc.ch)); @@ -321,7 +322,7 @@ return IsASpace(ch) || IsDelimiterCharacter(ch); } -static bool IsValidIdentifier(const SString& identifier) { +static bool IsValidIdentifier(const std::string& identifier) { // First character can't be '_', so initialize the flag to true bool lastWasUnderscore = true; @@ -355,8 +356,8 @@ return true; } -static bool IsValidNumber(const SString& number) { - int hashPos = number.search("#"); +static bool IsValidNumber(const std::string& number) { + size_t hashPos = number.find("#"); bool seenDot = false; size_t i = 0; @@ -366,7 +367,7 @@ return false; // Just in case // Decimal number - if (hashPos == -1) { + if (hashPos == std::string::npos) { bool canBeSpecial = false; for (; i < length; i++) { diff -Nru geany-0.18/scintilla/LexBash.cxx geany-0.19/scintilla/LexBash.cxx --- geany-0.18/scintilla/LexBash.cxx 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/LexBash.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -248,14 +248,8 @@ sc.SetState(SCE_SH_DEFAULT); break; case SCE_SH_COMMENTLINE: - if (sc.ch == '\\' && (sc.chNext == '\r' || sc.chNext == '\n')) { - // comment continuation - sc.Forward(); - if (sc.ch == '\r' && sc.chNext == '\n') { - sc.Forward(); - } - } else if (sc.atLineEnd) { - sc.ForwardSetState(SCE_SH_DEFAULT); + if (sc.atLineEnd && sc.chPrev != '\\') { + sc.SetState(SCE_SH_DEFAULT); } break; case SCE_SH_HERE_DELIM: @@ -294,23 +288,14 @@ HereDoc.State = 1; } } else if (HereDoc.State == 1) { // collect the delimiter - if (HereDoc.Quoted) { // a quoted here-doc delimiter - if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter - sc.ForwardSetState(SCE_SH_DEFAULT); - } else { - if (sc.ch == '\\' && sc.chNext == HereDoc.Quote) { // escaped quote - sc.Forward(); - } - HereDoc.Append(sc.ch); - } - } else { // an unquoted here-doc delimiter - if (setHereDoc2.Contains(sc.ch)) { - HereDoc.Append(sc.ch); - } else if (sc.ch == '\\') { - // skip escape prefix - } else { - sc.SetState(SCE_SH_DEFAULT); - } + if (setHereDoc2.Contains(sc.ch) || sc.chPrev == '\\') { + HereDoc.Append(sc.ch); + } else if (HereDoc.Quoted && sc.ch == HereDoc.Quote) { // closing quote => end of delimiter + sc.ForwardSetState(SCE_SH_DEFAULT); + } else if (sc.ch == '\\') { + // skip escape prefix + } else { + sc.SetState(SCE_SH_DEFAULT); } if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) { // force blowup sc.SetState(SCE_SH_ERROR); diff -Nru geany-0.18/scintilla/LexCaml.cxx geany-0.19/scintilla/LexCaml.cxx --- geany-0.18/scintilla/LexCaml.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/LexCaml.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -27,6 +27,7 @@ #include "Platform.h" #include "PropSet.h" +#include "PropSetSimple.h" #include "Accessor.h" #include "StyleContext.h" #include "KeyWords.h" @@ -143,7 +144,7 @@ int initStyle, char *words[], WindowID window, char *props) { // create and initialize a WindowAccessor (including contained PropSet) - PropSet ps; + PropSetSimple ps; ps.SetMultiple(props); WindowAccessor wa(window, ps); // create and initialize WordList(s) @@ -429,13 +430,11 @@ static #endif /* BUILD_AS_EXTERNAL_LEXER */ void FoldCamlDoc( - unsigned int startPos, int length, - int initStyle, - WordList *keywordlists[], - Accessor &styler) + unsigned int, int, + int, + WordList *[], + Accessor &) { - // below useless evaluation(s) to supress "not used" warnings - startPos || length || initStyle || keywordlists[0] || styler.Length(); } static const char * const camlWordListDesc[] = { diff -Nru geany-0.18/scintilla/LexCmake.cxx geany-0.19/scintilla/LexCmake.cxx --- geany-0.18/scintilla/LexCmake.cxx 2008-12-21 20:31:09.000000000 +0000 +++ geany-0.19/scintilla/LexCmake.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -13,6 +13,7 @@ #include "Platform.h" +#include "CharClassify.h" #include "PropSet.h" #include "Accessor.h" #include "KeyWords.h" diff -Nru geany-0.18/scintilla/LexCPP.cxx geany-0.19/scintilla/LexCPP.cxx --- geany-0.18/scintilla/LexCPP.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/LexCPP.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -59,8 +59,8 @@ WordList &keywords4 = *keywordlists[3]; // property styling.within.preprocessor - // For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) - // or only from the initial # to the end of the command word(1). + // For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) + // or only from the initial # to the end of the command word(1). bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); @@ -72,7 +72,7 @@ CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); // property lexer.cpp.allow.dollars - // Set to 0 to disallow the '$' character in identifiers with the cpp lexer. + // Set to 0 to disallow the '$' character in identifiers with the cpp lexer. if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) { setWordStart.Add('$'); setWord.Add('$'); @@ -379,20 +379,20 @@ WordList *[], Accessor &styler) { // property fold.comment - // This option enables folding multi-line comments and explicit fold points when using the C++ lexer. - // Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} - // at the end of a section that should fold. + // This option enables folding multi-line comments and explicit fold points when using the C++ lexer. + // Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} + // at the end of a section that should fold. bool foldComment = styler.GetPropertyInt("fold.comment") != 0; // property fold.preprocessor - // This option enables folding preprocessor directives when using the C++ lexer. - // Includes C#'s explicit #region and #endregion folding directives. + // This option enables folding preprocessor directives when using the C++ lexer. + // Includes C#'s explicit #region and #endregion folding directives. bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - // property fold.at.else - // This option enables C++ folding on a "} else {" line of an if statement. + // property fold.at.else + // This option enables C++ folding on a "} else {" line of an if statement. bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; unsigned int endPos = startPos + length; @@ -483,14 +483,14 @@ } } -static const char * const cppWordLists[] = { +static const char *const cppWordLists[] = { "Primary keywords and identifiers", "Secondary keywords and identifiers", "Documentation comment keywords", "Unused", "Global classes and typedefs", 0, - }; +}; static void ColouriseCppDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { diff -Nru geany-0.18/scintilla/LexCrontab.cxx geany-0.19/scintilla/LexCrontab.cxx --- geany-0.18/scintilla/LexCrontab.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/LexCrontab.cxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,222 +0,0 @@ -// Scintilla source code edit control -/** @file LexCrontab.cxx - ** Lexer to use with extended crontab files used by a powerful - ** Windows scheduler/event monitor/automation manager nnCron. - ** (http://nemtsev.eserv.ru/) - **/ -// Copyright 1998-2001 by Neil Hodgson -// The License.txt file describes the conditions under which this software may be distributed. - -#include -#include -#include -#include -#include - -#include "Platform.h" - -#include "PropSet.h" -#include "Accessor.h" -#include "KeyWords.h" -#include "Scintilla.h" -#include "SciLexer.h" - -#ifdef SCI_NAMESPACE -using namespace Scintilla; -#endif - -static void ColouriseNncrontabDoc(unsigned int startPos, int length, int, WordList -*keywordLists[], Accessor &styler) -{ - int state = SCE_NNCRONTAB_DEFAULT; - char chNext = styler[startPos]; - int lengthDoc = startPos + length; - // create a buffer large enough to take the largest chunk... - char *buffer = new char[length]; - int bufferCount = 0; - // used when highliting environment variables inside quoted string: - bool insideString = false; - - // this assumes that we have 3 keyword list in conf.properties - WordList §ion = *keywordLists[0]; - WordList &keyword = *keywordLists[1]; - WordList &modifier = *keywordLists[2]; - - // go through all provided text segment - // using the hand-written state machine shown below - styler.StartAt(startPos); - styler.StartSegment(startPos); - for (int i = startPos; i < lengthDoc; i++) { - char ch = chNext; - chNext = styler.SafeGetCharAt(i + 1); - - if (styler.IsLeadByte(ch)) { - chNext = styler.SafeGetCharAt(i + 2); - i++; - continue; - } - switch(state) { - case SCE_NNCRONTAB_DEFAULT: - if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') { - // whitespace is simply ignored here... - styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT); - break; - } else if( ch == '#' && styler.SafeGetCharAt(i+1) == '(') { - // signals the start of a task... - state = SCE_NNCRONTAB_TASK; - styler.ColourTo(i,SCE_NNCRONTAB_TASK); - } - else if( ch == '\\' && (styler.SafeGetCharAt(i+1) == ' ' || - styler.SafeGetCharAt(i+1) == '\t')) { - // signals the start of an extended comment... - state = SCE_NNCRONTAB_COMMENT; - styler.ColourTo(i,SCE_NNCRONTAB_COMMENT); - } else if( ch == '#' ) { - // signals the start of a plain comment... - state = SCE_NNCRONTAB_COMMENT; - styler.ColourTo(i,SCE_NNCRONTAB_COMMENT); - } else if( ch == ')' && styler.SafeGetCharAt(i+1) == '#') { - // signals the end of a task... - state = SCE_NNCRONTAB_TASK; - styler.ColourTo(i,SCE_NNCRONTAB_TASK); - } else if( ch == '"') { - state = SCE_NNCRONTAB_STRING; - styler.ColourTo(i,SCE_NNCRONTAB_STRING); - } else if( ch == '%') { - // signals environment variables - state = SCE_NNCRONTAB_ENVIRONMENT; - styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT); - } else if( ch == '<' && styler.SafeGetCharAt(i+1) == '%') { - // signals environment variables - state = SCE_NNCRONTAB_ENVIRONMENT; - styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT); - } else if( ch == '*' ) { - // signals an asterisk - // no state jump necessary for this simple case... - styler.ColourTo(i,SCE_NNCRONTAB_ASTERISK); - } else if( isalpha(ch) || ch == '<' ) { - // signals the start of an identifier - bufferCount = 0; - buffer[bufferCount++] = ch; - state = SCE_NNCRONTAB_IDENTIFIER; - } else if( isdigit(ch) ) { - // signals the start of a number - bufferCount = 0; - buffer[bufferCount++] = ch; - state = SCE_NNCRONTAB_NUMBER; - } else { - // style it the default style.. - styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT); - } - break; - - case SCE_NNCRONTAB_COMMENT: - // if we find a newline here, - // we simply go to default state - // else continue to work on it... - if( ch == '\n' || ch == '\r' ) { - state = SCE_NNCRONTAB_DEFAULT; - } else { - styler.ColourTo(i,SCE_NNCRONTAB_COMMENT); - } - break; - - case SCE_NNCRONTAB_TASK: - // if we find a newline here, - // we simply go to default state - // else continue to work on it... - if( ch == '\n' || ch == '\r' ) { - state = SCE_NNCRONTAB_DEFAULT; - } else { - styler.ColourTo(i,SCE_NNCRONTAB_TASK); - } - break; - - case SCE_NNCRONTAB_STRING: - if( ch == '%' ) { - state = SCE_NNCRONTAB_ENVIRONMENT; - insideString = true; - styler.ColourTo(i-1,SCE_NNCRONTAB_STRING); - break; - } - // if we find the end of a string char, we simply go to default state - // else we're still dealing with an string... - if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') || - (ch == '\n') || (ch == '\r') ) { - state = SCE_NNCRONTAB_DEFAULT; - } - styler.ColourTo(i,SCE_NNCRONTAB_STRING); - break; - - case SCE_NNCRONTAB_ENVIRONMENT: - // if we find the end of a string char, we simply go to default state - // else we're still dealing with an string... - if( ch == '%' && insideString ) { - state = SCE_NNCRONTAB_STRING; - insideString = false; - break; - } - if( (ch == '%' && styler.SafeGetCharAt(i-1)!='\\') - || (ch == '\n') || (ch == '\r') || (ch == '>') ) { - state = SCE_NNCRONTAB_DEFAULT; - styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT); - break; - } - styler.ColourTo(i+1,SCE_NNCRONTAB_ENVIRONMENT); - break; - - case SCE_NNCRONTAB_IDENTIFIER: - // stay in CONF_IDENTIFIER state until we find a non-alphanumeric - if( isalnum(ch) || (ch == '_') || (ch == '-') || (ch == '/') || - (ch == '$') || (ch == '.') || (ch == '<') || (ch == '>') || - (ch == '@') ) { - buffer[bufferCount++] = ch; - } else { - state = SCE_NNCRONTAB_DEFAULT; - buffer[bufferCount] = '\0'; - - // check if the buffer contains a keyword, - // and highlight it if it is a keyword... - if(section.InList(buffer)) { - styler.ColourTo(i,SCE_NNCRONTAB_SECTION ); - } else if(keyword.InList(buffer)) { - styler.ColourTo(i-1,SCE_NNCRONTAB_KEYWORD ); - } // else if(strchr(buffer,'/') || strchr(buffer,'.')) { - // styler.ColourTo(i-1,SCE_NNCRONTAB_EXTENSION); - // } - else if(modifier.InList(buffer)) { - styler.ColourTo(i-1,SCE_NNCRONTAB_MODIFIER ); - } else { - styler.ColourTo(i-1,SCE_NNCRONTAB_DEFAULT); - } - // push back the faulty character - chNext = styler[i--]; - } - break; - - case SCE_NNCRONTAB_NUMBER: - // stay in CONF_NUMBER state until we find a non-numeric - if( isdigit(ch) /* || ch == '.' */ ) { - buffer[bufferCount++] = ch; - } else { - state = SCE_NNCRONTAB_DEFAULT; - buffer[bufferCount] = '\0'; - // Colourize here... (normal number) - styler.ColourTo(i-1,SCE_NNCRONTAB_NUMBER); - // push back a character - chNext = styler[i--]; - } - break; - } - } - delete []buffer; -} - -static const char * const cronWordListDesc[] = { - "Section keywords and Forth words", - "nnCrontab keywords", - "Modifiers", - 0 -}; - -LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab", 0, cronWordListDesc); diff -Nru geany-0.18/scintilla/LexCSS.cxx geany-0.19/scintilla/LexCSS.cxx --- geany-0.18/scintilla/LexCSS.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.19/scintilla/LexCSS.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -62,6 +62,7 @@ int lastState = -1; // before operator int lastStateC = -1; // before comment + int lastStateS = -1; // before single-quoted/double-quoted string int op = ' '; // last operator int opPrev = ' '; // last operator @@ -105,7 +106,7 @@ i--; if ((sc.currentPos - i) % 2 == 1) continue; - sc.ForwardSetState(SCE_CSS_VALUE); + sc.ForwardSetState(lastStateS); } if (sc.state == SCE_CSS_OPERATOR) { @@ -140,9 +141,9 @@ sc.SetState(SCE_CSS_TAG); break; case '{': - if (lastState == SCE_CSS_DIRECTIVE) + if (lastState == SCE_CSS_MEDIA) sc.SetState(SCE_CSS_DEFAULT); - else if (lastState == SCE_CSS_TAG) + else if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DIRECTIVE) sc.SetState(SCE_CSS_IDENTIFIER); break; case '}': @@ -219,7 +220,8 @@ sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_PSEUDOELEMENT || sc.state == SCE_CSS_EXTENDED_PSEUDOCLASS || sc.state == SCE_CSS_EXTENDED_PSEUDOELEMENT || sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS || - sc.state == SCE_CSS_IMPORTANT + sc.state == SCE_CSS_IMPORTANT || + sc.state == SCE_CSS_DIRECTIVE )) { char s[100]; sc.GetCurrentLowered(s, sizeof(s)); @@ -263,6 +265,10 @@ if (strcmp(s2, "important") != 0) sc.ChangeState(SCE_CSS_VALUE); break; + case SCE_CSS_DIRECTIVE: + if (op == '@' && strcmp(s2, "media") == 0) + sc.ChangeState(SCE_CSS_MEDIA); + break; } } @@ -280,12 +286,14 @@ lastStateC = sc.state; sc.SetState(SCE_CSS_COMMENT); sc.Forward(); - } else if (sc.state == SCE_CSS_VALUE && (sc.ch == '\"' || sc.ch == '\'')) { + } else if ((sc.state == SCE_CSS_VALUE || sc.state == SCE_CSS_ATTRIBUTE) + && (sc.ch == '\"' || sc.ch == '\'')) { + lastStateS = sc.state; sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING)); } else if (IsCssOperator(sc.ch) && (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']') && (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!') - && (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{') + && ((sc.state != SCE_CSS_DIRECTIVE && sc.state != SCE_CSS_MEDIA) || sc.ch == ';' || sc.ch == '{') ) { if (sc.state != SCE_CSS_OPERATOR) lastState = sc.state; diff -Nru geany-0.18/scintilla/LexHaskell.cxx geany-0.19/scintilla/LexHaskell.cxx --- geany-0.18/scintilla/LexHaskell.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.19/scintilla/LexHaskell.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -25,6 +25,7 @@ #include "Platform.h" #include "PropSet.h" +#include "PropSetSimple.h" #include "Accessor.h" #include "StyleContext.h" #include "KeyWords.h" @@ -225,7 +226,7 @@ void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, int initStyle, char *words[], WindowID window, char *props) { - PropSet ps; + PropSetSimple ps; ps.SetMultiple(props); WindowAccessor wa(window, ps); diff -Nru geany-0.18/scintilla/LexHTML.cxx geany-0.19/scintilla/LexHTML.cxx --- geany-0.18/scintilla/LexHTML.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/LexHTML.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -69,6 +69,22 @@ s[i] = '\0'; } +static const char *GetNextWord(Accessor &styler, unsigned int start, char *s, size_t sLen) { + + size_t i = 0; + for (; i < sLen-1; i++) { + char ch = static_cast(styler.SafeGetCharAt(start + i)); + if ((i == 0) && !IsAWordStart(ch)) + break; + if ((i > 0) && !IsAWordChar(ch)) + break; + s[i] = ch; + } + s[i] = '\0'; + + return s; +} + static script_type segIsScriptingIndicator(Accessor &styler, unsigned int start, unsigned int end, script_type prevValue) { char s[100]; GetTextSegment(styler, start, end, s, sizeof(s)); @@ -474,6 +490,35 @@ return (ch == '(') || (ch == '=') || (ch == ','); } +static bool isMakoBlockEnd(const int ch, const int chNext, const char *blockType) { + if (strlen(blockType) == 0) { + return ((ch == '%') && (chNext == '>')); + } else if ((0 == strcmp(blockType, "inherit")) || + (0 == strcmp(blockType, "namespace")) || + (0 == strcmp(blockType, "include")) || + (0 == strcmp(blockType, "page"))) { + return ((ch == '/') && (chNext == '>')); + } else if (0 == strcmp(blockType, "%")) { + return isLineEnd(ch); + } else if (0 == strcmp(blockType, "{")) { + return ch == '}'; + } else { + return (ch == '>'); + } +} + +static bool isDjangoBlockEnd(const int ch, const int chNext, const char *blockType) { + if (strlen(blockType) == 0) { + return 0; + } else if (0 == strcmp(blockType, "%")) { + return ((ch == '%') && (chNext == '}')); + } else if (0 == strcmp(blockType, "{")) { + return ((ch == '}') && (chNext == '}')); + } else { + return 0; + } +} + static bool isPHPStringState(int state) { return (state == SCE_HPHP_HSTRING) || @@ -546,6 +591,10 @@ phpStringDelimiter[0] = '\0'; int StateToPrint = initStyle; int state = stateForPrintState(StateToPrint); + char makoBlockType[200]; + makoBlockType[0] = '\0'; + char djangoBlockType[2]; + djangoBlockType[0] = '\0'; // If inside a tag, it may be a script tag, so reread from the start to ensure any language tags are seen if (InTagState(state)) { @@ -575,8 +624,8 @@ // Default client and ASP scripting language is JavaScript lineState = eScriptJS << 8; - // property asp.default.language - // Script in ASP code is initially assumed to be in JavaScript. + // property asp.default.language + // Script in ASP code is initially assumed to be in JavaScript. // To change this to VBScript set asp.default.language to 2. Python is 3. lineState |= styler.GetPropertyInt("asp.default.language", eScriptJS) << 4; } @@ -593,40 +642,49 @@ if (inScriptType == eNonHtmlScript && state == SCE_H_COMMENT) { scriptLanguage = eScriptComment; } + script_type beforeLanguage = ScriptOfState(beforePreProc); - // property fold.html - // Folding is turned on or off for HTML and XML files with this option. + // property fold.html + // Folding is turned on or off for HTML and XML files with this option. // The fold option must also be on for folding to occur. const bool foldHTML = styler.GetPropertyInt("fold.html", 0) != 0; const bool fold = foldHTML && styler.GetPropertyInt("fold", 0); - // property fold.html.preprocessor - // Folding is turned on or off for scripts embedded in HTML files with this option. + // property fold.html.preprocessor + // Folding is turned on or off for scripts embedded in HTML files with this option. // The default is on. const bool foldHTMLPreprocessor = foldHTML && styler.GetPropertyInt("fold.html.preprocessor", 1); const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - // property fold.hypertext.comment - // Allow folding for comments in scripts embedded in HTML. - // The default is off. + // property fold.hypertext.comment + // Allow folding for comments in scripts embedded in HTML. + // The default is off. const bool foldComment = fold && styler.GetPropertyInt("fold.hypertext.comment", 0) != 0; - // property fold.hypertext.heredoc - // Allow folding for heredocs in scripts embedded in HTML. - // The default is off. + // property fold.hypertext.heredoc + // Allow folding for heredocs in scripts embedded in HTML. + // The default is off. const bool foldHeredoc = fold && styler.GetPropertyInt("fold.hypertext.heredoc", 0) != 0; - // property html.tags.case.sensitive - // For XML and HTML, setting this property to 1 will make tags match in a case - // sensitive way which is the expected behaviour for XML and XHTML. + // property html.tags.case.sensitive + // For XML and HTML, setting this property to 1 will make tags match in a case + // sensitive way which is the expected behaviour for XML and XHTML. const bool caseSensitive = styler.GetPropertyInt("html.tags.case.sensitive", 0) != 0; - // property lexer.xml.allow.scripts - // Set to 0 to disable scripts in XML. + // property lexer.xml.allow.scripts + // Set to 0 to disable scripts in XML. const bool allowScripts = styler.GetPropertyInt("lexer.xml.allow.scripts", 1) != 0; + // property lexer.html.mako + // Set to 1 to enable the mako template language. + const bool isMako = styler.GetPropertyInt("lexer.html.mako", 0) != 0; + + // property lexer.html.django + // Set to 1 to enable the django template language. + const bool isDjango = styler.GetPropertyInt("lexer.html.django", 0) != 0; + const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", 0x80, true); const CharacterSet setTagContinue(CharacterSet::setAlphaNum, ".-_:!#[", 0x80, true); const CharacterSet setAttributeContinue(CharacterSet::setAlphaNum, ".-_:!#/", 0x80, true); @@ -634,6 +692,7 @@ int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK; int levelCurrent = levelPrev; int visibleChars = 0; + int lineStartVisibleChars = 0; int chPrev = ' '; int ch = ' '; @@ -674,6 +733,8 @@ if ((!IsASpace(ch) || !foldCompact) && fold) visibleChars++; + if (!IsASpace(ch)) + lineStartVisibleChars++; // decide what is the current state to print (depending of the script tag) StateToPrint = statePrintForState(state, inScriptType); @@ -742,6 +803,7 @@ levelPrev = levelCurrent; } lineCurrent++; + lineStartVisibleChars = 0; styler.SetLineState(lineCurrent, ((inScriptType & 0x03) << 0) | ((tagOpened & 0x01) << 2) | @@ -751,6 +813,11 @@ ((beforePreProc & 0xFF) << 12)); } + // Allow falling through to mako handling code if newline is going to end a block + if (((ch == '\r' && chNext != '\n') || (ch == '\n')) && + (!isMako || (0 != strcmp(makoBlockType, "%")))) { + } + // generic end of script processing else if ((inScriptType == eNonHtmlScript) && (ch == '<') && (chNext == '/')) { // Check if it's the end of the script tag (or any other HTML tag) @@ -835,8 +902,80 @@ continue; } + // handle the start Mako template Python code + else if (isMako && scriptLanguage == eScriptNone && ((ch == '<' && chNext == '%') || + (lineStartVisibleChars == 1 && ch == '%') || + (ch == '$' && chNext == '{') || + (ch == '<' && chNext == '/' && chNext2 == '%'))) { + if (ch == '%') + strcpy(makoBlockType, "%"); + else if (ch == '$') + strcpy(makoBlockType, "{"); + else if (chNext == '/') + GetNextWord(styler, i+3, makoBlockType, sizeof(makoBlockType)); + else + GetNextWord(styler, i+2, makoBlockType, sizeof(makoBlockType)); + styler.ColourTo(i - 1, StateToPrint); + beforePreProc = state; + if (inScriptType == eNonHtmlScript) + inScriptType = eNonHtmlScriptPreProc; + else + inScriptType = eNonHtmlPreProc; + + if (chNext == '/') { + i += 2; + visibleChars += 2; + } else if (ch != '%') { + i++; + visibleChars++; + } + state = SCE_HP_START; + scriptLanguage = eScriptPython; + styler.ColourTo(i, SCE_H_ASP); + if (foldHTMLPreprocessor && ch == '<') + levelCurrent++; + + if (ch != '%' && ch != '$') { + i += strlen(makoBlockType); + visibleChars += strlen(makoBlockType); + if (keywords4.InList(makoBlockType)) + styler.ColourTo(i, SCE_HP_WORD); + else + styler.ColourTo(i, SCE_H_TAGUNKNOWN); + } + + ch = static_cast(styler.SafeGetCharAt(i)); + continue; + } + + // handle the start Django template code + else if (isDjango && scriptLanguage != eScriptPython && (ch == '{' && (chNext == '%' || chNext == '{'))) { + if (chNext == '%') + strcpy(djangoBlockType, "%"); + else + strcpy(djangoBlockType, "{"); + styler.ColourTo(i - 1, StateToPrint); + beforePreProc = state; + if (inScriptType == eNonHtmlScript) + inScriptType = eNonHtmlScriptPreProc; + else + inScriptType = eNonHtmlPreProc; + + i += 1; + visibleChars += 1; + state = SCE_HP_START; + beforeLanguage = scriptLanguage; + scriptLanguage = eScriptPython; + styler.ColourTo(i, SCE_H_ASP); + if (foldHTMLPreprocessor && chNext == '%') + levelCurrent++; + + ch = static_cast(styler.SafeGetCharAt(i)); + continue; + } + // handle the start of ASP pre-processor = Non-HTML - else if (!isCommentASPState(state) && (ch == '<') && (chNext == '%') && !isPHPStringState(state)) { + else if (!isMako && !isDjango && !isCommentASPState(state) && (ch == '<') && (chNext == '%') && !isPHPStringState(state)) { styler.ColourTo(i - 1, StateToPrint); beforePreProc = state; if (inScriptType == eNonHtmlScript) @@ -901,12 +1040,72 @@ continue; } + // handle the end of Mako Python code + else if (isMako && + ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && + (scriptLanguage != eScriptNone) && stateAllowsTermination(state) && + isMakoBlockEnd(ch, chNext, makoBlockType)) { + if (state == SCE_H_ASPAT) { + aspScript = segIsScriptingIndicator(styler, + styler.GetStartSegment(), i - 1, aspScript); + } + if (state == SCE_HP_WORD) { + classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType); + } else { + styler.ColourTo(i - 1, StateToPrint); + } + if (0 != strcmp(makoBlockType, "%") && (0 != strcmp(makoBlockType, "{")) && ch != '>') { + i++; + visibleChars++; + } + if (0 != strcmp(makoBlockType, "%")) { + styler.ColourTo(i, SCE_H_ASP); + } + state = beforePreProc; + if (inScriptType == eNonHtmlScriptPreProc) + inScriptType = eNonHtmlScript; + else + inScriptType = eHtml; + if (foldHTMLPreprocessor && ch != '\n' && ch != '\r') { + levelCurrent--; + } + scriptLanguage = eScriptNone; + continue; + } + + // handle the end of Django template code + else if (isDjango && + ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && + (scriptLanguage != eScriptNone) && stateAllowsTermination(state) && + isDjangoBlockEnd(ch, chNext, djangoBlockType)) { + if (state == SCE_H_ASPAT) { + aspScript = segIsScriptingIndicator(styler, + styler.GetStartSegment(), i - 1, aspScript); + } + if (state == SCE_HP_WORD) { + classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType); + } else { + styler.ColourTo(i - 1, StateToPrint); + } + i += 1; + visibleChars += 1; + styler.ColourTo(i, SCE_H_ASP); + state = beforePreProc; + if (inScriptType == eNonHtmlScriptPreProc) + inScriptType = eNonHtmlScript; + else + inScriptType = eHtml; + if (foldHTMLPreprocessor) { + levelCurrent--; + } + scriptLanguage = beforeLanguage; + continue; + } + // handle the end of a pre-processor = Non-HTML - else if (( - ((inScriptType == eNonHtmlPreProc) - || (inScriptType == eNonHtmlScriptPreProc)) && ( - ((scriptLanguage != eScriptNone) && stateAllowsTermination(state) && ((ch == '%') || (ch == '?'))) - ) && (chNext == '>')) || + else if ((!isMako && !isDjango && ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && + (((scriptLanguage != eScriptNone) && stateAllowsTermination(state))) && + (((ch == '%') || (ch == '?')) && (chNext == '>'))) || ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) { if (state == SCE_H_ASPAT) { aspScript = segIsScriptingIndicator(styler, diff -Nru geany-0.18/scintilla/LexMarkdown.cxx geany-0.19/scintilla/LexMarkdown.cxx --- geany-0.18/scintilla/LexMarkdown.cxx 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/scintilla/LexMarkdown.cxx 2010-03-09 17:07:53.000000000 +0000 @@ -18,8 +18,7 @@ * there is a following blank line issue that can't be ignored, * explained in the next paragraph. Embedded HTML and code * blocks would be better supported with language specific - * highlighting; something Scintilla isn't really architected - * to support yet. + * highlighting. * * The highlighting aims to accurately reflect correct syntax, * but a few restrictions are relaxed. Delimited code blocks are @@ -30,8 +29,8 @@ * * Written by Jon Strait - jstrait@moonloop.net * - * This source code is released for free distribution under the - * terms of the GNU General Public License. + * The License.txt file describes the conditions under which this + * software may be distributed. * *****************************************************************/ @@ -59,8 +58,8 @@ } // True if can follow ch down to the end with possibly trailing whitespace -static bool FollowToLineEnd(const int ch, const int state, const int endPos, StyleContext &sc) { - int i = 0; +static bool FollowToLineEnd(const int ch, const int state, const unsigned int endPos, StyleContext &sc) { + unsigned int i = 0; while (sc.GetRelative(++i) == ch) ; // Skip over whitespace @@ -78,13 +77,12 @@ // Set the state on text section from current to length characters, // then set the rest until the newline to default, except for any characters matching token static void SetStateAndZoom(const int state, const int length, const int token, StyleContext &sc) { - int i = 0; sc.SetState(state); sc.Forward(length); sc.SetState(SCE_MARKDOWN_DEFAULT); sc.Forward(); + bool started = false; while (sc.More() && !IsNewline(sc.ch)) { - bool started = false; if (sc.ch == token && !started) { sc.SetState(state); started = true; @@ -113,8 +111,9 @@ return false; } -static bool IsValidHrule(const int endPos, StyleContext &sc) { - int c, i = 0, count = 1; +static bool IsValidHrule(const unsigned int endPos, StyleContext &sc) { + int c, count = 1; + unsigned int i = 0; while (++i) { c = sc.GetRelative(i); if (c == sc.ch) @@ -131,35 +130,17 @@ } else { sc.SetState(SCE_MARKDOWN_DEFAULT); - return false; + return false; } } } -} - -// Only consume if already valid. Doesn't work for delimiting multiple lines. -static void ConsumeEnd(const int state, const int origPos, const int endPos, - const char *token, StyleContext &sc) { - int targetPos; - while (sc.currentPos + 1 < endPos) { - sc.Forward(); - if (sc.Match(token) && sc.chPrev != '\\' && sc.chPrev != ' ') { - targetPos = sc.currentPos + strlen(token); - sc.currentPos = origPos; - sc.SetState(state); - sc.Forward(targetPos - origPos); - sc.SetState(SCE_MARKDOWN_DEFAULT); - break; - } - } + return false; } static void ColorizeMarkdownDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler) { - - int digitCount = 0; - int endPos = startPos + length; - int precharCount; + WordList **, Accessor &styler) { + unsigned int endPos = startPos + length; + int precharCount = 0; // Don't advance on a new loop iteration and retry at the same position. // Useful in the corner case of having to start at the beginning file position // in the default state. @@ -330,7 +311,7 @@ } // Ordered list else if (IsADigit(sc.ch)) { - digitCount = 0; + int digitCount = 0; while (IsADigit(sc.GetRelative(++digitCount))) ; if (sc.GetRelative(digitCount) == '.' && @@ -354,7 +335,6 @@ // New state anywhere in doc if (sc.state == SCE_MARKDOWN_DEFAULT) { - int origPos = sc.currentPos; if (sc.atLineStart && sc.ch == '#') { sc.SetState(SCE_MARKDOWN_LINE_BEGIN); freezeCursor = true; @@ -430,4 +410,3 @@ } LexerModule lmMarkdown(SCLEX_MARKDOWN, ColorizeMarkdownDoc, "markdown"); - diff -Nru geany-0.18/scintilla/LexNsis.cxx geany-0.19/scintilla/LexNsis.cxx --- geany-0.18/scintilla/LexNsis.cxx 2008-12-21 20:31:09.000000000 +0000 +++ geany-0.19/scintilla/LexNsis.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -13,6 +13,7 @@ #include "Platform.h" +#include "CharClassify.h" #include "PropSet.h" #include "Accessor.h" #include "KeyWords.h" @@ -77,7 +78,7 @@ } } - if( nNextLine == -1 ) // We never foudn the next line... + if( nNextLine == -1 ) // We never found the next line... return false; for( unsigned int firstChar = nNextLine; firstChar < end; firstChar++ ) @@ -145,7 +146,7 @@ if( s[0] == '!' ) { - if( NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!if", bIgnoreCase ) == 0 || NsisCmp(s, "!macro", bIgnoreCase ) == 0 ) + if( NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifmacrodef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifmacrondef", bIgnoreCase ) == 0 || NsisCmp(s, "!if", bIgnoreCase ) == 0 || NsisCmp(s, "!macro", bIgnoreCase ) == 0 ) newFoldlevel++; else if( NsisCmp(s, "!endif", bIgnoreCase) == 0 || NsisCmp(s, "!macroend", bIgnoreCase ) == 0 ) newFoldlevel--; @@ -190,16 +191,16 @@ } // Check for special words... - if( NsisCmp(s, "!macro", bIgnoreCase ) == 0 || NsisCmp(s, "!macroend", bIgnoreCase) == 0 ) // Covers !micro and !microend + if( NsisCmp(s, "!macro", bIgnoreCase ) == 0 || NsisCmp(s, "!macroend", bIgnoreCase) == 0 ) // Covers !macro and !macroend return SCE_NSIS_MACRODEF; - if( NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!endif", bIgnoreCase) == 0 ) + if( NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!endif", bIgnoreCase) == 0 ) // Covers !ifdef, !ifndef and !endif return SCE_NSIS_IFDEFINEDEF; - if( NsisCmp(s, "!else", bIgnoreCase ) == 0 ) // || NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!endif", bIgnoreCase) == 0 ) + if( NsisCmp(s, "!if", bIgnoreCase ) == 0 || NsisCmp(s, "!else", bIgnoreCase ) == 0 ) // Covers !if and else return SCE_NSIS_IFDEFINEDEF; - if( NsisCmp(s, "!if", bIgnoreCase ) == 0 ) + if (NsisCmp(s, "!ifmacrodef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifmacrondef", bIgnoreCase ) == 0 ) // Covers !ifmacrodef and !ifnmacrodef return SCE_NSIS_IFDEFINEDEF; if( NsisCmp(s, "SectionGroup", bIgnoreCase) == 0 || NsisCmp(s, "SectionGroupEnd", bIgnoreCase) == 0 ) // Covers SectionGroup and SectionGroupEnd diff -Nru geany-0.18/scintilla/LexOthers.cxx geany-0.19/scintilla/LexOthers.cxx --- geany-0.18/scintilla/LexOthers.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/LexOthers.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -14,6 +14,7 @@ #include "Platform.h" +#include "CharClassify.h" #include "PropSet.h" #include "Accessor.h" #include "KeyWords.h" @@ -36,6 +37,10 @@ return (ch >= '1') && (ch <= '9'); } +static bool IsAlphabetic(int ch) { + return isascii(ch) && isalpha(ch); +} + static inline bool AtEOL(Accessor &styler, unsigned int i) { return (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')); @@ -100,7 +105,7 @@ } return; // Check for Drive Change (Drive Change is internal command) - return if found - } else if ((isalpha(lineBuffer[offset])) && + } else if ((IsAlphabetic(lineBuffer[offset])) && (lineBuffer[offset + 1] == ':') && ((isspacechar(lineBuffer[offset + 2])) || (((lineBuffer[offset + 2] == '\\')) && @@ -722,10 +727,10 @@ unsigned int linePos = 0; unsigned int startLine = startPos; - // property lexer.props.allow.initial.spaces - // For properties files, set to 0 to style all lines that start with whitespace in the default style. - // This is not suitable for SciTE .properties files which use indentation for flow control but - // can be used for RFC2822 text where indentation is used for continuation lines. + // property lexer.props.allow.initial.spaces + // For properties files, set to 0 to style all lines that start with whitespace in the default style. + // This is not suitable for SciTE .properties files which use indentation for flow control but + // can be used for RFC2822 text where indentation is used for continuation lines. bool allowInitialSpaces = styler.GetPropertyInt("lexer.props.allow.initial.spaces", 1) != 0; for (unsigned int i = startPos; i < startPos + length; i++) { @@ -960,17 +965,17 @@ } else if (strstart(lineBuffer, "Warning ")) { // Borland warning message return SCE_ERR_BORLAND; - } else if (strstr(lineBuffer, "at line " ) && - (strstr(lineBuffer, "at line " ) < (lineBuffer + lengthLine)) && + } else if (strstr(lineBuffer, "at line ") && + (strstr(lineBuffer, "at line ") < (lineBuffer + lengthLine)) && strstr(lineBuffer, "file ") && (strstr(lineBuffer, "file ") < (lineBuffer + lengthLine))) { // Lua 4 error message return SCE_ERR_LUA; - } else if (strstr(lineBuffer, " at " ) && - (strstr(lineBuffer, " at " ) < (lineBuffer + lengthLine)) && + } else if (strstr(lineBuffer, " at ") && + (strstr(lineBuffer, " at ") < (lineBuffer + lengthLine)) && strstr(lineBuffer, " line ") && (strstr(lineBuffer, " line ") < (lineBuffer + lengthLine)) && - (strstr(lineBuffer, " at " ) < (strstr(lineBuffer, " line ")))) { + (strstr(lineBuffer, " at ") < (strstr(lineBuffer, " line ")))) { // perl error message return SCE_ERR_PERL; } else if ((memcmp(lineBuffer, " at ", 6) == 0) && @@ -1064,7 +1069,7 @@ numstep = 1; // ch was ' ', handle as if it's a delphi errorline, only add 1 to i. else numstep = 2; // otherwise add 2. - for (j = i + numstep; j < lengthLine && isalpha(lineBuffer[j]) && chPos < sizeof(word) - 1; j++) + for (j = i + numstep; j < lengthLine && IsAlphabetic(lineBuffer[j]) && chPos < sizeof(word) - 1; j++) word[chPos++] = lineBuffer[j]; word[chPos] = 0; if (!CompareCaseInsensitive(word, "error") || !CompareCaseInsensitive(word, "warning") || @@ -1130,11 +1135,11 @@ styler.StartSegment(startPos); unsigned int linePos = 0; - // property lexer.errorlist.value.separate - // For lines in the output pane that are matches from Find in Files or GCC-style - // diagnostics, style the path and line number separately from the rest of the - // line with style 21 used for the rest of the line. - // This allows matched text to be more easily distinguished from its location. + // property lexer.errorlist.value.separate + // For lines in the output pane that are matches from Find in Files or GCC-style + // diagnostics, style the path and line number separately from the rest of the + // line with style 21 used for the rest of the line. + // This allows matched text to be more easily distinguished from its location. bool valueSeparate = styler.GetPropertyInt("lexer.errorlist.value.separate", 0) != 0; for (unsigned int i = startPos; i < startPos + length; i++) { lineBuffer[linePos++] = styler[i]; @@ -1251,13 +1256,13 @@ styler.ColourTo(lengthDoc-1, state); } -static const char * const batchWordListDesc[] = { +static const char *const batchWordListDesc[] = { "Internal Commands", "External Commands", 0 }; -static const char * const emptyWordListDesc[] = { +static const char *const emptyWordListDesc[] = { 0 }; diff -Nru geany-0.18/scintilla/LexPerl.cxx geany-0.19/scintilla/LexPerl.cxx --- geany-0.18/scintilla/LexPerl.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/LexPerl.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -1243,7 +1243,7 @@ else if (styler.Match(i, "=head")) isPodHeading = true; } else if (style == SCE_PL_DATASECTION) { - if (ch == '=' && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE) + if (ch == '=' && isascii(chNext) && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE) levelCurrent++; else if (styler.Match(i, "=cut") && levelCurrent > SC_FOLDLEVELBASE) levelCurrent--; diff -Nru geany-0.18/scintilla/LexPython.cxx geany-0.19/scintilla/LexPython.cxx --- geany-0.18/scintilla/LexPython.cxx 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/LexPython.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -36,7 +36,7 @@ enum literalsAllowed { litNone=0, litU=1, litB=2}; static bool IsPyStringTypeChar(int ch, literalsAllowed allowed) { - return + return ((allowed & litB) && (ch == 'b' || ch == 'B')) || ((allowed & litU) && (ch == 'u' || ch == 'U')); } @@ -136,13 +136,13 @@ WordList &keywords2 = *keywordlists[1]; // property tab.timmy.whinge.level - // For Python code, checks whether indenting is consistent. - // The default, 0 turns off indentation checking, - // 1 checks whether each line is potentially inconsistent with the previous line, - // 2 checks whether any space characters occur before a tab character in the indentation, - // 3 checks whether any spaces are in the indentation, and + // For Python code, checks whether indenting is consistent. + // The default, 0 turns off indentation checking, + // 1 checks whether each line is potentially inconsistent with the previous line, + // 2 checks whether any space characters occur before a tab character in the indentation, + // 3 checks whether any spaces are in the indentation, and // 4 checks for any tab characters in the indentation. - // 1 is a good level to use. + // 1 is a good level to use. const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level"); // property lexer.python.literals.binary @@ -158,6 +158,10 @@ if (styler.GetPropertyInt("lexer.python.strings.b", 1)) allowedLiterals = static_cast(allowedLiterals | litB); + // property lexer.python.strings.over.newline + // Set to 1 to allow strings to span newline characters. + bool stringsOverNewline = styler.GetPropertyInt("lexer.python.strings.over.newline") != 0; + initStyle = initStyle & 31; if (initStyle == SCE_P_STRINGEOL) { initStyle = SCE_P_DEFAULT; @@ -204,7 +208,7 @@ } lineCurrent++; if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) { - if (inContinuedString) { + if (inContinuedString || stringsOverNewline) { inContinuedString = false; } else { sc.ChangeState(SCE_P_STRINGEOL); @@ -349,7 +353,7 @@ if (sc.ch == '0' && (sc.chNext == 'x' || sc.chNext == 'X')) { base_n_number = true; sc.SetState(SCE_P_NUMBER); - } else if (sc.ch == '0' && + } else if (sc.ch == '0' && (sc.chNext == 'o' || sc.chNext == 'O' || sc.chNext == 'b' || sc.chNext == 'B')) { if (base2or8Literals) { base_n_number = true; @@ -416,6 +420,8 @@ // This option enables folding multi-line quoted strings when using the Python lexer. const bool foldQuotes = styler.GetPropertyInt("fold.quotes.python") != 0; + const bool foldCompact = styler.GetPropertyInt("fold.compact") != 0; + // Backtrack to previous non-blank line so we can determine indent level // for any white space lines (needed esp. within triple quoted strings) // and so we can fix any preceding fold level (which is why we go back @@ -514,16 +520,25 @@ while (--skipLine > lineCurrent) { int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL); - if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments) - skipLevel = levelBeforeComments; + if (foldCompact) { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments) + skipLevel = levelBeforeComments; + + int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; + + styler.SetLevel(skipLine, skipLevel | whiteFlag); + } else { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments && + !(skipLineIndent & SC_FOLDLEVELWHITEFLAG) && + !IsCommentLine(skipLine, styler)) + skipLevel = levelBeforeComments; - int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; - - styler.SetLevel(skipLine, skipLevel | whiteFlag); + styler.SetLevel(skipLine, skipLevel); + } } // Set fold header on non-quote/non-comment line - if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) { + if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) lev |= SC_FOLDLEVELHEADERFLAG; } @@ -543,7 +558,7 @@ //styler.SetLevel(lineCurrent, indentCurrent); } -static const char * const pythonWordListDesc[] = { +static const char *const pythonWordListDesc[] = { "Keywords", "Highlighted identifiers", 0 diff -Nru geany-0.18/scintilla/LexR.cxx geany-0.19/scintilla/LexR.cxx --- geany-0.18/scintilla/LexR.cxx 2008-09-26 13:23:59.000000000 +0100 +++ geany-0.19/scintilla/LexR.cxx 2010-02-28 12:56:19.000000000 +0000 @@ -77,9 +77,9 @@ sc.SetState(SCE_R_DEFAULT); } } else if (sc.state == SCE_R_IDENTIFIER) { - if (!IsAWordChar(sc.ch) || (sc.ch == '.')) { + if (!IsAWordChar(sc.ch)) { char s[100]; - sc.GetCurrentLowered(s, sizeof(s)); + sc.GetCurrent(s, sizeof(s)); if (keywords.InList(s)) { sc.ChangeState(SCE_R_KWORD); } else if (keywords2.InList(s)) { diff -Nru geany-0.18/scintilla/LexSQL.cxx geany-0.19/scintilla/LexSQL.cxx --- geany-0.18/scintilla/LexSQL.cxx 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/LexSQL.cxx 2010-03-07 10:31:51.000000000 +0000 @@ -231,6 +231,10 @@ bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0; + // property fold.sql.exists + // Enables "EXISTS" to end a fold as is started by "IF" in "DROP TABLE IF EXISTS". + bool foldSqlExists = styler.GetPropertyInt("fold.sql.exists", 1) != 0; + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -303,9 +307,13 @@ } } else if (strcmp(s, "begin") == 0) { levelNext++; - } else if (strcmp(s, "end") == 0 || - // DROP TABLE IF EXISTS or CREATE TABLE IF NOT EXISTS - strcmp(s, "exists") == 0) { + } else if ((strcmp(s, "end") == 0) || +// // DROP TABLE IF EXISTS or CREATE TABLE IF NOT EXISTS + (foldSqlExists && (strcmp(s, "exists") == 0)) || +// // SQL Anywhere permits IF ... ELSE ... ENDIF +// // will only be active if "endif" appears in the +// // keyword list. + (strcmp(s, "endif") == 0)) { endFound = true; levelNext--; if (levelNext < SC_FOLDLEVELBASE) { diff -Nru geany-0.18/scintilla/LexVerilog.cxx geany-0.19/scintilla/LexVerilog.cxx --- geany-0.18/scintilla/LexVerilog.cxx 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/scintilla/LexVerilog.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -0,0 +1,330 @@ +// Scintilla source code edit control +/** @file LexVerilog.cxx + ** Lexer for Verilog. + ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson + **/ +// Copyright 1998-2002 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. + +#include +#include +#include +#include +#include + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\''); +} + +static inline bool IsAWordStart(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '$'); +} + +static void ColouriseVerilogDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + + WordList &keywords = *keywordlists[0]; + WordList &keywords2 = *keywordlists[1]; + WordList &keywords3 = *keywordlists[2]; + WordList &keywords4 = *keywordlists[3]; + + // Do not leak onto next line + if (initStyle == SCE_V_STRINGEOL) + initStyle = SCE_V_DEFAULT; + + StyleContext sc(startPos, length, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + if (sc.atLineStart && (sc.state == SCE_V_STRING)) { + // Prevent SCE_V_STRINGEOL from leaking back to previous line + sc.SetState(SCE_V_STRING); + } + + // Handle line continuation generically. + if (sc.ch == '\\') { + if (sc.chNext == '\n' || sc.chNext == '\r') { + sc.Forward(); + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + continue; + } + } + + // Determine if the current state should terminate. + if (sc.state == SCE_V_OPERATOR) { + sc.SetState(SCE_V_DEFAULT); + } else if (sc.state == SCE_V_NUMBER) { + if (!IsAWordChar(sc.ch)) { + sc.SetState(SCE_V_DEFAULT); + } + } else if (sc.state == SCE_V_IDENTIFIER) { + if (!IsAWordChar(sc.ch) || (sc.ch == '.')) { + char s[100]; + sc.GetCurrent(s, sizeof(s)); + if (keywords.InList(s)) { + sc.ChangeState(SCE_V_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_V_WORD2); + } else if (keywords3.InList(s)) { + sc.ChangeState(SCE_V_WORD3); + } else if (keywords4.InList(s)) { + sc.ChangeState(SCE_V_USER); + } + sc.SetState(SCE_V_DEFAULT); + } + } else if (sc.state == SCE_V_PREPROCESSOR) { + if (!IsAWordChar(sc.ch)) { + sc.SetState(SCE_V_DEFAULT); + } + } else if (sc.state == SCE_V_COMMENT) { + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_V_DEFAULT); + } + } else if (sc.state == SCE_V_COMMENTLINE || sc.state == SCE_V_COMMENTLINEBANG) { + if (sc.atLineStart) { + sc.SetState(SCE_V_DEFAULT); + } + } else if (sc.state == SCE_V_STRING) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_V_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_V_STRINGEOL); + sc.ForwardSetState(SCE_V_DEFAULT); + } + } + + // Determine if a new state should be entered. + if (sc.state == SCE_V_DEFAULT) { + if (IsADigit(sc.ch) || (sc.ch == '\'') || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_V_NUMBER); + } else if (IsAWordStart(sc.ch)) { + sc.SetState(SCE_V_IDENTIFIER); + } else if (sc.Match('/', '*')) { + sc.SetState(SCE_V_COMMENT); + sc.Forward(); // Eat the * so it isn't used for the end of the comment + } else if (sc.Match('/', '/')) { + if (sc.Match("//!")) // Nice to have a different comment style + sc.SetState(SCE_V_COMMENTLINEBANG); + else + sc.SetState(SCE_V_COMMENTLINE); + } else if (sc.ch == '\"') { + sc.SetState(SCE_V_STRING); + } else if (sc.ch == '`') { + sc.SetState(SCE_V_PREPROCESSOR); + // Skip whitespace between ` and preprocessor word + do { + sc.Forward(); + } while ((sc.ch == ' ' || sc.ch == '\t') && sc.More()); + if (sc.atLineEnd) { + sc.SetState(SCE_V_DEFAULT); + } + } else if (isoperator(static_cast(sc.ch)) || sc.ch == '@' || sc.ch == '#') { + sc.SetState(SCE_V_OPERATOR); + } + } + } + sc.Complete(); +} + +static bool IsStreamCommentStyle(int style) { + return style == SCE_V_COMMENT; +} + +static bool IsCommentLine(int line, Accessor &styler) { + int pos = styler.LineStart(line); + int eolPos = styler.LineStart(line + 1) - 1; + for (int i = pos; i < eolPos; i++) { + char ch = styler[i]; + char chNext = styler.SafeGetCharAt(i + 1); + int style = styler.StyleAt(i); + if (ch == '/' && chNext == '/' && + (style == SCE_V_COMMENTLINE || style == SCE_V_COMMENTLINEBANG)) { + return true; + } else if (!IsASpaceOrTab(ch)) { + return false; + } + } + return false; +} +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "} else {". +static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle, + Accessor &styler) { + bool foldComment = styler.GetPropertyInt("fold.comment") != 0; + bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; + // Verilog specific folding options: + // fold_at_module - + // Generally used methodology in verilog code is + // one module per file, so folding at module definition is useless. + // fold_at_brace/parenthese - + // Folding of long port lists can be convenient. + bool foldAtModule = styler.GetPropertyInt("fold.verilog.flags", 0) != 0; + bool foldAtBrace = 1; + bool foldAtParenthese = 1; + + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; + int levelMinCurrent = levelCurrent; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int stylePrev = style; + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (foldComment && IsStreamCommentStyle(style)) { + if (!IsStreamCommentStyle(stylePrev)) { + levelNext++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + // Comments don't end at end of line and the next character may be unstyled. + levelNext--; + } + } + if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) + { + if (!IsCommentLine(lineCurrent - 1, styler) + && IsCommentLine(lineCurrent + 1, styler)) + levelNext++; + else if (IsCommentLine(lineCurrent - 1, styler) + && !IsCommentLine(lineCurrent+1, styler)) + levelNext--; + } + if (foldComment && (style == SCE_V_COMMENTLINE)) { + if ((ch == '/') && (chNext == '/')) { + char chNext2 = styler.SafeGetCharAt(i + 2); + if (chNext2 == '{') { + levelNext++; + } else if (chNext2 == '}') { + levelNext--; + } + } + } + if (foldPreprocessor && (style == SCE_V_PREPROCESSOR)) { + if (ch == '`') { + unsigned int j = i + 1; + while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) { + j++; + } + if (styler.Match(j, "if")) { + levelNext++; + } else if (styler.Match(j, "end")) { + levelNext--; + } + } + } + if (style == SCE_V_OPERATOR) { + if (foldAtParenthese) { + if (ch == '(') { + levelNext++; + } else if (ch == ')') { + levelNext--; + } + } + } + if (style == SCE_V_OPERATOR) { + if (foldAtBrace) { + if (ch == '{') { + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + } + if (style == SCE_V_WORD && stylePrev != SCE_V_WORD) { + unsigned int j = i; + if (styler.Match(j, "case") || + styler.Match(j, "casex") || + styler.Match(j, "casez") || + styler.Match(j, "function") || + styler.Match(j, "fork") || + styler.Match(j, "table") || + styler.Match(j, "task") || + styler.Match(j, "generate") || + styler.Match(j, "specify") || + styler.Match(j, "primitive") || + (styler.Match(j, "module") && foldAtModule) || + styler.Match(j, "begin")) { + levelNext++; + } else if (styler.Match(j, "endcase") || + styler.Match(j, "endfunction") || + styler.Match(j, "join") || + styler.Match(j, "endtask") || + styler.Match(j, "endgenerate") || + styler.Match(j, "endtable") || + styler.Match(j, "endspecify") || + styler.Match(j, "endprimitive") || + (styler.Match(j, "endmodule") && foldAtModule) || + (styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3)))) { + levelNext--; + } + } + if (atEOL) { + int levelUse = levelCurrent; + if (foldAtElse) { + levelUse = levelMinCurrent; + } + int lev = levelUse | levelNext << 16; + if (visibleChars == 0 && foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelCurrent = levelNext; + levelMinCurrent = levelCurrent; + visibleChars = 0; + } + if (!isspacechar(ch)) + visibleChars++; + } +} + +static void FoldVerilogDoc(unsigned int startPos, int length, int initStyle, WordList *[], + Accessor &styler) { + FoldNoBoxVerilogDoc(startPos, length, initStyle, styler); +} + +static const char * const verilogWordLists[] = { + "Primary keywords and identifiers", + "Secondary keywords and identifiers", + "System Tasks", + "User defined tasks and identifiers", + "Unused", + 0, + }; + + +LexerModule lmVerilog(SCLEX_VERILOG, ColouriseVerilogDoc, "verilog", FoldVerilogDoc, verilogWordLists); diff -Nru geany-0.18/scintilla/LexVHDL.cxx geany-0.19/scintilla/LexVHDL.cxx --- geany-0.18/scintilla/LexVHDL.cxx 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.19/scintilla/LexVHDL.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -1,9 +1,9 @@ // Scintilla source code edit control /** @file LexVHDL.cxx ** Lexer for VHDL - ** Written by Phil Reid, + ** Written by Phil Reid, ** Based on: - ** - The Verilog Lexer by Avi Yegudin + ** - The Verilog Lexer by Avi Yegudin ** - The Fortran Lexer by Chuan-jian Shen ** - The C++ lexer by Neil Hodgson **/ @@ -126,7 +126,7 @@ sc.SetState(SCE_VHDL_IDENTIFIER); } else if (sc.Match('-', '-')) { sc.SetState(SCE_VHDL_COMMENT); - sc.Forward(); + sc.Forward(); } else if (sc.Match('-', '-')) { if (sc.Match("--!")) // Nice to have a different comment style sc.SetState(SCE_VHDL_COMMENTLINEBANG); @@ -161,7 +161,7 @@ static void FoldNoBoxVHDLDoc( unsigned int startPos, int length, - int initStyle, + int, Accessor &styler) { // Decided it would be smarter to have the lexer have all keywords included. Therefore I @@ -249,7 +249,6 @@ char chPrev = '\0'; char chNextNonBlank; int styleNext = styler.StyleAt(startPos); - int style = initStyle; //Platform::DebugPrintf("Line[%04d] Prev[%20s] ************************* Level[%x]\n", lineCurrent+1, prevWord, levelCurrent); /***************************************/ @@ -265,16 +264,16 @@ j ++ ; chNextNonBlank = styler.SafeGetCharAt(j); } - style = styleNext; + int style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) + if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) { if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler)) { levelNext++; - } + } else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler)) { levelNext--; @@ -380,7 +379,7 @@ ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "function") == 0)) || ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "procedure") == 0))) { - levelMinCurrentBegin = levelNext - 1; + levelMinCurrentBegin = levelNext - 1; } //Platform::DebugPrintf("Line[%04d] Prev[%20s] Cur[%20s] Level[%x]\n", lineCurrent+1, prevWord, s, levelCurrent); strcpy(prevWord, s); @@ -444,34 +443,34 @@ // Keyword: -// access after alias all architecture array assert attribute begin block body buffer bus case component -// configuration constant disconnect downto else elsif end entity exit file for function generate generic -// group guarded if impure in inertial inout is label library linkage literal loop map new next null of -// on open others out package port postponed procedure process pure range record register reject report -// return select severity shared signal subtype then to transport type unaffected units until use variable +// access after alias all architecture array assert attribute begin block body buffer bus case component +// configuration constant disconnect downto else elsif end entity exit file for function generate generic +// group guarded if impure in inertial inout is label library linkage literal loop map new next null of +// on open others out package port postponed procedure process pure range record register reject report +// return select severity shared signal subtype then to transport type unaffected units until use variable // wait when while with // // Operators: // abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor // // Attributes: -// left right low high ascending image value pos val succ pred leftof rightof base range reverse_range -// length delayed stable quiet transaction event active last_event last_active last_value driving +// left right low high ascending image value pos val succ pred leftof rightof base range reverse_range +// length delayed stable quiet transaction event active last_event last_active last_value driving // driving_value simple_name path_name instance_name // // Std Functions: -// now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector -// to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left +// now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector +// to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left // rotate_right resize to_integer to_unsigned to_signed std_match to_01 // // Std Packages: -// std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed -// std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives +// std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed +// std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives // vital_timing // // Std Types: -// boolean bit character severity_level integer real time delay_length natural positive string bit_vector -// file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic +// boolean bit character severity_level integer real time delay_length natural positive string bit_vector +// file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic // std_logic_vector X01 X01Z UX01 UX01Z unsigned signed // diff -Nru geany-0.18/scintilla/LineMarker.cxx geany-0.19/scintilla/LineMarker.cxx --- geany-0.18/scintilla/LineMarker.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/LineMarker.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -31,7 +31,7 @@ markType = SC_MARK_PIXMAP; } -void LineMarker::SetXPM(const char * const *linesForm) { +void LineMarker::SetXPM(const char *const *linesForm) { delete pxpm; pxpm = new XPM(linesForm); markType = SC_MARK_PIXMAP; @@ -154,7 +154,7 @@ rcSmall.bottom = rc.bottom - 2; surface->RectangleDraw(rcSmall, fore.allocated, back.allocated); - } else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND || + } else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND || markType == SC_MARK_UNDERLINE || markType == SC_MARK_AVAILABLE) { // An invisible marker so don't draw anything diff -Nru geany-0.18/scintilla/LineMarker.h geany-0.19/scintilla/LineMarker.h --- geany-0.18/scintilla/LineMarker.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/LineMarker.h 2010-06-06 19:34:26.000000000 +0100 @@ -51,7 +51,7 @@ } void RefreshColourPalette(Palette &pal, bool want); void SetXPM(const char *textForm); - void SetXPM(const char * const *linesForm); + void SetXPM(const char *const *linesForm); void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter); }; diff -Nru geany-0.18/scintilla/Makefile.am geany-0.19/scintilla/Makefile.am --- geany-0.18/scintilla/Makefile.am 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/scintilla/Makefile.am 2010-06-06 19:36:23.000000000 +0100 @@ -13,7 +13,6 @@ LexCPP.cxx \ LexCaml.cxx \ LexCmake.cxx \ -LexCrontab.cxx \ LexCSS.cxx \ LexD.cxx \ LexFortran.cxx \ @@ -32,6 +31,7 @@ LexSQL.cxx \ LexTCL.cxx \ LexVHDL.cxx \ +LexVerilog.cxx \ LexYAML.cxx SRCS= \ @@ -53,6 +53,7 @@ RESearch.cxx \ RunStyles.cxx \ ScintillaBase.cxx \ +Selection.cxx \ StyleContext.cxx \ Style.cxx \ UniConversion.cxx \ @@ -81,10 +82,12 @@ Partitioning.h \ PerLine.h \ PositionCache.h \ +PropSetSimple.h \ RESearch.h \ RunStyles.h \ ScintillaBase.h \ scintilla-marshal.h \ +Selection.h \ SplitVector.h \ StyleContext.h \ Style.h \ diff -Nru geany-0.18/scintilla/Makefile.in geany-0.19/scintilla/Makefile.in --- geany-0.18/scintilla/Makefile.in 2009-08-16 18:29:21.000000000 +0100 +++ geany-0.19/scintilla/Makefile.in 2010-06-12 13:14:29.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@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 @@ -35,25 +37,32 @@ subdir = scintilla DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_$(V)) +am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) +am__v_AR_0 = @echo " AR " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ libscintilla_a_AR = $(AR) $(ARFLAGS) libscintilla_a_LIBADD = am__objects_1 = LexAda.$(OBJEXT) LexAsm.$(OBJEXT) LexBasic.$(OBJEXT) \ LexBash.$(OBJEXT) LexCPP.$(OBJEXT) LexCaml.$(OBJEXT) \ - LexCmake.$(OBJEXT) LexCrontab.$(OBJEXT) LexCSS.$(OBJEXT) \ - LexD.$(OBJEXT) LexFortran.$(OBJEXT) LexHaskell.$(OBJEXT) \ - LexHTML.$(OBJEXT) LexLua.$(OBJEXT) LexMarkdown.$(OBJEXT) \ - LexMatlab.$(OBJEXT) LexNsis.$(OBJEXT) LexOthers.$(OBJEXT) \ - LexPascal.$(OBJEXT) LexPerl.$(OBJEXT) LexPython.$(OBJEXT) \ - LexR.$(OBJEXT) LexRuby.$(OBJEXT) LexSQL.$(OBJEXT) \ - LexTCL.$(OBJEXT) LexVHDL.$(OBJEXT) LexYAML.$(OBJEXT) + LexCmake.$(OBJEXT) LexCSS.$(OBJEXT) LexD.$(OBJEXT) \ + LexFortran.$(OBJEXT) LexHaskell.$(OBJEXT) LexHTML.$(OBJEXT) \ + LexLua.$(OBJEXT) LexMarkdown.$(OBJEXT) LexMatlab.$(OBJEXT) \ + LexNsis.$(OBJEXT) LexOthers.$(OBJEXT) LexPascal.$(OBJEXT) \ + LexPerl.$(OBJEXT) LexPython.$(OBJEXT) LexR.$(OBJEXT) \ + LexRuby.$(OBJEXT) LexSQL.$(OBJEXT) LexTCL.$(OBJEXT) \ + LexVHDL.$(OBJEXT) LexVerilog.$(OBJEXT) LexYAML.$(OBJEXT) am__objects_2 = CallTip.$(OBJEXT) CellBuffer.$(OBJEXT) \ CharClassify.$(OBJEXT) ContractionState.$(OBJEXT) \ Decoration.$(OBJEXT) DocumentAccessor.$(OBJEXT) \ @@ -61,34 +70,56 @@ KeyMap.$(OBJEXT) KeyWords.$(OBJEXT) LineMarker.$(OBJEXT) \ PerLine.$(OBJEXT) PositionCache.$(OBJEXT) PropSet.$(OBJEXT) \ RESearch.$(OBJEXT) RunStyles.$(OBJEXT) ScintillaBase.$(OBJEXT) \ - StyleContext.$(OBJEXT) Style.$(OBJEXT) UniConversion.$(OBJEXT) \ - ViewStyle.$(OBJEXT) WindowAccessor.$(OBJEXT) XPM.$(OBJEXT) \ - AutoComplete.$(OBJEXT) ExternalLexer.$(OBJEXT) \ - PlatGTK.$(OBJEXT) ScintillaGTK.$(OBJEXT) \ - scintilla-marshal.$(OBJEXT) $(am__objects_1) + Selection.$(OBJEXT) StyleContext.$(OBJEXT) Style.$(OBJEXT) \ + UniConversion.$(OBJEXT) ViewStyle.$(OBJEXT) \ + WindowAccessor.$(OBJEXT) XPM.$(OBJEXT) AutoComplete.$(OBJEXT) \ + ExternalLexer.$(OBJEXT) PlatGTK.$(OBJEXT) \ + ScintillaGTK.$(OBJEXT) scintilla-marshal.$(OBJEXT) \ + $(am__objects_1) am_libscintilla_a_OBJECTS = $(am__objects_2) libscintilla_a_OBJECTS = $(am_libscintilla_a_OBJECTS) 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) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +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_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +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_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_$(V)) +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) +am__v_CXX_0 = @echo " CXX " $@; CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_$(V)) +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CXXLD_0 = @echo " CXXLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libscintilla_a_SOURCES) DIST_SOURCES = $(libscintilla_a_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -100,13 +131,42 @@ ps-recursive uninstall-recursive 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 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@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -184,6 +244,8 @@ 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@ @@ -260,7 +322,6 @@ LexCPP.cxx \ LexCaml.cxx \ LexCmake.cxx \ -LexCrontab.cxx \ LexCSS.cxx \ LexD.cxx \ LexFortran.cxx \ @@ -279,6 +340,7 @@ LexSQL.cxx \ LexTCL.cxx \ LexVHDL.cxx \ +LexVerilog.cxx \ LexYAML.cxx SRCS = \ @@ -300,6 +362,7 @@ RESearch.cxx \ RunStyles.cxx \ ScintillaBase.cxx \ +Selection.cxx \ StyleContext.cxx \ Style.cxx \ UniConversion.cxx \ @@ -328,10 +391,12 @@ Partitioning.h \ PerLine.h \ PositionCache.h \ +PropSetSimple.h \ RESearch.h \ RunStyles.h \ ScintillaBase.h \ scintilla-marshal.h \ +Selection.h \ SplitVector.h \ StyleContext.h \ Style.h \ @@ -358,9 +423,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scintilla/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scintilla/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scintilla/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu scintilla/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -378,13 +443,14 @@ 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): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) libscintilla.a: $(libscintilla_a_OBJECTS) $(libscintilla_a_DEPENDENCIES) - -rm -f libscintilla.a - $(libscintilla_a_AR) libscintilla.a $(libscintilla_a_OBJECTS) $(libscintilla_a_LIBADD) - $(RANLIB) libscintilla.a + $(AM_V_at)-rm -f libscintilla.a + $(AM_V_AR)$(libscintilla_a_AR) libscintilla.a $(libscintilla_a_OBJECTS) $(libscintilla_a_LIBADD) + $(AM_V_at)$(RANLIB) libscintilla.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -413,7 +479,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexCSS.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexCaml.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexCmake.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexCrontab.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexD.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexFortran.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexHTML.Po@am__quote@ @@ -431,6 +496,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexSQL.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexTCL.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexVHDL.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexVerilog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LexYAML.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LineMarker.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PerLine.Po@am__quote@ @@ -441,6 +507,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RunStyles.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScintillaBase.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScintillaGTK.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Selection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Style.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StyleContext.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UniConversion.Po@am__quote@ @@ -450,43 +517,49 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scintilla-marshal.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< .cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -504,7 +577,7 @@ # (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): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -521,7 +594,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -529,7 +602,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -555,16 +628,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -579,7 +652,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -591,7 +664,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -600,29 +673,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -643,29 +721,44 @@ 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + 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="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -695,6 +788,7 @@ 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" @@ -716,6 +810,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -724,18 +820,28 @@ 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 @@ -758,8 +864,8 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -780,6 +886,7 @@ marshallers: scintilla-marshal.list glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c + # 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-0.18/scintilla/makefile.win32 geany-0.19/scintilla/makefile.win32 --- geany-0.18/scintilla/makefile.win32 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/scintilla/makefile.win32 2010-06-06 19:36:23.000000000 +0100 @@ -60,8 +60,8 @@ #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ -LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ -LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o \ +LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexHTML.o LexOthers.o LexPascal.o \ +LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o LexVerilog.o\ LexMarkdown.o LexMatlab.o \ LexD.o LexLua.o LexHaskell.o LexBasic.o LexR.o LexYAML.o LexCmake.o LexNsis.o #--Autogenerated -- end of automatically generated section @@ -75,7 +75,7 @@ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o CharClassify.o XPM.o \ - RunStyles.o Decoration.o PositionCache.o PerLine.o \ + RunStyles.o Decoration.o PositionCache.o PerLine.o Selection.o \ $(MARSHALLER) $(LEXOBJS) $(AR) rc $@ $^ $(RANLIB) $@ diff -Nru geany-0.18/scintilla/Partitioning.h geany-0.19/scintilla/Partitioning.h --- geany-0.18/scintilla/Partitioning.h 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/Partitioning.h 2010-06-06 19:34:26.000000000 +0100 @@ -8,7 +8,7 @@ #ifndef PARTITIONING_H #define PARTITIONING_H -/// A split vector of integers with a method for adding a value to all elements +/// A split vector of integers with a method for adding a value to all elements /// in a range. /// Used by the Partitioning class. diff -Nru geany-0.18/scintilla/PerLine.cxx geany-0.19/scintilla/PerLine.cxx --- geany-0.18/scintilla/PerLine.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/PerLine.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -188,11 +188,14 @@ // No existing markers so allocate one element per line markers.InsertValue(0, lines, 0); } + if (line >= markers.Length()) { + return -1; + } if (!markers[line]) { // Need new structure to hold marker handle markers[line] = new MarkerHandleSet(); if (!markers[line]) - return - 1; + return -1; } markers[line]->InsertHandle(handleCurrent, markerNum); @@ -238,7 +241,7 @@ void LineLevels::InsertLine(int line) { if (levels.Length()) { int level = SC_FOLDLEVELBASE; - if ((line > 0) && (line < levels.Length())) { + if ((line > 0) && (line < levels.Length())) { level = levels[line-1] & ~SC_FOLDLEVELWHITEFLAG; } levels.InsertValue(line, 1, level); @@ -359,6 +362,7 @@ void LineAnnotation::InsertLine(int line) { if (annotations.Length()) { + annotations.EnsureLength(line); annotations.Insert(line, 0); } } @@ -417,7 +421,7 @@ delete []annotations[line]; } annotations[line] = AllocateAnnotation(strlen(text), style); - AnnotationHeader *pah = reinterpret_cast(annotations[line]); + AnnotationHeader *pah = reinterpret_cast(annotations[line]); pah->style = static_cast(style); pah->length = strlen(text); pah->lines = static_cast(NumberLines(text)); diff -Nru geany-0.18/scintilla/PerLine.h geany-0.19/scintilla/PerLine.h --- geany-0.18/scintilla/PerLine.h 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/PerLine.h 2010-06-06 19:34:26.000000000 +0100 @@ -11,7 +11,7 @@ #ifdef SCI_NAMESPACE namespace Scintilla { #endif - + /** * This holds the marker identifier and the marker type to display. * MarkerHandleNumbers are members of lists. diff -Nru geany-0.18/scintilla/PlatGTK.cxx geany-0.19/scintilla/PlatGTK.cxx --- geany-0.18/scintilla/PlatGTK.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/PlatGTK.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -31,10 +31,7 @@ with gdk_string_extents. */ #define FAST_WAY -#if GTK_MAJOR_VERSION >= 2 -#define USE_PANGO 1 #include "Converter.h" -#endif #ifdef _MSC_VER // Ignore unreferenced local functions in GTK+ headers @@ -105,21 +102,16 @@ public: int ascent; GdkFont *pfont; -#ifdef USE_PANGO PangoFontDescription *pfd; int characterSet; -#endif FontHandle(GdkFont *pfont_) { et = singleByte; ascent = 0; pfont = pfont_; -#ifdef USE_PANGO pfd = 0; characterSet = -1; -#endif ResetWidths(et); } -#ifdef USE_PANGO FontHandle(PangoFontDescription *pfd_, int characterSet_) { et = singleByte; ascent = 0; @@ -128,16 +120,13 @@ characterSet = characterSet_; ResetWidths(et); } -#endif ~FontHandle() { if (pfont) gdk_font_unref(pfont); pfont = 0; -#ifdef USE_PANGO if (pfd) pango_font_description_free(pfd); pfd = 0; -#endif } void ResetWidths(encodingType et_) { et = et_; @@ -352,12 +341,13 @@ char tmp[300]; char *d1 = NULL, *d2 = NULL, *d3 = NULL; strncpy(tmp, fontName, sizeof(tmp) - 1); + tmp[sizeof(tmp) - 1] = '\0'; d1 = strchr(tmp, '-'); // we know the first dash exists d2 = strchr(d1 + 1, '-'); if (d2) d3 = strchr(d2 + 1, '-'); - if (d3) { + if (d3 && d2) { // foundary-fontface-isoxxx-x *d2 = '\0'; foundary[0] = '-'; @@ -512,7 +502,6 @@ faceName[0] = '\0'; charset[0] = '\0'; -#ifdef USE_PANGO if (fontName[0] == '!') { PangoFontDescription *pfd = pango_font_description_new(); if (pfd) { @@ -523,7 +512,6 @@ return new FontHandle(pfd, characterSet); } } -#endif GdkFont *newid = 0; // If name of the font begins with a '-', assume, that it is @@ -666,7 +654,7 @@ Font::~Font() {} void Font::Create(const char *faceName, int characterSet, int size, - bool bold, bool italic, bool) { + bool bold, bool italic, int) { Release(); fid = FontCached::FindOrCreate(faceName, characterSet, size, bold, italic); } @@ -679,11 +667,9 @@ // Required on OS X #ifdef SCI_NAMESPACE -class Scintilla::SurfaceImpl : public Surface -#else -class SurfaceImpl : public Surface +namespace Scintilla { #endif -{ +class SurfaceImpl : public Surface { encodingType et; GdkDrawable *drawable; GdkGC *gc; @@ -692,13 +678,11 @@ int y; bool inited; bool createdGC; -#ifdef USE_PANGO PangoContext *pcontext; PangoLayout *layout; Converter conv; int characterSet; void SetConverter(int characterSet_); -#endif public: SurfaceImpl(); virtual ~SurfaceImpl(); @@ -745,6 +729,9 @@ void SetUnicodeMode(bool unicodeMode_); void SetDBCSMode(int codePage); }; +#ifdef SCI_NAMESPACE +} +#endif const char *CharacterSetID(int characterSet) { switch (characterSet) { @@ -795,22 +782,16 @@ } } -#ifdef USE_PANGO - void SurfaceImpl::SetConverter(int characterSet_) { if (characterSet != characterSet_) { characterSet = characterSet_; conv.Open("UTF-8", CharacterSetID(characterSet), false); } } -#endif SurfaceImpl::SurfaceImpl() : et(singleByte), drawable(0), gc(0), ppixmap(0), x(0), y(0), inited(false), createdGC(false) -#ifdef USE_PANGO -, pcontext(0), layout(0), characterSet(-1) -#endif -{ +, pcontext(0), layout(0), characterSet(-1) { } SurfaceImpl::~SurfaceImpl() { @@ -828,7 +809,6 @@ if (ppixmap) gdk_pixmap_unref(ppixmap); ppixmap = 0; -#ifdef USE_PANGO if (layout) g_object_unref(layout); layout = 0; @@ -837,7 +817,6 @@ pcontext = 0; conv.Close(); characterSet = -1; -#endif x = 0; y = 0; inited = false; @@ -848,34 +827,23 @@ return inited; } -// The WindowID argument is only used for Pango builds -#ifdef USE_PANGO -#define WID_NAME wid -#else -#define WID_NAME -#endif - -void SurfaceImpl::Init(WindowID WID_NAME) { +void SurfaceImpl::Init(WindowID wid) { Release(); -#ifdef USE_PANGO PLATFORM_ASSERT(wid); pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); PLATFORM_ASSERT(layout); -#endif inited = true; } -void SurfaceImpl::Init(SurfaceID sid, WindowID WID_NAME) { +void SurfaceImpl::Init(SurfaceID sid, WindowID wid) { PLATFORM_ASSERT(sid); GdkDrawable *drawable_ = reinterpret_cast(sid); Release(); -#ifdef USE_PANGO PLATFORM_ASSERT(wid); pcontext = gtk_widget_create_pango_context(PWidget(wid)); layout = pango_layout_new(pcontext); -#endif drawable = drawable_; gc = gdk_gc_new(drawable_); // Ask for lines that do not paint the last pixel so is like Win32 @@ -884,18 +852,16 @@ inited = true; } -void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID WID_NAME) { +void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID wid) { PLATFORM_ASSERT(surface_); Release(); SurfaceImpl *surfImpl = static_cast(surface_); PLATFORM_ASSERT(surfImpl->drawable); -#ifdef USE_PANGO PLATFORM_ASSERT(wid); pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); PLATFORM_ASSERT(layout); -#endif if (height > 0 && width > 0) ppixmap = gdk_pixmap_new(surfImpl->drawable, width, height, -1); drawable = ppixmap; @@ -1022,8 +988,6 @@ } } -#if GTK_MAJOR_VERSION >= 2 - // Plot a point into a guint32 buffer symetrically to all 4 qudrants static void AllFour(guint32 *pixels, int stride, int width, int height, int x, int y, guint32 val) { pixels[y*stride+x] = val; @@ -1044,20 +1008,6 @@ return co & 0xff; } -#endif - -#if GTK_MAJOR_VERSION < 2 -void SurfaceImpl::AlphaRectangle(PRectangle rc, int , ColourAllocated , int , ColourAllocated outline, int , int ) { - if (gc && drawable) { - // Can't use GdkPixbuf on GTK+ 1.x, so draw an outline rather than use alpha. - PenColour(outline); - gdk_draw_rectangle(drawable, gc, 0, - rc.left, rc.top, - rc.right - rc.left - 1, rc.bottom - rc.top - 1); - } -} -#else - static guint32 u32FromRGBA(guint8 r, guint8 g, guint8 b, guint8 a) { union { guint8 pixVal[4]; @@ -1081,9 +1031,9 @@ GdkPixbuf *pixalpha = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height); guint32 valEmpty = u32FromRGBA(0,0,0,0); - guint32 valFill = u32FromRGBA(GetRValue(fill.AsLong()), + guint32 valFill = u32FromRGBA(GetRValue(fill.AsLong()), GetGValue(fill.AsLong()), GetBValue(fill.AsLong()), alphaFill); - guint32 valOutline = u32FromRGBA(GetRValue(outline.AsLong()), + guint32 valOutline = u32FromRGBA(GetRValue(outline.AsLong()), GetGValue(outline.AsLong()), GetBValue(outline.AsLong()), alphaOutline); guint32 *pixels = reinterpret_cast(gdk_pixbuf_get_pixels(pixalpha)); int stride = gdk_pixbuf_get_rowstride(pixalpha) / 4; @@ -1113,8 +1063,6 @@ } } -#endif - void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) { PenColour(back); gdk_draw_arc(drawable, gc, 1, @@ -1168,7 +1116,6 @@ return utfForm; } -#ifdef USE_PANGO static char *UTF8FromIconv(const Converter &conv, const char *s, int &len) { if (conv) { char *utfForm = new char[len*3+1]; @@ -1253,8 +1200,6 @@ } } -#endif - // On GTK+, wchar_t is 4 bytes const int maxLengthTextRun = 10000; @@ -1264,7 +1209,6 @@ PenColour(fore); if (gc && drawable) { int xText = rc.left; -#ifdef USE_PANGO if (PFont(font_)->pfd) { char *utfForm = 0; bool useGFree = false; @@ -1287,7 +1231,11 @@ pango_layout_set_text(layout, utfForm, len); } pango_layout_set_font_description(layout, PFont(font_)->pfd); +#ifdef PANGO_VERSION + PangoLayoutLine *pll = pango_layout_get_line_readonly(layout,0); +#else PangoLayoutLine *pll = pango_layout_get_line(layout,0); +#endif gdk_draw_layout_line(drawable, gc, xText, ybase, pll); if (useGFree) { g_free(utfForm); @@ -1296,7 +1244,6 @@ } return; } -#endif // Draw text as a series of segments to avoid limitations in X servers const int segmentLength = 1000; bool draw8bit = true; @@ -1371,10 +1318,43 @@ } } +class ClusterIterator { + PangoLayoutIter *iter; + PangoRectangle pos; + int lenPositions; +public: + bool finished; + int positionStart; + int position; + int distance; + int curIndex; + ClusterIterator(PangoLayout *layout, int len) : lenPositions(len), finished(false), + positionStart(0), position(0), distance(0), curIndex(0) { + iter = pango_layout_get_iter(layout); + pango_layout_iter_get_cluster_extents(iter, NULL, &pos); + } + ~ClusterIterator() { + pango_layout_iter_free(iter); + } + + void Next() { + positionStart = position; + if (pango_layout_iter_next_cluster(iter)) { + pango_layout_iter_get_cluster_extents(iter, NULL, &pos); + position = PANGO_PIXELS(pos.x); + curIndex = pango_layout_iter_get_index(iter); + } else { + finished = true; + position = PANGO_PIXELS(pos.x + pos.width); + curIndex = lenPositions; + } + distance = position - positionStart; + } +}; + void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, int *positions) { if (font_.GetID()) { int totalWidth = 0; -#ifdef USE_PANGO const int lenPositions = len; if (PFont(font_)->pfd) { if (len == 1) { @@ -1384,32 +1364,24 @@ return; } } - PangoRectangle pos; pango_layout_set_font_description(layout, PFont(font_)->pfd); if (et == UTF8) { // Simple and direct as UTF-8 is native Pango encoding - pango_layout_set_text(layout, s, len); - PangoLayoutIter *iter = pango_layout_get_iter(layout); - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); int i = 0; - while (pango_layout_iter_next_cluster(iter)) { - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); - int position = PANGO_PIXELS(pos.x); - int curIndex = pango_layout_iter_get_index(iter); - int places = curIndex - i; - int distance = position - positions[i-1]; - while (i < curIndex) { + pango_layout_set_text(layout, s, len); + ClusterIterator iti(layout, lenPositions); + while (!iti.finished) { + iti.Next(); + int places = iti.curIndex - i; + while (i < iti.curIndex) { // Evenly distribute space among bytes of this cluster. // Would be better to find number of characters and then // divide evenly between characters with each byte of a character // being at the same position. - positions[i] = position - (curIndex - 1 - i) * distance / places; + positions[i] = iti.position - (iti.curIndex - 1 - i) * iti.distance / places; i++; } } - while (i < lenPositions) - positions[i++] = PANGO_PIXELS(pos.x + pos.width); - pango_layout_iter_free(iter); PLATFORM_ASSERT(i == lenPositions); } else { int positionsCalculated = 0; @@ -1423,26 +1395,23 @@ Converter convMeasure("UCS-2", CharacterSetID(characterSet), false); pango_layout_set_text(layout, utfForm, strlen(utfForm)); int i = 0; - int utfIndex = 0; - PangoLayoutIter *iter = pango_layout_get_iter(layout); - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); - while (pango_layout_iter_next_cluster(iter)) { - pango_layout_iter_get_cluster_extents (iter, NULL, &pos); - int position = PANGO_PIXELS(pos.x); - int utfIndexNext = pango_layout_iter_get_index(iter); - while (utfIndex < utfIndexNext) { + int clusterStart = 0; + ClusterIterator iti(layout, strlen(utfForm)); + while (!iti.finished) { + iti.Next(); + int clusterEnd = iti.curIndex; + int places = g_utf8_strlen(utfForm + clusterStart, clusterEnd - clusterStart); + int place = 1; + while (clusterStart < clusterEnd) { size_t lenChar = MultiByteLenFromIconv(convMeasure, s+i, len-i); - //size_t lenChar = mblen(s+i, MB_CUR_MAX); while (lenChar--) { - positions[i++] = position; + positions[i++] = iti.position - (places - place) * iti.distance / places; positionsCalculated++; } - utfIndex += UTF8CharLength(utfForm+utfIndex); + clusterStart += UTF8CharLength(utfForm+clusterStart); + place++; } } - while (i < lenPositions) - positions[i++] = PANGO_PIXELS(pos.x + pos.width); - pango_layout_iter_free(iter); delete []utfForm; PLATFORM_ASSERT(i == lenPositions); } @@ -1456,29 +1425,21 @@ utfForm = UTF8FromLatin1(s, len); } pango_layout_set_text(layout, utfForm, len); - PangoLayoutIter *iter = pango_layout_get_iter(layout); - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); int i = 0; - int positionStart = 0; int clusterStart = 0; // Each Latin1 input character may take 1 or 2 bytes in UTF-8 // and groups of up to 3 may be represented as ligatures. - while (pango_layout_iter_next_cluster(iter)) { - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); - int position = PANGO_PIXELS(pos.x); - int distance = position - positionStart; - int clusterEnd = pango_layout_iter_get_index(iter); + ClusterIterator iti(layout, strlen(utfForm)); + while (!iti.finished) { + iti.Next(); + int clusterEnd = iti.curIndex; int ligatureLength = g_utf8_strlen(utfForm + clusterStart, clusterEnd - clusterStart); PLATFORM_ASSERT(ligatureLength > 0 && ligatureLength <= 3); for (int charInLig=0; charInLigpfont; bool measure8bit = true; if (et != singleByte) { @@ -1553,7 +1513,6 @@ int SurfaceImpl::WidthText(Font &font_, const char *s, int len) { if (font_.GetID()) { -#ifdef USE_PANGO if (PFont(font_)->pfd) { char *utfForm = 0; pango_layout_set_font_description(layout, PFont(font_)->pfd); @@ -1575,7 +1534,11 @@ } pango_layout_set_text(layout, utfForm, len); } - PangoLayoutLine *pangoLine = pango_layout_get_line(layout, 0); +#ifdef PANGO_VERSION + PangoLayoutLine *pangoLine = pango_layout_get_line_readonly(layout,0); +#else + PangoLayoutLine *pangoLine = pango_layout_get_line(layout,0); +#endif pango_layout_line_get_extents(pangoLine, NULL, &pos); if (useGFree) { g_free(utfForm); @@ -1584,7 +1547,6 @@ } return PANGO_PIXELS(pos.width); } -#endif if (et == UTF8) { GdkWChar wctext[maxLengthTextRun]; size_t wclen = UTF16FromUTF8(s, len, static_cast(static_cast(wctext)), @@ -1601,11 +1563,9 @@ int SurfaceImpl::WidthChar(Font &font_, char ch) { if (font_.GetID()) { -#ifdef USE_PANGO if (PFont(font_)->pfd) { return WidthText(font_, &ch, 1); } -#endif return gdk_char_width(PFont(font_)->pfont, ch); } else { return 1; @@ -1635,7 +1595,6 @@ #ifdef FAST_WAY FontMutexLock(); int ascent = PFont(font_)->ascent; -#ifdef USE_PANGO if ((ascent == 0) && (PFont(font_)->pfd)) { PangoFontMetrics *metrics = pango_context_get_metrics(pcontext, PFont(font_)->pfd, pango_context_get_language(pcontext)); @@ -1644,7 +1603,6 @@ pango_font_metrics_unref(metrics); ascent = PFont(font_)->ascent; } -#endif if ((ascent == 0) && (PFont(font_)->pfont)) { ascent = PFont(font_)->pfont->ascent; } @@ -1672,7 +1630,6 @@ return 1; #ifdef FAST_WAY -#ifdef USE_PANGO if (PFont(font_)->pfd) { PangoFontMetrics *metrics = pango_context_get_metrics(pcontext, PFont(font_)->pfd, pango_context_get_language(pcontext)); @@ -1680,7 +1637,6 @@ pango_font_metrics_unref(metrics); return descent; } -#endif return PFont(font_)->pfont->descent; #else @@ -1766,18 +1722,12 @@ } void Window::SetPosition(PRectangle rc) { -#if 1 GtkAllocation alloc; alloc.x = rc.left; alloc.y = rc.top; alloc.width = rc.Width(); alloc.height = rc.Height(); gtk_widget_size_allocate(PWidget(wid), &alloc); -#else - - gtk_widget_set_uposition(wid, rc.left, rc.top); - gtk_widget_set_usize(wid, rc.right - rc.left, rc.bottom - rc.top); -#endif } void Window::SetPositionRelative(PRectangle rc, Window relativeTo) { @@ -1803,21 +1753,8 @@ if (oy + sizey > screenHeight) oy = screenHeight - sizey; -#if GTK_MAJOR_VERSION >= 2 gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy); -#else - gtk_widget_set_uposition(PWidget(wid), ox, oy); -#endif - -#if 0 - GtkAllocation alloc; - alloc.x = rc.left + ox; - alloc.y = rc.top + oy; - alloc.width = rc.right - rc.left; - alloc.height = rc.bottom - rc.top; - gtk_widget_size_allocate(wid, &alloc); -#endif gtk_widget_set_usize(PWidget(wid), sizex, sizey); } @@ -1899,8 +1836,8 @@ gdk_window_get_origin(PWidget(wid)->window, &x_offset, &y_offset); -// gtk 2.2+ -#if GTK_MAJOR_VERSION > 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 2) +#if GTK_CHECK_VERSION(2,2,0) + // GTK+ 2.2+ { GdkScreen* screen; gint monitor_num; @@ -1921,25 +1858,13 @@ struct ListImage { const char *xpm_data; -#if GTK_MAJOR_VERSION < 2 - GdkPixmap *pixmap; - GdkBitmap *bitmap; -#else GdkPixbuf *pixbuf; -#endif }; static void list_image_free(gpointer, gpointer value, gpointer) { ListImage *list_image = (ListImage *) value; -#if GTK_MAJOR_VERSION < 2 - if (list_image->pixmap) - gdk_pixmap_unref(list_image->pixmap); - if (list_image->bitmap) - gdk_bitmap_unref(list_image->bitmap); -#else if (list_image->pixbuf) gdk_pixbuf_unref (list_image->pixbuf); -#endif g_free(list_image); } @@ -1949,27 +1874,18 @@ ListBox::~ListBox() { } -#if GTK_MAJOR_VERSION >= 2 enum { PIXBUF_COLUMN, TEXT_COLUMN, N_COLUMNS }; -#endif class ListBoxX : public ListBox { WindowID list; WindowID scroller; -#if GTK_MAJOR_VERSION < 2 - int current; -#endif void *pixhash; -#if GTK_MAJOR_VERSION >= 2 - GtkCellRenderer* pixbuf_renderer; -#endif - int lineHeight; + GtkCellRenderer* pixbuf_renderer; XPMSet xset; - bool unicodeMode; int desiredVisibleRows; unsigned int maxItemCharacters; unsigned int aveCharWidth; @@ -1977,14 +1893,9 @@ CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), pixhash(NULL), desiredVisibleRows(5), maxItemCharacters(0), - doubleClickAction(NULL), doubleClickActionData(NULL) { -#if GTK_MAJOR_VERSION < 2 - current = 0; -#endif -#if GTK_MAJOR_VERSION >= 2 - pixbuf_renderer = 0; -#endif + ListBoxX() : list(0), pixhash(NULL), pixbuf_renderer(0), + desiredVisibleRows(5), maxItemCharacters(0), + aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } virtual ~ListBoxX() { if (pixhash) { @@ -2020,19 +1931,6 @@ return lb; } -#if GTK_MAJOR_VERSION < 2 -static void UnselectionAC(GtkWidget *, gint, gint, - GdkEventButton *, gpointer p) { - int *pi = reinterpret_cast(p); - *pi = -1; -} -static void SelectionAC(GtkWidget *, gint row, gint, - GdkEventButton *, gpointer p) { - int *pi = reinterpret_cast(p); - *pi = row; -} -#endif - static gboolean ButtonPress(GtkWidget *, GdkEventButton* ev, gpointer p) { try { ListBoxX* lb = reinterpret_cast(p); @@ -2047,7 +1945,6 @@ return FALSE; } -#if GTK_MAJOR_VERSION >= 2 /* Change the active color to the selected color so the listbox uses the color scheme that it would use if it had the focus. */ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { @@ -2070,7 +1967,6 @@ if (!gdk_color_equal(&style->text[GTK_STATE_SELECTED], &style->text[GTK_STATE_ACTIVE])) gtk_widget_modify_text(w, GTK_STATE_ACTIVE, &style->text[GTK_STATE_SELECTED]); } -#endif void ListBoxX::Create(Window &, int, Point, int, bool) { wid = gtk_window_new(GTK_WINDOW_POPUP); @@ -2088,21 +1984,6 @@ gtk_container_add(GTK_CONTAINER(frame), PWidget(scroller)); gtk_widget_show(PWidget(scroller)); -#if GTK_MAJOR_VERSION < 2 - list = gtk_clist_new(1); - GtkWidget *wid = PWidget(list); // No code inside the GTK_OBJECT macro - gtk_widget_show(wid); - gtk_container_add(GTK_CONTAINER(PWidget(scroller)), wid); - gtk_clist_set_column_auto_resize(GTK_CLIST(wid), 0, TRUE); - gtk_clist_set_selection_mode(GTK_CLIST(wid), GTK_SELECTION_BROWSE); - gtk_signal_connect(GTK_OBJECT(wid), "unselect_row", - GTK_SIGNAL_FUNC(UnselectionAC), ¤t); - gtk_signal_connect(GTK_OBJECT(wid), "select_row", - GTK_SIGNAL_FUNC(SelectionAC), ¤t); - gtk_signal_connect(GTK_OBJECT(wid), "button_press_event", - GTK_SIGNAL_FUNC(ButtonPress), this); - gtk_clist_set_shadow_type(GTK_CLIST(wid), GTK_SHADOW_NONE); -#else /* Tree and its model */ GtkListStore *store = gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING); @@ -2126,7 +2007,7 @@ gtk_tree_view_column_pack_start(column, pixbuf_renderer, FALSE); gtk_tree_view_column_add_attribute(column, pixbuf_renderer, "pixbuf", PIXBUF_COLUMN); - + GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -2142,28 +2023,15 @@ gtk_widget_show(wid); g_signal_connect(G_OBJECT(wid), "button_press_event", G_CALLBACK(ButtonPress), this); -#endif gtk_widget_realize(PWidget(wid)); } void ListBoxX::SetFont(Font &scint_font) { -#if GTK_MAJOR_VERSION < 2 - GtkStyle *style = gtk_widget_get_style(GTK_WIDGET(PWidget(list))); - if (!gdk_font_equal(style->font, PFont(scint_font)->pfont)) { - style = gtk_style_copy(style); - gdk_font_unref(style->font); - style->font = PFont(scint_font)->pfont; - gdk_font_ref(style->font); - gtk_widget_set_style(GTK_WIDGET(PWidget(list)), style); - gtk_style_unref(style); - } -#else // Only do for Pango font as there have been crashes for GDK fonts if (Created() && PFont(scint_font)->pfd) { // Current font is Pango font gtk_widget_modify_font(PWidget(list), PFont(scint_font)->pfd); } -#endif } void ListBoxX::SetAverageCharWidth(int width) { @@ -2191,13 +2059,6 @@ // First calculate height of the clist for our desired visible // row count otherwise it tries to expand to the total # of rows -#if GTK_MAJOR_VERSION < 2 - int ythickness = PWidget(list)->style->klass->ythickness; - height = (rows * GTK_CLIST(list)->row_height - + rows + 1 - + 2 * (ythickness - + GTK_CONTAINER(PWidget(list))->border_width)); -#else // Get cell height int row_width=0; int row_height=0; @@ -2209,7 +2070,6 @@ height = (rows * row_height + 2 * (ythickness + GTK_CONTAINER(PWidget(list))->border_width + 1)); -#endif gtk_widget_set_usize(GTK_WIDGET(PWidget(list)), -1, height); // Get the size of the scroller because we set usize on the window @@ -2229,30 +2089,19 @@ } int ListBoxX::CaretFromEdge() { -#if GTK_MAJOR_VERSION >= 2 gint renderer_width, renderer_height; gtk_cell_renderer_get_fixed_size(pixbuf_renderer, &renderer_width, &renderer_height); return 4 + renderer_width; -#endif - return 4 + xset.GetWidth(); } void ListBoxX::Clear() { -#if GTK_MAJOR_VERSION < 2 - gtk_clist_clear(GTK_CLIST(list)); -#else GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); gtk_list_store_clear(GTK_LIST_STORE(model)); -#endif maxItemCharacters = 0; } -#if GTK_MAJOR_VERSION < 2 -static void init_pixmap(ListImage *list_image, GtkWidget *window) { -#else static void init_pixmap(ListImage *list_image) { -#endif const char *textForm = list_image->xpm_data; const char * const * xpm_lineform = reinterpret_cast(textForm); const char **xpm_lineformfromtext = 0; @@ -2267,28 +2116,10 @@ } // Drop any existing pixmap/bitmap as data may have changed -#if GTK_MAJOR_VERSION < 2 - if (list_image->pixmap) - gdk_pixmap_unref(list_image->pixmap); - list_image->pixmap = NULL; - if (list_image->bitmap) - gdk_bitmap_unref(list_image->bitmap); - list_image->bitmap = NULL; - - list_image->pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL - , gtk_widget_get_colormap(window), &(list_image->bitmap), NULL - , (gchar **) xpm_lineform); - if (NULL == list_image->pixmap) { - if (list_image->bitmap) - gdk_bitmap_unref(list_image->bitmap); - list_image->bitmap = NULL; - } -#else if (list_image->pixbuf) gdk_pixbuf_unref(list_image->pixbuf); list_image->pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar**)xpm_lineform); -#endif delete []xpm_lineformfromtext; } @@ -2300,16 +2131,6 @@ list_image = (ListImage *) g_hash_table_lookup((GHashTable *) pixhash , (gconstpointer) GINT_TO_POINTER(type)); } -#if GTK_MAJOR_VERSION < 2 - char * szs[] = { s, NULL }; - int rownum = gtk_clist_append(GTK_CLIST(list), szs); - if (list_image) { - if (NULL == list_image->pixmap) - init_pixmap(list_image, (GtkWidget *) list); - gtk_clist_set_pixtext(GTK_CLIST(list), rownum, 0, s, SPACING - , list_image->pixmap, list_image->bitmap); - } -#else GtkTreeIter iter; GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list))); @@ -2324,7 +2145,7 @@ gint pixbuf_width = gdk_pixbuf_get_width(list_image->pixbuf); gint renderer_height, renderer_width; - gtk_cell_renderer_get_fixed_size(pixbuf_renderer, + gtk_cell_renderer_get_fixed_size(pixbuf_renderer, &renderer_width, &renderer_height); if (pixbuf_width > renderer_width) gtk_cell_renderer_set_fixed_size(pixbuf_renderer, @@ -2337,7 +2158,6 @@ gtk_list_store_set(GTK_LIST_STORE(store), &iter, TEXT_COLUMN, s, -1); } -#endif size_t len = strlen(s); if (maxItemCharacters < len) maxItemCharacters = len; @@ -2345,24 +2165,12 @@ int ListBoxX::Length() { if (wid) -#if GTK_MAJOR_VERSION < 2 - return GTK_CLIST(list)->rows; -#else return gtk_tree_model_iter_n_children(gtk_tree_view_get_model (GTK_TREE_VIEW(list)), NULL); -#endif return 0; } void ListBoxX::Select(int n) { -#if GTK_MAJOR_VERSION < 2 - if (n == -1) { - gtk_clist_unselect_row(GTK_CLIST(list), current, 0); - } else { - gtk_clist_select_row(GTK_CLIST(list), n, 0); - gtk_clist_moveto(GTK_CLIST(list), n, 0, 0.5, 0.5); - } -#else GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); GtkTreeSelection *selection = @@ -2410,13 +2218,9 @@ } else { gtk_tree_selection_unselect_all(selection); } -#endif } int ListBoxX::GetSelection() { -#if GTK_MAJOR_VERSION < 2 - return current; -#else GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; @@ -2429,20 +2233,9 @@ return indices[0]; } return -1; -#endif } int ListBoxX::Find(const char *prefix) { -#if GTK_MAJOR_VERSION < 2 - int count = Length(); - for (int i = 0; i < count; i++) { - char *s = 0; - gtk_clist_get_text(GTK_CLIST(list), i, 0, &s); - if (s && (0 == strncmp(prefix, s, strlen(prefix)))) { - return i; - } - } -#else GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); @@ -2457,32 +2250,17 @@ valid = gtk_tree_model_iter_next(model, &iter) != FALSE; i++; } -#endif return -1; } void ListBoxX::GetValue(int n, char *value, int len) { char *text = NULL; -#if GTK_MAJOR_VERSION < 2 - GtkCellType type = gtk_clist_get_cell_type(GTK_CLIST(list), n, 0); - switch (type) { - case GTK_CELL_TEXT: - gtk_clist_get_text(GTK_CLIST(list), n, 0, &text); - break; - case GTK_CELL_PIXTEXT: - gtk_clist_get_pixtext(GTK_CLIST(list), n, 0, &text, NULL, NULL, NULL); - break; - default: - break; - } -#else GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; if (valid) { gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); } -#endif if (text && len > 0) { strncpy(value, text, len); value[len - 1] = '\0'; @@ -2511,18 +2289,9 @@ (gconstpointer) GINT_TO_POINTER(type)); if (list_image) { // Drop icon already registered -#if GTK_MAJOR_VERSION < 2 - if (list_image->pixmap) - gdk_pixmap_unref(list_image->pixmap); - list_image->pixmap = 0; - if (list_image->bitmap) - gdk_bitmap_unref(list_image->bitmap); - list_image->bitmap = 0; -#else if (list_image->pixbuf) gdk_pixbuf_unref(list_image->pixbuf); list_image->pixbuf = NULL; -#endif list_image->xpm_data = xpm_data; } else { list_image = g_new0(ListImage, 1); @@ -2575,11 +2344,7 @@ void Menu::Destroy() { if (mid) -#if GTK_MAJOR_VERSION < 2 - gtk_object_unref(GTK_OBJECT(mid)); -#else g_object_unref(G_OBJECT(mid)); -#endif mid = 0; } @@ -2597,12 +2362,8 @@ if ((pt.y + requisition.height) > screenHeight) { pt.y = screenHeight - requisition.height; } -#if GTK_MAJOR_VERSION >= 2 gtk_item_factory_popup(factory, pt.x - 4, pt.y - 4, 3, gtk_get_current_event_time()); -#else - gtk_item_factory_popup(factory, pt.x - 4, pt.y - 4, 3, 0); -#endif } ElapsedTime::ElapsedTime() { @@ -2674,11 +2435,7 @@ #ifdef G_OS_WIN32 return "Lucida Console"; #else -#ifdef USE_PANGO return "!Sans"; -#else - return "lucidatypewriter"; -#endif #endif } @@ -2718,16 +2475,35 @@ reinterpret_cast(lParam)); } -bool Platform::IsDBCSLeadByte(int /* codePage */, char /* ch */) { +bool Platform::IsDBCSLeadByte(int codePage, char ch) { + // Byte ranges found in Wikipedia articles with relevant search strings in each case + unsigned char uch = static_cast(ch); + switch (codePage) { + case 932: + // Shift_jis + return ((uch >= 0x81) && (uch <= 0x9F)) || + ((uch >= 0xE0) && (uch <= 0xEF)); + case 936: + // GBK + return (uch >= 0x81) && (uch <= 0xFE); + case 950: + // Big5 + return (uch >= 0x81) && (uch <= 0xFE); + // Korean EUC-KR may be code page 949. + } return false; } -int Platform::DBCSCharLength(int, const char *s) { - int bytes = mblen(s, MB_CUR_MAX); - if (bytes >= 1) - return bytes; - else - return 1; +int Platform::DBCSCharLength(int codePage, const char *s) { + if (codePage == 932 || codePage == 936 || codePage == 950) { + return IsDBCSLeadByte(codePage, s[0]) ? 2 : 1; + } else { + int bytes = mblen(s, MB_CUR_MAX); + if (bytes >= 1) + return bytes; + else + return 1; + } } int Platform::DBCSCharMaxLength() { diff -Nru geany-0.18/scintilla/PositionCache.cxx geany-0.19/scintilla/PositionCache.cxx --- geany-0.18/scintilla/PositionCache.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/PositionCache.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -10,6 +10,9 @@ #include #include +#include +#include + #include "Platform.h" #include "Scintilla.h" @@ -28,6 +31,7 @@ #include "CharClassify.h" #include "Decoration.h" #include "Document.h" +#include "Selection.h" #include "PositionCache.h" #ifdef SCI_NAMESPACE @@ -46,11 +50,11 @@ inCache(false), maxLineLength(-1), numCharsInLine(0), + numCharsBeforeEOL(0), validity(llInvalid), xHighlightGuide(0), highlightColumn(0), - selStart(0), - selEnd(0), + psel(NULL), containsCaret(false), edgeColumn(0), chars(0), @@ -115,12 +119,7 @@ if (line < 0) { return 0; } else if ((line >= lines-1) || !lineStarts) { - int startLine = LineStart(line); - int endLine = numCharsInLine; - while ((endLine > startLine) && IsEOLChar(chars[endLine-1])) { - endLine--; - } - return endLine; + return numCharsBeforeEOL; } else { return lineStarts[line+1]; } @@ -135,8 +134,6 @@ if ((line >= lenLineStarts) && (line != 0)) { int newMaxLines = line + 20; int *newLineStarts = new int[newMaxLines]; - if (!newLineStarts) - return; for (int i = 0; i < newMaxLines; i++) { if (i < lenLineStarts) newLineStarts[i] = lineStarts[i]; @@ -201,6 +198,10 @@ return lower; } +int LineLayout::EndLineStyle() const { + return styles[numCharsBeforeEOL > 0 ? numCharsBeforeEOL-1 : 0]; +} + LineLayoutCache::LineLayoutCache() : level(0), length(0), size(0), cache(0), allInvalidated(false), styleClock(-1), useCount(0) { @@ -361,7 +362,8 @@ for (unsigned int j = 0; jj; k--) { selAndEdge[k] = selAndEdge[k-1]; } @@ -386,7 +388,7 @@ return -1; } -BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart) : +BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart, bool breakForSelection) : ll(ll_), lineStart(lineStart_), lineEnd(lineEnd_), @@ -412,9 +414,19 @@ nextBreak--; } - if (ll->selStart != ll->selEnd) { - Insert(ll->selStart - posLineStart - 1); - Insert(ll->selEnd - posLineStart - 1); + if (breakForSelection) { + SelectionPosition posStart(posLineStart); + SelectionPosition posEnd(posLineStart + lineEnd); + SelectionSegment segmentLine(posStart, posEnd); + for (size_t r=0; rpsel->Count(); r++) { + SelectionSegment portion = ll->psel->Range(r).Intersect(segmentLine); + if (!(portion.start == portion.end)) { + if (portion.start.IsValid()) + Insert(portion.start.Position() - posLineStart - 1); + if (portion.end.IsValid()) + Insert(portion.end.Position() - posLineStart - 1); + } + } } Insert(ll->edgeColumn - 1); @@ -437,7 +449,7 @@ delete []selAndEdge; } -int BreakFinder::First() { +int BreakFinder::First() const { return nextBreak; } @@ -524,7 +536,7 @@ clock = clock_; if (s_ && positions_) { positions = new short[len + (len + 1) / 2]; - for (unsigned int i=0;i(positions_[i]); } memcpy(reinterpret_cast(positions + len), s_, len); @@ -547,7 +559,7 @@ unsigned int len_, int *positions_) const { if ((styleNumber == styleNumber_) && (len == len_) && (memcmp(reinterpret_cast(positions + len), s_, len)== 0)) { - for (unsigned int i=0;i other.clock; } @@ -593,7 +605,7 @@ void PositionCache::Clear() { if (!allClear) { - for (size_t i=0;i 60000) { // Since there are only 16 bits for the clock, wrap it round and // reset all cache entries so none get stuck with a high clock. - for (size_t i=0;i +// Copyright 1998-2009 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. #ifndef POSITIONCACHE_H @@ -30,11 +30,11 @@ enum { wrapWidthInfinite = 0x7ffffff }; int maxLineLength; int numCharsInLine; + int numCharsBeforeEOL; enum validLevel { llInvalid, llCheckTextAndStyle, llPositions, llLines } validity; int xHighlightGuide; bool highlightColumn; - int selStart; - int selEnd; + Selection *psel; bool containsCaret; int edgeColumn; char *chars; @@ -66,6 +66,7 @@ char bracesMatchStyle, int xHighlight); void RestoreBracesHighlight(Range rangeLine, Position braces[]); int FindBefore(int x, int lower, int upper) const; + int EndLineStyle() const; }; /** @@ -92,7 +93,7 @@ }; void Invalidate(LineLayout::validLevel validity_); void SetLevel(int level_); - int GetLevel() { return level; } + int GetLevel() const { return level; } LineLayout *Retrieve(int lineNumber, int lineCaret, int maxChars, int styleClock_, int linesOnScreen, int linesInDoc); void Dispose(LineLayout *ll); @@ -110,7 +111,7 @@ void Clear(); bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, int *positions_) const; static int Hash(unsigned int styleNumber, const char *s, unsigned int len); - bool NewerThan(const PositionCacheEntry &other); + bool NewerThan(const PositionCacheEntry &other) const; void ResetClock(); }; @@ -135,9 +136,9 @@ int subBreak; void Insert(int val); public: - BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart); + BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart, bool breakForSelection); ~BreakFinder(); - int First(); + int First() const; int Next(); }; @@ -151,7 +152,7 @@ ~PositionCache(); void Clear(); void SetSize(size_t size_); - int GetSize() { return size; } + int GetSize() const { return size; } void MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned int styleNumber, const char *s, unsigned int len, int *positions); }; diff -Nru geany-0.18/scintilla/PropSet.cxx geany-0.19/scintilla/PropSet.cxx --- geany-0.18/scintilla/PropSet.cxx 2007-12-02 11:58:17.000000000 +0000 +++ geany-0.19/scintilla/PropSet.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -11,370 +11,53 @@ #include #include +#ifdef _MSC_VER +// Visual C++ doesn't like unreachable code or long decorated names in its own headers. +#pragma warning(disable: 4018 4100 4245 4511 4512 4663 4702 4786) +#endif + +#include +#include + #include "Platform.h" #include "PropSet.h" +#include "PropSetSimple.h" #ifdef SCI_NAMESPACE using namespace Scintilla; #endif -// The comparison and case changing functions here assume ASCII -// or extended ASCII such as the normal Windows code page. - -static inline char MakeUpperCase(char ch) { - if (ch < 'a' || ch > 'z') - return ch; - else - return static_cast(ch - 'a' + 'A'); -} - -static inline bool IsLetter(char ch) { - return ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')); -} - -inline bool IsASpace(unsigned int ch) { - return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d)); -} - -int CompareCaseInsensitive(const char *a, const char *b) { - while (*a && *b) { - if (*a != *b) { - char upperA = MakeUpperCase(*a); - char upperB = MakeUpperCase(*b); - if (upperA != upperB) - return upperA - upperB; - } - a++; - b++; - } - // Either *a or *b is nul - return *a - *b; -} - -int CompareNCaseInsensitive(const char *a, const char *b, size_t len) { - while (*a && *b && len) { - if (*a != *b) { - char upperA = MakeUpperCase(*a); - char upperB = MakeUpperCase(*b); - if (upperA != upperB) - return upperA - upperB; - } - a++; - b++; - len--; - } - if (len == 0) - return 0; - else - // Either *a or *b is nul - return *a - *b; -} +typedef std::map mapss; -bool EqualCaseInsensitive(const char *a, const char *b) { - return 0 == CompareCaseInsensitive(a, b); +PropSetSimple::PropSetSimple() { + mapss *props = new mapss; + impl = static_cast(props); } -// Since the CaseInsensitive functions declared in SString -// are implemented here, I will for now put the non-inline -// implementations of the SString members here as well, so -// that I can quickly see what effect this has. - -SString::SString(int i) : sizeGrowth(sizeGrowthDefault) { - char number[32]; - sprintf(number, "%0d", i); - s = StringAllocate(number); - sSize = sLen = (s) ? strlen(s) : 0; +PropSetSimple::~PropSetSimple() { + mapss *props = static_cast(impl); + delete props; + impl = 0; } -SString::SString(double d, int precision) : sizeGrowth(sizeGrowthDefault) { - char number[32]; - sprintf(number, "%.*f", precision, d); - s = StringAllocate(number); - sSize = sLen = (s) ? strlen(s) : 0; -} - -bool SString::grow(lenpos_t lenNew) { - while (sizeGrowth * 6 < lenNew) { - sizeGrowth *= 2; - } - char *sNew = new char[lenNew + sizeGrowth + 1]; - if (sNew) { - if (s) { - memcpy(sNew, s, sLen); - delete []s; - } - s = sNew; - s[sLen] = '\0'; - sSize = lenNew + sizeGrowth; - } - return sNew != 0; -} - -SString &SString::assign(const char *sOther, lenpos_t sSize_) { - if (!sOther) { - sSize_ = 0; - } else if (sSize_ == measure_length) { - sSize_ = strlen(sOther); - } - if (sSize > 0 && sSize_ <= sSize) { // Does not allocate new buffer if the current is big enough - if (s && sSize_) { - memcpy(s, sOther, sSize_); - } - s[sSize_] = '\0'; - sLen = sSize_; - } else { - delete []s; - s = StringAllocate(sOther, sSize_); - if (s) { - sSize = sSize_; // Allow buffer bigger than real string, thus providing space to grow - sLen = sSize_; - } else { - sSize = sLen = 0; - } - } - return *this; -} - -bool SString::operator==(const SString &sOther) const { - if ((s == 0) && (sOther.s == 0)) - return true; - if ((s == 0) || (sOther.s == 0)) - return false; - return strcmp(s, sOther.s) == 0; -} - -bool SString::operator==(const char *sOther) const { - if ((s == 0) && (sOther == 0)) - return true; - if ((s == 0) || (sOther == 0)) - return false; - return strcmp(s, sOther) == 0; -} - -SString SString::substr(lenpos_t subPos, lenpos_t subLen) const { - if (subPos >= sLen) { - return SString(); // return a null string if start index is out of bounds - } - if ((subLen == measure_length) || (subPos + subLen > sLen)) { - subLen = sLen - subPos; // can't substr past end of source string - } - return SString(s, subPos, subPos + subLen); -} - -SString &SString::lowercase(lenpos_t subPos, lenpos_t subLen) { - if ((subLen == measure_length) || (subPos + subLen > sLen)) { - subLen = sLen - subPos; // don't apply past end of string - } - for (lenpos_t i = subPos; i < subPos + subLen; i++) { - if (s[i] < 'A' || s[i] > 'Z') - continue; - else - s[i] = static_cast(s[i] - 'A' + 'a'); - } - return *this; -} - -SString &SString::uppercase(lenpos_t subPos, lenpos_t subLen) { - if ((subLen == measure_length) || (subPos + subLen > sLen)) { - subLen = sLen - subPos; // don't apply past end of string - } - for (lenpos_t i = subPos; i < subPos + subLen; i++) { - if (s[i] < 'a' || s[i] > 'z') - continue; - else - s[i] = static_cast(s[i] - 'a' + 'A'); - } - return *this; -} - -SString &SString::append(const char *sOther, lenpos_t sLenOther, char sep) { - if (!sOther) { - return *this; - } - if (sLenOther == measure_length) { - sLenOther = strlen(sOther); - } - int lenSep = 0; - if (sLen && sep) { // Only add a separator if not empty - lenSep = 1; - } - lenpos_t lenNew = sLen + sLenOther + lenSep; - // Conservative about growing the buffer: don't do it, unless really needed - if ((lenNew < sSize) || (grow(lenNew))) { - if (lenSep) { - s[sLen] = sep; - sLen++; - } - memcpy(&s[sLen], sOther, sLenOther); - sLen += sLenOther; - s[sLen] = '\0'; - } - return *this; -} - -SString &SString::insert(lenpos_t pos, const char *sOther, lenpos_t sLenOther) { - if (!sOther || pos > sLen) { - return *this; - } - if (sLenOther == measure_length) { - sLenOther = strlen(sOther); - } - lenpos_t lenNew = sLen + sLenOther; - // Conservative about growing the buffer: don't do it, unless really needed - if ((lenNew < sSize) || grow(lenNew)) { - lenpos_t moveChars = sLen - pos + 1; - for (lenpos_t i = moveChars; i > 0; i--) { - s[pos + sLenOther + i - 1] = s[pos + i - 1]; - } - memcpy(s + pos, sOther, sLenOther); - sLen = lenNew; - } - return *this; -} - -/** - * Remove @a len characters from the @a pos position, included. - * Characters at pos + len and beyond replace characters at pos. - * If @a len is 0, or greater than the length of the string - * starting at @a pos, the string is just truncated at @a pos. - */ -void SString::remove(lenpos_t pos, lenpos_t len) { - if (pos >= sLen) { - return; - } - if (len < 1 || pos + len >= sLen) { - s[pos] = '\0'; - sLen = pos; - } else { - for (lenpos_t i = pos; i < sLen - len + 1; i++) { - s[i] = s[i+len]; - } - sLen -= len; - } -} - -bool SString::startswith(const char *prefix) { - lenpos_t lenPrefix = strlen(prefix); - if (lenPrefix > sLen) { - return false; - } - return strncmp(s, prefix, lenPrefix) == 0; -} - -bool SString::endswith(const char *suffix) { - lenpos_t lenSuffix = strlen(suffix); - if (lenSuffix > sLen) { - return false; - } - return strncmp(s + sLen - lenSuffix, suffix, lenSuffix) == 0; -} - -int SString::search(const char *sFind, lenpos_t start) const { - if (start < sLen) { - const char *sFound = strstr(s + start, sFind); - if (sFound) { - return sFound - s; - } - } - return -1; -} - -int SString::substitute(char chFind, char chReplace) { - int c = 0; - char *t = s; - while (t) { - t = strchr(t, chFind); - if (t) { - *t = chReplace; - t++; - c++; - } - } - return c; -} - -int SString::substitute(const char *sFind, const char *sReplace) { - int c = 0; - lenpos_t lenFind = strlen(sFind); - lenpos_t lenReplace = strlen(sReplace); - int posFound = search(sFind); - while (posFound >= 0) { - remove(posFound, lenFind); - insert(posFound, sReplace, lenReplace); - posFound = search(sFind, posFound + lenReplace); - c++; - } - return c; -} - -char *SContainer::StringAllocate(lenpos_t len) { - if (len != measure_length) { - return new char[len + 1]; - } else { - return 0; - } -} - -char *SContainer::StringAllocate(const char *s, lenpos_t len) { - if (s == 0) { - return 0; - } - if (len == measure_length) { - len = strlen(s); - } - char *sNew = new char[len + 1]; - if (sNew) { - memcpy(sNew, s, len); - sNew[len] = '\0'; - } - return sNew; -} - -// End SString functions - -PropSet::PropSet() { - superPS = 0; - for (int root = 0; root < hashRoots; root++) - props[root] = 0; -} - -PropSet::~PropSet() { - superPS = 0; - Clear(); -} - -void PropSet::Set(const char *key, const char *val, int lenKey, int lenVal) { +void PropSetSimple::Set(const char *key, const char *val, int lenKey, int lenVal) { + mapss *props = static_cast(impl); if (!*key) // Empty keys are not supported return; if (lenKey == -1) lenKey = static_cast(strlen(key)); if (lenVal == -1) lenVal = static_cast(strlen(val)); - unsigned int hash = HashString(key, lenKey); - for (Property *p = props[hash % hashRoots]; p; p = p->next) { - if ((hash == p->hash) && - ((strlen(p->key) == static_cast(lenKey)) && - (0 == strncmp(p->key, key, lenKey)))) { - // Replace current value - delete [](p->val); - p->val = StringDup(val, lenVal); - return; - } - } - // Not found - Property *pNew = new Property; - if (pNew) { - pNew->hash = hash; - pNew->key = StringDup(key, lenKey); - pNew->val = StringDup(val, lenVal); - pNew->next = props[hash % hashRoots]; - props[hash % hashRoots] = pNew; - } + (*props)[std::string(key, lenKey)] = std::string(val, lenVal); +} + +static bool IsASpaceCharacter(unsigned int ch) { + return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d)); } -void PropSet::Set(const char *keyVal) { - while (IsASpace(*keyVal)) +void PropSetSimple::Set(const char *keyVal) { + while (IsASpaceCharacter(*keyVal)) keyVal++; const char *endVal = keyVal; while (*endVal && (*endVal != '\n')) @@ -387,34 +70,7 @@ } } -void PropSet::Unset(const char *key, int lenKey) { - if (!*key) // Empty keys are not supported - return; - if (lenKey == -1) - lenKey = static_cast(strlen(key)); - unsigned int hash = HashString(key, lenKey); - Property *pPrev = NULL; - for (Property *p = props[hash % hashRoots]; p; p = p->next) { - if ((hash == p->hash) && - ((strlen(p->key) == static_cast(lenKey)) && - (0 == strncmp(p->key, key, lenKey)))) { - if (pPrev) - pPrev->next = p->next; - else - props[hash % hashRoots] = p->next; - if (p == enumnext) - enumnext = p->next; // Not that anyone should mix enum and Set / Unset. - delete [](p->key); - delete [](p->val); - delete p; - return; - } else { - pPrev = p; - } - } -} - -void PropSet::SetMultiple(const char *s) { +void PropSetSimple::SetMultiple(const char *s) { const char *eol = strchr(s, '\n'); while (eol) { Set(s); @@ -424,16 +80,11 @@ Set(s); } -SString PropSet::Get(const char *key) const { - unsigned int hash = HashString(key, strlen(key)); - for (Property *p = props[hash % hashRoots]; p; p = p->next) { - if ((hash == p->hash) && (0 == strcmp(p->key, key))) { - return p->val; - } - } - if (superPS) { - // Failed here, so try in base property set - return superPS->Get(key); +const char *PropSetSimple::Get(const char *key) const { + mapss *props = static_cast(impl); + mapss::const_iterator keyPos = props->find(std::string(key)); + if (keyPos != props->end()) { + return keyPos->second.c_str(); } else { return ""; } @@ -445,7 +96,7 @@ // for that, through a recursive function and a simple chain of pointers. struct VarChain { - VarChain(const char*var_=NULL, const VarChain *link_=NULL): var(var_), link(link_) {} + VarChain(const char *var_=NULL, const VarChain *link_=NULL): var(var_), link(link_) {} bool contains(const char *testVar) const { return (var && (0 == strcmp(var, testVar))) @@ -456,300 +107,70 @@ const VarChain *link; }; -static int ExpandAllInPlace(const PropSet &props, SString &withVars, int maxExpands, const VarChain &blankVars = VarChain()) { - int varStart = withVars.search("$("); - while ((varStart >= 0) && (maxExpands > 0)) { - int varEnd = withVars.search(")", varStart+2); - if (varEnd < 0) { +static int ExpandAllInPlace(const PropSetSimple &props, std::string &withVars, int maxExpands, const VarChain &blankVars) { + size_t varStart = withVars.find("$("); + while ((varStart != std::string::npos) && (maxExpands > 0)) { + size_t varEnd = withVars.find(")", varStart+2); + if (varEnd == std::string::npos) { break; } // For consistency, when we see '$(ab$(cde))', expand the inner variable first, // regardless whether there is actually a degenerate variable named 'ab$(cde'. - int innerVarStart = withVars.search("$(", varStart+2); - while ((innerVarStart > varStart) && (innerVarStart < varEnd)) { + size_t innerVarStart = withVars.find("$(", varStart+2); + while ((innerVarStart != std::string::npos) && (innerVarStart > varStart) && (innerVarStart < varEnd)) { varStart = innerVarStart; - innerVarStart = withVars.search("$(", varStart+2); + innerVarStart = withVars.find("$(", varStart+2); } - SString var(withVars.c_str(), varStart + 2, varEnd); - SString val = props.Get(var.c_str()); + std::string var(withVars.c_str(), varStart + 2, varEnd - varStart - 2); + std::string val = props.Get(var.c_str()); if (blankVars.contains(var.c_str())) { - val.clear(); // treat blankVar as an empty string (e.g. to block self-reference) + val = ""; // treat blankVar as an empty string (e.g. to block self-reference) } if (--maxExpands >= 0) { maxExpands = ExpandAllInPlace(props, val, maxExpands, VarChain(var.c_str(), &blankVars)); } - withVars.remove(varStart, varEnd-varStart+1); + withVars.erase(varStart, varEnd-varStart+1); withVars.insert(varStart, val.c_str(), val.length()); - varStart = withVars.search("$("); + varStart = withVars.find("$("); } return maxExpands; } -SString PropSet::GetExpanded(const char *key) const { - SString val = Get(key); +char *PropSetSimple::Expanded(const char *key) const { + std::string val = Get(key); ExpandAllInPlace(*this, val, 100, VarChain(key)); - return val; -} - -SString PropSet::Expand(const char *withVars, int maxExpands) const { - SString val = withVars; - ExpandAllInPlace(*this, val, maxExpands); - return val; -} - -int PropSet::GetInt(const char *key, int defaultValue) const { - SString val = GetExpanded(key); - if (val.length()) - return val.value(); - return defaultValue; -} - -bool isprefix(const char *target, const char *prefix) { - while (*target && *prefix) { - if (*target != *prefix) - return false; - target++; - prefix++; - } - if (*prefix) - return false; - else - return true; -} - -void PropSet::Clear() { - for (int root = 0; root < hashRoots; root++) { - Property *p = props[root]; - while (p) { - Property *pNext = p->next; - p->hash = 0; - delete []p->key; - p->key = 0; - delete []p->val; - p->val = 0; - delete p; - p = pNext; - } - props[root] = 0; - } -} - -char *PropSet::ToString() const { - size_t len=0; - for (int r = 0; r < hashRoots; r++) { - for (Property *p = props[r]; p; p = p->next) { - len += strlen(p->key) + 1; - len += strlen(p->val) + 1; - } - } - if (len == 0) - len = 1; // Return as empty string - char *ret = new char [len]; - if (ret) { - char *w = ret; - for (int root = 0; root < hashRoots; root++) { - for (Property *p = props[root]; p; p = p->next) { - strcpy(w, p->key); - w += strlen(p->key); - *w++ = '='; - strcpy(w, p->val); - w += strlen(p->val); - *w++ = '\n'; - } - } - ret[len-1] = '\0'; - } + char *ret = new char [val.size() + 1]; + strcpy(ret, val.c_str()); return ret; } -/** - * Creates an array that points into each word in the string and puts \0 terminators - * after each word. - */ -static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = false) { - int prev = '\n'; - int words = 0; - // For rapid determination of whether a character is a separator, build - // a look up table. - bool wordSeparator[256]; - for (int i=0;i<256; i++) { - wordSeparator[i] = false; - } - wordSeparator['\r'] = true; - wordSeparator['\n'] = true; - if (!onlyLineEnds) { - wordSeparator[' '] = true; - wordSeparator['\t'] = true; - } - for (int j = 0; wordlist[j]; j++) { - int curr = static_cast(wordlist[j]); - if (!wordSeparator[curr] && wordSeparator[prev]) - words++; - prev = curr; - } - char **keywords = new char *[words + 1]; - if (keywords) { - words = 0; - prev = '\0'; - size_t slen = strlen(wordlist); - for (size_t k = 0; k < slen; k++) { - if (!wordSeparator[static_cast(wordlist[k])]) { - if (!prev) { - keywords[words] = &wordlist[k]; - words++; - } - } else { - wordlist[k] = '\0'; - } - prev = wordlist[k]; - } - keywords[words] = &wordlist[slen]; - *len = words; - } else { - *len = 0; - } - return keywords; -} - -void WordList::Clear() { - if (words) { - delete []list; - delete []words; - } - words = 0; - list = 0; - len = 0; - sorted = false; -} - -void WordList::Set(const char *s) { - list = StringDup(s); - sorted = false; - words = ArrayFromWordList(list, &len, onlyLineEnds); -} - -extern "C" int cmpString(const void *a1, const void *a2) { - // Can't work out the correct incantation to use modern casts here - return strcmp(*(char**)(a1), *(char**)(a2)); -} - -static void SortWordList(char **words, unsigned int len) { - qsort(reinterpret_cast(words), len, sizeof(*words), - cmpString); -} - -bool WordList::InList(const char *s) { - if (0 == words) - return false; - if (!sorted) { - sorted = true; - SortWordList(words, len); - for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++) - starts[k] = -1; - for (int l = len - 1; l >= 0; l--) { - unsigned char indexChar = words[l][0]; - starts[indexChar] = l; - } - } - unsigned char firstChar = s[0]; - int j = starts[firstChar]; - if (j >= 0) { - while ((unsigned char)words[j][0] == firstChar) { - if (s[1] == words[j][1]) { - const char *a = words[j] + 1; - const char *b = s + 1; - while (*a && *a == *b) { - a++; - b++; - } - if (!*a && !*b) - return true; - } - j++; - } +char *PropSetSimple::ToString() const { + mapss *props = static_cast(impl); + std::string sval; + for (mapss::const_iterator it=props->begin(); it != props->end(); it++) { + sval += it->first; + sval += "="; + sval += it->second; + sval += "\n"; } - j = starts['^']; - if (j >= 0) { - while (words[j][0] == '^') { - const char *a = words[j] + 1; - const char *b = s; - while (*a && *a == *b) { - a++; - b++; - } - if (!*a) - return true; - j++; - } - } - return false; + char *ret = new char [sval.size() + 1]; + strcpy(ret, sval.c_str()); + return ret; } -/** similar to InList, but word s can be a substring of keyword. - * eg. the keyword define is defined as def~ine. This means the word must start - * with def to be a keyword, but also defi, defin and define are valid. - * The marker is ~ in this case. - */ -bool WordList::InListAbbreviated(const char *s, const char marker) { - if (0 == words) - return false; - if (!sorted) { - sorted = true; - SortWordList(words, len); - for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++) - starts[k] = -1; - for (int l = len - 1; l >= 0; l--) { - unsigned char indexChar = words[l][0]; - starts[indexChar] = l; - } +int PropSetSimple::GetInt(const char *key, int defaultValue) const { + char *val = Expanded(key); + if (val) { + int retVal = val[0] ? atoi(val) : defaultValue; + delete []val; + return retVal; } - unsigned char firstChar = s[0]; - int j = starts[firstChar]; - if (j >= 0) { - while (words[j][0] == firstChar) { - bool isSubword = false; - int start = 1; - if (words[j][1] == marker) { - isSubword = true; - start++; - } - if (s[1] == words[j][start]) { - const char *a = words[j] + start; - const char *b = s + 1; - while (*a && *a == *b) { - a++; - if (*a == marker) { - isSubword = true; - a++; - } - b++; - } - if ((!*a || isSubword) && !*b) - return true; - } - j++; - } - } - j = starts['^']; - if (j >= 0) { - while (words[j][0] == '^') { - const char *a = words[j] + 1; - const char *b = s; - while (*a && *a == *b) { - a++; - b++; - } - if (!*a) - return true; - j++; - } - } - return false; + return defaultValue; } diff -Nru geany-0.18/scintilla/PropSetSimple.h geany-0.19/scintilla/PropSetSimple.h --- geany-0.18/scintilla/PropSetSimple.h 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/scintilla/PropSetSimple.h 2010-03-07 10:31:51.000000000 +0000 @@ -0,0 +1,33 @@ +// Scintilla source code edit control +/** @file PropSetSimple.h + ** A basic string to string map. + **/ +// Copyright 1998-2009 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef PROPSETSIMPLE_H +#define PROPSETSIMPLE_H + +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + +class PropSetSimple : public PropertyGet { + void *impl; + void Set(const char *keyVal); +public: + PropSetSimple(); + virtual ~PropSetSimple(); + void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1); + void SetMultiple(const char *); + const char *Get(const char *key) const; + char *Expanded(const char *key) const; + char *ToString() const; + int GetInt(const char *key, int defaultValue=0) const; +}; + +#ifdef SCI_NAMESPACE +} +#endif + +#endif diff -Nru geany-0.18/scintilla/RESearch.cxx geany-0.19/scintilla/RESearch.cxx --- geany-0.18/scintilla/RESearch.cxx 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/RESearch.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -198,6 +198,8 @@ * matches: foo-foo fo-fo fob-fob foobar-foobar ... */ +#include + #include "CharClassify.h" #include "RESearch.h" @@ -246,6 +248,7 @@ */ RESearch::RESearch(CharClassify *charClassTable) { + failure = 0; charClass = charClassTable; Init(); } @@ -416,6 +419,7 @@ ChSet(static_cast(c)); } } + break; case 'w': for (c = 0; c < MAXCHR; c++) { if (iswordc(static_cast(c))) { diff -Nru geany-0.18/scintilla/ScintillaBase.cxx geany-0.19/scintilla/ScintillaBase.cxx --- geany-0.18/scintilla/ScintillaBase.cxx 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/ScintillaBase.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -10,10 +10,14 @@ #include #include +#include +#include + #include "Platform.h" #include "Scintilla.h" #include "PropSet.h" +#include "PropSetSimple.h" #ifdef SCI_LEXER #include "SciLexer.h" #include "Accessor.h" @@ -36,6 +40,7 @@ #include "CharClassify.h" #include "Decoration.h" #include "Document.h" +#include "Selection.h" #include "PositionCache.h" #include "Editor.h" #include "ScintillaBase.h" @@ -52,7 +57,7 @@ lexLanguage = SCLEX_CONTAINER; performingStyle = false; lexCurrent = 0; - for (int wl = 0;wl < numWordLists;wl++) + for (int wl = 0; wl < numWordLists; wl++) keyWordLists[wl] = new WordList; keyWordLists[numWordLists] = 0; #endif @@ -60,7 +65,7 @@ ScintillaBase::~ScintillaBase() { #ifdef SCI_LEXER - for (int wl = 0;wl < numWordLists;wl++) + for (int wl = 0; wl < numWordLists; wl++) delete keyWordLists[wl]; #endif } @@ -190,7 +195,7 @@ ct.CallTipCancel(); } if ((iMessage == SCI_DELETEBACK) || (iMessage == SCI_DELETEBACKNOTLINE)) { - if (currentPos <= ct.posStartCallTip) { + if (sel.MainCaret() <= ct.posStartCallTip) { ct.CallTipCancel(); } } @@ -198,8 +203,8 @@ return Editor::KeyCommand(iMessage); } -void ScintillaBase::AutoCompleteDoubleClick(void* p) { - ScintillaBase* sci = reinterpret_cast(p); +void ScintillaBase::AutoCompleteDoubleClick(void *p) { + ScintillaBase *sci = reinterpret_cast(p); sci->AutoCompleteCompleted(); } @@ -212,24 +217,24 @@ const char *typeSep = strchr(list, ac.GetTypesep()); size_t lenInsert = (typeSep) ? (typeSep-list) : strlen(list); if (ac.ignoreCase) { - SetEmptySelection(currentPos - lenEntered); - pdoc->DeleteChars(currentPos, lenEntered); - SetEmptySelection(currentPos); - pdoc->InsertString(currentPos, list, lenInsert); - SetEmptySelection(currentPos + lenInsert); + SetEmptySelection(sel.MainCaret() - lenEntered); + pdoc->DeleteChars(sel.MainCaret(), lenEntered); + SetEmptySelection(sel.MainCaret()); + pdoc->InsertString(sel.MainCaret(), list, lenInsert); + SetEmptySelection(sel.MainCaret() + lenInsert); } else { - SetEmptySelection(currentPos); - pdoc->InsertString(currentPos, list + lenEntered, lenInsert - lenEntered); - SetEmptySelection(currentPos + lenInsert - lenEntered); + SetEmptySelection(sel.MainCaret()); + pdoc->InsertString(sel.MainCaret(), list + lenEntered, lenInsert - lenEntered); + SetEmptySelection(sel.MainCaret() + lenInsert - lenEntered); } return; } } - ac.Start(wMain, idAutoComplete, currentPos, LocationFromPosition(currentPos), + ac.Start(wMain, idAutoComplete, sel.MainCaret(), PointMainCaret(), lenEntered, vs.lineHeight, IsUnicodeMode()); PRectangle rcClient = GetClientRectangle(); - Point pt = LocationFromPosition(currentPos - lenEntered); + Point pt = LocationFromPosition(sel.MainCaret() - lenEntered); PRectangle rcPopupBounds = wMain.GetMonitorRect(pt); if (rcPopupBounds.Height() == 0) rcPopupBounds = rcClient; @@ -239,7 +244,7 @@ if (pt.x >= rcClient.right - widthLB) { HorizontalScrollTo(xOffset + pt.x - rcClient.right + widthLB); Redraw(); - pt = LocationFromPosition(currentPos); + pt = PointMainCaret(); } PRectangle rcac; rcac.left = pt.x - ac.lb->CaretFromEdge(); @@ -305,7 +310,7 @@ char wordCurrent[1000]; int i; int startWord = ac.posStart - ac.startLen; - for (i = startWord; i < currentPos && i - startWord < 1000; i++) + for (i = startWord; i < sel.MainCaret() && i - startWord < 1000; i++) wordCurrent[i - startWord] = pdoc->CharAt(i); wordCurrent[Platform::Minimum(i - startWord, 999)] = '\0'; ac.Select(wordCurrent); @@ -322,9 +327,9 @@ } void ScintillaBase::AutoCompleteCharacterDeleted() { - if (currentPos < ac.posStart - ac.startLen) { + if (sel.MainCaret() < ac.posStart - ac.startLen) { AutoCompleteCancel(); - } else if (ac.cancelAtStartPos && (currentPos <= ac.posStart)) { + } else if (ac.cancelAtStartPos && (sel.MainCaret() <= ac.posStart)) { AutoCompleteCancel(); } else { AutoCompleteMoveToCurrentWord(); @@ -349,7 +354,6 @@ ac.Show(false); - listSelected = selected; SCNotification scn = {0}; scn.nmhdr.code = listType > 0 ? SCN_USERLISTSELECTION : SCN_AUTOCSELECTION; scn.message = 0; @@ -357,7 +361,7 @@ scn.listType = listType; Position firstPos = ac.posStart - ac.startLen; scn.lParam = firstPos; - scn.text = listSelected.c_str(); + scn.text = selected; NotifyParent(scn); if (!ac.Active()) @@ -367,22 +371,20 @@ if (listType > 0) return; - Position endPos = currentPos; + Position endPos = sel.MainCaret(); if (ac.dropRestOfWord) endPos = pdoc->ExtendWordSelect(endPos, 1, true); if (endPos < firstPos) return; - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); if (endPos != firstPos) { pdoc->DeleteChars(firstPos, endPos - firstPos); } SetEmptySelection(ac.posStart); if (item != -1) { - SString piece = selected; - pdoc->InsertCString(firstPos, piece.c_str()); - SetEmptySelection(firstPos + static_cast(piece.length())); + pdoc->InsertCString(firstPos, selected); + SetEmptySelection(firstPos + static_cast(strlen(selected))); } - pdoc->EndUndoAction(); } int ScintillaBase::AutoCompleteGetCurrent() { @@ -391,6 +393,23 @@ return ac.lb->GetSelection(); } +int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) { + if (ac.Active()) { + int item = ac.lb->GetSelection(); + char selected[1000]; + selected[0] = '\0'; + if (item != -1) { + ac.lb->GetValue(item, selected, sizeof(selected)); + if (buffer != NULL) + strcpy(buffer, selected); + return strlen(selected); + } + } + if (buffer != NULL) + *buffer = '\0'; + return 0; +} + void ScintillaBase::CallTipShow(Point pt, const char *defn) { ac.Cancel(); pt.y += vs.lineHeight; @@ -401,7 +420,7 @@ if (ct.UseStyleCallTip()) { ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back); } - PRectangle rc = ct.CallTipStart(currentPos, pt, + PRectangle rc = ct.CallTipStart(sel.MainCaret(), pt, defn, vs.styles[ctStyle].fontName, vs.styles[ctStyle].sizeZoomed, @@ -436,10 +455,10 @@ AddToPopUp("Undo", idcmdUndo, writable && pdoc->CanUndo()); AddToPopUp("Redo", idcmdRedo, writable && pdoc->CanRedo()); AddToPopUp(""); - AddToPopUp("Cut", idcmdCut, writable && currentPos != anchor); - AddToPopUp("Copy", idcmdCopy, currentPos != anchor); + AddToPopUp("Cut", idcmdCut, writable && !sel.Empty()); + AddToPopUp("Copy", idcmdCopy, !sel.Empty()); AddToPopUp("Paste", idcmdPaste, writable && WndProc(SCI_CANPASTE, 0, 0)); - AddToPopUp("Delete", idcmdDelete, writable && currentPos != anchor); + AddToPopUp("Delete", idcmdDelete, writable && !sel.Empty()); AddToPopUp(""); AddToPopUp("Select All", idcmdSelectAll); popup.Show(pt, wMain); @@ -463,6 +482,8 @@ lexCurrent = LexerModule::Find(lexLanguage); if (!lexCurrent) lexCurrent = LexerModule::Find(SCLEX_NULL); + int bits = lexCurrent ? lexCurrent->GetStyleBitsNeeded() : 5; + vs.EnsureStyle((1 << bits) - 1); } void ScintillaBase::SetLexerLanguage(const char *languageName) { @@ -472,6 +493,8 @@ lexCurrent = LexerModule::Find(SCLEX_NULL); if (lexCurrent) lexLanguage = lexCurrent->GetLanguage(); + int bits = lexCurrent ? lexCurrent->GetStyleBitsNeeded() : 5; + vs.EnsureStyle((1 << bits) - 1); } void ScintillaBase::Colourise(int start, int end) { @@ -563,6 +586,9 @@ case SCI_AUTOCGETCURRENT: return AutoCompleteGetCurrent(); + case SCI_AUTOCGETCURRENTTEXT: + return AutoCompleteGetCurrentText(reinterpret_cast(lParam)); + case SCI_AUTOCSETCANCELATSTART: ac.cancelAtStartPos = wParam != 0; break; @@ -705,25 +731,17 @@ reinterpret_cast(lParam)); break; - case SCI_GETPROPERTY: { - SString val = props.Get(reinterpret_cast(wParam)); - const int n = val.length(); - if (lParam != 0) { - char *ptr = reinterpret_cast(lParam); - memcpy(ptr, val.c_str(), n); - ptr[n] = '\0'; // terminate - } - return n; // Not including NUL - } + case SCI_GETPROPERTY: + return StringResult(lParam, props.Get(reinterpret_cast(wParam))); case SCI_GETPROPERTYEXPANDED: { - SString val = props.GetExpanded(reinterpret_cast(wParam)); - const int n = val.length(); + char *val = props.Expanded(reinterpret_cast(wParam)); + const int n = strlen(val); if (lParam != 0) { char *ptr = reinterpret_cast(lParam); - memcpy(ptr, val.c_str(), n); - ptr[n] = '\0'; // terminate + strcpy(ptr, val); } + delete []val; return n; // Not including NUL } @@ -741,8 +759,12 @@ SetLexerLanguage(reinterpret_cast(lParam)); break; + case SCI_GETLEXERLANGUAGE: + return StringResult(lParam, lexCurrent ? lexCurrent->languageName : ""); + case SCI_GETSTYLEBITSNEEDED: return lexCurrent ? lexCurrent->GetStyleBitsNeeded() : 5; + #endif default: diff -Nru geany-0.18/scintilla/ScintillaBase.h geany-0.19/scintilla/ScintillaBase.h --- geany-0.18/scintilla/ScintillaBase.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/ScintillaBase.h 2010-06-06 19:34:26.000000000 +0100 @@ -16,8 +16,8 @@ */ class ScintillaBase : public Editor { // Private so ScintillaBase objects can not be copied - ScintillaBase(const ScintillaBase &) : Editor() {} - ScintillaBase &operator=(const ScintillaBase &) { return *this; } + ScintillaBase(const ScintillaBase &); + ScintillaBase &operator=(const ScintillaBase &); protected: /** Enumeration of commands and child windows. */ @@ -41,15 +41,13 @@ CallTip ct; int listType; ///< 0 is an autocomplete list - SString listSelected; ///< Receives listbox selected string int maxListWidth; /// Maximum width of list, in average character widths - bool performingStyle; ///< Prevent reentrance - #ifdef SCI_LEXER + bool performingStyle; ///< Prevent reentrance int lexLanguage; const LexerModule *lexCurrent; - PropSet props; + PropSetSimple props; enum {numWordLists=KEYWORDSET_MAX+1}; WordList *keyWordLists[numWordLists+1]; void SetLexer(uptr_t wParam); @@ -73,11 +71,12 @@ void AutoCompleteCancel(); void AutoCompleteMove(int delta); int AutoCompleteGetCurrent(); + int AutoCompleteGetCurrentText(char *buffer); void AutoCompleteCharacterAdded(char ch); void AutoCompleteCharacterDeleted(); void AutoCompleteCompleted(); void AutoCompleteMoveToCurrentWord(); - static void AutoCompleteDoubleClick(void* p); + static void AutoCompleteDoubleClick(void *p); void CallTipClick(); void CallTipShow(Point pt, const char *defn); diff -Nru geany-0.18/scintilla/ScintillaGTK.cxx geany-0.19/scintilla/ScintillaGTK.cxx --- geany-0.18/scintilla/ScintillaGTK.cxx 2009-07-04 10:19:36.000000000 +0100 +++ geany-0.19/scintilla/ScintillaGTK.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -10,6 +10,9 @@ #include #include +#include +#include + #include #include @@ -24,6 +27,7 @@ #ifdef SCI_LEXER #include "SciLexer.h" #include "PropSet.h" +#include "PropSetSimple.h" #include "Accessor.h" #include "KeyWords.h" #endif @@ -44,17 +48,15 @@ #include "Decoration.h" #include "CharClassify.h" #include "Document.h" +#include "Selection.h" #include "PositionCache.h" #include "Editor.h" -#include "SString.h" #include "ScintillaBase.h" #include "UniConversion.h" #include "gtk/gtksignal.h" #include "gtk/gtkmarshal.h" -#if GLIB_MAJOR_VERSION >= 2 #include "scintilla-marshal.h" -#endif #ifdef SCI_LEXER #include @@ -62,15 +64,7 @@ #include "ExternalLexer.h" #endif -#define INTERNATIONAL_INPUT - -#if !PLAT_GTK_WIN32 || GTK_MAJOR_VERSION >= 2 -#define USE_CONVERTER -#endif - -#ifdef USE_CONVERTER #include "Converter.h" -#endif #ifdef _MSC_VER // Constant conditional expressions are because of GTK+ headers @@ -83,11 +77,7 @@ #define USE_GTK_CLIPBOARD #endif -#if GLIB_MAJOR_VERSION < 2 -#define OBJECT_CLASS GtkObjectClass -#else #define OBJECT_CLASS GObjectClass -#endif #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -116,6 +106,7 @@ bool capturedMouse; bool dragWasDropped; int lastKey; + int rectangularSelectionModifier; GtkWidgetClass *parentClass; @@ -130,17 +121,9 @@ CLIPFORMAT cfColumnSelect; #endif -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - // Input context used for supporting internationalized key entry - GdkIC *ic; - GdkICAttr *ic_attr; -#else Window wPreedit; Window wPreeditDraw; GtkIMContext *im_context; -#endif -#endif // Wheel mouse support unsigned int linesPerScroll; @@ -151,8 +134,8 @@ GdkRegion *rgnUpdate; // Private so ScintillaGTK objects can not be copied - ScintillaGTK(const ScintillaGTK &) : ScintillaBase() {} - ScintillaGTK &operator=(const ScintillaGTK &) { return * this; } + ScintillaGTK(const ScintillaGTK &); + ScintillaGTK &operator=(const ScintillaGTK &); public: ScintillaGTK(_ScintillaObject *sci_); @@ -190,6 +173,8 @@ void NotifyKey(int key, int modifiers); void NotifyURIDropped(const char *list); const char *CharacterSetID() const; + virtual CaseFolder *CaseFolderForEncoding(); + virtual std::string CaseMapString(const std::string &s, int caseMapping); virtual int KeyDefault(int key, int modifiers); virtual void CopyToClipboard(const SelectionText &selectedText); virtual void Copy(); @@ -238,36 +223,25 @@ gint PressThis(GdkEventButton *event); static gint Press(GtkWidget *widget, GdkEventButton *event); static gint MouseRelease(GtkWidget *widget, GdkEventButton *event); -#if PLAT_GTK_WIN32 || (GTK_MAJOR_VERSION >= 2) static gint ScrollEvent(GtkWidget *widget, GdkEventScroll *event); -#endif static gint Motion(GtkWidget *widget, GdkEventMotion *event); gboolean KeyThis(GdkEventKey *event); static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event); static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event); -#if GTK_MAJOR_VERSION >= 2 gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); void CommitThis(char *str); static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis); void PreeditChangedThis(); static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis); -#endif static gint StyleSetText(GtkWidget *widget, GtkStyle *previous, void*); static gint RealizeText(GtkWidget *widget, void*); -#if GLIB_MAJOR_VERSION < 2 - static void Destroy(GtkObject *object); -#else static void Destroy(GObject *object); -#endif static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data, guint time); static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, guint info, guint time); static gint SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event); -#if GTK_MAJOR_VERSION < 2 - static gint SelectionNotify(GtkWidget *widget, GdkEventSelection *selection_event); -#endif static void DragBegin(GtkWidget *widget, GdkDragContext *context); gboolean DragMotionThis(GdkDragContext *context, gint x, gint y, guint dragtime); static gboolean DragMotion(GtkWidget *widget, GdkDragContext *context, @@ -282,7 +256,9 @@ static void DragDataGet(GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time); static gint TimeOut(ScintillaGTK *sciThis); - static gint IdleCallback(ScintillaGTK *sciThis); + static gboolean IdleCallback(ScintillaGTK *sciThis); + static gboolean StyleIdle(ScintillaGTK *sciThis); + virtual void QueueStyling(int upTo); static void PopUpCB(ScintillaGTK *sciThis, guint action, GtkWidget *widget); gint ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose); @@ -302,9 +278,6 @@ }; static gint scintilla_signals[LAST_SIGNAL] = { 0 }; -#if GLIB_MAJOR_VERSION < 2 -static GtkWidgetClass *parent_class = NULL; -#endif enum { TARGET_STRING, @@ -346,15 +319,8 @@ adjustmentv(0), adjustmenth(0), scrollBarWidth(30), scrollBarHeight(30), capturedMouse(false), dragWasDropped(false), - lastKey(0), parentClass(0), -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - ic(NULL), - ic_attr(NULL), -#else + lastKey(0), rectangularSelectionModifier(SCMOD_CTRL), parentClass(0), im_context(NULL), -#endif -#endif lastWheelMouseDirection(0), wheelMouseIntensity(0), rgnUpdate(0) { @@ -362,6 +328,12 @@ wMain = GTK_WIDGET(sci); #if PLAT_GTK_WIN32 + rectangularSelectionModifier = SCMOD_ALT; +#else + rectangularSelectionModifier = SCMOD_CTRL; +#endif + +#if PLAT_GTK_WIN32 // There does not seem to be a real standard for indicating that the clipboard // contains a rectangular selection, so copy Developer Studio. cfColumnSelect = static_cast( @@ -407,65 +379,6 @@ gdk_window_show(widget->window); gdk_cursor_destroy(cursor); widget->style = gtk_style_attach(widget->style, widget->window); -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - if (gdk_im_ready() && (ic_attr = gdk_ic_attr_new()) != NULL) { - gint width, height; - GdkColormap *colormap; - GdkEventMask mask; - GdkICAttr *attr = ic_attr; - GdkICAttributesType attrmask = GDK_IC_ALL_REQ; - GdkIMStyle style; - GdkIMStyle supported_style = (GdkIMStyle) (GDK_IM_PREEDIT_NONE | - GDK_IM_PREEDIT_NOTHING | - GDK_IM_PREEDIT_POSITION | - GDK_IM_STATUS_NONE | - GDK_IM_STATUS_NOTHING); - - if (widget->style && widget->style->font->type != GDK_FONT_FONTSET) - supported_style = (GdkIMStyle) ((int) supported_style & ~GDK_IM_PREEDIT_POSITION); - - attr->style = style = gdk_im_decide_style(supported_style); - attr->client_window = widget->window; - - if ((colormap = gtk_widget_get_colormap (widget)) != gtk_widget_get_default_colormap ()) { - attrmask = (GdkICAttributesType) ((int) attrmask | GDK_IC_PREEDIT_COLORMAP); - attr->preedit_colormap = colormap; - } - - switch (style & GDK_IM_PREEDIT_MASK) { - case GDK_IM_PREEDIT_POSITION: - if (widget->style && widget->style->font->type != GDK_FONT_FONTSET) { - g_warning("over-the-spot style requires fontset"); - break; - } - - attrmask = (GdkICAttributesType) ((int) attrmask | GDK_IC_PREEDIT_POSITION_REQ); - gdk_window_get_size(widget->window, &width, &height); - attr->spot_location.x = 0; - attr->spot_location.y = height; - attr->preedit_area.x = 0; - attr->preedit_area.y = 0; - attr->preedit_area.width = width; - attr->preedit_area.height = height; - attr->preedit_fontset = widget->style->font; - - break; - } - ic = gdk_ic_new(attr, attrmask); - - if (ic == NULL) { - g_warning("Can't create input context."); - } else { - mask = gdk_window_get_events(widget->window); - mask = (GdkEventMask) ((int) mask | gdk_ic_get_events(ic)); - gdk_window_set_events(widget->window, mask); - - if (GTK_WIDGET_HAS_FOCUS(widget)) - gdk_im_begin(ic, widget->window); - } - } -#else wPreedit = gtk_window_new(GTK_WINDOW_POPUP); wPreeditDraw = gtk_drawing_area_new(); GtkWidget *predrw = PWidget(wPreeditDraw); // No code inside the G_OBJECT macro @@ -482,20 +395,11 @@ g_signal_connect(G_OBJECT(im_context), "preedit_changed", G_CALLBACK(PreeditChanged), this); gtk_im_context_set_client_window(im_context, widget->window); -#endif -#endif GtkWidget *widtxt = PWidget(wText); // // No code inside the G_OBJECT macro -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_connect_after(GTK_OBJECT(widtxt), "style_set", - GtkSignalFunc(ScintillaGTK::StyleSetText), NULL); - gtk_signal_connect_after(GTK_OBJECT(widtxt), "realize", - GtkSignalFunc(ScintillaGTK::RealizeText), NULL); -#else g_signal_connect_after(G_OBJECT(widtxt), "style_set", G_CALLBACK(ScintillaGTK::StyleSetText), NULL); g_signal_connect_after(G_OBJECT(widtxt), "realize", G_CALLBACK(ScintillaGTK::RealizeText), NULL); -#endif gtk_widget_realize(widtxt); gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); @@ -515,23 +419,10 @@ gtk_widget_unrealize(PWidget(wText)); gtk_widget_unrealize(PWidget(scrollbarv)); gtk_widget_unrealize(PWidget(scrollbarh)); -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - if (ic) { - gdk_ic_destroy(ic); - ic = NULL; - } - if (ic_attr) { - gdk_ic_attr_destroy(ic_attr); - ic_attr = NULL; - } -#else gtk_widget_unrealize(PWidget(wPreedit)); gtk_widget_unrealize(PWidget(wPreeditDraw)); g_object_unref(im_context); im_context = NULL; -#endif -#endif if (GTK_WIDGET_CLASS(parentClass)->unrealize) GTK_WIDGET_CLASS(parentClass)->unrealize(widget); @@ -613,18 +504,6 @@ } } -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 -gint ScintillaGTK::CursorMoved(GtkWidget *widget, int xoffset, int yoffset, ScintillaGTK *sciThis) { - if (GTK_WIDGET_HAS_FOCUS(widget) && gdk_im_ready() && sciThis->ic && - (gdk_ic_get_style(sciThis->ic) & GDK_IM_PREEDIT_POSITION)) { - sciThis->ic_attr->spot_location.x = xoffset; - sciThis->ic_attr->spot_location.y = yoffset; - gdk_ic_set_attr(sciThis->ic, sciThis->ic_attr, GDK_IC_SPOT_LOCATION); - } - return FALSE; -} -#else gint ScintillaGTK::CursorMoved(GtkWidget *, int xoffset, int yoffset, ScintillaGTK *sciThis) { GdkRectangle area; area.x = xoffset; @@ -634,22 +513,11 @@ gtk_im_context_set_cursor_location(sciThis->im_context, &area); return FALSE; } -#endif -#else -gint ScintillaGTK::CursorMoved(GtkWidget *, int, int, ScintillaGTK *) { - return FALSE; -} -#endif gint ScintillaGTK::FocusInThis(GtkWidget *widget) { try { GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS); SetFocusState(true); -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - if (ic) - gdk_im_begin(ic, widget->window); -#else if (im_context != NULL) { gchar *str = NULL; gint cursor_pos; @@ -665,8 +533,6 @@ g_free(str); gtk_im_context_focus_in(im_context); } -#endif -#endif } catch (...) { errorStatus = SC_STATUS_FAILURE; @@ -684,16 +550,10 @@ GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS); SetFocusState(false); -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - gdk_im_end(); -#else if (PWidget(wPreedit) != NULL) gtk_widget_hide(PWidget(wPreedit)); if (im_context != NULL) gtk_im_context_focus_out(im_context); -#endif -#endif } catch (...) { errorStatus = SC_STATUS_FAILURE; @@ -728,19 +588,6 @@ sciThis->Resize(allocation->width, allocation->height); -#ifdef INTERNATIONAL_INPUT -#if GTK_MAJOR_VERSION < 2 - if (sciThis->ic && (gdk_ic_get_style(sciThis->ic) & GDK_IM_PREEDIT_POSITION)) { - gint width, height; - - gdk_window_get_size(widget->window, &width, &height); - sciThis->ic_attr->preedit_area.width = width; - sciThis->ic_attr->preedit_area.height = height; - - gdk_ic_set_attr(sciThis->ic, sciThis->ic_attr, GDK_IC_PREEDIT_AREA); - } -#endif -#endif } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; } @@ -769,43 +616,26 @@ gtk_widget_set_parent(PWidget(wText), PWidget(wMain)); GtkWidget *widtxt = PWidget(wText); // No code inside the G_OBJECT macro gtk_widget_show(widtxt); -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_connect(GTK_OBJECT(widtxt), "expose_event", - GtkSignalFunc(ScintillaGTK::ExposeText), this); -#else g_signal_connect(G_OBJECT(widtxt), "expose_event", G_CALLBACK(ScintillaGTK::ExposeText), this); -#endif gtk_widget_set_events(widtxt, GDK_EXPOSURE_MASK); -#if GTK_MAJOR_VERSION >= 2 // Avoid background drawing flash gtk_widget_set_double_buffered(widtxt, FALSE); -#endif gtk_drawing_area_size(GTK_DRAWING_AREA(widtxt), 100,100); adjustmentv = gtk_adjustment_new(0.0, 0.0, 201.0, 1.0, 20.0, 20.0); scrollbarv = gtk_vscrollbar_new(GTK_ADJUSTMENT(adjustmentv)); GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarv), GTK_CAN_FOCUS); -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_connect(adjustmentv, "value_changed", - GtkSignalFunc(ScrollSignal), this); -#else g_signal_connect(G_OBJECT(adjustmentv), "value_changed", G_CALLBACK(ScrollSignal), this); -#endif gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarv)); adjustmenth = gtk_adjustment_new(0.0, 0.0, 101.0, 1.0, 20.0, 20.0); scrollbarh = gtk_hscrollbar_new(GTK_ADJUSTMENT(adjustmenth)); GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarh), GTK_CAN_FOCUS); -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_connect(adjustmenth, "value_changed", - GtkSignalFunc(ScrollHSignal), this); -#else g_signal_connect(G_OBJECT(adjustmenth), "value_changed", G_CALLBACK(ScrollHSignal), this); -#endif gtk_widget_set_parent(PWidget(scrollbarh), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarh)); @@ -823,7 +653,6 @@ GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets, static_cast(GDK_ACTION_COPY | GDK_ACTION_MOVE)); -#if GLIB_MAJOR_VERSION >= 2 // Set caret period based on GTK settings gboolean blinkOn = false; if (g_object_class_find_property(G_OBJECT_GET_CLASS( @@ -841,7 +670,6 @@ } else { caret.period = 0; } -#endif SetTicking(true); } @@ -859,12 +687,8 @@ } bool ScintillaGTK::DragThreshold(Point ptStart, Point ptNow) { -#if GTK_MAJOR_VERSION < 2 - return Editor::DragThreshold(ptStart, ptNow); -#else return gtk_drag_check_threshold(GTK_WIDGET(PWidget(wMain)), ptStart.x, ptStart.y, ptNow.x, ptNow.y); -#endif } void ScintillaGTK::StartDrag() { @@ -878,9 +702,9 @@ reinterpret_cast(&evbtn)); } -#ifdef USE_CONVERTER static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, - const char *charSetSource, bool transliterations) { + const char *charSetSource, bool transliterations, bool silent=false) { + // s is not const because of different versions of iconv disagreeing about const *lenResult = 0; char *destForm = 0; Converter conv(charSetDest, charSetSource, transliterations); @@ -892,7 +716,9 @@ size_t outLeft = len*3+1; size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions == ((size_t)(-1))) { -fprintf(stderr, "iconv %s->%s failed for %s\n", charSetSource, charSetDest, static_cast(s)); + if (!silent) + fprintf(stderr, "iconv %s->%s failed for %s\n", + charSetSource, charSetDest, static_cast(s)); delete []destForm; destForm = 0; } else { @@ -910,7 +736,6 @@ } return destForm; } -#endif // Returns the target converted to UTF8. // Return the length in bytes. @@ -922,7 +747,6 @@ } } else { // Need to convert -#ifdef USE_CONVERTER const char *charSetBuffer = CharacterSetID(); if (*charSetBuffer) { //~ fprintf(stderr, "AsUTF8 %s %d %0d-%0d\n", charSetBuffer, targetLength, targetStart, targetEnd); @@ -943,10 +767,6 @@ pdoc->GetCharRange(text, targetStart, targetLength); } } -#else - // Fail - return 0; -#endif } //~ fprintf(stderr, "Length = %d bytes\n", targetLength); return targetLength; @@ -963,14 +783,11 @@ return inputLength; } else { // Need to convert -#ifdef USE_CONVERTER const char *charSetBuffer = CharacterSetID(); if (*charSetBuffer) { -//~ fprintf(stderr, "Encode %s %d\n", charSetBuffer, inputLength); int outLength = 0; char *tmpEncoded = ConvertText(&outLength, utf8, inputLength, charSetBuffer, "UTF-8", true); if (tmpEncoded) { -//~ fprintf(stderr, " \"%s\"\n", tmpEncoded); if (encoded) { memcpy(encoded, tmpEncoded, outLength); } @@ -983,14 +800,18 @@ } return inputLength; } -#endif } // Fail return 0; } bool ScintillaGTK::ValidCodePage(int codePage) const { - return codePage == 0 || codePage == SC_CP_UTF8 || codePage == SC_CP_DBCS; + return codePage == 0 + || codePage == SC_CP_UTF8 + || codePage == 932 + || codePage == 936 + || codePage == 950 + || codePage == SC_CP_DBCS; } sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { @@ -1009,7 +830,7 @@ #ifdef SCI_LEXER case SCI_LOADLEXERLIBRARY: - LexerManager::GetInstance()->Load(reinterpret_cast(wParam)); + LexerManager::GetInstance()->Load(reinterpret_cast(lParam)); break; #endif case SCI_TARGETASUTF8: @@ -1019,6 +840,13 @@ return EncodedFromUTF8(reinterpret_cast(wParam), reinterpret_cast(lParam)); + case SCI_SETRECTANGULARSELECTIONMODIFIER: + rectangularSelectionModifier = wParam; + break; + + case SCI_GETRECTANGULARSELECTIONMODIFIER: + return rectangularSelectionModifier; + default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } @@ -1049,16 +877,17 @@ bool ScintillaGTK::SetIdle(bool on) { if (on) { // Start idler, if it's not running. - if (idler.state == false) { + if (!idler.state) { idler.state = true; - idler.idlerID = reinterpret_cast - (gtk_idle_add((GtkFunction)IdleCallback, this)); + idler.idlerID = reinterpret_cast( + g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, + reinterpret_cast(IdleCallback), this, NULL)); } } else { // Stop idler, if it's running - if (idler.state == true) { + if (idler.state) { idler.state = false; - gtk_idle_remove(GPOINTER_TO_UINT(idler.idlerID)); + g_source_remove(GPOINTER_TO_UINT(idler.idlerID)); } } return true; @@ -1097,25 +926,7 @@ // Redraw all of text area. This paint will not be abandoned. void ScintillaGTK::FullPaint() { -#if GTK_MAJOR_VERSION < 2 - paintState = painting; - rcPaint = GetClientRectangle(); - //Platform::DebugPrintf("ScintillaGTK::FullPaint %0d,%0d %0d,%0d\n", - // rcPaint.left, rcPaint.top, rcPaint.right, rcPaint.bottom); - paintingAllText = true; - if ((PWidget(wText))->window) { - Surface *sw = Surface::Allocate(); - if (sw) { - sw->Init(PWidget(wText)->window, PWidget(wText)); - Paint(sw, rcPaint); - sw->Release(); - delete sw; - } - } - paintState = notPainting; -#else wText.InvalidateAll(); -#endif } PRectangle ScintillaGTK::GetClientRectangle() { @@ -1160,50 +971,8 @@ // rc.left, rc.top, rc.right, rc.bottom); GtkWidget *wi = PWidget(wText); -#if GTK_MAJOR_VERSION < 2 - PRectangle rc = GetClientRectangle(); - GdkGC *gc = gdk_gc_new(wi->window); - - // Set up gc so we get GraphicsExposures from gdk_draw_pixmap - // which calls XCopyArea - gdk_gc_set_exposures(gc, TRUE); - - // Redraw exposed bit : scrolling upwards - if (diff > 0) { - gdk_draw_pixmap(wi->window, - gc, wi->window, - 0, diff, - 0, 0, - rc.Width()-1, rc.Height() - diff); - SyncPaint(PRectangle(0, rc.Height() - diff, - rc.Width(), rc.Height()+1)); - - // Redraw exposed bit : scrolling downwards - } else { - gdk_draw_pixmap(wi->window, - gc, wi->window, - 0, 0, - 0, -diff, - rc.Width()-1, rc.Height() + diff); - SyncPaint(PRectangle(0, 0, rc.Width(), -diff)); - } - - // Look for any graphics expose - GdkEvent* event; - while ((event = gdk_event_get_graphics_expose(wi->window)) != NULL) { - gtk_widget_event(wi, event); - if (event->expose.count == 0) { - gdk_event_free(event); - break; - } - gdk_event_free(event); - } - - gdk_gc_unref(gc); -#else gdk_window_scroll(wi->window, 0, -diff); gdk_window_process_updates(wi->window, FALSE); -#endif } void ScintillaGTK::SetVerticalScrollPos() { @@ -1257,37 +1026,21 @@ } void ScintillaGTK::NotifyChange() { -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], - Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); -#else g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); -#endif } void ScintillaGTK::NotifyFocus(bool focus) { -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], - Platform::LongFromTwoShorts - (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); -#else g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, Platform::LongFromTwoShorts (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); -#endif } void ScintillaGTK::NotifyParent(SCNotification scn) { scn.nmhdr.hwndFrom = PWidget(wMain); scn.nmhdr.idFrom = GetCtrlID(); -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], - GetCtrlID(), &scn); -#else g_signal_emit(G_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], 0, GetCtrlID(), &scn); -#endif } void ScintillaGTK::NotifyKey(int key, int modifiers) { @@ -1313,6 +1066,110 @@ return ::CharacterSetID(vs.styles[STYLE_DEFAULT].characterSet); } +class CaseFolderUTF8 : public CaseFolderTable { +public: + CaseFolderUTF8() { + StandardASCII(); + } + virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) { + if ((lenMixed == 1) && (sizeFolded > 0)) { + folded[0] = mapping[static_cast(mixed[0])]; + return 1; + } else { + gchar *mapped = g_utf8_casefold(mixed, lenMixed); + size_t lenMapped = strlen(mapped); + if (lenMapped < sizeFolded) { + memcpy(folded, mapped, lenMapped); + } else { + lenMapped = 0; + } + g_free(mapped); + return lenMapped; + } + } +}; + +CaseFolder *ScintillaGTK::CaseFolderForEncoding() { + if (pdoc->dbcsCodePage == SC_CP_UTF8) { + return new CaseFolderUTF8(); + } else { + CaseFolderTable *pcf = new CaseFolderTable(); + const char *charSetBuffer = CharacterSetID(); + if ((pdoc->dbcsCodePage == 0) && charSetBuffer) { + pcf->StandardASCII(); + // Only for single byte encodings + for (int i=0x80; i<0x100; i++) { + char sCharacter[2] = "A"; + sCharacter[0] = i; + int convertedLength = 1; + const char *sUTF8 = ConvertText(&convertedLength, sCharacter, 1, + "UTF-8", charSetBuffer, false); + if (sUTF8) { + gchar *mapped = g_utf8_casefold(sUTF8, strlen(sUTF8)); + if (mapped) { + int mappedLength = strlen(mapped); + const char *mappedBack = ConvertText(&mappedLength, mapped, + mappedLength, charSetBuffer, "UTF-8", false, true); + if (mappedBack && (strlen(mappedBack) == 1) && (mappedBack[0] != sCharacter[0])) { + pcf->SetTranslation(sCharacter[0], mappedBack[0]); + } + delete []mappedBack; + g_free(mapped); + } + } + delete []sUTF8; + } + } + return pcf; + } +} + +std::string ScintillaGTK::CaseMapString(const std::string &s, int caseMapping) { + if (s.size() == 0) + return std::string(); + + if (caseMapping == cmSame) + return s; + + const char *needsFree1 = 0; // Must be freed with delete [] + const char *charSetBuffer = CharacterSetID(); + const char *sUTF8 = s.c_str(); + int rangeBytes = s.size(); + + int convertedLength = rangeBytes; + // Change text to UTF-8 + if (!IsUnicodeMode()) { + // Need to convert + if (*charSetBuffer) { + sUTF8 = ConvertText(&convertedLength, const_cast(s.c_str()), rangeBytes, + "UTF-8", charSetBuffer, false); + needsFree1 = sUTF8; + } + } + gchar *mapped; // Must be freed with g_free + if (caseMapping == cmUpper) { + mapped = g_utf8_strup(sUTF8, convertedLength); + } else { + mapped = g_utf8_strdown(sUTF8, convertedLength); + } + int mappedLength = strlen(mapped); + char *mappedBack = mapped; + + char *needsFree2 = 0; // Must be freed with delete [] + if (!IsUnicodeMode()) { + if (*charSetBuffer) { + mappedBack = ConvertText(&mappedLength, mapped, mappedLength, charSetBuffer, "UTF-8", false); + needsFree2 = mappedBack; + } + } + + std::string ret(mappedBack, mappedLength); + g_free(mapped); + delete []needsFree1; + delete []needsFree2; + return ret; +} + int ScintillaGTK::KeyDefault(int key, int modifiers) { if (!(modifiers & SCI_CTRL) && !(modifiers & SCI_ALT)) { if (key < 256) { @@ -1345,7 +1202,7 @@ } void ScintillaGTK::Copy() { - if (currentPos != anchor) { + if (!sel.Empty()) { #ifndef USE_GTK_CLIPBOARD CopySelectionRange(©Text); gtk_selection_owner_set(GTK_WIDGET(PWidget(wMain)), @@ -1357,7 +1214,7 @@ StoreOnClipboard(clipText); #endif #if PLAT_GTK_WIN32 - if (selType == selRectangle) { + if (sel.IsRectangular()) { ::OpenClipboard(NULL); ::SetClipboardData(cfColumnSelect, 0); ::CloseClipboard(); @@ -1378,17 +1235,10 @@ ct.wDraw = gtk_drawing_area_new(); GtkWidget *widcdrw = PWidget(ct.wDraw); // // No code inside the G_OBJECT macro gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), widcdrw); -#if GLIB_MAJOR_VERSION < 2 - gtk_signal_connect(GTK_OBJECT(widcdrw), "expose_event", - GtkSignalFunc(ScintillaGTK::ExposeCT), &ct); - gtk_signal_connect(GTK_OBJECT(widcdrw), "button_press_event", - GtkSignalFunc(ScintillaGTK::PressCT), static_cast(this)); -#else g_signal_connect(G_OBJECT(widcdrw), "expose_event", G_CALLBACK(ScintillaGTK::ExposeCT), &ct); g_signal_connect(G_OBJECT(widcdrw), "button_press_event", G_CALLBACK(ScintillaGTK::PressCT), static_cast(this)); -#endif gtk_widget_set_events(widcdrw, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); } @@ -1410,9 +1260,7 @@ menuSig, cmd, const_cast(label[0] ? "" : ""), -#if GTK_MAJOR_VERSION >= 2 NULL -#endif }; gtk_item_factory_create_item(GTK_ITEM_FACTORY(popup.GetID()), &itemEntry, this, 1); @@ -1433,7 +1281,7 @@ void ScintillaGTK::ClaimSelection() { // X Windows has a 'primary selection' as well as the clipboard. // Whenever the user selects some text, we become the primary selection - if (currentPos != anchor && GTK_WIDGET_REALIZED(GTK_WIDGET(PWidget(wMain)))) { + if (!sel.Empty() && GTK_WIDGET_REALIZED(GTK_WIDGET(PWidget(wMain)))) { primarySelection = true; gtk_selection_owner_set(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME); @@ -1468,6 +1316,8 @@ isRectangular = ::IsClipboardFormatAvailable(cfColumnSelect) != 0; #else isRectangular = ((len > 2) && (data[len - 1] == 0 && data[len - 2] == '\n')); + if (isRectangular) + len--; // Forget the extra '\0' #endif char *dest; @@ -1487,16 +1337,13 @@ } else { // UTF-8 dest = Document::TransformLineEnds(&len, data, len, pdoc->eolMode); selText.Set(dest, len, SC_CP_UTF8, 0, isRectangular, false); -#ifdef USE_CONVERTER const char *charSetBuffer = CharacterSetID(); if (!IsUnicodeMode() && *charSetBuffer) { -//fprintf(stderr, "Convert to locale %s\n", CharacterSetID()); - // Convert to locale - dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8", true); - selText.Set(dest, len, pdoc->dbcsCodePage, - vs.styles[STYLE_DEFAULT].characterSet, selText.rectangular, false); + // Convert to locale + dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8", true); + selText.Set(dest, len, pdoc->dbcsCodePage, + vs.styles[STYLE_DEFAULT].characterSet, selText.rectangular, false); } -#endif } } @@ -1513,19 +1360,19 @@ SelectionText selText; GetGtkSelectionText(selection_data, selText); - pdoc->BeginUndoAction(); + UndoGroup ug(pdoc); if (selection_data->selection != GDK_SELECTION_PRIMARY) { ClearSelection(); } - int selStart = SelectionStart(); + SelectionPosition selStart = sel.IsRectangular() ? + sel.Rectangular().Start() : + sel.Range(sel.Main()).Start(); if (selText.rectangular) { PasteRectangular(selStart, selText.s, selText.len); } else { - pdoc->InsertString(currentPos, selText.s, selText.len); - SetEmptySelection(currentPos + selText.len); + InsertPaste(selStart, selText.s, selText.len); } - pdoc->EndUndoAction(); EnsureCaretVisible(); } } @@ -1574,7 +1421,6 @@ } #endif -#if GTK_MAJOR_VERSION >= 2 // Convert text to utf8 if it isn't already SelectionText *converted = 0; if ((text->codePage != SC_CP_UTF8) && (info == TARGET_UTF8_STRING)) { @@ -1595,79 +1441,22 @@ // All other tested aplications behave benignly by ignoring the \0. // The #if is here because on Windows cfColumnSelect clip entry is used // instead as standard indicator of rectangularness (so no need to kludge) - int len = strlen(text->s); + const char *textData = text->s ? text->s : ""; + int len = strlen(textData); #if PLAT_GTK_WIN32 == 0 if (text->rectangular) len++; #endif if (info == TARGET_UTF8_STRING) { - gtk_selection_data_set_text(selection_data, text->s, len); + gtk_selection_data_set_text(selection_data, textData, len); } else { gtk_selection_data_set(selection_data, static_cast(GDK_SELECTION_TYPE_STRING), - 8, reinterpret_cast(text->s), len); + 8, reinterpret_cast(textData), len); } delete converted; -#else /* Gtk 1 */ - char *selBuffer = text->s; - - char *tmputf = 0; - if ((info == TARGET_UTF8_STRING) || (info == TARGET_STRING)) { - int len = strlen(selBuffer); -#ifdef USE_CONVERTER - // Possible character set conversion - const char *charSetBuffer = ::CharacterSetID(text->characterSet); - if (info == TARGET_UTF8_STRING) { - //fprintf(stderr, "Copy to clipboard as UTF-8\n"); - if (text->codePage != SC_CP_UTF8) { - // Convert to UTF-8 - //fprintf(stderr, "Convert to UTF-8 from %s\n", charSetBuffer); - tmputf = ConvertText(&len, selBuffer, len, "UTF-8", charSetBuffer, false); - selBuffer = tmputf; - } - } else if (info == TARGET_STRING) { - if (text->codePage == SC_CP_UTF8) { - //fprintf(stderr, "Convert to locale %s\n", charSetBuffer); - // Convert to locale - tmputf = ConvertText(&len, selBuffer, len, charSetBuffer, "UTF-8", true); - selBuffer = tmputf; - } - } -#endif - - // Here is a somewhat evil kludge. - // As I can not work out how to store data on the clipboard in multiple formats - // and need some way to mark the clipping as being stream or rectangular, - // the terminating \0 is included in the length for rectangular clippings. - // All other tested aplications behave benignly by ignoring the \0. - // The #if is here because on Windows cfColumnSelect clip entry is used - // instead as standard indicator of rectangularness (so no need to kludge) -#if PLAT_GTK_WIN32 == 0 - if (text->rectangular) - len++; -#endif - gtk_selection_data_set(selection_data, - (info == TARGET_STRING) ? - static_cast(GDK_SELECTION_TYPE_STRING) : atomUTF8, - 8, reinterpret_cast(selBuffer), - len); - } else if ((info == TARGET_TEXT) || (info == TARGET_COMPOUND_TEXT)) { - guchar *text; - GdkAtom encoding; - gint format; - gint new_length; - - gdk_string_to_compound_text(reinterpret_cast(selBuffer), - &encoding, &format, &text, &new_length); - gtk_selection_data_set(selection_data, encoding, format, text, new_length); - gdk_free_compound_text(text); - } - - delete []tmputf; -#endif /* Gtk >= 2 */ - #if PLAT_GTK_WIN32 delete newline_normalized; #endif @@ -1726,9 +1515,6 @@ int horizontalScrollBarHeight = scrollBarHeight; if (!showSBHorizontal) horizontalScrollBarHeight = 0; - int verticalScrollBarHeight = scrollBarWidth; - if (!verticalScrollBarVisible) - verticalScrollBarHeight = 0; GtkAllocation alloc; if (showSBHorizontal) { @@ -1780,6 +1566,21 @@ gtk_adjustment_set_value(adjustment, value); } +static int modifierTranslated(int sciModifier) { + switch (sciModifier) { + case SCMOD_SHIFT: + return GDK_SHIFT_MASK; + case SCMOD_CTRL: + return GDK_CONTROL_MASK; + case SCMOD_ALT: + return GDK_MOD1_MASK; + case SCMOD_SUPER: + return GDK_MOD4_MASK; + default: + return 0; + } +} + gint ScintillaGTK::PressThis(GdkEventButton *event) { try { //Platform::DebugPrintf("Press %x time=%d state = %x button = %x\n",this,event->time, event->state, event->button); @@ -1803,25 +1604,20 @@ gtk_widget_grab_focus(PWidget(wMain)); if (event->button == 1) { - // On X, instead of sending literal modifiers use control instead of alt + // On X, instead of sending literal modifiers use the user specified + // modifier, defaulting to control instead of alt. // This is because most X window managers grab alt + click for moving -#if !PLAT_GTK_WIN32 - ButtonDown(pt, event->time, - (event->state & GDK_SHIFT_MASK) != 0, - (event->state & GDK_CONTROL_MASK) != 0, - (event->state & GDK_CONTROL_MASK) != 0); -#else ButtonDown(pt, event->time, (event->state & GDK_SHIFT_MASK) != 0, (event->state & GDK_CONTROL_MASK) != 0, - (event->state & GDK_MOD1_MASK) != 0); -#endif + (event->state & modifierTranslated(rectangularSelectionModifier)) != 0); } else if (event->button == 2) { // Grab the primary selection if it exists - Position pos = PositionFromLocation(pt); + SelectionPosition pos = SPositionFromLocation(pt, false, false, UserVirtualSpace()); if (OwnPrimarySelection() && primary.s == NULL) CopySelectionRange(&primary); + sel.Clear(); SetSelection(pos, pos); atomSought = atomUTF8; gtk_selection_convert(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, @@ -1853,11 +1649,7 @@ } catch (...) { errorStatus = SC_STATUS_FAILURE; } -#if GTK_MAJOR_VERSION >= 2 return TRUE; -#else - return FALSE; -#endif } gint ScintillaGTK::Press(GtkWidget *widget, GdkEventButton *event) { @@ -1893,7 +1685,6 @@ // win32gtk and GTK >= 2 use SCROLL_* events instead of passing the // button4/5/6/7 events to the GTK app -#if PLAT_GTK_WIN32 || (GTK_MAJOR_VERSION >= 2) gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); @@ -1970,7 +1761,6 @@ } return FALSE; } -#endif gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); @@ -2075,11 +1865,9 @@ try { //fprintf(stderr, "SC-key: %d %x [%s]\n", // event->keyval, event->state, (event->length > 0) ? event->string : "empty"); -#if GTK_MAJOR_VERSION >= 2 if (gtk_im_context_filter_keypress(im_context, event)) { return 1; } -#endif if (!event->keyval) { return true; } @@ -2096,10 +1884,6 @@ // This will have to change for Unicode else if (key >= 0xFE00) key = KeyTranslate(key); -#if GTK_MAJOR_VERSION < 2 - else if (!IsUnicodeMode() && (key >= 0x100) && (key < 0x1000)) - key &= 0xff; -#endif bool consumed = false; bool added = KeyDown(key, shift, ctrl, alt, &consumed) != 0; @@ -2129,7 +1913,6 @@ return FALSE; } -#if GTK_MAJOR_VERSION >= 2 gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) { try { gchar *str; @@ -2222,7 +2005,7 @@ gint x, y; gdk_window_get_origin((PWidget(wText))->window, &x, &y); - Point pt = LocationFromPosition(currentPos); + Point pt = PointMainCaret(); if (pt.x < 0) pt.x = 0; if (pt.y < 0) @@ -2245,7 +2028,6 @@ void ScintillaGTK::PreeditChanged(GtkIMContext *, ScintillaGTK *sciThis) { sciThis->PreeditChangedThis(); } -#endif gint ScintillaGTK::StyleSetText(GtkWidget *widget, GtkStyle *, void*) { if (widget->window != NULL) @@ -2259,12 +2041,7 @@ return FALSE; } -#if GLIB_MAJOR_VERSION < 2 -void ScintillaGTK::Destroy(GtkObject *object) -#else -void ScintillaGTK::Destroy(GObject *object) -#endif -{ +void ScintillaGTK::Destroy(GObject *object) { try { ScintillaObject *scio = reinterpret_cast(object); // This avoids a double destruction @@ -2274,13 +2051,6 @@ //Platform::DebugPrintf("Destroying %x %x\n", sciThis, object); sciThis->Finalise(); -#if GLIB_MAJOR_VERSION < 2 - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (* GTK_OBJECT_CLASS(parent_class)->destroy)(object); -#else - // IS ANYTHING NEEDED ? -#endif - delete sciThis; scio->pscin = 0; } catch (...) { @@ -2308,13 +2078,11 @@ DrawChild(PWidget(sciThis->scrollbarv), area); } -#ifdef INTERNATIONAL_INPUT - Point pt = sciThis->LocationFromPosition(sciThis->currentPos); + Point pt = sciThis->PointMainCaret(); pt.y += sciThis->vs.lineHeight - 2; if (pt.x < 0) pt.x = 0; if (pt.y < 0) pt.y = 0; CursorMoved(widget, pt.x, pt.y, sciThis); -#endif } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; } @@ -2330,9 +2098,7 @@ rcPaint.bottom = ose->area.y + ose->area.height; PLATFORM_ASSERT(rgnUpdate == NULL); -#if GTK_MAJOR_VERSION >= 2 rgnUpdate = gdk_region_copy(ose->region); -#endif PRectangle rcClient = GetClientRectangle(); paintingAllText = rcPaint.Contains(rcClient); Surface *surfaceWindow = Surface::Allocate(); @@ -2375,51 +2141,11 @@ //fprintf(stderr, "Expose %0d,%0d %0d,%0d\n", //ose->area.x, ose->area.y, ose->area.width, ose->area.height); -#if GTK_MAJOR_VERSION < 2 - - paintState = painting; - - rcPaint.left = ose->area.x; - rcPaint.top = ose->area.y; - rcPaint.right = ose->area.x + ose->area.width; - rcPaint.bottom = ose->area.y + ose->area.height; - - PRectangle rcClient = GetClientRectangle(); - paintingAllText = rcPaint.Contains(rcClient); - Surface *surfaceWindow = Surface::Allocate(); - if (surfaceWindow) { - surfaceWindow->Init(PWidget(wMain)->window, PWidget(wMain)); - - // Fill the corner between the scrollbars - if (verticalScrollBarVisible) { - if (horizontalScrollBarVisible && (wrapState == eWrapNone)) { - PRectangle rcCorner = wMain.GetClientPosition(); - rcCorner.left = rcCorner.right - scrollBarWidth + 1; - rcCorner.top = rcCorner.bottom - scrollBarHeight + 1; - //fprintf(stderr, "Corner %0d,%0d %0d,%0d\n", - //rcCorner.left, rcCorner.top, rcCorner.right, rcCorner.bottom); - surfaceWindow->FillRectangle(rcCorner, - vs.styles[STYLE_LINENUMBER].back.allocated); - } - } - - //Paint(surfaceWindow, rcPaint); - surfaceWindow->Release(); - delete surfaceWindow; - } - if (paintState == paintAbandoned) { - // Painting area was insufficient to cover new styling or brace highlight positions - FullPaint(); - } - paintState = notPainting; - -#else - // For GTK+ 2, the text is painted in ExposeText + // The text is painted in ExposeText gtk_container_propagate_expose( GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarh), ose); gtk_container_propagate_expose( GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarv), ose); -#endif } catch (...) { errorStatus = SC_STATUS_FAILURE; @@ -2478,13 +2204,6 @@ return gtk_selection_clear(widget, selection_event); } -#if GTK_MAJOR_VERSION < 2 -gint ScintillaGTK::SelectionNotify(GtkWidget *widget, GdkEventSelection *selection_event) { - //Platform::DebugPrintf("Selection notify\n"); - return gtk_selection_notify(widget, selection_event); -} -#endif - void ScintillaGTK::DragBegin(GtkWidget *, GdkDragContext *) { //Platform::DebugPrintf("DragBegin\n"); } @@ -2493,10 +2212,10 @@ gint x, gint y, guint dragtime) { try { Point npt(x, y); - SetDragPosition(PositionFromLocation(npt)); + SetDragPosition(SPositionFromLocation(npt, false, false, UserVirtualSpace())); GdkDragAction preferredAction = context->suggested_action; - int pos = PositionFromLocation(npt); - if ((inDragDrop == ddDragging) && (0 == PositionInSelection(pos))) { + SelectionPosition pos = SPositionFromLocation(npt); + if ((inDragDrop == ddDragging) && (PositionInSelection(pos.Position()))) { // Avoid dragging selection onto itself as that produces a move // with no real effect but which creates undo actions. preferredAction = static_cast(0); @@ -2520,7 +2239,7 @@ void ScintillaGTK::DragLeave(GtkWidget *widget, GdkDragContext * /*context*/, guint) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { - sciThis->SetDragPosition(invalidPosition); + sciThis->SetDragPosition(SelectionPosition(invalidPosition)); //Platform::DebugPrintf("DragLeave %x\n", sciThis); } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; @@ -2533,7 +2252,7 @@ // If drag did not result in drop here or elsewhere if (!sciThis->dragWasDropped) sciThis->SetEmptySelection(sciThis->posDrag); - sciThis->SetDragPosition(invalidPosition); + sciThis->SetDragPosition(SelectionPosition(invalidPosition)); //Platform::DebugPrintf("DragEnd %x %d\n", sciThis, sciThis->dragWasDropped); sciThis->inDragDrop = ddNone; } catch (...) { @@ -2546,7 +2265,7 @@ ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { //Platform::DebugPrintf("Drop %x\n", sciThis); - sciThis->SetDragPosition(invalidPosition); + sciThis->SetDragPosition(SelectionPosition(invalidPosition)); } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; } @@ -2558,7 +2277,7 @@ ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { sciThis->ReceivedDrop(selection_data); - sciThis->SetDragPosition(invalidPosition); + sciThis->SetDragPosition(SelectionPosition(invalidPosition)); } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; } @@ -2569,22 +2288,22 @@ ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { sciThis->dragWasDropped = true; - if (sciThis->currentPos != sciThis->anchor) { + if (!sciThis->sel.Empty()) { sciThis->GetSelection(selection_data, info, &sciThis->drag); } if (context->action == GDK_ACTION_MOVE) { - int selStart = sciThis->SelectionStart(); - int selEnd = sciThis->SelectionEnd(); - if (sciThis->posDrop > selStart) { - if (sciThis->posDrop > selEnd) - sciThis->posDrop = sciThis->posDrop - (selEnd - selStart); - else - sciThis->posDrop = selStart; - sciThis->posDrop = sciThis->pdoc->ClampPositionIntoDocument(sciThis->posDrop); + for (size_t r=0; rsel.Count(); r++) { + if (sciThis->posDrop >= sciThis->sel.Range(r).Start()) { + if (sciThis->posDrop > sciThis->sel.Range(r).End()) { + sciThis->posDrop.Add(-sciThis->sel.Range(r).Length()); + } else { + sciThis->posDrop.Add(-SelectionRange(sciThis->posDrop, sciThis->sel.Range(r).Start()).Length()); + } + } } sciThis->ClearSelection(); } - sciThis->SetDragPosition(invalidPosition); + sciThis->SetDragPosition(SelectionPosition(invalidPosition)); } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; } @@ -2595,8 +2314,8 @@ return 1; } -int ScintillaGTK::IdleCallback(ScintillaGTK *sciThis) { - // Idler will be automatically stoped, if there is nothing +gboolean ScintillaGTK::IdleCallback(ScintillaGTK *sciThis) { + // Idler will be automatically stopped, if there is nothing // to do while idle. bool ret = sciThis->Idle(); if (ret == false) { @@ -2608,6 +2327,22 @@ return ret; } +gboolean ScintillaGTK::StyleIdle(ScintillaGTK *sciThis) { + sciThis->IdleStyling(); + // Idler will be automatically stopped + return FALSE; +} + +void ScintillaGTK::QueueStyling(int upTo) { + Editor::QueueStyling(upTo); + if (!styleNeeded.active) { + // Only allow one style needed to be queued + styleNeeded.active = true; + g_idle_add_full(G_PRIORITY_HIGH_IDLE, + reinterpret_cast(StyleIdle), this, NULL); + } +} + void ScintillaGTK::PopUpCB(ScintillaGTK *sciThis, guint action, GtkWidget *) { if (action) { sciThis->Command(action); @@ -2627,11 +2362,7 @@ sciThis->CallTipClick(); } catch (...) { } -#if GTK_MAJOR_VERSION >= 2 return TRUE; -#else - return FALSE; -#endif } gint ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip *ctip) { @@ -2667,32 +2398,6 @@ extern void Platform_Initialise(); extern void Platform_Finalise(); -#if GLIB_MAJOR_VERSION < 2 -GtkType scintilla_get_type() { - static GtkType scintilla_type = 0; - try { - - if (!scintilla_type) { - Platform_Initialise(); - static GtkTypeInfo scintilla_info = { - "Scintilla", - sizeof (ScintillaObject), - sizeof (ScintillaClass), - (GtkClassInitFunc) scintilla_class_init, - (GtkObjectInitFunc) scintilla_init, - (gpointer) NULL, - (gpointer) NULL, - 0 - }; - - scintilla_type = gtk_type_unique(gtk_container_get_type(), &scintilla_info); - } - - } catch (...) { - } - return scintilla_type; -} -#else GType scintilla_get_type() { static GType scintilla_type = 0; try { @@ -2722,12 +2427,9 @@ } return scintilla_type; } -#endif void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) { -#if GLIB_MAJOR_VERSION >= 2 Platform_Initialise(); -#endif atomClipboard = gdk_atom_intern("CLIPBOARD", FALSE); atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE); atomString = GDK_SELECTION_TYPE_STRING; @@ -2738,23 +2440,14 @@ // of the signal handlers here (those that currently attached to wDraw // in Initialise() may require coordinate translation?) -#if GLIB_MAJOR_VERSION < 2 - object_class->destroy = Destroy; -#else object_class->finalize = Destroy; -#endif widget_class->size_request = SizeRequest; widget_class->size_allocate = SizeAllocate; widget_class->expose_event = ExposeMain; -#if GTK_MAJOR_VERSION < 2 - widget_class->draw = Draw; -#endif widget_class->motion_notify_event = Motion; widget_class->button_press_event = Press; widget_class->button_release_event = MouseRelease; -#if PLAT_GTK_WIN32 || (GTK_MAJOR_VERSION >= 2) widget_class->scroll_event = ScrollEvent; -#endif widget_class->key_press_event = KeyPress; widget_class->key_release_event = KeyRelease; widget_class->focus_in_event = FocusIn; @@ -2762,9 +2455,6 @@ widget_class->selection_received = SelectionReceived; widget_class->selection_get = SelectionGet; widget_class->selection_clear_event = SelectionClear; -#if GTK_MAJOR_VERSION < 2 - widget_class->selection_notify_event = SelectionNotify; -#endif widget_class->drag_data_received = DragDataReceived; widget_class->drag_motion = DragMotion; @@ -2781,14 +2471,8 @@ container_class->forall = MainForAll; } -#if GLIB_MAJOR_VERSION < 2 -#define GTK_CLASS_TYPE(c) (c->type) -#define SIG_MARSHAL gtk_marshal_NONE__INT_POINTER -#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER -#else #define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER #define MARSHAL_ARGUMENTS G_TYPE_INT, G_TYPE_POINTER -#endif static void scintilla_class_init(ScintillaClass *klass) { try { @@ -2796,29 +2480,6 @@ GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; GtkContainerClass *container_class = (GtkContainerClass*) klass; -#if GLIB_MAJOR_VERSION < 2 - parent_class = (GtkWidgetClass*) gtk_type_class(gtk_container_get_type()); - - scintilla_signals[COMMAND_SIGNAL] = gtk_signal_new( - "command", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(ScintillaClass, command), - SIG_MARSHAL, - GTK_TYPE_NONE, - 2, MARSHAL_ARGUMENTS); - - scintilla_signals[NOTIFY_SIGNAL] = gtk_signal_new( - SCINTILLA_NOTIFY, - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(ScintillaClass, notify), - SIG_MARSHAL, - GTK_TYPE_NONE, - 2, MARSHAL_ARGUMENTS); - gtk_object_class_add_signals(object_class, - reinterpret_cast(scintilla_signals), LAST_SIGNAL); -#else GSignalFlags sigflags = GSignalFlags(G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST); scintilla_signals[COMMAND_SIGNAL] = g_signal_new( "command", @@ -2841,7 +2502,7 @@ SIG_MARSHAL, G_TYPE_NONE, 2, MARSHAL_ARGUMENTS); -#endif + klass->command = NULL; klass->notify = NULL; @@ -2859,11 +2520,7 @@ } GtkWidget* scintilla_new() { -#if GLIB_MAJOR_VERSION < 2 - return GTK_WIDGET(gtk_type_new(scintilla_get_type())); -#else return GTK_WIDGET(g_object_new(scintilla_get_type(), NULL)); -#endif } void scintilla_set_id(ScintillaObject *sci, uptr_t id) { diff -Nru geany-0.18/scintilla/Selection.cxx geany-0.19/scintilla/Selection.cxx --- geany-0.18/scintilla/Selection.cxx 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/scintilla/Selection.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -0,0 +1,366 @@ +// Scintilla source code edit control +/** @file Selection.cxx + ** Classes maintaining the selection. + **/ +// Copyright 2009 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. + +#include + +#include + +#include "Platform.h" + +#include "Scintilla.h" + +#include "Selection.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +void SelectionPosition::MoveForInsertDelete(bool insertion, int startChange, int length) { + if (insertion) { + if (position > startChange) { + position += length; + } + } else { + if (position > startChange) { + int endDeletion = startChange + length; + if (position > endDeletion) { + position -= length; + } else { + position = startChange; + } + } + } +} + +bool SelectionPosition::operator <(const SelectionPosition &other) const { + if (position == other.position) + return virtualSpace < other.virtualSpace; + else + return position < other.position; +} + +bool SelectionPosition::operator >(const SelectionPosition &other) const { + if (position == other.position) + return virtualSpace > other.virtualSpace; + else + return position > other.position; +} + +bool SelectionPosition::operator <=(const SelectionPosition &other) const { + if (position == other.position && virtualSpace == other.virtualSpace) + return true; + else + return other > *this; +} + +bool SelectionPosition::operator >=(const SelectionPosition &other) const { + if (position == other.position && virtualSpace == other.virtualSpace) + return true; + else + return *this > other; +} + +int SelectionRange::Length() const { + if (anchor > caret) { + return anchor.Position() - caret.Position(); + } else { + return caret.Position() - anchor.Position(); + } +} + +bool SelectionRange::Contains(int pos) const { + if (anchor > caret) + return (pos >= caret.Position()) && (pos <= anchor.Position()); + else + return (pos >= anchor.Position()) && (pos <= caret.Position()); +} + +bool SelectionRange::Contains(SelectionPosition sp) const { + if (anchor > caret) + return (sp >= caret) && (sp <= anchor); + else + return (sp >= anchor) && (sp <= caret); +} + +bool SelectionRange::ContainsCharacter(int posCharacter) const { + if (anchor > caret) + return (posCharacter >= caret.Position()) && (posCharacter < anchor.Position()); + else + return (posCharacter >= anchor.Position()) && (posCharacter < caret.Position()); +} + +SelectionSegment SelectionRange::Intersect(SelectionSegment check) const { + SelectionSegment inOrder(caret, anchor); + if ((inOrder.start <= check.end) || (inOrder.end >= check.start)) { + SelectionSegment portion = check; + if (portion.start < inOrder.start) + portion.start = inOrder.start; + if (portion.end > inOrder.end) + portion.end = inOrder.end; + if (portion.start > portion.end) + return SelectionSegment(); + else + return portion; + } else { + return SelectionSegment(); + } +} + +bool SelectionRange::Trim(SelectionRange range) { + SelectionPosition startRange = range.Start(); + SelectionPosition endRange = range.End(); + SelectionPosition start = Start(); + SelectionPosition end = End(); + PLATFORM_ASSERT(start <= end); + PLATFORM_ASSERT(startRange <= endRange); + if ((startRange <= end) && (endRange >= start)) { + if ((start > startRange) && (end < endRange)) { + // Completely covered by range -> empty at start + end = start; + } else if ((start < startRange) && (end > endRange)) { + // Completely covers range -> empty at start + end = start; + } else if (start <= startRange) { + // Trim end + end = startRange; + } else { // + PLATFORM_ASSERT(end >= endRange); + // Trim start + start = endRange; + } + if (anchor > caret) { + caret = start; + anchor = end; + } else { + anchor = start; + caret = end; + } + return Empty(); + } else { + return false; + } +} + +// If range is all virtual collapse to start of virtual space +void SelectionRange::MinimizeVirtualSpace() { + if (caret.Position() == anchor.Position()) { + int virtualSpace = caret.VirtualSpace(); + if (virtualSpace > anchor.VirtualSpace()) + virtualSpace = anchor.VirtualSpace(); + caret.SetVirtualSpace(virtualSpace); + anchor.SetVirtualSpace(virtualSpace); + } +} + +Selection::Selection() : mainRange(0), moveExtends(false), tentativeMain(false), selType(selStream) { + AddSelection(SelectionPosition(0)); +} + +Selection::~Selection() { +} + +bool Selection::IsRectangular() const { + return (selType == selRectangle) || (selType == selThin); +} + +int Selection::MainCaret() const { + return ranges[mainRange].caret.Position(); +} + +int Selection::MainAnchor() const { + return ranges[mainRange].anchor.Position(); +} + +SelectionRange &Selection::Rectangular() { + return rangeRectangular; +} + +SelectionSegment Selection::Limits() const { + if (ranges.empty()) { + return SelectionSegment(); + } else { + SelectionSegment sr(ranges[0].anchor, ranges[0].caret); + for (size_t i=1; i ranges[i].Start().Position()) && (pos <= ranges[i].End().Position())) + return i == mainRange ? 1 : 2; + } + return 0; +} + +int Selection::VirtualSpaceFor(int pos) const { + int virtualSpace = 0; + for (size_t i=0; i= j) + mainRange--; + } else { + j++; + } + } + } + } +} + +void Selection::RotateMain() { + mainRange = (mainRange + 1) % ranges.size(); +} + diff -Nru geany-0.18/scintilla/Selection.h geany-0.19/scintilla/Selection.h --- geany-0.18/scintilla/Selection.h 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/scintilla/Selection.h 2010-06-06 19:34:26.000000000 +0100 @@ -0,0 +1,187 @@ +// Scintilla source code edit control +/** @file Selection.h + ** Classes maintaining the selection. + **/ +// Copyright 2009 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef SELECTION_H +#define SELECTION_H + +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + +class SelectionPosition { + int position; + int virtualSpace; +public: + explicit SelectionPosition(int position_=INVALID_POSITION, int virtualSpace_=0) : position(position_), virtualSpace(virtualSpace_) { + PLATFORM_ASSERT(virtualSpace < 800000); + if (virtualSpace < 0) + virtualSpace = 0; + } + void Reset() { + position = 0; + virtualSpace = 0; + } + void MoveForInsertDelete(bool insertion, int startChange, int length); + bool operator ==(const SelectionPosition &other) const { + return position == other.position && virtualSpace == other.virtualSpace; + } + bool operator <(const SelectionPosition &other) const; + bool operator >(const SelectionPosition &other) const; + bool operator <=(const SelectionPosition &other) const; + bool operator >=(const SelectionPosition &other) const; + int Position() const { + return position; + } + void SetPosition(int position_) { + position = position_; + virtualSpace = 0; + } + int VirtualSpace() const { + return virtualSpace; + } + void SetVirtualSpace(int virtualSpace_) { + PLATFORM_ASSERT(virtualSpace_ < 800000); + if (virtualSpace_ >= 0) + virtualSpace = virtualSpace_; + } + void Add(int increment) { + position = position + increment; + } + bool IsValid() const { + return position >= 0; + } +}; + +// Ordered range to make drawing simpler +struct SelectionSegment { + SelectionPosition start; + SelectionPosition end; + SelectionSegment() { + } + SelectionSegment(SelectionPosition a, SelectionPosition b) { + if (a < b) { + start = a; + end = b; + } else { + start = b; + end = a; + } + } + bool Empty() const { + return start == end; + } + void Extend(SelectionPosition p) { + if (start > p) + start = p; + if (end < p) + end = p; + } +}; + +struct SelectionRange { + SelectionPosition caret; + SelectionPosition anchor; + + SelectionRange() { + } + SelectionRange(SelectionPosition single) : caret(single), anchor(single) { + } + SelectionRange(int single) : caret(single), anchor(single) { + } + SelectionRange(SelectionPosition caret_, SelectionPosition anchor_) : caret(caret_), anchor(anchor_) { + } + SelectionRange(int caret_, int anchor_) : caret(caret_), anchor(anchor_) { + } + bool Empty() const { + return anchor == caret; + } + int Length() const; + // int Width() const; // Like Length but takes virtual space into account + bool operator ==(const SelectionRange &other) const { + return caret == other.caret && anchor == other.anchor; + } + bool operator <(const SelectionRange &other) const { + return caret < other.caret || ((caret == other.caret) && (anchor < other.anchor)); + } + void Reset() { + anchor.Reset(); + caret.Reset(); + } + void ClearVirtualSpace() { + anchor.SetVirtualSpace(0); + caret.SetVirtualSpace(0); + } + bool Contains(int pos) const; + bool Contains(SelectionPosition sp) const; + bool ContainsCharacter(int posCharacter) const; + SelectionSegment Intersect(SelectionSegment check) const; + SelectionPosition Start() const { + return (anchor < caret) ? anchor : caret; + } + SelectionPosition End() const { + return (anchor < caret) ? caret : anchor; + } + bool Trim(SelectionRange range); + // If range is all virtual collapse to start of virtual space + void MinimizeVirtualSpace(); +}; + +class Selection { + std::vector ranges; + std::vector rangesSaved; + SelectionRange rangeRectangular; + size_t mainRange; + bool moveExtends; + bool tentativeMain; +public: + enum selTypes { noSel, selStream, selRectangle, selLines, selThin }; + selTypes selType; + + Selection(); + ~Selection(); + bool IsRectangular() const; + int MainCaret() const; + int MainAnchor() const; + SelectionRange &Rectangular(); + SelectionSegment Limits() const; + // This is for when you want to move the caret in response to a + // user direction command - for rectangular selections, use the range + // that covers all selected text otherwise return the main selection. + SelectionSegment LimitsForRectangularElseMain() const; + size_t Count() const; + size_t Main() const; + void SetMain(size_t r); + SelectionRange &Range(size_t r); + SelectionRange &RangeMain(); + bool MoveExtends() const; + void SetMoveExtends(bool moveExtends_); + bool Empty() const; + SelectionPosition Last() const; + int Length() const; + void MovePositions(bool insertion, int startChange, int length); + void TrimSelection(SelectionRange range); + void SetSelection(SelectionRange range); + void AddSelection(SelectionRange range); + void TentativeSelection(SelectionRange range); + void CommitTentative(); + int CharacterInSelection(int posCharacter) const; + int InSelectionForEOL(int pos) const; + int VirtualSpaceFor(int pos) const; + void Clear(); + void RemoveDuplicates(); + void RotateMain(); + bool Tentative() const { return tentativeMain; } + std::vector RangesCopy() const { + return ranges; + } +}; + +#ifdef SCI_NAMESPACE +} +#endif + +#endif diff -Nru geany-0.18/scintilla/SplitVector.h geany-0.19/scintilla/SplitVector.h --- geany-0.18/scintilla/SplitVector.h 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/SplitVector.h 2010-06-06 19:34:26.000000000 +0100 @@ -1,6 +1,6 @@ // Scintilla source code edit control /** @file SplitVector.h - ** Main data structure for holding arrays that handle insertions + ** Main data structure for holding arrays that handle insertions ** and deletions efficiently. **/ // Copyright 1998-2007 by Neil Hodgson @@ -97,7 +97,7 @@ /// Retrieve the character at a particular position. /// Retrieving positions outside the range of the buffer returns 0. - /// The assertions here are disabled since calling code can be + /// The assertions here are disabled since calling code can be /// simpler if out of range access works and returns 0. T ValueAt(int position) const { if (position < part1Length) { @@ -135,7 +135,7 @@ } } - T& operator[](int position) const { + T &operator[](int position) const { PLATFORM_ASSERT(position >= 0 && position < lengthBody); if (position < part1Length) { return body[position]; @@ -182,14 +182,14 @@ } } - /// Ensure at least length elements allocated, + /// Ensure at least length elements allocated, /// appending zero valued elements if needed. void EnsureLength(int wantedLength) { if (Length() < wantedLength) { InsertValue(Length(), wantedLength - Length(), 0); } } - + /// Insert text into the buffer from an array. void InsertFromArray(int positionToInsert, const T s[], int positionFrom, int insertLength) { PLATFORM_ASSERT((positionToInsert >= 0) && (positionToInsert <= lengthBody)); @@ -238,7 +238,7 @@ DeleteRange(0, lengthBody); } - T* BufferPointer() { + T *BufferPointer() { RoomFor(1); GapTo(lengthBody); body[lengthBody] = 0; diff -Nru geany-0.18/scintilla/StyleContext.h geany-0.19/scintilla/StyleContext.h --- geany-0.18/scintilla/StyleContext.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/StyleContext.h 2010-05-16 18:44:24.000000000 +0100 @@ -16,9 +16,7 @@ class StyleContext { Accessor &styler; unsigned int endPos; - StyleContext& operator=(const StyleContext&) { - return *this; - } + StyleContext &operator=(const StyleContext &); void GetNextChar(unsigned int pos) { chNext = static_cast(styler.SafeGetCharAt(pos+1)); if (styler.IsLeadByte(static_cast(chNext))) { @@ -67,7 +65,7 @@ void Complete() { styler.ColourTo(currentPos - 1, state); } - bool More() { + bool More() const { return currentPos < endPos; } void Forward() { @@ -110,10 +108,10 @@ int GetRelative(int n) { return static_cast(styler.SafeGetCharAt(currentPos+n)); } - bool Match(char ch0) { + bool Match(char ch0) const { return ch == static_cast(ch0); } - bool Match(char ch0, char ch1) { + bool Match(char ch0, char ch1) const { return (ch == static_cast(ch0)) && (chNext == static_cast(ch1)); } bool Match(const char *s) { diff -Nru geany-0.18/scintilla/Style.cxx geany-0.19/scintilla/Style.cxx --- geany-0.18/scintilla/Style.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/Style.cxx 2010-05-16 18:44:24.000000000 +0100 @@ -92,6 +92,13 @@ else font.Release(); aliasOfDefaultFont = false; + sizeZoomed = 2; + lineHeight = 2; + ascent = 1; + descent = 1; + externalLeading = 0; + aveCharWidth = 1; + spaceWidth = 1; } void Style::ClearTo(const Style &source) { @@ -126,7 +133,7 @@ return strcmp(fontName, other->fontName) == 0; } -void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, bool extraFontFlag) { +void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, int extraFontFlag) { sizeZoomed = size + zoomLevel; if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1 sizeZoomed = 2; diff -Nru geany-0.18/scintilla/Style.h geany-0.19/scintilla/Style.h --- geany-0.18/scintilla/Style.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/Style.h 2010-06-06 19:34:26.000000000 +0100 @@ -53,8 +53,8 @@ bool visible_, bool changeable_, bool hotspot_); void ClearTo(const Style &source); bool EquivalentFontTo(const Style *other) const; - void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, bool extraFontFlag = false); - bool IsProtected() const { return !(changeable && visible);}; + void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, int extraFontFlag = 0); + bool IsProtected() const { return !(changeable && visible);} }; #ifdef SCI_NAMESPACE diff -Nru geany-0.18/scintilla/SVector.h geany-0.19/scintilla/SVector.h --- geany-0.18/scintilla/SVector.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/SVector.h 2010-06-06 19:34:26.000000000 +0100 @@ -19,26 +19,21 @@ */ class SVector { enum { allocSize = 4000 }; - + int *v; ///< The vector unsigned int size; ///< Number of elements allocated unsigned int len; ///< Number of elements used in vector - bool allocFailure; ///< A memory allocation call has failed - + /** Internally allocate more elements than the user wants * to avoid thrashing the memory allocator. */ void SizeTo(int newSize) { if (newSize < allocSize) newSize += allocSize; - else + else newSize = (newSize * 3) / 2; - int* newv = new int[newSize]; - if (!newv) { - allocFailure = true; - return; - } + int *newv = new int[newSize]; size = newSize; - unsigned int i=0; + unsigned int i=0; for (; i 0) { SizeTo(other.Length()); - if (!allocFailure) { - for (int i=0;i 0) { SizeTo(other.Length()); - if (!allocFailure) { - for (int i=0;i // The License.txt file describes the conditions under which this software may be distributed. @@ -61,10 +61,22 @@ putf[len] = '\0'; } +unsigned int UTF8CharLength(unsigned char ch) { + if (ch < 0x80) { + return 1; + } else if (ch < 0x80 + 0x40 + 0x20) { + return 2; + } else if (ch < 0x80 + 0x40 + 0x20 + 0x10) { + return 3; + } else { + return 4; + } +} + unsigned int UTF16Length(const char *s, unsigned int len) { unsigned int ulen = 0; unsigned int charLen; - for (unsigned int i=0;i(s[i]); if (ch < 0x80) { charLen = 1; diff -Nru geany-0.18/scintilla/UniConversion.h geany-0.19/scintilla/UniConversion.h --- geany-0.18/scintilla/UniConversion.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/UniConversion.h 2010-06-06 19:34:26.000000000 +0100 @@ -1,12 +1,13 @@ // Scintilla source code edit control /** @file UniConversion.h - ** Functions to handle UFT-8 and UCS-2 strings. + ** Functions to handle UTF-8 and UTF-16 strings. **/ // Copyright 1998-2001 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. unsigned int UTF8Length(const wchar_t *uptr, unsigned int tlen); void UTF8FromUTF16(const wchar_t *uptr, unsigned int tlen, char *putf, unsigned int len); +unsigned int UTF8CharLength(unsigned char ch); unsigned int UTF16Length(const char *s, unsigned int len); unsigned int UTF16FromUTF8(const char *s, unsigned int len, wchar_t *tbuf, unsigned int tlen); diff -Nru geany-0.18/scintilla/ViewStyle.cxx geany-0.19/scintilla/ViewStyle.cxx --- geany-0.18/scintilla/ViewStyle.cxx 2009-05-03 18:49:33.000000000 +0100 +++ geany-0.19/scintilla/ViewStyle.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -41,7 +41,7 @@ } void FontNames::Clear() { - for (int i=0;i #include -#include +#include #include #include "Platform.h" @@ -28,7 +28,7 @@ if (SC_CP_UTF8 == codePage) // For lexing, all characters >= 0x80 are treated the // same so none is considered a lead byte. - return false; + return false; else return Platform::IsDBCSLeadByte(codePage, ch); } @@ -75,10 +75,10 @@ return Platform::SendScintilla(id, SCI_GETFOLDLEVEL, line, 0); } -int WindowAccessor::Length() { - if (lenDoc == -1) +int WindowAccessor::Length() { + if (lenDoc == -1) lenDoc = Platform::SendScintilla(id, SCI_GETTEXTLENGTH, 0, 0); - return lenDoc; + return lenDoc; } int WindowAccessor::GetLineState(int line) { @@ -129,7 +129,7 @@ startPos = extremePosition; lenDoc = -1; if (validLen > 0) { - Platform::SendScintillaPointer(id, SCI_SETSTYLINGEX, validLen, + Platform::SendScintillaPointer(id, SCI_SETSTYLINGEX, validLen, styleBuf); validLen = 0; } @@ -138,12 +138,12 @@ int WindowAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) { int end = Length(); int spaceFlags = 0; - - // Determines the indentation level of the current line and also checks for consistent + + // Determines the indentation level of the current line and also checks for consistent // indentation compared to the previous line. - // Indentation is judged consistent when the indentation whitespace of each line lines + // Indentation is judged consistent when the indentation whitespace of each line lines // the same or the indentation of one line is a prefix of the other. - + int pos = LineStart(line); char ch = (*this)[pos]; int indent = 0; @@ -170,11 +170,11 @@ } ch = (*this)[++pos]; } - + *flags = spaceFlags; indent += SC_FOLDLEVELBASE; // if completely empty line or the start of a comment... - if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) ) + if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos))) return indent | SC_FOLDLEVELWHITEFLAG; else return indent; diff -Nru geany-0.18/scintilla/XPM.cxx geany-0.19/scintilla/XPM.cxx --- geany-0.18/scintilla/XPM.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.19/scintilla/XPM.cxx 2010-06-06 19:34:26.000000000 +0100 @@ -38,7 +38,7 @@ return i; } -ColourAllocated XPM::ColourFromCode(int ch) { +ColourAllocated XPM::ColourFromCode(int ch) const { return colourCodeTable[ch]->allocated; #ifdef SLOW for (int i=0; i - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: about.c 4046 2009-07-30 11:29:53Z ntrel $ + * $Id: about.c 4953 2010-05-24 09:59:16Z frlan $ */ /* @@ -33,7 +33,6 @@ #include "geanywraplabel.h" #include "main.h" -static GtkWidget *gb_window = NULL; #include "gb.c" @@ -41,51 +40,59 @@ #define INFO "%s" #define CODENAME "\"" GEANY_CODENAME "\"" #define BUILDDATE "%s" -#define COPYRIGHT "Copyright (c) 2005-2009\nEnrico Tröger\nNick Treleaven\nFrank Lanitz\nAll rights reserved." +#define COPYRIGHT "Copyright (c) 2005-2010\nEnrico Tröger\nNick Treleaven\nFrank Lanitz\nAll rights reserved." const gchar *translators[][2] = { - { "be_BY", "Yura Semashko <yurand2@gmail.com>" }, + { "ast", "Marcos Costales <marcoscostales@gmail.com>"}, + { "be_BY", "Yura Siamashka <yurand2@gmail.com>" }, { "bg", "Dilyan Rusev <dilyanrusev@gmail.com>" }, { "ca_ES", "Toni Garcia-Navarro <topi@elpiset.net>" }, { "cs_CZ", "Petr Messner <messa@messa.cz>\nAnna Talianova <anickat1@gmail.com>" }, { "de_DE", "Frank Lanitz <frank@frank.uvena.de>\nDominic Hopf <dmaphy@googlemail.com>" }, { "el", "Stavros Temertzidis <bullgr@gmail.com>" }, { "en_GB", "Jeff Bailes <thepizzaking@gmail.com>" }, - { "es", "Damián Viano <debian@damianv.com.ar>\nNacho Cabanes <ncabanes@gmail.com>" }, + { "es", "Antonio Jiménez González <tonificante@hotmail.com>\nLucas Vieites <lucasvieites@gmail.com>" }, { "fi", "Harri Koskinen <harri@fastmonkey.org>\nJari Rahkonen <jari.rahkonen@pp1.inet.fi>" }, { "fr", "Jean-Philippe Moal <skateinmars@skateinmars.net>" }, + { "gl", "José Manuel Castroagudín Silva <chavescesures@gmail.com>"}, { "hu", "Gabor Kmetyko <kg_kilo@freemail.hu>" }, { "it", "Max Baldinelli <m.baldinelli@agora.it>,\nDario Santomarco <dariello@yahoo.it>" }, { "ja", "Tarot Osuji <tarot@sdf.lonestar.org>\nChikahiro Masami <cmasa.z321@gmail.com>" }, { "ko", "Park Jang-heon <dotkabi@gmail.com>" }, { "lb", "Laurent Hoeltgen <hoeltgman@gmail.com>" }, - { "nl", "Kurt De Bree <kdebree@telenet.be>" }, + { "nl", "Peter Scholtens <peter.scholtens@xs4all.nl>\nAyke van Laethem <aykevanlaethem@gmail.com>" }, { "pl_PL", "Jarosław Foksa <jfoksa@gmail.com>" }, { "pt_BR", "Alexandra Moreire <alexandream@gmail.com>\nAdrovane Marques Kade <adrovane@gmail.com>" }, { "ro", "Alex Eftimie <alex@rosedu.org>" }, { "ru_RU", "brahmann_ <brahmann@pisem.net>,\nNikita E. Shalaev <nshalaev@eu.spb.ru>" }, - { "sl_SI", "Jože Klepec <joze.klepec@siol.net>"}, + { "sl", "Jože Klepec <joze.klepec@siol.net>"}, { "sv", "Tony Mattsson <superxorn@gmail.com>" }, { "tr", "Gürkan Gür <seqizz@gmail.com>"}, { "uk", "Boris Dibrov <dibrov.bor@gmail.com>" }, { "vi_VN", "Clytie Siddall <clytie@riverland.net.au>" }, - { "zh_CN", "Dormouse Young <mouselinux@163.com>" }, + { "zh_CN", "Dormouse Young <mouselinux@163.com>,\nXhacker Liu <liu.dongyuan@gmail.com>" }, { "zh_TW", "KoViCH <kovich.ian@gmail.com>" } }; static const gint translators_len = G_N_ELEMENTS(translators); const gchar *prev_translators[][2] = { + { "es", "Damián Viano <debian@damianv.com.ar>\nNacho Cabanes <ncabanes@gmail.com>" }, { "pl_PL", "Jacek Wolszczak <shutdownrunner@o2.pl>" }, + { "nl", "Kurt De Bree <kdebree@telenet.be>" } }; static const gint prev_translators_len = G_N_ELEMENTS(prev_translators); static const gchar *contributors = -"Alexander Rodin, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, Bronisław Białek, Catalin Marinas, " -"Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., Dave Moore, Dirk Weber, " -"Elias Pschernig, Eugene Arshinov, Felipe Pena, François Cami, " -"Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, Jean-François Wauthy, Jeff Pohlmeyer, " -"Jesse Mayes, John Gabriele, Jon Strait, Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, Moritz Barsnick, " -"Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, Robert McGinley, Roland Baudin, S Jagannathan, Saleem Abdulrasool, " +"Alexander Rodin, Alexey Antipov, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, " +"Bronisław Białek, Can Koy, Catalin Marinas, " +"Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., " +"Daniel Marjamaki, Dave Moore, " +"Dimitar Zhekov, Dirk Weber, Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, " +"Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, " +"Jean-François Wauthy, Jeff Pohlmeyer, Jesse Mayes, John Gabriele, Jon Senior, Jon Strait, Josef Whiter, " +"Jörn Reder, Kelvin Gardiner, Kevin Ellwood, Kristoffer A. Tjernås, Lex Trotman, Marko Peric, Matti Mårds, " +"Moritz Barsnick, Ondrej Donek, Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, " +"Robert McGinley, Roland Baudin, Ross McKay, S Jagannathan, Saleem Abdulrasool, " "Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Thomas Martitz, Tomás Vírseda, " "Tyler Mulligan, Walery Studennikov, Yura Siamashka"; @@ -151,14 +158,14 @@ gtk_widget_show(header_hbox); gtk_container_add(GTK_CONTAINER(header_eventbox), header_hbox); header_image = gtk_image_new(); - gtk_box_pack_start(GTK_BOX(header_hbox), header_image, FALSE,FALSE,0); + gtk_box_pack_start(GTK_BOX(header_hbox), header_image, FALSE, FALSE, 0); header_label = gtk_label_new(NULL); gtk_label_set_use_markup(GTK_LABEL(header_label), TRUE); /* print the subversion revision generated by ./configure if it is available */ g_snprintf(buffer, sizeof(buffer), HEADER, main_get_version_string()); gtk_label_set_markup(GTK_LABEL(header_label), buffer); gtk_widget_show(header_label); - gtk_box_pack_start(GTK_BOX(header_hbox), header_label, FALSE,FALSE,0); + gtk_box_pack_start(GTK_BOX(header_hbox), header_label, FALSE, FALSE, 0); header_eventbox_style_set(header_eventbox); header_label_style_set(header_label); g_signal_connect_after(header_eventbox, "style-set", G_CALLBACK(header_eventbox_style_set), NULL); diff -Nru geany-0.18/src/about.h geany-0.19/src/about.h --- geany-0.18/src/about.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/about.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * about.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: about.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: about.h 4518 2010-01-01 22:55:18Z eht16 $ */ diff -Nru geany-0.18/src/build.c geany-0.19/src/build.c --- geany-0.18/src/build.c 2009-08-02 14:33:39.000000000 +0100 +++ geany-0.19/src/build.c 2010-06-03 12:09:20.000000000 +0100 @@ -1,8 +1,9 @@ /* * build.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven + * Copyright 2009 Lex Trotman * * 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 @@ -18,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: build.c 4050 2009-08-02 13:33:39Z eht16 $ + * $Id: build.c 4985 2010-06-03 11:09:20Z eht16 $ */ /* @@ -60,15 +61,17 @@ #include "geanymenubuttonaction.h" -GeanyBuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_NONE, NULL, 0}; +GeanyBuildInfo build_info = {GEANY_GBG_FT, 0, 0, NULL, GEANY_FILETYPES_NONE, NULL, 0}; static gchar *current_dir_entered = NULL; -static struct +typedef struct RunInfo { GPid pid; gint file_type_id; -} run_info = {0, GEANY_FILETYPES_NONE}; +} RunInfo; + +static RunInfo *run_info; #ifdef G_OS_WIN32 static const gchar RUN_SCRIPT_CMD[] = "geany_run_script.bat"; @@ -76,21 +79,15 @@ static const gchar RUN_SCRIPT_CMD[] = "./geany_run_script.sh"; #endif -enum -{ - LATEX_CMD_TO_DVI, - LATEX_CMD_TO_PDF, - LATEX_CMD_VIEW_DVI, - LATEX_CMD_VIEW_PDF -}; - -static GeanyBuildType last_toolbutton_action = GBO_BUILD; +/* pack group (<8) and command (<32) into a user_data pointer */ +#define GRP_CMD_TO_POINTER(grp, cmd) GINT_TO_POINTER((((grp)&7) << 5) | ((cmd)&0x1f)) +#define GBO_TO_POINTER(gbo) (GRP_CMD_TO_POINTER(GBO_TO_GBG(gbo), GBO_TO_CMD(gbo))) +#define GPOINTER_TO_CMD(gptr) (GPOINTER_TO_INT(gptr)&0x1f) +#define GPOINTER_TO_GRP(gptr) ((GPOINTER_TO_INT(gptr)&0xe0) >> 5) -static BuildMenuItems default_menu_items = - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; -static BuildMenuItems latex_menu_items = - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +static gpointer last_toolbutton_action = GBO_TO_POINTER(GEANY_GBO_BUILD); +static BuildMenuItems menu_items = {NULL, {NULL, NULL, NULL, NULL}}; static struct { @@ -107,6 +104,8 @@ } widgets; +static gint build_groups_count[GEANY_GBG_COUNT] = { 3, 4, 2 }; +static gint build_items_count = 9; #ifndef G_OS_WIN32 static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); @@ -116,18 +115,13 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); static void set_stop_button(gboolean stop); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); -static void on_build_arguments_activate(GtkMenuItem *menuitem, gpointer user_data); - -static void on_build_compile_activate(GtkMenuItem *menuitem, gpointer user_data); -static void on_build_tex_activate(GtkMenuItem *menuitem, gpointer user_data); -static void on_build_build_activate(GtkMenuItem *menuitem, gpointer user_data); -static void on_build_make_activate(GtkMenuItem *menuitem, gpointer user_data); -static void on_build_execute_activate(GtkMenuItem *menuitem, gpointer user_data); -static void on_build_next_error(GtkMenuItem *menuitem, gpointer user_data); -static void on_build_previous_error(GtkMenuItem *menuitem, gpointer user_data); +static void on_set_build_commands_activate(GtkWidget *w, gpointer u); +static void on_build_next_error(GtkWidget *menuitem, gpointer user_data); +static void on_build_previous_error(GtkWidget *menuitem, gpointer user_data); static void kill_process(GPid *pid); static void show_build_result_message(gboolean failure); static void process_build_output_line(const gchar *line, gint color); +static void show_build_commands_dialog(void); void build_finalize(void) @@ -135,275 +129,424 @@ g_free(build_info.dir); g_free(build_info.custom_target); - if (default_menu_items.menu != NULL && GTK_IS_WIDGET(default_menu_items.menu)) - gtk_widget_destroy(default_menu_items.menu); - if (latex_menu_items.menu != NULL && GTK_IS_WIDGET(latex_menu_items.menu)) - gtk_widget_destroy(latex_menu_items.menu); + if (menu_items.menu != NULL && GTK_IS_WIDGET(menu_items.menu)) + gtk_widget_destroy(menu_items.menu); +} + - g_object_unref(widgets.toolmenu); +/* note: copied from keybindings.c, may be able to go away */ +static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, + GtkAccelGroup *accel_group, GtkWidget *menuitem) +{ + GeanyKeyBinding *kb = keybindings_get_item(group, kb_id); + + if (kb->key != 0) + gtk_widget_add_accelerator(menuitem, "activate", accel_group, + kb->key, kb->mods, GTK_ACCEL_VISIBLE); } -static GPid build_compile_tex_file(GeanyDocument *doc, gint mode) +/* convenience routines to access parts of GeanyBuildCommand */ +static gchar *id_to_str(GeanyBuildCommand *bc, gint id) { - const gchar *cmd = NULL; + return bc->entries[id]; +} - if (doc == NULL || doc->file_name == NULL) - return (GPid) 1; - if (mode == LATEX_CMD_TO_DVI) - { - cmd = doc->file_type->programs->compiler; - build_info.type = GBO_COMPILE; - } - else - { - cmd = doc->file_type->programs->linker; - build_info.type = GBO_BUILD; - } +static gchar *buildcmd_label(GeanyBuildCommand *bc) +{ + return _(id_to_str(bc, GEANY_BC_LABEL)); +} + - return build_spawn_cmd(doc, cmd, NULL); +static gchar *buildcmd_cmd(GeanyBuildCommand *bc) +{ + return id_to_str(bc, GEANY_BC_COMMAND); } -static GPid build_view_tex_file(GeanyDocument *doc, gint mode) +static gchar *buildcmd_working_dir(GeanyBuildCommand *bc) { - gchar **argv, **term_argv; - gchar *executable = NULL; - gchar *view_file = NULL; - gchar *locale_filename = NULL; - gchar *cmd_string = NULL; - gchar *locale_cmd_string = NULL; - gchar *locale_term_cmd; - gchar *script_name; - gchar *working_dir; - gint term_argv_len, i; - GError *error = NULL; + return id_to_str(bc, GEANY_BC_WORKING_DIR); +} - if (doc == NULL || doc->file_name == NULL) - return (GPid) 1; - run_info.file_type_id = GEANY_FILETYPES_LATEX; +static const gchar *config_keys[] = { + [GEANY_BC_LABEL] = "LB", + [GEANY_BC_COMMAND] = "CM", + [GEANY_BC_WORKING_DIR] = "WD" +}; - executable = utils_remove_ext_from_filename(doc->file_name); - view_file = g_strconcat(executable, (mode == LATEX_CMD_VIEW_DVI) ? ".dvi" : ".pdf", NULL); +/*----------------------------------------------------- + * + * Execute commands and handle results + * + *-----------------------------------------------------*/ - /* try convert in locale */ - locale_filename = utils_get_locale_from_utf8(view_file); +/* the various groups of commands not in the filetype struct */ +static GeanyBuildCommand *ft_def = NULL; +static GeanyBuildCommand *non_ft_proj = NULL; +static GeanyBuildCommand *non_ft_pref = NULL; +static GeanyBuildCommand *non_ft_def = NULL; +static GeanyBuildCommand *exec_proj = NULL; +static GeanyBuildCommand *exec_pref = NULL; +static GeanyBuildCommand *exec_def = NULL; +/* and the regexen not in the filetype structure */ +static gchar *regex_pref = NULL; +/* project non-fileregex string */ +static gchar *regex_proj = NULL; + +/* control if build commands are printed by get_build_cmd, for debug purposes only*/ +#ifndef PRINTBUILDCMDS +#define PRINTBUILDCMDS FALSE +#endif +static gboolean printbuildcmds = PRINTBUILDCMDS; - /* replace %f and %e in the run_cmd string */ - cmd_string = g_strdup((mode == LATEX_CMD_VIEW_DVI) ? - g_strdup(doc->file_type->programs->run_cmd) : - g_strdup(doc->file_type->programs->run_cmd2)); - utils_str_replace_all(&cmd_string, "%f", view_file); - utils_str_replace_all(&cmd_string, "%e", executable); - - /* try convert in locale */ - locale_cmd_string = utils_get_locale_from_utf8(cmd_string); - - /* get the terminal path */ - locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); - /* split the term_cmd, so arguments will work too */ - term_argv = g_strsplit(locale_term_cmd, " ", -1); - term_argv_len = g_strv_length(term_argv); - - /* check that terminal exists (to prevent misleading error messages) */ - if (term_argv[0] != NULL) - { - gchar *tmp = term_argv[0]; - /* g_find_program_in_path checks tmp exists and is executable */ - term_argv[0] = g_find_program_in_path(tmp); - g_free(tmp); - } - if (term_argv[0] == NULL) - { - ui_set_statusbar(TRUE, - _("Could not find terminal \"%s\" " - "(check path for Terminal tool setting in Preferences)"), tool_prefs.term_cmd); - utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, NULL); - g_strfreev(term_argv); - return (GPid) 1; - } +/* for debug only, print the commands structures in priority order */ +static void printfcmds(void) +{ + GeanyBuildCommand **cl[GEANY_GBG_COUNT][GEANY_BCS_COUNT] = { + /* GEANY_BCS_DEF, GEANY_BCS_FT, GEANY_BCS_HOME_FT, GEANY_BCS_PREF, + * GEANY_BCS_FT_PROJ, GEANY_BCS_PROJ */ + { &ft_def, NULL, NULL, NULL, NULL, NULL }, + { &non_ft_def, NULL, NULL, &non_ft_pref, NULL, &non_ft_proj }, + { &exec_def, NULL, NULL, &exec_pref, NULL, &exec_proj } + }; + GeanyFiletype *ft = NULL; + GeanyDocument *doc; + gint i, j, k, l, m; + enum GeanyBuildCmdEntries n; + gint cc[GEANY_BCS_COUNT]; + gchar c; - /* RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because - * it contains no umlauts */ - working_dir = g_path_get_dirname(locale_filename); /** TODO do we need project support here? */ - script_name = g_build_filename(working_dir, RUN_SCRIPT_CMD, NULL); - if (! build_create_shellscript(script_name, locale_cmd_string, TRUE)) + doc = document_get_current(); + if (doc != NULL) + ft = doc->file_type; + if (ft != NULL) { - ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), - executable); - utils_free_pointers(7, executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, working_dir, NULL); - g_strfreev(term_argv); - return (GPid) 1; + printf("filetype %s\n",ft->name); + cl[GEANY_GBG_FT][GEANY_BCS_FT] = &(ft->filecmds); + cl[GEANY_GBG_FT][GEANY_BCS_HOME_FT] = &(ft->homefilecmds); + cl[GEANY_GBG_FT][GEANY_BCS_PROJ] = &(ft->projfilecmds); + cl[GEANY_GBG_NON_FT][GEANY_BCS_FT] = &(ft->ftdefcmds); + cl[GEANY_GBG_EXEC][GEANY_BCS_FT] = &(ft->execcmds); + cl[GEANY_GBG_EXEC][GEANY_BCS_HOME_FT] = &(ft->homeexeccmds); + cl[GEANY_GBG_EXEC][GEANY_BCS_PROJ_FT] = &(ft->projexeccmds); } - g_free(script_name); - - argv = g_new0(gchar *, term_argv_len + 3); - for (i = 0; i < term_argv_len; i++) + for (i = 0; i < GEANY_BCS_COUNT; ++i) { - argv[i] = g_strdup(term_argv[i]); - } -#ifdef G_OS_WIN32 - /* command line arguments only for cmd.exe */ - if (strstr(argv[0], "cmd.exe") != NULL) + m = 1; + for (j = 0; j < GEANY_GBG_COUNT; ++j) { - argv[term_argv_len ] = g_strdup("/Q /C"); - argv[term_argv_len + 1] = g_strdup(RUN_SCRIPT_CMD); + for (k = 0; k < build_groups_count[j]; ++k) + if (cl[j][i] != NULL && *(cl[j][i]) != NULL && (*(cl[j][i]))[k].exists) + { + for (n = 0; n < GEANY_BC_CMDENTRIES_COUNT; n++) + { + if ((*(cl[j][i]))[k].entries[n] != NULL && + (l = strlen((*(cl[j][i]))[k].entries[n])) > m) + { + m = l; + } + } + } } - else + cc[i] = m; + } + for (i = 0; i < GEANY_GBG_COUNT; ++i) + { + for (k = 0; k < build_groups_count[i]; ++k) { - argv[term_argv_len ] = g_strdup(RUN_SCRIPT_CMD); - argv[term_argv_len + 1] = NULL; + for (l = 0; l < 2; ++l) + { + c = ' '; + for (j = 0; j < GEANY_BCS_COUNT; ++j) + { + if (cl[i][j] != NULL && *(cl[i][j]) != NULL && (*(cl[i][j]))[k].exists) + { + for (n = 0; n < GEANY_BC_CMDENTRIES_COUNT; n++) + { + if ((*(cl[i][j]))[k].entries[i] != NULL) + printf("%c %*.*s",c,cc[j],cc[j],(*(cl[i][j]))[k].entries[i]); + else + printf("%c %*.*s",c,cc[j],cc[j]," "); + } + } + else + printf("%c %*.*s",c,cc[j],cc[j]," "); + c = ','; + } + printf("\n"); + } } -#else - argv[term_argv_len ] = g_strdup("-e"); - argv[term_argv_len + 1] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL); -#endif - argv[term_argv_len + 2] = NULL; + printf("\n"); + } +} - if (! g_spawn_async(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(run_info.pid), &error)) - { - geany_debug("g_spawn_async() failed: %s", error->message); - ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); - utils_free_pointers(7, executable, view_file, locale_filename, cmd_string, - locale_cmd_string, locale_term_cmd, working_dir, NULL); - g_strfreev(argv); - g_strfreev(term_argv); - g_error_free(error); - error = NULL; - return (GPid) 0; +/* macros to save typing and make the logic visible */ +#define return_cmd_if(src, cmds)\ + if (cmds != NULL && cmds[cmdindex].exists && below>src)\ + { \ + *fr=src; \ + if (printbuildcmds) \ + printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); \ + return &(cmds[cmdindex]); \ } - if (run_info.pid > 0) - { - /*setpgid(0, getppid());*/ - g_child_watch_add(run_info.pid, (GChildWatchFunc) run_exit_cb, NULL); - build_menu_update(doc); - } +#define return_ft_cmd_if(src, cmds)\ + if (ft != NULL && ft->cmds != NULL \ + && ft->cmds[cmdindex].exists && below>src)\ + { \ + *fr=src; \ + if (printbuildcmds) \ + printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); \ + return &(ft->cmds[cmdindex]); \ + } - utils_free_pointers(7, executable, view_file, locale_filename, cmd_string, - locale_cmd_string, locale_term_cmd, working_dir, NULL); - g_strfreev(argv); - g_strfreev(term_argv); - return run_info.pid; +/* get the next lowest command taking priority into account */ +static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, gint cmdgrp, gint cmdindex, + gint below, gint *from) +{ + /* Note: parameter below used in macros above */ + GeanyFiletype *ft = NULL; + gint sink, *fr = &sink; + + if (printbuildcmds) + printfcmds(); + if (cmdgrp >= GEANY_GBG_COUNT) + return NULL; + if (from != NULL) + fr = from; + if (doc == NULL) + doc = document_get_current(); + if (doc != NULL) + ft = doc->file_type; + + switch (cmdgrp) + { + case GEANY_GBG_FT: /* order proj ft, home ft, ft, defft */ + if (ft != NULL) + { + return_ft_cmd_if(GEANY_BCS_PROJ, projfilecmds); + return_ft_cmd_if(GEANY_BCS_PREF, homefilecmds); + return_ft_cmd_if(GEANY_BCS_FT, filecmds); + } + return_cmd_if(GEANY_BCS_DEF, ft_def); + break; + case GEANY_GBG_NON_FT: /* order proj, pref, def */ + return_cmd_if(GEANY_BCS_PROJ, non_ft_proj); + return_cmd_if(GEANY_BCS_PREF, non_ft_pref); + return_ft_cmd_if(GEANY_BCS_FT, ftdefcmds); + return_cmd_if(GEANY_BCS_DEF, non_ft_def); + break; + case GEANY_GBG_EXEC: /* order proj, proj ft, pref, home ft, ft, def */ + return_cmd_if(GEANY_BCS_PROJ, exec_proj); + return_ft_cmd_if(GEANY_BCS_PROJ_FT, projexeccmds); + return_cmd_if(GEANY_BCS_PREF, exec_pref); + return_ft_cmd_if(GEANY_BCS_FT, homeexeccmds); + return_ft_cmd_if(GEANY_BCS_FT, execcmds); + return_cmd_if(GEANY_BCS_DEF, exec_def); + break; + default: + break; + } + return NULL; } -/* get curfile.o in locale encoding from document::file_name */ -static gchar *get_object_filename(GeanyDocument *doc) +/* shortcut to start looking at the top */ +static GeanyBuildCommand *get_build_cmd(GeanyDocument *doc, gint grp, gint cmdindex, gint *from) { - gchar *locale_filename, *short_file, *noext, *object_file; - - if (doc->file_name == NULL) return NULL; + return get_next_build_cmd(doc, grp, cmdindex, GEANY_BCS_COUNT, from); +} - locale_filename = utils_get_locale_from_utf8(doc->file_name); - short_file = g_path_get_basename(locale_filename); - g_free(locale_filename); +#define return_nonblank_regex(src, ptr)\ + if (NZV(ptr)) \ + { *fr = (src); return &(ptr); } - noext = utils_remove_ext_from_filename(short_file); - g_free(short_file); - object_file = g_strdup_printf("%s.o", noext); - g_free(noext); +/* like get_build_cmd, but for regexen, used by filetypes */ +gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from) +{ + gint sink, *fr = &sink; - return object_file; + if (from != NULL) + fr = from; + if (grp == GEANY_GBG_FT) + { + if (ft == NULL) + { + GeanyDocument *doc = document_get_current(); + if (doc != NULL) + ft = doc->file_type; + } + if (ft == NULL) + return NULL; + return_nonblank_regex(GEANY_BCS_PROJ, ft->projerror_regex_string); + return_nonblank_regex(GEANY_BCS_HOME_FT, ft->homeerror_regex_string); + return_nonblank_regex(GEANY_BCS_FT, ft->error_regex_string); + } + else if (grp == GEANY_GBG_NON_FT) + { + return_nonblank_regex(GEANY_BCS_PROJ, regex_proj); + return_nonblank_regex(GEANY_BCS_PREF, regex_pref); + } + return NULL; } -static GPid build_make_file(GeanyDocument *doc, gint build_opts) +/* get pointer to the command group array */ +static GeanyBuildCommand *get_build_group(GeanyBuildSource src, GeanyBuildGroup grp) { - GString *cmdstr; - gchar *dir = NULL; - GPid pid; - - if (doc == NULL || doc->file_name == NULL) - return (GPid) 1; - - cmdstr = g_string_new(tool_prefs.make_cmd); - g_string_append_c(cmdstr, ' '); + GeanyDocument *doc; + GeanyFiletype *ft = NULL; - if (build_opts == GBO_MAKE_OBJECT) + switch (grp) { - gchar *tmp; + case GEANY_GBG_FT: + if ((doc = document_get_current()) == NULL) + return NULL; + if ((ft = doc->file_type) == NULL) + return NULL; - build_info.type = build_opts; - tmp = get_object_filename(doc); - g_string_append(cmdstr, tmp); - g_free(tmp); - } - else if (build_opts == GBO_MAKE_CUSTOM && build_info.custom_target) - { - build_info.type = GBO_MAKE_CUSTOM; - g_string_append(cmdstr, build_info.custom_target); - dir = project_get_make_dir(); + switch (src) + { + case GEANY_BCS_DEF: return ft->ftdefcmds; + case GEANY_BCS_FT: return ft->filecmds; + case GEANY_BCS_HOME_FT: return ft->homefilecmds; + case GEANY_BCS_PREF: return ft->homefilecmds; + case GEANY_BCS_PROJ: return ft->projfilecmds; + default: return NULL; + } + break; + case GEANY_GBG_NON_FT: + switch (src) + { + case GEANY_BCS_DEF: return non_ft_def; + case GEANY_BCS_PREF: return non_ft_pref; + case GEANY_BCS_PROJ: return non_ft_proj; + default: return NULL; + } + break; + case GEANY_GBG_EXEC: + if ((doc = document_get_current()) != NULL) + ft = doc->file_type; + switch (src) + { + case GEANY_BCS_DEF: return exec_def; + case GEANY_BCS_FT: return ft ? ft->execcmds: NULL; + case GEANY_BCS_HOME_FT: return ft ? ft->homeexeccmds: NULL; + case GEANY_BCS_PROJ_FT: return ft ? ft->projexeccmds: NULL; + case GEANY_BCS_PREF: return exec_pref; + case GEANY_BCS_PROJ: return exec_proj; + default: return NULL; + } + break; + default: + return NULL; } - else /* GBO_MAKE_ALL */ +} + + +/** Remove the specified Build menu item. + * + * Makes the specified menu item configuration no longer exist. This + * is different to setting fields to blank because the menu item + * will be deleted from the configuration file on saving + * (except the system filetypes settings @see Build Menu Configuration + * section of the Manual). + * + * @param src the source of the menu item to remove. + * @param grp the group of the command to remove. + * @param cmd the index (from 0) of the command within the group. A negative + * value will remove the whole group. + * + * If any parameter is out of range does nothing. + * + * @see build_menu_update + **/ +void build_remove_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd) +{ + GeanyBuildCommand *bc; + gint i; + + bc = get_build_group(src, grp); + if (bc == NULL) + return; + if (cmd < 0) { - build_info.type = GBO_MAKE_ALL; - g_string_append(cmdstr, "all"); - dir = project_get_make_dir(); + for (i = 0; i < build_groups_count[grp]; ++i) + bc[i].exists = FALSE; } - - pid = build_spawn_cmd(doc, cmdstr->str, dir); /* if dir is NULL, idx filename is used */ - g_free(dir); - g_string_free(cmdstr, TRUE); - return pid; + else if (cmd < build_groups_count[grp]) + bc[cmd].exists = FALSE; } -static GPid build_compile_file(GeanyDocument *doc) +/** Get the @a GeanyBuildCommand structure for the specified Build menu item. + * + * Get the command for any menu item specified by @a src, @a grp and @a cmd even if it is + * hidden by higher priority commands. + * + * @param src the source of the specified menu item. + * @param grp the group of the specified menu item. + * @param cmd the index of the command within the group. + * + * @return a pointer to the @a GeanyBuildCommand structure or @a NULL if it doesn't exist. + * This is a pointer to an internal structure and must not be freed. + * + * @see build_menu_update + **/ +GeanyBuildCommand *build_get_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd) { - if (doc == NULL || doc->file_name == NULL) - return (GPid) 1; + GeanyBuildCommand *bc; - build_info.type = GBO_COMPILE; - return build_spawn_cmd(doc, doc->file_type->programs->compiler, NULL); + if (src >= GEANY_BCS_COUNT || grp >= GEANY_GBG_COUNT || cmd >= build_groups_count[grp]) + return NULL; + bc = get_build_group(src, grp); + if (bc == NULL) + return NULL; + return &(bc[cmd]); } -static GPid build_link_file(GeanyDocument *doc) +/** Get the @a GeanyBuildCommand structure for the menu item. + * + * Get the current highest priority command specified by @a grp and @a cmd. This is the one + * that the menu item will use if activated. + * + * @param grp the group of the specified menu item. + * @param cmd the index of the command within the group. + * @param src pointer to @a gint to return which source provided the command. Ignored if @a NULL. + * Values are one of @a GeanyBuildSource but returns a signed type not the enum. + * + * @return a pointer to the @a GeanyBuildCommand structure or @a NULL if it doesn't exist. + * This is a pointer to an internal structure and must not be freed. + * + * @see build_menu_update + **/ +/* parameter checked version of get_build_cmd for external interface */ +GeanyBuildCommand *build_get_current_menu_item(GeanyBuildGroup grp, gint cmd, gint *src) { - if (doc == NULL || doc->file_name == NULL) - return (GPid) 1; - - build_info.type = GBO_BUILD; - return build_spawn_cmd(doc, doc->file_type->programs->linker, NULL); + if (*src >= GEANY_BCS_COUNT || grp >= GEANY_GBG_COUNT || cmd >= build_groups_count[grp]) + return NULL; + return get_build_cmd(NULL, grp, cmd, src); } -/* If linking, clear all error indicators in all documents. - * Otherwise, just clear error indicators in document idx. */ +/* Clear all error indicators in all documents. */ static void clear_errors(GeanyDocument *doc) { - switch (build_info.type) - { - case GBO_COMPILE: - case GBO_MAKE_OBJECT: - g_return_if_fail(doc); - editor_indicator_clear_errors(doc->editor); - break; - - case GBO_BUILD: - case GBO_MAKE_ALL: - case GBO_MAKE_CUSTOM: - { - guint i; + guint i; - for (i = 0; i < documents_array->len; i++) - { - if (documents[i]->is_valid) - editor_indicator_clear_errors(documents[i]->editor); - } - break; - } + for (i = 0; i < documents_array->len; i++) + { + if (documents[i]->is_valid) + editor_indicator_clear_errors(documents[i]->editor); } } @@ -449,44 +592,93 @@ #endif +/* Replaces occurences of %e and %p with the appropriate filenames, + * %d and %p replacements should be in UTF8 */ +static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *src) +{ + GString *stack; + gchar *filename = NULL; + gchar *replacement; + gchar *executable = NULL; + gchar *ret_str; /* to be freed when not in use anymore */ + + stack = g_string_new(src); + if (doc != NULL && doc->file_name != NULL) + { + filename = utils_get_utf8_from_locale(doc->file_name); + + /* replace %f with the filename (including extension) */ + replacement = g_path_get_basename(filename); + utils_string_replace_all(stack, "%f", replacement); + g_free(replacement); + + /* replace %d with the absolute path of the dir of the current file */ + replacement = g_path_get_dirname(filename); + utils_string_replace_all(stack, "%d", replacement); + g_free(replacement); + + /* replace %e with the filename (excluding extension) */ + executable = utils_remove_ext_from_filename(filename); + replacement = g_path_get_basename(executable); + utils_string_replace_all(stack, "%e", replacement); + g_free(replacement); + } + + /* replace %p with the current project's (absolute) base directory */ + replacement = NULL; /* prevent double free if no replacement found */ + if (app->project) + { + replacement = project_get_base_path(); + } + else if (strstr(stack->str, "%p")) + { /* fall back to %d */ + ui_set_statusbar(FALSE, _("failed to substitute %%p, no project active")); + if (doc != NULL && filename != NULL) + replacement = g_path_get_dirname(filename); + } + + utils_string_replace_all(stack, "%p", replacement); + g_free(replacement); + + ret_str = utils_get_utf8_from_locale(stack->str); + g_free(executable); + g_free(filename); + g_string_free(stack, TRUE); + + return ret_str; /* don't forget to free src also if needed */ +} + + /* dir is the UTF-8 working directory to run cmd in. It can be NULL to use the * idx document directory */ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir) { - GError *error = NULL; - gchar **argv; - gchar *working_dir; - gchar *utf8_working_dir; - gchar *cmd_string; - gchar *utf8_cmd_string; - gchar *locale_filename; - gchar *executable; - gchar *tmp; + GError *error = NULL; + gchar **argv; + gchar *working_dir; + gchar *utf8_working_dir; + gchar *cmd_string; + gchar *utf8_cmd_string; #ifdef G_OS_WIN32 - gchar *output[2]; - gint status; + gchar *output[2]; + gint status; #else - gint stdout_fd; - gint stderr_fd; + gint stdout_fd; + gint stderr_fd; #endif - g_return_val_if_fail(doc != NULL, (GPid) 1); + if (!((doc != NULL && NZV(doc->file_name)) || NZV(dir))) + { + geany_debug("Failed to run command with no working directory"); + ui_set_statusbar(TRUE, _("Process failed, no working directory")); + return (GPid) 1; + } - clear_errors(doc); + if (doc != NULL) + clear_errors(doc); setptr(current_dir_entered, NULL); - locale_filename = utils_get_locale_from_utf8(doc->file_name); - executable = utils_remove_ext_from_filename(locale_filename); - cmd_string = g_strdup(cmd); - /* replace %f and %e in the command string */ - tmp = g_path_get_basename(locale_filename); - utils_str_replace_all(&cmd_string, "%f", tmp); - g_free(tmp); - tmp = g_path_get_basename(executable); - utils_str_replace_all(&cmd_string, "%e", tmp); - g_free(tmp); - g_free(executable); #ifdef G_OS_WIN32 argv = g_strsplit(cmd_string, " ", 0); @@ -499,8 +691,7 @@ #endif utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); - utf8_working_dir = (dir != NULL) ? g_strdup(dir) : - g_path_get_dirname(doc->file_name); + utf8_working_dir = NZV(dir) ? g_strdup(dir) : g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); gtk_list_store_clear(msgwindow.store_compiler); @@ -512,7 +703,7 @@ /* set the build info for the message window */ g_free(build_info.dir); build_info.dir = g_strdup(working_dir); - build_info.file_type_id = FILETYPE_ID(doc->file_type); + build_info.file_type_id = (doc == NULL) ? GEANY_FILETYPES_NONE : FILETYPE_ID(doc->file_type); build_info.message_count = 0; #ifdef G_OS_WIN32 @@ -529,7 +720,6 @@ g_strfreev(argv); g_error_free(error); g_free(working_dir); - g_free(locale_filename); error = NULL; return (GPid) 0; } @@ -547,15 +737,14 @@ } /* use GIOChannels to monitor stdout and stderr */ - utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + utils_set_up_io_channel(stdout_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, TRUE, build_iofunc, GINT_TO_POINTER(0)); - utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + utils_set_up_io_channel(stderr_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, TRUE, build_iofunc, GINT_TO_POINTER(1)); #endif g_strfreev(argv); g_free(working_dir); - g_free(locale_filename); return build_info.pid; } @@ -564,71 +753,53 @@ /* Returns: NULL if there was an error, or the working directory the script was created in. * vte_cmd_nonscript is the location of a string which is filled with the command to be used * when vc->skip_run_script is set, otherwise it will be set to NULL */ -static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript) +static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript, gint cmdindex) { - gchar *locale_filename = NULL; + gchar *locale_filename = NULL; gboolean have_project; GeanyProject *project = app->project; - GeanyFiletype *ft = doc->file_type; - gchar *cmd = NULL; - gchar *executable = NULL; - gchar *working_dir = NULL; + GeanyBuildCommand *cmd = NULL; + gchar *executable = NULL; + gchar *working_dir = NULL; + const gchar *cmd_working_dir; gboolean autoclose = FALSE; gboolean result = FALSE; - gchar *tmp; + gchar *tmp; + gchar *cmd_string; if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = NULL; locale_filename = utils_get_locale_from_utf8(doc->file_name); - have_project = (project != NULL && NZV(project->run_cmd)); - cmd = (have_project) ? - project->run_cmd : - ft->programs->run_cmd; - - if (strstr(cmd, "%e") != NULL) - { - executable = utils_remove_ext_from_filename(locale_filename); - setptr(executable, g_path_get_basename(executable)); - } + have_project = project != NULL; + cmd = get_build_cmd(doc, GEANY_GBG_EXEC, cmdindex, NULL); - if (have_project) - { - gchar *project_base_path = project_get_base_path(); - working_dir = utils_get_locale_from_utf8(project_base_path); - g_free(project_base_path); - } - else - working_dir = g_path_get_dirname(locale_filename); + cmd_string = build_replace_placeholder(doc, buildcmd_cmd(cmd)); + cmd_working_dir = buildcmd_working_dir(cmd); + if (! NZV(cmd_working_dir)) + cmd_working_dir = "%d"; + working_dir = build_replace_placeholder(doc, cmd_working_dir); /* in utf-8 */ /* only test whether working dir exists, don't change it or else Windows support will break * (gspawn-win32-helper.exe is used by GLib and must be in $PATH which means current working * dir where geany.exe was started from, so we can't change it) */ - if (! g_file_test(working_dir, G_FILE_TEST_EXISTS) || + if (!NZV(working_dir) || ! g_file_test(working_dir, G_FILE_TEST_EXISTS) || ! g_file_test(working_dir, G_FILE_TEST_IS_DIR)) { - gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir); - - ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), utf8_working_dir); - utils_free_pointers(4, utf8_working_dir, working_dir, executable, locale_filename, NULL); + ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), + NZV(working_dir) ? working_dir : "" ); + utils_free_pointers(2, cmd_string, working_dir, NULL); return NULL; } - /* replace %f and %e in the run_cmd string */ - cmd = g_strdup(cmd); - tmp = g_path_get_basename(locale_filename); - utils_str_replace_all(&cmd, "%f", tmp); - g_free(tmp); - utils_str_replace_all(&cmd, "%e", executable); - #ifdef HAVE_VTE if (vte_info.load_vte && vc != NULL && vc->run_in_vte) { if (vc->skip_run_script) { if (vte_cmd_nonscript != NULL) - *vte_cmd_nonscript = cmd; + *vte_cmd_nonscript = cmd_string; utils_free_pointers(2, executable, locale_filename, NULL); return working_dir; @@ -642,17 +813,14 @@ /* RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because it * contains no umlauts */ tmp = g_build_filename(working_dir, RUN_SCRIPT_CMD, NULL); - result = build_create_shellscript(tmp, cmd, autoclose); + result = build_create_shellscript(tmp, cmd_string, autoclose); if (! result) { - gchar *utf8_cmd = utils_get_utf8_from_locale(cmd); - ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), - utf8_cmd); - g_free(utf8_cmd); + NZV(cmd_string) ? cmd_string : NULL); } - utils_free_pointers(4, tmp, cmd, executable, locale_filename, NULL); + utils_free_pointers(4, cmd_string, tmp, executable, locale_filename, NULL); if (result) return working_dir; @@ -662,25 +830,24 @@ } -static GPid build_run_cmd(GeanyDocument *doc) +static GPid build_run_cmd(GeanyDocument *doc, gint cmdindex) { - gchar *working_dir; - gchar *vte_cmd_nonscript = NULL; - GError *error = NULL; + gchar *working_dir; + gchar *vte_cmd_nonscript = NULL; + GError *error = NULL; if (doc == NULL || doc->file_name == NULL) return (GPid) 0; - working_dir = prepare_run_script(doc, &vte_cmd_nonscript); + working_dir = prepare_run_script(doc, &vte_cmd_nonscript, cmdindex); if (working_dir == NULL) return (GPid) 0; - run_info.file_type_id = FILETYPE_ID(doc->file_type); + run_info[cmdindex].file_type_id = FILETYPE_ID(doc->file_type); #ifdef HAVE_VTE if (vte_info.load_vte && vc != NULL && vc->run_in_vte) { - GeanyProject *project = app->project; gchar *vte_cmd; if (vc->skip_run_script) @@ -692,9 +859,8 @@ else vte_cmd = g_strconcat("\n/bin/sh ", RUN_SCRIPT_CMD, "\n", NULL); - /* change into current directory if it is not done by default or we have a project and - * project run command(working_dir is already set accordingly) */ - if (! vc->follow_path || (project != NULL && NZV(project->run_cmd))) + /* change into current directory if it is not done by default */ + if (! vc->follow_path) { /* we need to convert the working_dir back to UTF-8 because the VTE expects it */ gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir); @@ -713,17 +879,17 @@ gtk_widget_grab_focus(vc->vte); msgwin_show_hide(TRUE); - run_info.pid = 1; + run_info[cmdindex].pid = 1; g_free(vte_cmd); } else #endif { - gchar *locale_term_cmd = NULL; - gchar **term_argv = NULL; - guint term_argv_len, i; - gchar **argv = NULL; + gchar *locale_term_cmd = NULL; + gchar **term_argv = NULL; + guint term_argv_len, i; + gchar **argv = NULL; /* get the terminal path */ locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); @@ -744,7 +910,7 @@ ui_set_statusbar(TRUE, _("Could not find terminal \"%s\" " "(check path for Terminal tool setting in Preferences)"), tool_prefs.term_cmd); - run_info.pid = (GPid) 1; + run_info[cmdindex].pid = (GPid) 1; goto free_strings; } @@ -757,12 +923,12 @@ /* command line arguments only for cmd.exe */ if (strstr(argv[0], "cmd.exe") != NULL) { - argv[term_argv_len ] = g_strdup("/Q /C"); + argv[term_argv_len] = g_strdup("/Q /C"); argv[term_argv_len + 1] = g_strdup(RUN_SCRIPT_CMD); } else { - argv[term_argv_len ] = g_strdup(RUN_SCRIPT_CMD); + argv[term_argv_len] = g_strdup(RUN_SCRIPT_CMD); argv[term_argv_len + 1] = NULL; } #else @@ -772,19 +938,20 @@ argv[term_argv_len + 2] = NULL; if (! g_spawn_async(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(run_info.pid), &error)) + NULL, NULL, &(run_info[cmdindex].pid), &error)) { geany_debug("g_spawn_async() failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); g_unlink(RUN_SCRIPT_CMD); g_error_free(error); error = NULL; - run_info.pid = (GPid) 0; + run_info[cmdindex].pid = (GPid) 0; } - if (run_info.pid > 0) + if (run_info[cmdindex].pid > 0) { - g_child_watch_add(run_info.pid, (GChildWatchFunc) run_exit_cb, NULL); + g_child_watch_add(run_info[cmdindex].pid, (GChildWatchFunc) run_exit_cb, + (gpointer)&(run_info[cmdindex])); build_menu_update(doc); } free_strings: @@ -794,7 +961,7 @@ } g_free(working_dir); - return run_info.pid; + return run_info[cmdindex].pid; } @@ -809,7 +976,7 @@ if (! NZV(msg)) return; - if (editor_prefs.use_indicators && build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX) + if (build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX) { gchar *filename; gint line; @@ -825,7 +992,7 @@ { GeanyDocument *doc = document_find_by_filename(filename); - if (doc) + if (doc && editor_prefs.use_indicators) { if (line > 0) /* some compilers, like pdflatex report errors on line 0 */ line--; /* so only adjust the line number if it is greater than 0 */ @@ -847,14 +1014,16 @@ if (cond & (G_IO_IN | G_IO_PRI)) { gchar *msg; + GIOStatus st; - while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) + while ((st = g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL)) == G_IO_STATUS_NORMAL && msg) { gint color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; process_build_output_line(msg, color); g_free(msg); } + if (st == G_IO_STATUS_ERROR || st == G_IO_STATUS_EOF) return FALSE; } if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) return FALSE; @@ -912,7 +1081,7 @@ if (failure) { msg = _("Compilation failed."); - msgwin_compiler_add_string(COLOR_DARK_RED, msg); + msgwin_compiler_add_string(COLOR_BLUE, msg); /* If msgwindow is hidden, user will want to display it to see the error */ if (! ui_prefs.msgwindow_visible) { @@ -968,9 +1137,11 @@ static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) { + RunInfo *run_info_data = (RunInfo*)user_data; + g_spawn_close_pid(child_pid); - run_info.pid = 0; + run_info_data->pid = 0; /* reset the stop button and menu item to the original meaning */ build_menu_update(NULL); } @@ -998,7 +1169,8 @@ str = g_strdup_printf( "#!/bin/sh\n\nrm $0\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ \n\n%s\n", cmd, (autoclose) ? "" : - "\necho \"Press return to continue\"\n#to be more compatible with shells like dash\ndummy_var=\"\"\nread dummy_var"); + "\necho \"Press return to continue\"\n#to be more compatible with shells like " + "dash\ndummy_var=\"\"\nread dummy_var"); #endif fputs(str, fp); @@ -1010,1107 +1182,1486 @@ } -/* note: copied from keybindings.c. - * Perhaps the separate Tex menu could be merged with the default build menu? - * Then this could be done with Glade and set the accels in keybindings.c. */ -static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, - GtkAccelGroup *accel_group, GtkWidget *menuitem) -{ - GeanyKeyBinding *kb = &group->keys[kb_id]; +typedef void Callback(GtkWidget *w, gpointer u); - if (kb->key != 0) - gtk_widget_add_accelerator(menuitem, "activate", accel_group, - kb->key, kb->mods, GTK_ACCEL_VISIBLE); -} +/* run the command catenating cmd_cat if present */ +static void build_command(GeanyDocument *doc, GeanyBuildGroup grp, gint cmd, gchar *cmd_cat) +{ + gchar *dir; + gchar *full_command, *subs_command; + GeanyBuildCommand *buildcmd = get_build_cmd(doc, grp, cmd, NULL); + gchar *cmdstr; + if (buildcmd == NULL) + return; -#define GEANY_ADD_WIDGET_ACCEL(kb_id, menuitem) \ - add_menu_accel(group, kb_id, accel_group, menuitem) + cmdstr = buildcmd_cmd(buildcmd); -static void create_build_menu_gen(BuildMenuItems *menu_items) -{ - GtkWidget *menu, *item = NULL, *separator; - GtkAccelGroup *accel_group = gtk_accel_group_new(); - GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_BUILD); + if (cmd_cat != NULL) + { + if (cmdstr != NULL) + full_command = g_strconcat(cmdstr, cmd_cat, NULL); + else + full_command = g_strdup(cmd_cat); + } + else + full_command = cmdstr; - menu = gtk_menu_new(); + dir = build_replace_placeholder(doc, buildcmd_working_dir(buildcmd)); + subs_command = build_replace_placeholder(doc, full_command); + build_info.grp = grp; + build_info.cmd = cmd; + build_spawn_cmd(doc, subs_command, dir); + g_free(subs_command); + g_free(dir); + if (cmd_cat != NULL) + g_free(full_command); + build_menu_update(doc); - /* compile the code */ - item = ui_image_menu_item_new(GTK_STOCK_CONVERT, _("_Compile")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_COMPILE, item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_compile_activate), NULL); - menu_items->item_compile = item; +} - /* build the code */ - item = ui_image_menu_item_new(GEANY_STOCK_BUILD, _("_Build")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_build_activate), NULL); - menu_items->item_link = item; - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); +/*---------------------------------------------------------------- + * + * Create build menu and handle callbacks (&toolbar callbacks) + * + *----------------------------------------------------------------*/ +static void on_make_custom_input_response(const gchar *input) +{ + GeanyDocument *doc = document_get_current(); - /* build the code with make all */ - item = gtk_image_menu_item_new_with_mnemonic(_("_Make All")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_ALL)); - menu_items->item_make_all = item; + setptr(build_info.custom_target, g_strdup(input)); + build_command(doc, GBO_TO_GBG(GEANY_GBO_CUSTOM), GBO_TO_CMD(GEANY_GBO_CUSTOM), + build_info.custom_target); +} - /* build the code with make custom */ - item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_CUSTOM)); - menu_items->item_make_custom = item; - /* build the code with make object */ - item = gtk_image_menu_item_new_with_mnemonic(_("Make _Object")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOBJECT, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_OBJECT)); - menu_items->item_make_object = item; +static void on_build_menu_item(GtkWidget *w, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + GeanyBuildCommand *bc; + gint grp = GPOINTER_TO_GRP(user_data); + gint cmd = GPOINTER_TO_CMD(user_data); - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); + if (doc && doc->changed) + document_save_file(doc, FALSE); + if (grp == GEANY_GBG_NON_FT && cmd == GBO_TO_CMD(GEANY_GBO_CUSTOM)) + { + static GtkWidget *dialog = NULL; /* keep dialog for combo history */ - /* next error */ - item = gtk_image_menu_item_new_with_mnemonic(_("_Next Error")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_NEXTERROR, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_next_error), NULL); - menu_items->item_next_error = item; - - item = gtk_image_menu_item_new_with_mnemonic(_("_Previous Error")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_PREVIOUSERROR, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_previous_error), NULL); - menu_items->item_previous_error = item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - - /* execute the code */ - item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN, item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_execute_activate), NULL); - menu_items->item_exec = item; - - separator = gtk_separator_menu_item_new(); - gtk_widget_show(separator); - gtk_container_add(GTK_CONTAINER(menu), separator); - gtk_widget_set_sensitive(separator, FALSE); - - /* arguments */ - item = ui_image_menu_item_new(GTK_STOCK_PREFERENCES, _("_Set Includes and Arguments")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); - menu_items->item_set_args = item; - - menu_items->menu = menu; - g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */ -} - - -static void create_build_menu_tex(BuildMenuItems *menu_items) -{ - GtkWidget *menu, *item, *separator; - GtkAccelGroup *accel_group = gtk_accel_group_new(); - GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_BUILD); - - menu = gtk_menu_new(); - - /* DVI */ - item = ui_image_menu_item_new(GTK_STOCK_CONVERT, _("LaTeX -> _DVI")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_COMPILE, item); - g_signal_connect(item, "activate", - G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_DVI)); - menu_items->item_compile = item; - - /* PDF */ - item = ui_image_menu_item_new(GEANY_STOCK_BUILD, _("LaTeX -> _PDF")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); - g_signal_connect(item, "activate", - G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_PDF)); - menu_items->item_link = item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - - /* build the code with make all */ - item = gtk_image_menu_item_new_with_mnemonic(_("_Make All")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_ALL)); - menu_items->item_make_all = item; - - /* build the code with make custom */ - item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_CUSTOM)); - menu_items->item_make_custom = item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - - /* next error */ - item = gtk_image_menu_item_new_with_mnemonic(_("_Next Error")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_NEXTERROR, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_next_error), NULL); - menu_items->item_next_error = item; - - item = gtk_image_menu_item_new_with_mnemonic(_("_Previous Error")); - gtk_widget_show(item); - /*GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_, item);*/ - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_previous_error), NULL); - menu_items->item_previous_error = item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - - /* DVI view */ -#define LATEX_VIEW_DVI_LABEL _("_View DVI File") /* used later again */ - item = ui_image_menu_item_new(GTK_STOCK_FIND, LATEX_VIEW_DVI_LABEL); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN, item); - g_signal_connect(item, "activate", - G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_DVI)); - menu_items->item_exec = item; - - /* PDF view */ - item = ui_image_menu_item_new(GTK_STOCK_FIND, _("V_iew PDF File")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN2, item); - g_signal_connect(item, "activate", - G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_PDF)); - menu_items->item_exec2 = item; - - /* separator */ - separator = gtk_separator_menu_item_new(); - gtk_widget_show(separator); - gtk_container_add(GTK_CONTAINER(menu), separator); - gtk_widget_set_sensitive(separator, FALSE); - - /* arguments */ - item = ui_image_menu_item_new(GTK_STOCK_PREFERENCES, _("_Set Arguments")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", - G_CALLBACK(on_build_arguments_activate), filetypes[GEANY_FILETYPES_LATEX]); - menu_items->item_set_args = item; - - gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group); - - menu_items->menu = menu; - g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */ -} - - -static void -on_includes_arguments_tex_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data) -{ - GeanyFiletype *ft = user_data; - g_return_if_fail(ft != NULL); - - if (response == GTK_RESPONSE_ACCEPT) - { - const gchar *newstr; - struct build_programs *programs = ft->programs; - - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "tex_entry1"))); - if (! utils_str_equal(newstr, programs->compiler)) + if (! dialog) { - if (programs->compiler) g_free(programs->compiler); - programs->compiler = g_strdup(newstr); - programs->modified = TRUE; + dialog = dialogs_show_input_persistent(_("Custom Text"), + _("Enter custom text here, all entered text is appended to the command."), + build_info.custom_target, &on_make_custom_input_response); } - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "tex_entry2"))); - if (! utils_str_equal(newstr, programs->linker)) + else { - if (programs->linker) g_free(programs->linker); - programs->linker = g_strdup(newstr); - programs->modified = TRUE; + gtk_widget_show(dialog); } - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "tex_entry3"))); - if (! utils_str_equal(newstr, programs->run_cmd)) + return; + } + else if (grp == GEANY_GBG_EXEC) + { + if (run_info[cmd].pid > (GPid) 1) { - if (programs->run_cmd) g_free(programs->run_cmd); - programs->run_cmd = g_strdup(newstr); - programs->modified = TRUE; + kill_process(&run_info[cmd].pid); + return; } - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "tex_entry4"))); - if (! utils_str_equal(newstr, programs->run_cmd2)) - { - if (programs->run_cmd2) g_free(programs->run_cmd2); - programs->run_cmd2 = g_strdup(newstr); - programs->modified = TRUE; + bc = get_build_cmd(doc, grp, cmd, NULL); + if (bc != NULL && strcmp(buildcmd_cmd(bc), "builtin") == 0) + { + gchar *uri; + if (doc == NULL) + return; + uri = g_strconcat("file:///", g_path_skip_root(doc->file_name), NULL); + utils_open_browser(uri); + g_free(uri); + } + else + build_run_cmd(doc, cmd); } + else + build_command(doc, grp, cmd, NULL); } -static void show_includes_arguments_tex(void) -{ - GtkWidget *dialog, *label, *entries[4], *vbox, *table; - GeanyDocument *doc = document_get_current(); - gint response; - GeanyFiletype *ft = NULL; +/* group codes for menu items other than the known commands + * value order is important, see the following table for use */ - if (doc != NULL) - ft = doc->file_type; - g_return_if_fail(ft != NULL); - - dialog = gtk_dialog_new_with_buttons(_("Set Arguments"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_set_name(dialog, "GeanyDialog"); - - label = gtk_label_new(_("Set programs and options for compiling and viewing (La)TeX files.")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); - - table = gtk_table_new(4, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - gtk_container_add(GTK_CONTAINER(vbox), table); - - /* LaTeX -> DVI args */ - if (ft->programs->compiler != NULL && ft->actions->can_compile) - { - label = gtk_label_new(_("DVI creation:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); - - entries[0] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[0]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[0]), 30); - if (ft->programs->compiler) - { - gtk_entry_set_text(GTK_ENTRY(entries[0]), ft->programs->compiler); - } - gtk_table_attach_defaults(GTK_TABLE(table), entries[0], 1, 2, 0, 1); - g_object_set_data_full(G_OBJECT(dialog), "tex_entry1", - g_object_ref(entries[0]), (GDestroyNotify)g_object_unref); - } +/* the rest in each group */ +#define MENU_FT_REST (GEANY_GBG_COUNT + GEANY_GBG_FT) +#define MENU_NON_FT_REST (GEANY_GBG_COUNT + GEANY_GBG_NON_FT) +#define MENU_EXEC_REST (GEANY_GBG_COUNT + GEANY_GBG_EXEC) +/* the separator */ +#define MENU_SEPARATOR (2*GEANY_GBG_COUNT) +/* the fixed items */ +#define MENU_NEXT_ERROR (MENU_SEPARATOR + 1) +#define MENU_PREV_ERROR (MENU_NEXT_ERROR + 1) +#define MENU_COMMANDS (MENU_PREV_ERROR + 1) +#define MENU_DONE (MENU_COMMANDS + 1) + + +static struct BuildMenuItemSpec { + const gchar *stock_id; + const gint key_binding; + const gint build_grp; + const gint build_cmd; + const gchar *fix_label; + Callback *cb; +} build_menu_specs[] = { + {GTK_STOCK_CONVERT, GEANY_KEYS_BUILD_COMPILE, GBO_TO_GBG(GEANY_GBO_COMPILE), + GBO_TO_CMD(GEANY_GBO_COMPILE), NULL, on_build_menu_item}, + {GEANY_STOCK_BUILD, GEANY_KEYS_BUILD_LINK, GBO_TO_GBG(GEANY_GBO_BUILD), + GBO_TO_CMD(GEANY_GBO_BUILD), NULL, on_build_menu_item}, + {NULL, -1, MENU_FT_REST, + GBO_TO_CMD(GEANY_GBO_BUILD) + 1, NULL, on_build_menu_item}, + {NULL, -1, MENU_SEPARATOR, + GBF_SEP_1, NULL, NULL}, + {NULL, GEANY_KEYS_BUILD_MAKE, GBO_TO_GBG(GEANY_GBO_MAKE_ALL), + GBO_TO_CMD(GEANY_GBO_MAKE_ALL), NULL, on_build_menu_item}, + {NULL, GEANY_KEYS_BUILD_MAKEOWNTARGET, GBO_TO_GBG(GEANY_GBO_CUSTOM), + GBO_TO_CMD(GEANY_GBO_CUSTOM), NULL, on_build_menu_item}, + {NULL, GEANY_KEYS_BUILD_MAKEOBJECT, GBO_TO_GBG(GEANY_GBO_MAKE_OBJECT), + GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT), NULL, on_build_menu_item}, + {NULL, -1, MENU_NON_FT_REST, + GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT) + 1, NULL, on_build_menu_item}, + {NULL, -1, MENU_SEPARATOR, + GBF_SEP_2, NULL, NULL}, + {NULL, GEANY_KEYS_BUILD_NEXTERROR, MENU_NEXT_ERROR, + GBF_NEXT_ERROR, N_("_Next Error"), on_build_next_error}, + {NULL, GEANY_KEYS_BUILD_PREVIOUSERROR, MENU_PREV_ERROR, + GBF_PREV_ERROR, N_("_Previous Error"), on_build_previous_error}, + {NULL, -1, MENU_SEPARATOR, + GBF_SEP_3, NULL, NULL}, + {GTK_STOCK_EXECUTE, GEANY_KEYS_BUILD_RUN, GBO_TO_GBG(GEANY_GBO_EXEC), + GBO_TO_CMD(GEANY_GBO_EXEC), NULL, on_build_menu_item}, + {NULL, -1, MENU_EXEC_REST, + GBO_TO_CMD(GEANY_GBO_EXEC) + 1, NULL, on_build_menu_item}, + {NULL, -1, MENU_SEPARATOR, + GBF_SEP_4, NULL, NULL}, + {GTK_STOCK_PREFERENCES, GEANY_KEYS_BUILD_OPTIONS, MENU_COMMANDS, + GBF_COMMANDS, N_("_Set Build Commands"), on_set_build_commands_activate}, + {NULL, -1, MENU_DONE, + 0, NULL, NULL} +}; - /* LaTeX -> PDF args */ - if (ft->programs->linker != NULL && ft->actions->can_link) - { - label = gtk_label_new(_("PDF creation:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); - entries[1] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[1]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[1]), 30); - if (ft->programs->linker) - { - gtk_entry_set_text(GTK_ENTRY(entries[1]), ft->programs->linker); - } - gtk_table_attach_defaults(GTK_TABLE(table), entries[1], 1, 2, 1, 2); - g_object_set_data_full(G_OBJECT(dialog), "tex_entry2", - g_object_ref(entries[1]), (GDestroyNotify)g_object_unref); - } +static void create_build_menu_item(GtkWidget *menu, GeanyKeyGroup *group, GtkAccelGroup *ag, + struct BuildMenuItemSpec *bs, const gchar *lbl, gint grp, gint cmd) +{ + GtkWidget *item = gtk_image_menu_item_new_with_mnemonic(lbl); - /* View LaTeX -> DVI args */ - if (ft->programs->run_cmd != NULL) + if (bs->stock_id != NULL) { - label = gtk_label_new(_("DVI preview:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); - - entries[2] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[2]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[2]), 30); - if (ft->programs->run_cmd) - { - gtk_entry_set_text(GTK_ENTRY(entries[2]), ft->programs->run_cmd); - } - gtk_table_attach_defaults(GTK_TABLE(table), entries[2], 1, 2, 2, 3); - g_object_set_data_full(G_OBJECT(dialog), "tex_entry3", - g_object_ref(entries[2]), (GDestroyNotify)g_object_unref); + GtkWidget *image = gtk_image_new_from_stock(bs->stock_id, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); } - - /* View LaTeX -> PDF args */ - if (ft->programs->run_cmd2 != NULL) + gtk_widget_show(item); + if (bs->key_binding >= 0) + add_menu_accel(group, bs->key_binding, ag, item); + gtk_container_add(GTK_CONTAINER(menu), item); + if (bs->cb != NULL) { - label = gtk_label_new(_("PDF preview:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); - - entries[3] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[3]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[3]), 30); - if (ft->programs->run_cmd2) - { - gtk_entry_set_text(GTK_ENTRY(entries[3]), ft->programs->run_cmd2); - } - gtk_table_attach_defaults(GTK_TABLE(table), entries[3], 1, 2, 3, 4); - g_object_set_data_full(G_OBJECT(dialog), "tex_entry4", - g_object_ref(entries[3]), (GDestroyNotify)g_object_unref); + g_signal_connect(item, "activate", G_CALLBACK(bs->cb), GRP_CMD_TO_POINTER(grp,cmd)); } - - label = gtk_label_new(_("%f will be replaced by the current filename, e.g. test_file.c\n" - "%e will be replaced by the filename without extension, e.g. test_file")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); - - gtk_widget_show_all(dialog); - /* run modally to prevent user changing idx filetype */ - response = gtk_dialog_run(GTK_DIALOG(dialog)); - /* call the callback manually */ - on_includes_arguments_tex_dialog_response(GTK_DIALOG(dialog), response, ft); - - gtk_widget_destroy(dialog); + menu_items.menu_item[grp][cmd] = item; } -static void -on_includes_arguments_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data) +static void create_build_menu(BuildMenuItems *build_menu_items) { - GeanyDocument *doc = user_data; - GeanyFiletype *ft; - - g_return_if_fail(doc != NULL); + GtkWidget *menu; + GtkAccelGroup *accel_group = gtk_accel_group_new(); + GeanyKeyGroup *keygroup = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_BUILD); + gint i, j; - ft = doc->file_type; - g_return_if_fail(ft != NULL); + menu = gtk_menu_new(); + build_menu_items->menu_item[GEANY_GBG_FT] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_FT]); + build_menu_items->menu_item[GEANY_GBG_NON_FT] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_NON_FT]); + build_menu_items->menu_item[GEANY_GBG_EXEC] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_EXEC]); + build_menu_items->menu_item[GBG_FIXED] = g_new0(GtkWidget*, GBF_COUNT); - if (response == GTK_RESPONSE_ACCEPT) + for (i = 0; build_menu_specs[i].build_grp != MENU_DONE; ++i) { - const gchar *newstr; - struct build_programs *programs = ft->programs; - - if (ft->actions->can_compile) + struct BuildMenuItemSpec *bs = &(build_menu_specs[i]); + if (bs->build_grp == MENU_SEPARATOR) { - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "includes_entry1"))); - if (! utils_str_equal(newstr, programs->compiler)) - { - if (programs->compiler) g_free(programs->compiler); - programs->compiler = g_strdup(newstr); - programs->modified = TRUE; - } + GtkWidget *item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + build_menu_items->menu_item[GBG_FIXED][bs->build_cmd] = item; } - if (ft->actions->can_link) + else if (bs->fix_label != NULL) { - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "includes_entry2"))); - if (! utils_str_equal(newstr, programs->linker)) - { - if (programs->linker) g_free(programs->linker); - programs->linker = g_strdup(newstr); - programs->modified = TRUE; - } + create_build_menu_item(menu, keygroup, accel_group, bs, _(bs->fix_label), + GBG_FIXED, bs->build_cmd); } - if (ft->actions->can_exec) + else if (bs->build_grp >= MENU_FT_REST && bs->build_grp <= MENU_SEPARATOR) { - newstr = gtk_entry_get_text( - GTK_ENTRY(ui_lookup_widget(GTK_WIDGET(dialog), "includes_entry3"))); - if (! utils_str_equal(newstr, programs->run_cmd)) + gint grp = bs->build_grp - GEANY_GBG_COUNT; + for (j = bs->build_cmd; j < build_groups_count[grp]; ++j) { - if (programs->run_cmd) g_free(programs->run_cmd); - programs->run_cmd = g_strdup(newstr); - programs->modified = TRUE; + GeanyBuildCommand *bc = get_build_cmd(NULL, grp, j, NULL); + const gchar *lbl = (bc == NULL) ? "" : buildcmd_label(bc); + create_build_menu_item(menu, keygroup, accel_group, bs, lbl, grp, j); } } - if (programs->modified) - build_menu_update(doc); + else + { + GeanyBuildCommand *bc = get_build_cmd(NULL, bs->build_grp, bs->build_cmd, NULL); + const gchar *lbl = (bc == NULL) ? "" : buildcmd_label(bc); + create_build_menu_item(menu, keygroup, accel_group, bs, lbl, bs->build_grp, bs->build_cmd); + } } + build_menu_items->menu = menu; + gtk_widget_show(menu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "menu_build1")), menu); } -static void show_includes_arguments_gen(void) +/* portability to various GTK versions needs checking + * conforms to description of gtk_accel_label as child of menu item + * NB 2.16 adds set_label but not yet set_label_mnemonic */ +static void geany_menu_item_set_label(GtkWidget *w, const gchar *label) { - GtkWidget *dialog, *label, *entries[3], *vbox; - GtkWidget *ft_table = NULL; - gint row = 0; - gint response; - GeanyDocument *doc = document_get_current(); - GeanyFiletype *ft = NULL; - - if (doc != NULL) - ft = doc->file_type; - g_return_if_fail(ft != NULL); - - dialog = gtk_dialog_new_with_buttons(_("Set Includes and Arguments"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_set_name(dialog, "GeanyDialog"); - - label = gtk_label_new(_("Set the commands for building and running programs.")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); + GtkWidget *c = gtk_bin_get_child(GTK_BIN(w)); - if (ft->actions->can_compile || ft->actions->can_link || ft->actions->can_exec) - { - GtkWidget *align, *frame; - /* in-dialog heading for the "Set Includes and Arguments" dialog */ - gchar *frame_title = g_strdup_printf(_("%s commands"), ft->title); + gtk_label_set_text_with_mnemonic(GTK_LABEL(c), label); +} - frame = ui_frame_new_with_alignment(frame_title, &align); - gtk_container_add(GTK_CONTAINER(vbox), frame); - g_free(frame_title); - ft_table = gtk_table_new(3, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(ft_table), 6); - gtk_container_add(GTK_CONTAINER(align), ft_table); - row = 0; - } +/** Update the build menu to reflect changes in configuration or status. + * + * Sets the labels and number of visible items to match the highest + * priority configured commands. Also sets sensitivity if build commands are + * running and switches executes to stop when commands are running. + * + * @param doc The current document, if available, to save looking it up. + * If @c NULL it will be looked up. + * + * Call this after modifying any fields of a GeanyBuildCommand structure. + * + * @see Build Menu Configuration section of the Manual. + * + **/ +void build_menu_update(GeanyDocument *doc) +{ + gint i, cmdcount, cmd, grp; + gboolean vis = FALSE; + gboolean have_path, build_running, exec_running, have_errors, cmd_sensitivity; + gboolean can_compile, can_build, can_make, run_sensitivity = FALSE, run_running = FALSE; + GeanyBuildCommand *bc; - /* include-args */ - if (ft->actions->can_compile) + if (menu_items.menu == NULL) + create_build_menu(&menu_items); + if (doc == NULL) + doc = document_get_current(); + have_path = doc != NULL && doc->file_name != NULL; + build_running = build_info.pid > (GPid) 1; + have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler), NULL) > 0; + for (i = 0; build_menu_specs[i].build_grp != MENU_DONE; ++i) { - label = gtk_label_new(_("Compile:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(ft_table), label, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); - - entries[0] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[0]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[0]), 30); - if (ft->programs->compiler) + struct BuildMenuItemSpec *bs = &(build_menu_specs[i]); + switch (bs->build_grp) { - gtk_entry_set_text(GTK_ENTRY(entries[0]), ft->programs->compiler); + case MENU_SEPARATOR: + if (vis == TRUE) + { + gtk_widget_show_all(menu_items.menu_item[GBG_FIXED][bs->build_cmd]); + vis = FALSE; + } + else + gtk_widget_hide_all(menu_items.menu_item[GBG_FIXED][bs->build_cmd]); + break; + case MENU_NEXT_ERROR: + case MENU_PREV_ERROR: + gtk_widget_set_sensitive(menu_items.menu_item[GBG_FIXED][bs->build_cmd], have_errors); + vis |= TRUE; + break; + case MENU_COMMANDS: + vis |= TRUE; + break; + default: /* all configurable commands */ + if (bs->build_grp >= GEANY_GBG_COUNT) + { + grp = bs->build_grp - GEANY_GBG_COUNT; + cmdcount = build_groups_count[grp]; + } + else + { + grp = bs->build_grp; + cmdcount = bs->build_cmd + 1; + } + for (cmd = bs->build_cmd; cmd < cmdcount; ++cmd) + { + GtkWidget *menu_item = menu_items.menu_item[grp][cmd]; + const gchar *label; + bc = get_build_cmd(doc, grp, cmd, NULL); + if (bc) + label = buildcmd_label(bc); + else + label = NULL; + + if (grp < GEANY_GBG_EXEC) + { + cmd_sensitivity = + (grp == GEANY_GBG_FT && bc != NULL && have_path && ! build_running) || + (grp == GEANY_GBG_NON_FT && bc != NULL && ! build_running); + gtk_widget_set_sensitive(menu_item, cmd_sensitivity); + if (bc != NULL && NZV(label)) + { + geany_menu_item_set_label(menu_item, label); + gtk_widget_show_all(menu_item); + vis |= TRUE; + } + else + gtk_widget_hide_all(menu_item); + } + else + { + GtkWidget *image; + exec_running = run_info[cmd].pid > (GPid) 1; + cmd_sensitivity = (bc != NULL) || exec_running; + gtk_widget_set_sensitive(menu_item, cmd_sensitivity); + if (cmd == GBO_TO_CMD(GEANY_GBO_EXEC)) + run_sensitivity = cmd_sensitivity; + if (! exec_running) + { + image = gtk_image_new_from_stock(bs->stock_id, GTK_ICON_SIZE_MENU); + } + else + { + image = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + } + if (cmd == GBO_TO_CMD(GEANY_GBO_EXEC)) + run_running = exec_running; + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image); + if (bc != NULL && NZV(label)) + { + geany_menu_item_set_label(menu_item, label); + gtk_widget_show_all(menu_item); + vis |= TRUE; + } + else + gtk_widget_hide_all(menu_item); + } + } } - gtk_table_attach_defaults(GTK_TABLE(ft_table), entries[0], 1, 2, row, row + 1); - row++; - - g_object_set_data_full(G_OBJECT(dialog), "includes_entry1", - g_object_ref(entries[0]), (GDestroyNotify)g_object_unref); } - /* lib-args */ - if (ft->actions->can_link) - { - label = gtk_label_new(_("Build:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(ft_table), label, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + run_sensitivity &= (doc != NULL); + can_build = get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_BUILD), NULL) != NULL + && have_path && ! build_running; + if (widgets.toolitem_build != NULL) + gtk_widget_set_sensitive(widgets.toolitem_build, can_build); + can_make = FALSE; + if (widgets.toolitem_make_all != NULL) + gtk_widget_set_sensitive(widgets.toolitem_make_all, + (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_MAKE_ALL), NULL) != NULL + && ! build_running)); + if (widgets.toolitem_make_custom != NULL) + gtk_widget_set_sensitive(widgets.toolitem_make_custom, + (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_CUSTOM), NULL) != NULL + && ! build_running)); + if (widgets.toolitem_make_object != NULL) + gtk_widget_set_sensitive(widgets.toolitem_make_object, + (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT), NULL) != NULL + && ! build_running)); + if (widgets.toolitem_set_args != NULL) + gtk_widget_set_sensitive(widgets.toolitem_set_args, TRUE); - entries[1] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[1]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[1]), 30); - if (ft->programs->linker) - { - gtk_entry_set_text(GTK_ENTRY(entries[1]), ft->programs->linker); - } - gtk_table_attach_defaults(GTK_TABLE(ft_table), entries[1], 1, 2, row, row + 1); - row++; + can_compile = get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_COMPILE), NULL) != NULL + && have_path && ! build_running; + gtk_action_set_sensitive(widgets.compile_action, can_compile); + gtk_action_set_sensitive(widgets.build_action, can_make); + gtk_action_set_sensitive(widgets.run_action, run_sensitivity); - g_object_set_data_full(G_OBJECT(dialog), "includes_entry2", - g_object_ref(entries[1]), (GDestroyNotify)g_object_unref); - } + /* show the stop command if a program is running from execute 0 , otherwise show run command */ + set_stop_button(run_running); - /* program-args */ - if (ft->actions->can_exec) - { - label = gtk_label_new(_("Execute:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(ft_table), label, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); +} - entries[2] = gtk_entry_new(); - ui_entry_add_clear_icon(entries[2]); - gtk_entry_set_width_chars(GTK_ENTRY(entries[2]), 30); - if (ft->programs->run_cmd) - { - gtk_entry_set_text(GTK_ENTRY(entries[2]), ft->programs->run_cmd); - } - gtk_table_attach_defaults(GTK_TABLE(ft_table), entries[2], 1, 2, row, row + 1); - row++; - g_object_set_data_full(G_OBJECT(dialog), "includes_entry3", - g_object_ref(entries[2]), (GDestroyNotify)g_object_unref); +/* Call build_menu_update() instead of calling this directly. */ +static void set_stop_button(gboolean stop) +{ + const gchar *button_stock_id = NULL; + GtkToolButton *run_button; + + run_button = GTK_TOOL_BUTTON(toolbar_get_widget_by_name("Run")); + if (run_button != NULL) + button_stock_id = gtk_tool_button_get_stock_id(run_button); + + if (stop && utils_str_equal(button_stock_id, "gtk-stop")) + return; + if (! stop && utils_str_equal(button_stock_id, "gtk-execute")) + return; - /* disable the run command if there is a valid project run command set */ - if (app->project && NZV(app->project->run_cmd)) - gtk_widget_set_sensitive(entries[2], FALSE); + /* use the run button also as stop button */ + if (stop) + { + if (run_button != NULL) + gtk_tool_button_set_stock_id(run_button, "gtk-stop"); } + else + { + if (run_button != NULL) + gtk_tool_button_set_stock_id(run_button, "gtk-execute"); + } +} - label = gtk_label_new(_("%f will be replaced by the current filename, e.g. test_file.c\n" - "%e will be replaced by the filename without extension, e.g. test_file")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); - gtk_widget_show_all(dialog); - /* run modally to prevent user changing idx filetype */ - response = gtk_dialog_run(GTK_DIALOG(dialog)); - /* call the callback manually */ - on_includes_arguments_dialog_response(GTK_DIALOG(dialog), response, doc); +static void on_set_build_commands_activate(GtkWidget *w, gpointer u) +{ + show_build_commands_dialog(); +} - gtk_widget_destroy(dialog); + +static void on_toolbutton_build_activate(GtkWidget *menuitem, gpointer user_data) +{ + last_toolbutton_action = user_data; + g_object_set(widgets.build_action, "tooltip", _("Build the current file"), NULL); + on_build_menu_item(menuitem, user_data); } -static void -on_build_arguments_activate (GtkMenuItem *menuitem, - gpointer user_data) +static void on_toolbutton_make_activate(GtkWidget *menuitem, gpointer user_data) { - if (user_data && FILETYPE_ID((GeanyFiletype*) user_data) == GEANY_FILETYPES_LATEX) - show_includes_arguments_tex(); + gchar *msg; + gint grp, cmd; + + last_toolbutton_action = user_data; + grp = GPOINTER_TO_GRP(user_data); + cmd = GPOINTER_TO_CMD(user_data); + if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_MAKE_ALL)) + msg = _("Build the current file with Make and the default target"); + else if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_CUSTOM)) + msg = _("Build the current file with Make and the specified target"); + else if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_MAKE_OBJECT)) + msg = _("Compile the current file with Make"); else - show_includes_arguments_gen(); + msg = NULL; + g_object_set(widgets.build_action, "tooltip", msg, NULL); + on_build_menu_item(menuitem, user_data); } -static gboolean is_c_header(const gchar *fname) +static void kill_process(GPid *pid) { - gchar *ext = NULL; + /* Unix: SIGQUIT is not the best signal to use because it causes a core dump (this should not + * perforce necessary for just killing a process). But we must use a signal which we can + * ignore because the main process get it too, it is declared to ignore in main.c. */ + gint result; - if (fname) +#ifdef G_OS_WIN32 + g_return_if_fail(*pid != NULL); + result = TerminateProcess(*pid, 0); + /* TerminateProcess() returns TRUE on success, for the check below we have to convert + * it to FALSE (and vice versa) */ + result = ! result; +#else + g_return_if_fail(*pid > 1); + result = kill(*pid, SIGQUIT); +#endif + + if (result != 0) + ui_set_statusbar(TRUE, _("Process could not be stopped (%s)."), g_strerror(errno)); + else { - ext = strrchr(fname, '.'); + *pid = 0; + build_menu_update(NULL); } - return (ext == NULL) ? FALSE : (*(ext + 1) == 'h'); /* match *.h* */ } -/* Call this whenever build menu items need to be enabled/disabled. - * Uses current document (if there is one) when idx == -1 */ -void build_menu_update(GeanyDocument *doc) +static void on_build_next_error(GtkWidget *menuitem, gpointer user_data) { - GeanyFiletype *ft; - gboolean have_path, can_build, can_make, can_run, can_stop, can_set_args, have_errors; - BuildMenuItems *menu_items; - static GtkWidget *menubar_build_menu = NULL; - - if (menubar_build_menu == NULL) /* cache the build menu pointer */ - menubar_build_menu = ui_lookup_widget(main_widgets.window, "menu_build1"); - if (doc == NULL) - doc = document_get_current(); - if (doc == NULL || (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_NONE && doc->file_name == NULL)) + if (ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_compiler), + msgwin_goto_compiler_file_line)) { - gtk_widget_set_sensitive(menubar_build_menu, FALSE); - gtk_menu_item_remove_submenu(GTK_MENU_ITEM(menubar_build_menu)); - gtk_action_set_sensitive(widgets.compile_action, FALSE); - gtk_action_set_sensitive(widgets.build_action, FALSE); - gtk_action_set_sensitive(widgets.run_action, FALSE); - return; + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); } else - gtk_widget_set_sensitive(menubar_build_menu, TRUE); - - ft = doc->file_type; - g_return_if_fail(ft != NULL); - - menu_items = build_get_menu_items(ft->id); - /* Note: don't remove the submenu first because it can now cause an X hang if - * the menu is already open when called from build_exit_cb(). */ - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_build_menu), - menu_items->menu); - - have_path = doc->file_name != NULL; - - can_make = have_path && build_info.pid <= (GPid) 1; - - /* disable compile and link for C/C++ header files */ - if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) - can_build = can_make && ! is_c_header(doc->file_name); - else - can_build = can_make; + ui_set_statusbar(FALSE, _("No more build errors.")); +} - if (menu_items->item_compile) - gtk_widget_set_sensitive(menu_items->item_compile, - can_build && ft->actions->can_compile && NZV(ft->programs->compiler)); - if (menu_items->item_link) - gtk_widget_set_sensitive(menu_items->item_link, - can_build && ft->actions->can_link && NZV(ft->programs->linker)); - if (menu_items->item_make_all) - gtk_widget_set_sensitive(menu_items->item_make_all, can_make); - if (menu_items->item_make_custom) - gtk_widget_set_sensitive(menu_items->item_make_custom, can_make); - if (menu_items->item_make_object) - gtk_widget_set_sensitive(menu_items->item_make_object, can_make); - if (app->project && NZV(app->project->run_cmd)) - can_run = have_path; /* for now run is disabled for all untitled files */ +static void on_build_previous_error(GtkWidget *menuitem, gpointer user_data) +{ + if (ui_tree_view_find_previous(GTK_TREE_VIEW(msgwindow.tree_compiler), + msgwin_goto_compiler_file_line)) + { + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); + } else - can_run = have_path && ft->actions->can_exec && NZV(ft->programs->run_cmd); + ui_set_statusbar(FALSE, _("No more build errors.")); +} - can_stop = run_info.pid > (GPid) 1; - can_run &= ! can_stop; - /* item_exec is enabled for both run and stop commands */ - if (menu_items->item_exec) - gtk_widget_set_sensitive(menu_items->item_exec, can_run || can_stop); - /* item_exec2 is disabled if there's a running process already */ - if (menu_items->item_exec2) - gtk_widget_set_sensitive(menu_items->item_exec2, can_run); - - can_set_args = - ((ft->actions->can_compile || - ft->actions->can_link || - ft->actions->can_exec) && - FILETYPE_ID(ft) != GEANY_FILETYPES_NONE); - if (menu_items->item_set_args) - gtk_widget_set_sensitive(menu_items->item_set_args, can_set_args); +void build_toolbutton_build_clicked(GtkAction *action, gpointer unused) +{ + if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_BUILD)) + { + on_build_menu_item(NULL, GBO_TO_POINTER(GEANY_GBO_BUILD)); + } + else + { + on_build_menu_item(NULL, last_toolbutton_action); + } +} - if (widgets.toolitem_build != NULL) - gtk_widget_set_sensitive(widgets.toolitem_build, - can_build && ft->actions->can_link && ft->id != GEANY_FILETYPES_LATEX); - if (widgets.toolitem_make_all != NULL) - gtk_widget_set_sensitive(widgets.toolitem_make_all, can_make); - if (widgets.toolitem_make_custom != NULL) - gtk_widget_set_sensitive(widgets.toolitem_make_custom, can_make); - if (widgets.toolitem_make_object != NULL) - gtk_widget_set_sensitive(widgets.toolitem_make_object, - can_make && ft->id != GEANY_FILETYPES_LATEX); - if (widgets.toolitem_set_args != NULL) - gtk_widget_set_sensitive(widgets.toolitem_set_args, can_set_args); - gtk_action_set_sensitive(widgets.compile_action, - can_build && ft->actions->can_compile && NZV(ft->programs->compiler)); - gtk_action_set_sensitive(widgets.build_action, can_make); - gtk_action_set_sensitive(widgets.run_action, can_run || can_stop); +/*------------------------------------------------------ + * + * Create and handle the build menu configuration dialog + * + *-------------------------------------------------------*/ +typedef struct RowWidgets +{ + GtkWidget *entries[GEANY_BC_CMDENTRIES_COUNT]; + GeanyBuildSource src; + GeanyBuildSource dst; + GeanyBuildCommand *cmdsrc; + gint grp; + gint cmd; + gboolean cleared; +} RowWidgets; - /* show the stop command if a program is running, otherwise show run command */ - set_stop_button(can_stop); - /* simply enable next error command if the compiler window has any items */ - have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler), - NULL) > 0; - if (menu_items->item_next_error) - gtk_widget_set_sensitive(menu_items->item_next_error, have_errors); - if (menu_items->item_previous_error) - gtk_widget_set_sensitive(menu_items->item_previous_error, have_errors); +static void set_build_command_entry_text(GtkWidget *wid, const gchar *text) +{ + if (GTK_IS_BUTTON(wid)) + gtk_button_set_label(GTK_BUTTON(wid), text); + else + gtk_entry_set_text(GTK_ENTRY(wid), text); } -/* Call build_menu_update() instead of calling this directly. */ -static void set_stop_button(gboolean stop) +static void on_clear_dialog_row(GtkWidget *unused, gpointer user_data) { - const gchar *button_stock_id = NULL; - GtkStockItem sitem; - GtkToolButton *run_button; - GtkWidget *menuitem = build_get_menu_items(run_info.file_type_id)->item_exec; - - run_button = GTK_TOOL_BUTTON(toolbar_get_widget_by_name("Run")); - if (run_button != NULL) - button_stock_id = gtk_tool_button_get_stock_id(run_button); - - if (stop && utils_str_equal(button_stock_id, "gtk-stop")) - return; - if (! stop && utils_str_equal(button_stock_id, "gtk-execute")) - return; + RowWidgets *r = (RowWidgets*)user_data; + gint src; + enum GeanyBuildCmdEntries i; + GeanyBuildCommand *bc = get_next_build_cmd(NULL, r->grp, r->cmd, r->dst, &src); - /* use the run button also as stop button */ - if (stop) + if (bc != NULL) { - if (run_button != NULL) - gtk_tool_button_set_stock_id(run_button, "gtk-stop"); - - if (menuitem != NULL) + r->cmdsrc = bc; + r->src = src; + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-stop", GTK_ICON_SIZE_MENU)); - gtk_stock_lookup("gtk-stop", &sitem); - gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - sitem.label); + set_build_command_entry_text(r->entries[i], + id_to_str(bc,i) != NULL ? id_to_str(bc,i) : ""); } } else { - if (run_button != NULL) - gtk_tool_button_set_stock_id(run_button, "gtk-execute"); - - if (menuitem != NULL) + r->cmdsrc = NULL; + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { - /* LaTeX hacks ;-( */ - if (run_info.file_type_id == GEANY_FILETYPES_LATEX) - { - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU)); - gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - LATEX_VIEW_DVI_LABEL); - } - else - { - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_MENU)); - - gtk_stock_lookup("gtk-execute", &sitem); - gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - sitem.label); - } + set_build_command_entry_text(r->entries[i], ""); } } + r->cleared = TRUE; } -/* Creates the relevant build menu if necessary. - * If filetype_idx is -1, the current filetype is used, or GEANY_FILETYPES_NONE */ -BuildMenuItems *build_get_menu_items(gint filetype_idx) +static void on_clear_dialog_regex_row(GtkEntry *regex, gpointer unused) { - BuildMenuItems *items; + gtk_entry_set_text(regex,""); +} - if (filetype_idx == -1) - { - GeanyDocument *doc = document_get_current(); - GeanyFiletype *ft = NULL; - if (doc != NULL) - ft = doc->file_type; - filetype_idx = FILETYPE_ID(ft); - } +static void on_label_button_clicked(GtkWidget *wid) +{ + const gchar *old = gtk_button_get_label(GTK_BUTTON(wid)); + gchar *str = dialogs_show_input(_("Set menu item label"), NULL, old); - if (filetype_idx == GEANY_FILETYPES_LATEX) - { - items = &latex_menu_items; - if (items->menu == NULL) - create_build_menu_tex(items); - } - else - { - items = &default_menu_items; - if (items->menu == NULL) - create_build_menu_gen(items); - } - return items; + gtk_button_set_label(GTK_BUTTON(wid), str); + g_free(str); } -static void -on_build_compile_activate (GtkMenuItem *menuitem, - gpointer user_data) +/* Column headings, array NULL-terminated */ +static const gchar *colheads[] = { - GeanyDocument *doc = document_get_current(); - - if (doc == NULL) - return; + N_("Item"), + N_("Label"), + N_("Command"), + N_("Working directory"), + N_("Clear"), + NULL }; +/* column names */ +#define DC_ITEM 0 +#define DC_ENTRIES 1 +#define DC_CLEAR 4 +#define DC_N_COL 5 + +static const guint entry_x_padding = 3; +static const guint entry_y_padding = 0; + + +static RowWidgets *build_add_dialog_row(GeanyDocument *doc, GtkTable *table, guint row, + GeanyBuildSource dst, gint grp, gint cmd, gboolean dir) +{ + GtkWidget *label, *clear, *clearicon; + RowWidgets *roww; + GeanyBuildCommand *bc; + gint src; + enum GeanyBuildCmdEntries i; + guint column = 0; + + label = gtk_label_new(g_strdup_printf("%d:", cmd + 1)); + gtk_table_attach(table, label, column, column + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + roww = g_new0(RowWidgets, 1); + roww->src = GEANY_BCS_COUNT; + roww->grp = grp; + roww->cmd = cmd; + roww->dst = dst; + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + { + gint xflags = (i == GEANY_BC_COMMAND) ? GTK_FILL | GTK_EXPAND : GTK_FILL; + + column += 1; + if (i == GEANY_BC_LABEL) + { + GtkWidget *wid = roww->entries[i] = gtk_button_new(); + gtk_button_set_use_underline(GTK_BUTTON(wid), TRUE); + ui_widget_set_tooltip_text(wid, _("Click to set menu item label")); + g_signal_connect(wid, "clicked", G_CALLBACK(on_label_button_clicked), NULL); + } + else + roww->entries[i] = gtk_entry_new(); + gtk_table_attach(table, roww->entries[i], column, column + 1, row, row + 1, xflags, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + } + column++; + clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + clear = gtk_button_new(); + gtk_button_set_image(GTK_BUTTON(clear), clearicon); + g_signal_connect(clear, "clicked", G_CALLBACK(on_clear_dialog_row), roww); + gtk_table_attach(table, clear, column, column + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + roww->cmdsrc = bc = get_build_cmd(doc, grp, cmd, &src); + if (bc != NULL) + roww->src = src; + + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + { + const gchar *str = ""; + if (bc != NULL && (str = bc->entries[i]) == NULL) + str = ""; + set_build_command_entry_text(roww->entries[i], str); + } + if (bc != NULL && (src > (gint)dst || (grp == GEANY_GBG_FT && (doc == NULL || doc->file_type == NULL)))) + { + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + gtk_widget_set_sensitive(roww->entries[i], FALSE); + gtk_widget_set_sensitive(clear, FALSE); + } + return roww; +} + + +typedef struct BuildTableFields +{ + RowWidgets **rows; + GtkWidget *fileregex; + GtkWidget *nonfileregex; + gchar **fileregexstring; + gchar **nonfileregexstring; +} BuildTableFields; + + +GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildTableData *table_data, + GeanyFiletype *ft) +{ + GtkWidget *label, *sep, *clearicon, *clear; + BuildTableFields *fields; + GtkTable *table; + const gchar **ch; + gchar *txt; + guint col, row, cmdindex; + gint cmd; + gint src; + gboolean sensitivity; + guint sep_padding = entry_y_padding + 3; + + table = GTK_TABLE(gtk_table_new(build_items_count + 12, 5, FALSE)); + fields = g_new0(BuildTableFields, 1); + fields->rows = g_new0(RowWidgets*, build_items_count); + for (ch = colheads, col = 0; *ch != NULL; ch++, col++) + { + label = gtk_label_new(_(*ch)); + gtk_table_attach(table, label, col, col + 1, 0, 1, + GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + } + sep = gtk_hseparator_new(); + gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, sep_padding); + if (ft != NULL && ft->id != GEANY_FILETYPES_NONE) + txt = g_strdup_printf(_("%s Commands"), ft->title); + else + txt = g_strdup_printf(_("%s Commands"), _("No Filetype")); + label = ui_label_new_bold(txt); + g_free(txt); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(table, label, 0, DC_N_COL, 2, 3, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + for (row = 3, cmdindex = 0, cmd = 0; cmd < build_groups_count[GEANY_GBG_FT]; ++row, ++cmdindex, ++cmd) + fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_FT, cmd, FALSE); + label = gtk_label_new(_("Error Regular Expression:")); + gtk_table_attach(table, label, 0, DC_ENTRIES + 1, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + fields->fileregex = gtk_entry_new(); + fields->fileregexstring = build_get_regex(GEANY_GBG_FT, NULL, &src); + sensitivity = (ft == NULL) ? FALSE : TRUE; + if (fields->fileregexstring != NULL && *(fields->fileregexstring) != NULL) + { + gtk_entry_set_text(GTK_ENTRY(fields->fileregex), *(fields->fileregexstring)); + if (src > (gint)dst) + sensitivity = FALSE; + } + gtk_table_attach(table, fields->fileregex, DC_ENTRIES + 1, DC_CLEAR, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + clear = gtk_button_new(); + gtk_button_set_image(GTK_BUTTON(clear), clearicon); + g_signal_connect_swapped(clear, "clicked", + G_CALLBACK(on_clear_dialog_regex_row), (fields->fileregex)); + gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + gtk_widget_set_sensitive(fields->fileregex, sensitivity); + gtk_widget_set_sensitive(clear, sensitivity); + ++row; + sep = gtk_hseparator_new(); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, sep_padding); + ++row; + label = ui_label_new_bold(_("Non-Filetype Commands")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + for (++row, cmd = 0; cmd < build_groups_count[GEANY_GBG_NON_FT]; ++row, ++cmdindex, ++cmd) + fields->rows[cmdindex] = build_add_dialog_row( + doc, table, row, dst, GEANY_GBG_NON_FT, cmd, TRUE); + label = gtk_label_new(_("Error Regular Expression:")); + gtk_table_attach(table, label, 0, DC_ENTRIES + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + fields->nonfileregex = gtk_entry_new(); + fields->nonfileregexstring = build_get_regex(GEANY_GBG_NON_FT, NULL, &src); + sensitivity = TRUE; + if (fields->nonfileregexstring != NULL && *(fields->nonfileregexstring) != NULL) + { + gtk_entry_set_text(GTK_ENTRY(fields->nonfileregex), *(fields->nonfileregexstring)); + sensitivity = src > (gint)dst ? FALSE : TRUE; + } + gtk_table_attach(table, fields->nonfileregex, DC_ENTRIES + 1, DC_CLEAR, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + clear = gtk_button_new(); + gtk_button_set_image(GTK_BUTTON(clear), clearicon); + g_signal_connect_swapped(clear, "clicked", + G_CALLBACK(on_clear_dialog_regex_row), (fields->nonfileregex)); + gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + gtk_widget_set_sensitive(fields->nonfileregex, sensitivity); + gtk_widget_set_sensitive(clear, sensitivity); + ++row; + label = gtk_label_new(_("Note: Item 2 opens a dialog and appends the response to the command.")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + ++row; + sep = gtk_hseparator_new(); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, sep_padding); + ++row; + label = ui_label_new_bold(_("Execute Commands")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + for (++row, cmd = 0; cmd < build_groups_count[GEANY_GBG_EXEC]; ++row, ++cmdindex, ++cmd) + fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_EXEC, cmd, TRUE); + sep = gtk_hseparator_new(); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, sep_padding); + ++row; + label = gtk_label_new( + _("%d, %e, %f, %p are substituted in command and directory fields, see manual for details.")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + /*printf("%d extra rows in dialog\n", row-build_items_count);*/ + ++row; + *table_data = fields; + return GTK_WIDGET(table); +} + + +void build_free_fields(BuildTableData table_data) +{ + gint cmdindex; + + for (cmdindex = 0; cmdindex < build_items_count; ++cmdindex) + g_free(table_data->rows[cmdindex]); + g_free(table_data->rows); + g_free(table_data); +} + + +/* string compare where null pointers match null or 0 length strings */ +static gint stcmp(const gchar *a, const gchar *b) +{ + if (a == NULL && b == NULL) + return 0; + if (a == NULL && b != NULL) + return strlen(b); + if (a != NULL && b == NULL) + return strlen(a); + return strcmp(a, b); +} - if (doc->changed) - document_save_file(doc, FALSE); - if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_LATEX) - build_compile_tex_file(doc, 0); +static const gchar *get_build_command_entry_text(GtkWidget *wid) +{ + if (GTK_IS_BUTTON(wid)) + return gtk_button_get_label(GTK_BUTTON(wid)); else - build_compile_file(doc); + return gtk_entry_get_text(GTK_ENTRY(wid)); } -static void -on_build_tex_activate (GtkMenuItem *menuitem, - gpointer user_data) +static gboolean read_row(BuildDestination *dst, BuildTableData table_data, gint drow, gint grp, gint cmd) { - GeanyDocument *doc = document_get_current(); + gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; + gboolean changed = FALSE; + GeanyBuildSource src; + enum GeanyBuildCmdEntries i; + + src = table_data->rows[drow]->src; + + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + { + entries[i] = g_strdup(get_build_command_entry_text(table_data->rows[drow]->entries[i])); + } + if (table_data->rows[drow]->cleared) + { + if (dst->dst[grp] != NULL) + { + if (*(dst->dst[grp]) == NULL) + *(dst->dst[grp]) = g_new0(GeanyBuildCommand, build_groups_count[grp]); + (*(dst->dst[grp]))[cmd].exists = FALSE; + (*(dst->dst[grp]))[cmd].changed = TRUE; + changed = TRUE; + } + } + if ( + ( + table_data->rows[drow]->cmdsrc == NULL /* originally there was no content */ + && + ( + NZV(entries[GEANY_BC_LABEL]) /* but now one field has some */ + || NZV(entries[GEANY_BC_COMMAND]) + || NZV(entries[GEANY_BC_WORKING_DIR]) + ) + ) + || + ( + table_data->rows[drow]->cmdsrc != NULL /* originally there was content */ + && + ( /* and some of it was changed */ + stcmp(entries[GEANY_BC_LABEL], table_data->rows[drow]->cmdsrc->entries[GEANY_BC_LABEL]) != 0 + || stcmp(entries[GEANY_BC_COMMAND], table_data->rows[drow]->cmdsrc->entries[GEANY_BC_COMMAND]) != 0 + || stcmp(entries[GEANY_BC_WORKING_DIR], + table_data->rows[drow]->cmdsrc->entries[GEANY_BC_WORKING_DIR]) != 0 + ) + ) + ) + { + if (dst->dst[grp] != NULL) + { + if (*(dst->dst[grp]) == NULL) + *(dst->dst[grp]) = g_new0(GeanyBuildCommand, build_groups_count[grp]); + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + setptr((*(dst->dst[grp]))[cmd].entries[i], entries[i]); + (*(dst->dst[grp]))[cmd].exists = TRUE; + (*(dst->dst[grp]))[cmd].changed = TRUE; + changed = TRUE; + } + } + else + { + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + g_free(entries[i]); + } + return changed; +} - if (doc == NULL) - return; - if (doc->changed) - document_save_file(doc, FALSE); +static gboolean read_regex(GtkWidget *regexentry, gchar **src, gchar **dst) +{ + gboolean changed = FALSE; + gchar *reg = g_strdup(gtk_entry_get_text(GTK_ENTRY(regexentry))); - switch (GPOINTER_TO_INT(user_data)) + if ( + ( + (src == NULL /* originally there was no regex */ + || *src == NULL /* or it was NULL*/ + ) + && NZV(reg) > 0 /* and something was typed */ + ) + ||(src != NULL /* originally there was a regex*/ + && strcmp(*src, reg) != 0 /* and it has been changed */ + ) + ) { - case LATEX_CMD_TO_DVI: - case LATEX_CMD_TO_PDF: - build_compile_tex_file(doc, GPOINTER_TO_INT(user_data)); break; - case LATEX_CMD_VIEW_DVI: - case LATEX_CMD_VIEW_PDF: - build_view_tex_file(doc, GPOINTER_TO_INT(user_data)); break; + if (dst != NULL) + { + setptr(*dst, reg); + changed = TRUE; + } } + return changed; } -static void -on_build_build_activate (GtkMenuItem *menuitem, - gpointer user_data) +static gboolean build_read_commands(BuildDestination *dst, BuildTableData table_data, gint response) { - GeanyDocument *doc = document_get_current(); - - if (doc == NULL || doc->file_type == NULL || ! doc->file_type->actions->can_link) - return; + gint cmdindex, cmd; + gboolean changed = FALSE; - if (doc->changed) - document_save_file(doc, FALSE); - - if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_LATEX) - build_compile_tex_file(doc, 1); - else - build_link_file(doc); + if (response == GTK_RESPONSE_ACCEPT) + { + for (cmdindex = 0, cmd = 0; cmd < build_groups_count[GEANY_GBG_FT]; ++cmdindex, ++cmd) + changed |= read_row(dst, table_data, cmdindex, GEANY_GBG_FT, cmd); + for (cmd = 0; cmd < build_groups_count[GEANY_GBG_NON_FT]; ++cmdindex, ++cmd) + changed |= read_row(dst, table_data, cmdindex, GEANY_GBG_NON_FT, cmd); + for (cmd = 0; cmd < build_groups_count[GEANY_GBG_EXEC]; ++cmdindex, ++cmd) + changed |= read_row(dst, table_data, cmdindex, GEANY_GBG_EXEC, cmd); + changed |= read_regex(table_data->fileregex, table_data->fileregexstring, dst->fileregexstr); + changed |= read_regex(table_data->nonfileregex, table_data->nonfileregexstring, dst->nonfileregexstr); + } + return changed; } -static void -on_toolbutton_build_activate (GtkMenuItem *menuitem, - gpointer user_data) +void build_read_project(GeanyFiletype *ft, BuildTableData build_properties) { - last_toolbutton_action = GPOINTER_TO_INT(user_data); - g_object_set(widgets.build_action, "tooltip", _("Build the current file"), NULL); - on_build_build_activate(menuitem, user_data); + BuildDestination menu_dst; + + if (ft != NULL) + { + menu_dst.dst[GEANY_GBG_FT] = &(ft->projfilecmds); + menu_dst.fileregexstr = &(ft->projerror_regex_string); + } + else + { + menu_dst.dst[GEANY_GBG_FT] = NULL; + menu_dst.fileregexstr = NULL; + } + menu_dst.dst[GEANY_GBG_NON_FT] = &non_ft_proj; + menu_dst.dst[GEANY_GBG_EXEC] = &exec_proj; + menu_dst.nonfileregexstr = ®ex_proj; + + build_read_commands(&menu_dst, build_properties, GTK_RESPONSE_ACCEPT); } -static void -on_make_custom_input_response(const gchar *input) +static void show_build_commands_dialog(void) { + GtkWidget *dialog, *table, *vbox; GeanyDocument *doc = document_get_current(); + GeanyFiletype *ft = NULL; + const gchar *title = _("Set Build Commands"); + gint response; + BuildTableData table_data; + BuildDestination prefdsts; - if (doc->changed) - document_save_file(doc, FALSE); + if (doc != NULL) + ft = doc->file_type; + dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(main_widgets.window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + table = build_commands_table(doc, GEANY_BCS_PREF, &table_data, ft); + vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0); + gtk_widget_show_all(dialog); + /* run modally to prevent user changing idx filetype */ + response = gtk_dialog_run(GTK_DIALOG(dialog)); - setptr(build_info.custom_target, g_strdup(input)); + prefdsts.dst[GEANY_GBG_NON_FT] = &non_ft_pref; + if (ft != NULL) + { + prefdsts.dst[GEANY_GBG_FT] = &(ft->homefilecmds); + prefdsts.fileregexstr = &(ft->homeerror_regex_string); + prefdsts.dst[GEANY_GBG_EXEC] = &(ft->homeexeccmds); + } + else + { + prefdsts.dst[GEANY_GBG_FT] = NULL; + prefdsts.fileregexstr = NULL; + prefdsts.dst[GEANY_GBG_EXEC] = NULL; + } + prefdsts.nonfileregexstr = ®ex_pref; + if (build_read_commands(&prefdsts, table_data, response) && ft != NULL) + ft->home_save_needed = TRUE; + build_free_fields(table_data); - build_make_file(doc, GBO_MAKE_CUSTOM); + build_menu_update(doc); + gtk_widget_destroy(dialog); } -static void -show_make_custom(void) +/* Creates the relevant build menu if necessary. */ +BuildMenuItems *build_get_menu_items(gint filetype_idx) { - static GtkWidget *dialog = NULL; /* keep dialog for combo history */ + BuildMenuItems *items; - if (! dialog) - dialog = dialogs_show_input(_("Make Custom Target"), - _("Enter custom options here, all entered text is passed to the make command."), - build_info.custom_target, TRUE, &on_make_custom_input_response); - else - { - gtk_widget_show(dialog); - } + items = &menu_items; + if (items->menu == NULL) + create_build_menu(items); + return items; } -static void -on_build_make_activate (GtkMenuItem *menuitem, - gpointer user_data) +/* set non_ft working directory entries to %p for project */ +void build_set_non_ft_wd_to_proj(BuildTableData table_data) { - GeanyDocument *doc = document_get_current(); - gint build_opts = GPOINTER_TO_INT(user_data); + gint i, start, end; - g_return_if_fail(doc != NULL && doc->file_name != NULL); + start = build_groups_count[GEANY_GBG_FT]; + end = start + build_groups_count[GEANY_GBG_NON_FT]; + for (i = start; i < end; ++i) + gtk_entry_set_text(GTK_ENTRY(table_data->rows[i]->entries[GEANY_BC_WORKING_DIR]), "%p"); +} - switch (build_opts) - { - case GBO_MAKE_CUSTOM: - { - show_make_custom(); - break; - } - case GBO_MAKE_OBJECT: - /* fall through */ - case GBO_MAKE_ALL: - { - if (doc->changed) - document_save_file(doc, FALSE); +/*---------------------------------------------------------- + * + * Load and store configuration + * + * ---------------------------------------------------------*/ +static const gchar *build_grp_name = "build-menu"; - build_make_file(doc, build_opts); +/* config format for build-menu group is prefix_gg_nn_xx=value + * where gg = FT, NF, EX for the command group + * nn = 2 digit command number + * xx = LB for label, CM for command and WD for working dir */ +static const gchar *groups[GEANY_GBG_COUNT] = { "FT", "NF", "EX" }; +static const gchar *fixedkey="xx_xx_xx"; + +#define set_key_grp(key, grp) (key[prefixlen + 0] = grp[0], key[prefixlen + 1] = grp[1]) +#define set_key_cmd(key, cmd) (key[prefixlen + 3] = cmd[0], key[prefixlen + 4] = cmd[1]) +#define set_key_fld(key, fld) (key[prefixlen + 6] = fld[0], key[prefixlen + 7] = fld[1]) + +static void build_load_menu_grp(GKeyFile *config, GeanyBuildCommand **dst, gint grp, + gchar *prefix, gboolean loc) +{ + gint cmd, prefixlen; /* NOTE prefixlen used in macros above */ + GeanyBuildCommand *dstcmd; + gchar *key; + static gchar cmdbuf[3] = " "; + + if (*dst == NULL) + *dst = g_new0(GeanyBuildCommand, build_groups_count[grp]); + dstcmd = *dst; + prefixlen = prefix == NULL ? 0 : strlen(prefix); + key = g_strconcat(prefix == NULL ? "" : prefix, fixedkey, NULL); + for (cmd = 0; cmd < build_groups_count[grp]; ++cmd) + { + gchar *label; + if (cmd < 0 || cmd >= 100) + return; /* ensure no buffer overflow */ + sprintf(cmdbuf, "%02d", cmd); + set_key_grp(key, groups[grp]); + set_key_cmd(key, cmdbuf); + set_key_fld(key, "LB"); + if (loc) + label = g_key_file_get_locale_string(config, build_grp_name, key, NULL, NULL); + else + label = g_key_file_get_string(config, build_grp_name, key, NULL); + if (label != NULL) + { + dstcmd[cmd].exists = TRUE; + setptr(dstcmd[cmd].entries[GEANY_BC_LABEL], label); + set_key_fld(key,"CM"); + setptr(dstcmd[cmd].entries[GEANY_BC_COMMAND], + g_key_file_get_string(config, build_grp_name, key, NULL)); + set_key_fld(key,"WD"); + setptr(dstcmd[cmd].entries[GEANY_BC_WORKING_DIR], + g_key_file_get_string(config, build_grp_name, key, NULL)); } + else dstcmd[cmd].exists = FALSE; } + g_free(key); } -static void -on_toolbutton_make_activate (GtkMenuItem *menuitem, - gpointer user_data) +/* for the specified source load new format build menu items or try to make some sense of + * old format setings, not done perfectly but better than ignoring them */ +void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) { - gchar *msg; + GeanyFiletype *ft; + GeanyProject *pj; + gchar **ftlist; + gchar *value, *basedir, *makebasedir; + gboolean bvalue = FALSE; + + if (g_key_file_has_group(config, build_grp_name)) + { + switch (src) + { + case GEANY_BCS_FT: + ft = (GeanyFiletype*)p; + if (ft == NULL) + return; + build_load_menu_grp(config, &(ft->filecmds), GEANY_GBG_FT, NULL, TRUE); + build_load_menu_grp(config, &(ft->ftdefcmds), GEANY_GBG_NON_FT, NULL, TRUE); + build_load_menu_grp(config, &(ft->execcmds), GEANY_GBG_EXEC, NULL, TRUE); + setptr(ft->error_regex_string, + g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + break; + case GEANY_BCS_HOME_FT: + ft = (GeanyFiletype*)p; + if (ft == NULL) + return; + build_load_menu_grp(config, &(ft->homefilecmds), GEANY_GBG_FT, NULL, FALSE); + build_load_menu_grp(config, &(ft->homeexeccmds), GEANY_GBG_EXEC, NULL, FALSE); + setptr(ft->homeerror_regex_string, + g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + break; + case GEANY_BCS_PREF: + build_load_menu_grp(config, &non_ft_pref, GEANY_GBG_NON_FT, NULL, FALSE); + build_load_menu_grp(config, &exec_pref, GEANY_GBG_EXEC, NULL, FALSE); + setptr(regex_pref, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + break; + case GEANY_BCS_PROJ: + build_load_menu_grp(config, &non_ft_proj, GEANY_GBG_NON_FT, NULL, FALSE); + build_load_menu_grp(config, &exec_proj, GEANY_GBG_EXEC, NULL, FALSE); + setptr(regex_proj, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + pj = (GeanyProject*)p; + if (p == NULL) + return; + ftlist = g_key_file_get_string_list(config, build_grp_name, "filetypes", NULL, NULL); + if (ftlist != NULL) + { + gchar **ftname; + if (pj->build_filetypes_list == NULL) + pj->build_filetypes_list = g_ptr_array_new(); + g_ptr_array_set_size(pj->build_filetypes_list, 0); + for (ftname = ftlist; *ftname != NULL; ++ftname) + { + ft = filetypes_lookup_by_name(*ftname); + if (ft != NULL) + { + gchar *regkey = g_strdup_printf("%serror_regex", *ftname); + g_ptr_array_add(pj->build_filetypes_list, ft); + setptr(ft->projerror_regex_string, + g_key_file_get_string(config, build_grp_name, regkey, NULL)); + g_free(regkey); + build_load_menu_grp(config, &(ft->projfilecmds), GEANY_GBG_FT, *ftname, FALSE); + build_load_menu_grp(config, &(ft->projexeccmds), GEANY_GBG_EXEC, *ftname, FALSE); + } + } + g_free(ftlist); + } + break; + default: /* defaults don't load from config, see build_init */ + break; + } + } - last_toolbutton_action = GPOINTER_TO_INT(user_data); - switch (last_toolbutton_action) - { - case GBO_MAKE_ALL: - msg = _("Build the current file with Make and the default target"); + /* load old [build_settings] values if there is no value defined by [build-menu] */ + + /* set GeanyBuildCommand if it doesn't already exist and there is a command */ +#define ASSIGNIF(type, id, string, value) \ + if (NZV(value) && ! type[GBO_TO_CMD(id)].exists) { \ + type[GBO_TO_CMD(id)].exists = TRUE; \ + setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_LABEL], g_strdup(string)); \ + setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_COMMAND], (value)); \ + setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_WORKING_DIR], NULL); \ + type[GBO_TO_CMD(id)].old = TRUE; \ + } else \ + g_free(value); + + switch (src) + { + case GEANY_BCS_FT: + ft = (GeanyFiletype*)p; + value = g_key_file_get_string(config, "build_settings", "compiler", NULL); + if (value != NULL) + { + if (ft->filecmds == NULL) + ft->filecmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]); + ASSIGNIF(ft->filecmds, GEANY_GBO_COMPILE, _("_Compile"), value); + } + value = g_key_file_get_string(config, "build_settings", "linker", NULL); + if (value != NULL) + { + if (ft->filecmds == NULL) + ft->filecmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]); + ASSIGNIF(ft->filecmds, GEANY_GBO_BUILD, _("_Build"), value); + } + value = g_key_file_get_string(config, "build_settings", "run_cmd", NULL); + if (value != NULL) + { + if (ft->execcmds == NULL) + ft->execcmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); + ASSIGNIF(ft->execcmds, GEANY_GBO_EXEC, _("_Execute"), value); + } + if (ft->error_regex_string == NULL) + ft->error_regex_string = g_key_file_get_string(config, "build_settings", "error_regex", NULL); break; - case GBO_MAKE_CUSTOM: - msg = _("Build the current file with Make and the specified target"); + case GEANY_BCS_PROJ: + if (non_ft_pref == NULL) + non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); + basedir = project_get_base_path(); + if (basedir == NULL) + basedir = g_strdup("%d"); + bvalue = g_key_file_get_boolean(config, "project", "make_in_base_path", NULL); + if (bvalue) + makebasedir = g_strdup(basedir); + else + makebasedir = g_strdup("%d"); + if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].old) + setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].entries[GEANY_BC_WORKING_DIR], g_strdup(makebasedir)); + if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].old) + setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].entries[GEANY_BC_WORKING_DIR], g_strdup(makebasedir)); + if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].old) + setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].entries[GEANY_BC_WORKING_DIR], g_strdup("%d")); + value = g_key_file_get_string(config, "project", "run_cmd", NULL); + if (NZV(value)) + { + if (exec_proj == NULL) + exec_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); + if (! exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists) + { + exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists = TRUE; + setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_LABEL], g_strdup(_("_Execute"))); + setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_COMMAND], value); + setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_WORKING_DIR], g_strdup(basedir)); + exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].old = TRUE; + } + } + g_free(makebasedir); + g_free(basedir); break; - case GBO_MAKE_OBJECT: - msg = _("Compile the current file with Make"); + case GEANY_BCS_PREF: + value = g_key_file_get_string(config, "tools", "make_cmd", NULL); + if (value != NULL) + { + if (non_ft_pref == NULL) + non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); + ASSIGNIF(non_ft_pref, GEANY_GBO_CUSTOM, _("Make Custom _Target"), + g_strdup_printf("%s ", value)); + ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_OBJECT, _("Make _Object"), + g_strdup_printf("%s %%e.o",value)); + ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_ALL, _("_Make"), value); + } break; default: - msg = NULL; + break; } - g_object_set(widgets.build_action, "tooltip", msg, NULL); - on_build_make_activate(menuitem, user_data); } -static gboolean use_html_builtin(GeanyDocument *doc, GeanyFiletype *ft) +static gint build_save_menu_grp(GKeyFile *config, GeanyBuildCommand *src, gint grp, gchar *prefix) { - gboolean use_builtin = FALSE; - if (ft->id == GEANY_FILETYPES_HTML) - { - /* we have a project, check its run_cmd */ - if (app->project != NULL) - { - if (utils_str_equal(app->project->run_cmd, "builtin")) - use_builtin = TRUE; + gint cmd, prefixlen; /* NOTE prefixlen used in macros above */ + gchar *key; + gint count = 0; + enum GeanyBuildCmdEntries i; + + if (src == NULL) + return 0; + prefixlen = prefix == NULL ? 0 : strlen(prefix); + key = g_strconcat(prefix == NULL ? "" : prefix, fixedkey, NULL); + for (cmd = 0; cmd < build_groups_count[grp]; ++cmd) + { + if (src[cmd].exists) ++count; + if (src[cmd].changed) + { + static gchar cmdbuf[4] = " "; + if (cmd < 0 || cmd >= 100) + return count; /* ensure no buffer overflow */ + sprintf(cmdbuf, "%02d", cmd); + set_key_grp(key, groups[grp]); + set_key_cmd(key, cmdbuf); + if (src[cmd].exists) + { + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + { + set_key_fld(key, config_keys[i]); + g_key_file_set_string(config, build_grp_name, key, src[cmd].entries[i]); + } + } + else + { + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) + { + set_key_fld(key, config_keys[i]); + g_key_file_remove_key(config, build_grp_name, key, NULL); + } + } } - /* no project, check for filetype run_cmd */ - else if (ft->actions->can_exec && utils_str_equal(ft->programs->run_cmd, "builtin")) - use_builtin = TRUE; - } - - if (use_builtin) - { - gchar *uri = g_strconcat("file:///", g_path_skip_root(doc->file_name), NULL); - utils_open_browser(uri); - g_free(uri); - - return TRUE; } - return FALSE; + g_free(key); + return count; } -static void -on_build_execute_activate (GtkMenuItem *menuitem, - gpointer user_data) +typedef struct ForEachData { - GeanyDocument *doc = document_get_current(); - filetype_id ft_id; - GeanyFiletype *ft; + GKeyFile *config; + GPtrArray *ft_names; +} ForEachData; - if (doc == NULL) - return; - /* make the process "stopable" */ - if (run_info.pid > (GPid) 1) +static void foreach_project_filetype(gpointer data, gpointer user_data) +{ + GeanyFiletype *ft = (GeanyFiletype*) data; + ForEachData *d = (ForEachData*) user_data; + gint i = 0; + gchar *regkey = g_strdup_printf("%serror_regex", ft->name); + + i += build_save_menu_grp(d->config, ft->projfilecmds, GEANY_GBG_FT, ft->name); + i += build_save_menu_grp(d->config, ft->projexeccmds, GEANY_GBG_EXEC, ft->name); + if (NZV(ft->projerror_regex_string)) { - kill_process(&run_info.pid); - return; + g_key_file_set_string(d->config, build_grp_name, regkey, ft->projerror_regex_string); + i++; } + else + g_key_file_remove_key(d->config, build_grp_name, regkey, NULL); + g_free(regkey); + if (i > 0) + g_ptr_array_add(d->ft_names, ft->name); +} - ft_id = FILETYPE_ID(doc->file_type); - ft = filetypes[ft_id]; - if (ft_id == GEANY_FILETYPES_LATEX) - { /* run LaTeX file */ - if (build_view_tex_file(doc, GPOINTER_TO_INT(user_data)) == (GPid) 0) - { - ui_set_statusbar(TRUE, _("Failed to execute the view program")); - } - } - /* use_html_builtin() checks for HTML builtin request and returns FALSE if not */ - else if (! use_html_builtin(doc, ft)) - { /* run everything else */ - - /* save the file only if the run command uses it */ - if (doc->changed && - NZV(ft->programs->run_cmd) && /* can happen when project is open */ - strstr(ft->programs->run_cmd, "%f") != NULL) - document_save_file(doc, FALSE); - build_run_cmd(doc); +void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) +{ + GeanyFiletype *ft; + GeanyProject *pj; + ForEachData data; + gchar *regkey; + + switch (src) + { + case GEANY_BCS_HOME_FT: + ft = (GeanyFiletype*)ptr; + if (ft == NULL) + return; + build_save_menu_grp(config, ft->homefilecmds, GEANY_GBG_FT, NULL); + build_save_menu_grp(config, ft->homeexeccmds, GEANY_GBG_EXEC, NULL); + regkey = g_strdup_printf("%serror_regex", ft->name); + if (NZV(ft->homeerror_regex_string)) + g_key_file_set_string(config, build_grp_name, regkey, ft->projerror_regex_string); + else + g_key_file_remove_key(config, build_grp_name, regkey, NULL); + g_free(regkey); + break; + case GEANY_BCS_PREF: + build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL); + build_save_menu_grp(config, exec_pref, GEANY_GBG_EXEC, NULL); + if (NZV(regex_pref)) + g_key_file_set_string(config, build_grp_name, "error_regex", regex_pref); + else + g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); + break; + case GEANY_BCS_PROJ: + pj = (GeanyProject*)ptr; + build_save_menu_grp(config, non_ft_proj, GEANY_GBG_NON_FT, NULL); + build_save_menu_grp(config, exec_proj, GEANY_GBG_EXEC, NULL); + if (NZV(regex_proj)) + g_key_file_set_string(config, build_grp_name, "error_regex", regex_proj); + else + g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); + if (pj->build_filetypes_list != NULL) + { + data.config = config; + data.ft_names = g_ptr_array_new(); + g_ptr_array_foreach(pj->build_filetypes_list, foreach_project_filetype, (gpointer)(&data)); + if (data.ft_names->pdata != NULL) + g_key_file_set_string_list(config, build_grp_name, "filetypes", + (const gchar**)(data.ft_names->pdata), data.ft_names->len); + else + g_key_file_remove_key(config, build_grp_name, "filetypes", NULL); + g_ptr_array_free(data.ft_names, TRUE); + } + break; + default: /* defaults and GEANY_BCS_FT can't save */ + break; } } -static void kill_process(GPid *pid) +void build_set_group_count(GeanyBuildGroup grp, gint count) { - /* Unix: SIGQUIT is not the best signal to use because it causes a core dump (this should not - * perforce necessary for just killing a process). But we must use a signal which we can - * ignore because the main process get it too, it is declared to ignore in main.c. */ + gint i, sum; - gint result; + if (count > build_groups_count[grp]) + build_groups_count[grp] = count; + for (i = 0, sum = 0; i < GEANY_GBG_COUNT; ++i) + sum += build_groups_count[i]; + build_items_count = sum; +} -#ifdef G_OS_WIN32 - g_return_if_fail(*pid != NULL); - result = TerminateProcess(*pid, 0); - /* TerminateProcess() returns TRUE on success, for the check below we have to convert - * it to FALSE (and vice versa) */ - result = ! result; -#else - g_return_if_fail(*pid > 1); - result = kill(*pid, SIGQUIT); -#endif - if (result != 0) - ui_set_statusbar(TRUE, _("Process could not be stopped (%s)."), g_strerror(errno)); - else - { - *pid = 0; - build_menu_update(NULL); - } +gint build_get_group_count(GeanyBuildGroup grp) +{ + return build_groups_count[grp]; } -static void -on_build_next_error (GtkMenuItem *menuitem, - gpointer user_data) +static void on_project_close(void) { - if (ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_compiler), - msgwin_goto_compiler_file_line)) - { - gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); - } - else - ui_set_statusbar(FALSE, _("No more build errors.")); + /* remove project regexen */ + setptr(regex_proj, NULL); } -static void -on_build_previous_error (GtkMenuItem *menuitem, - gpointer user_data) +static struct { - if (ui_tree_view_find_previous(GTK_TREE_VIEW(msgwindow.tree_compiler), - msgwin_goto_compiler_file_line)) - { - gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); - } - else - ui_set_statusbar(FALSE, _("No more build errors.")); -} + const gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; + GeanyBuildCommand **ptr; + gint index; +} default_cmds[] = { + { {N_("_Make"), "make", NULL}, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_ALL)}, + { {N_("Make Custom _Target"), "make ", NULL}, &non_ft_def, GBO_TO_CMD(GEANY_GBO_CUSTOM)}, + { {N_("Make _Object"), "make %e.o", NULL }, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)}, + { {N_("_Execute"), "./%e", NULL }, &exec_def, GBO_TO_CMD(GEANY_GBO_EXEC)}, + { {NULL, NULL, NULL}, NULL, 0 } +}; void build_init(void) { GtkWidget *item; GtkWidget *toolmenu; + gint cmdindex; + + g_signal_connect(geany_object, "project-close", on_project_close, NULL); + + ft_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]); + non_ft_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); + exec_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); + run_info = g_new0(RunInfo, build_groups_count[GEANY_GBG_EXEC]); + for (cmdindex = 0; default_cmds[cmdindex].entries[GEANY_BC_COMMAND] != NULL; ++cmdindex) + { + enum GeanyBuildCmdEntries k; + GeanyBuildCommand *cmd = &((*(default_cmds[cmdindex].ptr))[ default_cmds[cmdindex].index ]); + cmd->exists = TRUE; + for (k = 0; k < GEANY_BC_CMDENTRIES_COUNT; k++) + { + cmd->entries[k] = g_strdup(default_cmds[cmdindex].entries[k]); + } + } /* create the toolbar Build item sub menu */ toolmenu = gtk_menu_new(); @@ -2120,7 +2671,8 @@ item = ui_image_menu_item_new(GEANY_STOCK_BUILD, _("_Build")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_build_activate), NULL); + g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_build_activate), + GBO_TO_POINTER(GEANY_GBO_BUILD)); widgets.toolitem_build = item; item = gtk_separator_menu_item_new(); @@ -2132,7 +2684,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(toolmenu), item); g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), - GINT_TO_POINTER(GBO_MAKE_ALL)); + GBO_TO_POINTER(GEANY_GBO_MAKE_ALL)); widgets.toolitem_make_all = item; /* build the code with make custom */ @@ -2140,7 +2692,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(toolmenu), item); g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), - GINT_TO_POINTER(GBO_MAKE_CUSTOM)); + GBO_TO_POINTER(GEANY_GBO_CUSTOM)); widgets.toolitem_make_custom = item; /* build the code with make object */ @@ -2148,7 +2700,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(toolmenu), item); g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), - GINT_TO_POINTER(GBO_MAKE_OBJECT)); + GBO_TO_POINTER(GEANY_GBO_MAKE_OBJECT)); widgets.toolitem_make_object = item; item = gtk_separator_menu_item_new(); @@ -2156,13 +2708,12 @@ gtk_container_add(GTK_CONTAINER(toolmenu), item); /* arguments */ - item = ui_image_menu_item_new(GTK_STOCK_PREFERENCES, _("_Set Includes and Arguments")); + item = ui_image_menu_item_new(GTK_STOCK_PREFERENCES, _("_Set Build Menu Commands")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(toolmenu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); + g_signal_connect(item, "activate", G_CALLBACK(on_set_build_commands_activate), NULL); widgets.toolitem_set_args = item; - /* get toolbar action pointers */ widgets.build_action = toolbar_get_action_by_name("Build"); widgets.compile_action = toolbar_get_action_by_name("Compile"); @@ -2173,11 +2724,3 @@ } -void build_toolbutton_build_clicked(GtkAction *action, gpointer user_data) -{ - if (last_toolbutton_action == GBO_BUILD) - on_build_build_activate(NULL, user_data); - else - on_build_make_activate(NULL, GINT_TO_POINTER(last_toolbutton_action)); -} - diff -Nru geany-0.18/src/build.h geany-0.19/src/build.h --- geany-0.18/src/build.h 2009-04-24 20:31:00.000000000 +0100 +++ geany-0.19/src/build.h 2010-05-11 15:55:47.000000000 +0100 @@ -1,8 +1,8 @@ /* * build.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,27 +18,100 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: build.h 3732 2009-04-24 19:31:00Z eht16 $ + * $Id: build.h 4904 2010-05-11 14:55:47Z ntrel $ */ +/* * @file build.h Interface to the Build menu functionality. */ #ifndef GEANY_BUILD_H #define GEANY_BUILD_H 1 #define GEANY_BUILD_ERR_HIGHLIGHT_MAX 100 -typedef enum /* Geany Build Options */ +/* Order is important (see GBO_TO_GBG, GBO_TO_CMD below) */ +/** Geany Known Build Commands. + * These commands are named after their default use. + * Only these commands can currently have keybindings. + **/ +typedef enum { - GBO_COMPILE, - GBO_BUILD, - GBO_MAKE_ALL, - GBO_MAKE_CUSTOM, - GBO_MAKE_OBJECT + GEANY_GBO_COMPILE, /**< default compile file */ + GEANY_GBO_BUILD, /**< default build file */ + GEANY_GBO_MAKE_ALL, /**< default make */ + GEANY_GBO_CUSTOM, /**< default make user specified target */ + GEANY_GBO_MAKE_OBJECT, /**< default make object, make %e.o */ + GEANY_GBO_EXEC, /**< default execute ./%e */ + GEANY_GBO_COUNT /**< count of how many */ } GeanyBuildType; +/** Groups of Build menu items. */ +typedef enum +{ + GEANY_GBG_FT, /**< filetype items */ + GEANY_GBG_NON_FT, /**< non filetype items.*/ + GEANY_GBG_EXEC, /**< execute items */ + GEANY_GBG_COUNT /**< count of groups. */ +} GeanyBuildGroup; + +/* include the fixed widgets in an array indexed by groups */ +#define GBG_FIXED GEANY_GBG_COUNT + +/** Convert @c GeanyBuildType to @c GeanyBuildGroup. + * + * This macro converts @c GeanyBuildType enum values (the "known" commands) + * to the group they are part of. + * + * @param gbo the @c GeanyBuildType value. + * + * @return the @c GeanyBuildGroup group that @a gbo is in. + * + * Note this is a macro so that it can be used in static initialisers. + **/ +#define GBO_TO_GBG(gbo) ((gbo)>GEANY_GBO_EXEC?GEANY_GBG_COUNT:((gbo)>=GEANY_GBO_EXEC?GEANY_GBG_EXEC: \ + ((gbo) >= GEANY_GBO_MAKE_ALL ? GEANY_GBG_NON_FT : GEANY_GBG_FT))) + +/** Convert @c GeanyBuildType to command index. + * + * This macro converts @c GeanyBuildType enum values (the "known" commands) + * to the index within the group. + * + * @param gbo the @c GeanyBuildType value. + * + * @return the index of the @a gbo command in its group. + * + * Note this is a macro so that it can be used in static initialisers. + **/ +#define GBO_TO_CMD(gbo) ((gbo)>=GEANY_GBO_COUNT?(gbo)-GEANY_GBO_COUNT:((gbo)>=GEANY_GBO_EXEC?(gbo)-GEANY_GBO_EXEC: \ + ((gbo) >= GEANY_GBO_MAKE_ALL ? (gbo)-GEANY_GBO_MAKE_ALL : (gbo)))) + +enum GeanyBuildFixedMenuItems +{ + GBF_NEXT_ERROR, + GBF_PREV_ERROR, + GBF_COMMANDS, + GBF_SEP_1, + GBF_SEP_2, + GBF_SEP_3, + GBF_SEP_4, + GBF_COUNT +}; + +/** Build menu item sources in increasing priority */ +typedef enum +{ + GEANY_BCS_DEF, /**< Default values. */ + GEANY_BCS_FT, /**< System filetype values. */ + GEANY_BCS_HOME_FT, /**< Filetypes in ~/.config/geany/filedefs */ + GEANY_BCS_PREF, /**< Preferences file ~/.config/geany/geany.conf */ + GEANY_BCS_PROJ_FT, /**< Project file filetype command */ + GEANY_BCS_PROJ, /**< Project file if open. */ + GEANY_BCS_COUNT /**< Count of sources. */ +} GeanyBuildSource; + typedef struct GeanyBuildInfo { - GeanyBuildType type; /* current action(one of the above enumeration) */ + GeanyBuildGroup grp; + gint cmd; GPid pid; /* process id of the spawned process */ gchar *dir; guint file_type_id; @@ -48,37 +121,82 @@ extern GeanyBuildInfo build_info; +/** The entries of a command for a menu item */ +typedef enum GeanyBuildCmdEntries +{ + GEANY_BC_LABEL, /**< The menu item label, _ marks mnemonic */ + GEANY_BC_COMMAND, /**< The command to run. */ + GEANY_BC_WORKING_DIR, /**< The directory to run in */ + GEANY_BC_CMDENTRIES_COUNT /**< Count of entries */ +} GeanyBuildCmdEntries; + +/** The command for a menu item. */ +typedef struct GeanyBuildCommand +{ + /** Pointers to g_string values of the command entries. + * Must be freed if the pointer is changed. */ + gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; + gboolean exists; /**< If the entries have valid values. */ + gboolean changed; /**< Save on exit if @c changed, remove if not @c exist. */ + gboolean old; /**< Converted from old format. */ +} GeanyBuildCommand; typedef struct BuildMenuItems { GtkWidget *menu; - GtkWidget *item_compile; - GtkWidget *item_link; - GtkWidget *item_make_all; - GtkWidget *item_make_custom; - GtkWidget *item_make_object; - GtkWidget *item_next_error; - GtkWidget *item_previous_error; - GtkWidget *item_exec; - GtkWidget *item_exec2; - GtkWidget *item_set_args; + GtkWidget **menu_item[GEANY_GBG_COUNT + 1]; /* +1 for fixed items */ } BuildMenuItems; +/* a structure defining the destinations for a set of groups of commands & regex */ +typedef struct BuildDestination +{ + GeanyBuildCommand **dst[GEANY_GBG_COUNT]; + gchar **fileregexstr; + gchar **nonfileregexstr; +} BuildDestination; +/* opaque pointers returned from build functions and passed back to them */ +typedef struct BuildTableFields *BuildTableData; void build_init(void); void build_finalize(void); +/* menu configuration dialog functions */ +GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildTableData *data, GeanyFiletype *ft); +void build_read_project(GeanyFiletype *ft, BuildTableData build_properties); + +void build_free_fields(BuildTableData data); + +void build_set_non_ft_wd_to_proj(BuildTableData table_data); + +/* build response decode assistance function */ gboolean build_parse_make_dir(const gchar *string, gchar **prefix); +/* build menu functions */ + void build_menu_update(GeanyDocument *doc); +void build_toolbutton_build_clicked(GtkAction *action, gpointer user_data); + +void build_remove_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd); + +GeanyBuildCommand *build_get_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd); + +GeanyBuildCommand *build_get_current_menu_item(GeanyBuildGroup grp, gint cmd, gint *src); + BuildMenuItems *build_get_menu_items(gint filetype_idx); -void build_toolbutton_build_clicked(GtkAction *action, gpointer user_data); +/* load and store menu configuration */ +void build_load_menu(GKeyFile *config, GeanyBuildSource dst, gpointer ptr); + +void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src); + +void build_set_group_count(GeanyBuildGroup grp, gint count); +gint build_get_group_count(GeanyBuildGroup grp); +gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from); #endif diff -Nru geany-0.18/src/callbacks.c geany-0.19/src/callbacks.c --- geany-0.18/src/callbacks.c 2009-07-23 17:01:45.000000000 +0100 +++ geany-0.19/src/callbacks.c 2010-05-09 16:48:55.000000000 +0100 @@ -1,8 +1,8 @@ /* * callbacks.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: callbacks.c 4014 2009-07-23 16:01:45Z ntrel $ + * $Id: callbacks.c 4894 2010-05-09 15:48:55Z eht16 $ */ /* @@ -52,7 +52,7 @@ #include "build.h" #include "prefs.h" #include "templates.h" -#include "treeviews.h" +#include "sidebar.h" #include "keybindings.h" #include "encodings.h" #include "search.h" @@ -65,6 +65,7 @@ #include "plugins.h" #include "log.h" #include "toolbar.h" +#include "pluginutils.h" #ifdef HAVE_VTE @@ -76,9 +77,6 @@ #endif -/* flag to indicate the explicit change of a toggle button of the toolbar menu and so the - * toggled callback should ignore the change since it is not triggered by the user */ -static gboolean ignore_toolbar_toggle = FALSE; /* flag to indicate that an insert callback was triggered from the file menu, * so we need to store the current cursor position in editor_info.click_pos. */ @@ -181,7 +179,7 @@ if (doc != NULL && cur_page >= 0) { - if (doc->file_name == NULL) + if (document_need_save_as(doc)) dialogs_show_save_as(); else document_save_file(doc, FALSE); @@ -203,23 +201,33 @@ { gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); GeanyDocument *doc, *cur_doc = document_get_current(); + gint count = 0; for (i = 0; i < max; i++) { doc = document_get_from_page(i); if (! doc->changed) continue; - if (doc->file_name == NULL) + if (document_need_save_as(doc)) { /* display unnamed document */ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), document_get_notebook_page(doc)); - dialogs_show_save_as(); + if (dialogs_show_save_as()) + count++; } else - document_save_file(doc, FALSE); + { + if (document_save_file(doc, FALSE)) + count++; + } } - treeviews_update_tag_list(cur_doc, TRUE); + if (!count) + return; + + ui_set_statusbar(FALSE, ngettext("%d file saved.", "%d files saved.", count), count); + /* saving may have changed window title, sidebar for another doc, so update */ + sidebar_update_tag_list(cur_doc, TRUE); ui_set_window_title(cur_doc); } @@ -272,9 +280,18 @@ on_edit1_activate (GtkMenuItem *menuitem, gpointer user_data) { + GtkWidget *item; GeanyDocument *doc = document_get_current(); + ui_update_menu_copy_items(doc); ui_update_insert_include_item(doc, 1); + + item = ui_lookup_widget(main_widgets.window, "plugin_preferences1"); +#ifndef HAVE_PLUGINS + gtk_widget_hide(item); +#else + gtk_widget_set_sensitive(item, plugins_have_preferences()); +#endif } @@ -453,7 +470,7 @@ GeanyDocument *doc = document_get_current(); gchar *base_name; gint i = GPOINTER_TO_INT(user_data); - gchar *charset = NULL; + const gchar *charset = NULL; g_return_if_fail(doc != NULL); g_return_if_fail(doc->file_name != NULL); @@ -464,6 +481,8 @@ return; charset = encodings[i].charset; } + else + charset = doc->encoding; base_name = g_path_get_basename(doc->file_name); if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, @@ -479,42 +498,6 @@ void -on_images_and_text2_activate (GtkCheckMenuItem *menuitem, - gpointer user_data) -{ - if (ignore_toolbar_toggle || ! gtk_check_menu_item_get_active(menuitem)) - return; - - gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), GTK_TOOLBAR_BOTH); - toolbar_prefs.icon_style = GTK_TOOLBAR_BOTH; -} - - -void -on_images_only2_activate (GtkCheckMenuItem *menuitem, - gpointer user_data) -{ - if (ignore_toolbar_toggle || ! gtk_check_menu_item_get_active(menuitem)) - return; - - gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), GTK_TOOLBAR_ICONS); - toolbar_prefs.icon_style = GTK_TOOLBAR_ICONS; -} - - -void -on_text_only2_activate (GtkCheckMenuItem *menuitem, - gpointer user_data) -{ - if (ignore_toolbar_toggle || ! gtk_check_menu_item_get_active(menuitem)) - return; - - gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), GTK_TOOLBAR_TEXT); - toolbar_prefs.icon_style = GTK_TOOLBAR_TEXT; -} - - -void on_change_font1_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -530,6 +513,7 @@ document_new_file(NULL, NULL, NULL); } + /* open file */ void on_toolbutton_open_clicked (GtkAction *action, @@ -590,42 +574,8 @@ if (search_data.search_bar) ui_set_search_entry_background(entry, result); } -} - - -void -on_toolbar_large_icons1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data) -{ - if (ignore_toolbar_toggle || ! gtk_check_menu_item_get_active(menuitem)) - return; - - toolbar_prefs.icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR; - gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), toolbar_prefs.icon_size); -} - - -void -on_toolbar_small_icons1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data) -{ - if (ignore_toolbar_toggle || ! gtk_check_menu_item_get_active(menuitem)) - return; - - toolbar_prefs.icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; - gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), toolbar_prefs.icon_size); -} - - -void -on_very_small_icons1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data) -{ - if (ignore_toolbar_toggle || ! gtk_check_menu_item_get_active(menuitem)) - return; - - toolbar_prefs.icon_size = GTK_ICON_SIZE_MENU; - gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), toolbar_prefs.icon_size); + else + on_find1_activate(NULL, NULL); } @@ -655,6 +605,7 @@ sci_zoom_in(doc->editor->sci); } + /* zoom out from menu bar and popup menu */ void on_zoom_out1_activate (GtkMenuItem *menuitem, @@ -735,12 +686,14 @@ if (doc != NULL) { - treeviews_select_openfiles_item(doc); - document_set_text_changed(doc, doc->changed); /* also sets window title and status bar */ + sidebar_select_openfiles_item(doc); + ui_save_buttons_toggle(doc->changed); + ui_set_window_title(doc); + ui_update_statusbar(doc, -1); ui_update_popup_reundo_items(doc); ui_document_show_hide(doc); /* update the document menu */ build_menu_update(doc); - treeviews_update_tag_list(doc, FALSE); + sidebar_update_tag_list(doc, FALSE); /* We delay the check to avoid weird fast, unintended switching of notebook pages when * the 'file has changed' dialog is shown while the switch event is not yet completely @@ -777,18 +730,26 @@ } +static void convert_eol(gint mode) +{ + GeanyDocument *doc = document_get_current(); + + g_return_if_fail(doc != NULL); + + sci_convert_eols(doc->editor->sci, mode); + sci_set_eol_mode(doc->editor->sci, mode); + ui_update_statusbar(doc, -1); +} + + void on_crlf_activate (GtkCheckMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc; if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem)) return; - doc = document_get_current(); - g_return_if_fail(doc != NULL); - sci_convert_eols(doc->editor->sci, SC_EOL_CRLF); - sci_set_eol_mode(doc->editor->sci, SC_EOL_CRLF); + convert_eol(SC_EOL_CRLF); } @@ -796,14 +757,10 @@ on_lf_activate (GtkCheckMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc; if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem)) return; - doc = document_get_current(); - g_return_if_fail(doc != NULL); - sci_convert_eols(doc->editor->sci, SC_EOL_LF); - sci_set_eol_mode(doc->editor->sci, SC_EOL_LF); + convert_eol(SC_EOL_LF); } @@ -811,14 +768,10 @@ on_cr_activate (GtkCheckMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc; if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem)) return; - doc = document_get_current(); - g_return_if_fail(doc != NULL); - sci_convert_eols(doc->editor->sci, SC_EOL_CR); - sci_set_eol_mode(doc->editor->sci, SC_EOL_CR); + convert_eol(SC_EOL_CR); } @@ -841,32 +794,7 @@ { if (event->button == 3) { - GtkWidget *w; - - ignore_toolbar_toggle = TRUE; - - switch (toolbar_prefs.icon_style) - { - case 0: w = ui_lookup_widget(ui_widgets.toolbar_menu, "images_only2"); break; - case 1: w = ui_lookup_widget(ui_widgets.toolbar_menu, "text_only2"); break; - default: w = ui_lookup_widget(ui_widgets.toolbar_menu, "images_and_text2"); break; - } - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), TRUE); - - switch (toolbar_prefs.icon_size) - { - case GTK_ICON_SIZE_LARGE_TOOLBAR: - w = ui_lookup_widget(ui_widgets.toolbar_menu, "large_icons1"); break; - case GTK_ICON_SIZE_SMALL_TOOLBAR: - w = ui_lookup_widget(ui_widgets.toolbar_menu, "small_icons1"); break; - default: w = ui_lookup_widget(ui_widgets.toolbar_menu, "very_small_icons1"); break; - } - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), TRUE); - - ignore_toolbar_toggle = FALSE; - gtk_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, NULL, NULL, NULL, event->button, event->time); - return TRUE; } return FALSE; @@ -958,10 +886,11 @@ on_show_messages_window1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { - if (ignore_callback) return; + if (ignore_callback) + return; ui_prefs.msgwindow_visible = (ui_prefs.msgwindow_visible) ? FALSE : TRUE; - ui_widget_show_hide(ui_lookup_widget(main_widgets.window, "scrolledwindow1"), ui_prefs.msgwindow_visible); + msgwin_show_hide(ui_prefs.msgwindow_visible); } @@ -1121,8 +1050,15 @@ g_return_if_fail(doc != NULL); - sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); - symbols_goto_tag(editor_info.current_word, definition); + /* update cursor pos for navigating back afterwards */ + if (!sci_has_selection(doc->editor->sci)) + sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); + + /* use the keybinding callback as it checks for selections as well as current word */ + if (definition) + keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_TAGDEFINITION); + else + keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_TAGDECLARATION); } @@ -1240,21 +1176,45 @@ } +static void get_line_and_offset_from_text(const gchar *text, gint *line_no, gint *offset) +{ + if (*text == '+' || *text == '-') + { + *line_no = atoi(text + 1); + *offset = (*text == '+') ? 1 : -1; + } + else + { + *line_no = atoi(text) - 1; + *offset = 0; + } +} + + void on_go_to_line_activate (GtkMenuItem *menuitem, gpointer user_data) { - static gdouble val = 1; + static gchar value[16] = ""; + gchar *result; - if (dialogs_show_input_numeric(_("Go to Line"), _("Enter the line you want to go to:"), - &val, 1, 100000000, 1)) + result = dialogs_show_input_goto_line( + _("Go to Line"), _("Enter the line you want to go to:"), value); + if (result != NULL) { GeanyDocument *doc = document_get_current(); + gint offset; + gint line_no; g_return_if_fail(doc != NULL); - if (! editor_goto_line(doc->editor, (gint) val - 1)) + get_line_and_offset_from_text(result, &line_no, &offset); + if (! editor_goto_line(doc->editor, line_no, offset)) utils_beep(); + /* remember value for future calls */ + g_snprintf(value, sizeof(value), "%s", result); + + g_free(result); } } @@ -1263,11 +1223,16 @@ on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) { GeanyDocument *doc = document_get_current(); + gint offset; + gint line_no; g_return_if_fail(doc != NULL); - if (! editor_goto_line(doc->editor, atoi(text) - 1)) + get_line_and_offset_from_text(text, &line_no, &offset); + if (! editor_goto_line(doc->editor, line_no, offset)) utils_beep(); + else + keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); } @@ -1283,6 +1248,8 @@ on_toolbutton_goto_entry_activate(NULL, text, NULL); } + else + on_go_to_line_activate(NULL, NULL); } @@ -1290,24 +1257,9 @@ on_help1_activate (GtkMenuItem *menuitem, gpointer user_data) { - gint skip; gchar *uri; -#ifdef G_OS_WIN32 - skip = 8; - uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL); - g_strdelimit(uri, "\\", '/'); /* replace '\\' by '/' */ -#else - skip = 7; - uri = g_strconcat("file://", app->docdir, "index.html", NULL); -#endif - - if (! g_file_test(uri + skip, G_FILE_TEST_IS_REGULAR)) - { /* fall back to online documentation if it is not found on the hard disk */ - g_free(uri); - uri = g_strconcat(GEANY_HOMEPAGE, "manual/", VERSION, "/index.html", NULL); - } - + uri = utils_get_help_url(NULL); utils_open_browser(uri); g_free(uri); } @@ -1350,7 +1302,7 @@ line = symbols_get_current_function(doc, &cur_tag); pos = sci_get_position_from_line(doc->editor->sci, line - 1); - text = templates_get_template_function(doc->file_type->id, cur_tag); + text = templates_get_template_function(doc, cur_tag); sci_insert_text(doc->editor->sci, pos, text); g_free(text); @@ -1372,7 +1324,10 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ - editor_insert_multiline_comment(doc->editor); + if (doc->file_type->comment_open) + editor_insert_multiline_comment(doc->editor); + else + utils_beep(); } @@ -1385,7 +1340,7 @@ g_return_if_fail(doc != NULL); - text = templates_get_template_licence(FILETYPE_ID(doc->file_type), GEANY_TEMPLATE_GPL); + text = templates_get_template_licence(doc, GEANY_TEMPLATE_GPL); verify_click_pos(doc); /* make sure that the click_pos is valid */ @@ -1404,7 +1359,7 @@ g_return_if_fail(doc != NULL); - text = templates_get_template_licence(FILETYPE_ID(doc->file_type), GEANY_TEMPLATE_BSD); + text = templates_get_template_licence(doc, GEANY_TEMPLATE_BSD); verify_click_pos(doc); /* make sure that the click_pos is valid */ @@ -1423,7 +1378,7 @@ g_return_if_fail(doc != NULL); - text = templates_get_template_changelog(); + text = templates_get_template_changelog(doc); sci_insert_text(doc->editor->sci, 0, text); /* sets the cursor to the right position to type the changelog text, * the template has 21 chars + length of name and email */ @@ -1439,7 +1394,7 @@ { GeanyDocument *doc = document_get_current(); gchar *text; - gchar *fname; + const gchar *fname; GeanyFiletype *ft; g_return_if_fail(doc != NULL); @@ -1454,23 +1409,23 @@ } -static void -on_custom_date_input_response(const gchar *input) -{ - setptr(ui_prefs.custom_date_format, g_strdup(input)); -} - - void on_insert_date_activate (GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); - gchar *format; + const gchar *format = NULL; gchar *time_str; g_return_if_fail(doc != NULL); + /* set default value */ + if (utils_str_equal("", ui_prefs.custom_date_format)) + { + g_free(ui_prefs.custom_date_format); + ui_prefs.custom_date_format = g_strdup("%d.%m.%Y"); + } + if (utils_str_equal(_("dd.mm.yyyy"), (gchar*) user_data)) format = "%d.%m.%Y"; else if (utils_str_equal(_("mm.dd.yyyy"), (gchar*) user_data)) @@ -1487,16 +1442,11 @@ format = ui_prefs.custom_date_format; else { - /* set default value */ - if (utils_str_equal("", ui_prefs.custom_date_format)) - { - g_free(ui_prefs.custom_date_format); - ui_prefs.custom_date_format = g_strdup("%d.%m.%Y"); - } - - dialogs_show_input(_("Custom Date Format"), - _("Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function."), - ui_prefs.custom_date_format, FALSE, &on_custom_date_input_response); + setptr(ui_prefs.custom_date_format, + dialogs_show_input(_("Custom Date Format"), + _("Enter here a custom date and time format. " + "You can use any conversion specifiers which can be used with the ANSI C strftime function."), + ui_prefs.custom_date_format)); return; } @@ -1624,19 +1574,28 @@ void on_menu_show_sidebar1_toggled (GtkCheckMenuItem *checkmenuitem, - gpointer user_data) + gpointer user_data) { if (ignore_callback) return; ui_prefs.sidebar_visible = ! ui_prefs.sidebar_visible; - if ((! interface_prefs.sidebar_openfiles_visible && ! interface_prefs.sidebar_symbol_visible)) + if (! interface_prefs.sidebar_openfiles_visible && ! interface_prefs.sidebar_symbol_visible) { interface_prefs.sidebar_openfiles_visible = TRUE; interface_prefs.sidebar_symbol_visible = TRUE; } +#if GTK_CHECK_VERSION(2, 14, 0) + /* if window has input focus, set it back to the editor before toggling off */ + if (! ui_prefs.sidebar_visible && + gtk_container_get_focus_child(GTK_CONTAINER(main_widgets.sidebar_notebook)) != NULL) + { + keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); + } +#endif + ui_sidebar_show_hide(); } @@ -1700,14 +1659,6 @@ void -on_menu_duplicate_line1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_DUPLICATELINE); -} - - -void on_menu_increase_indent1_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -1866,7 +1817,7 @@ if (sel != NULL) { - gchar *locale_filename, *filename; + gchar *locale_filename, *filename = NULL; if (g_path_is_absolute(sel)) filename = g_strdup(sel); @@ -1874,7 +1825,10 @@ { /* relative filename, add the path of the current file */ gchar *path; - path = g_path_get_dirname(doc->file_name); + path = utils_get_current_file_dir_utf8(); + if (!path) + path = g_get_current_dir(); + filename = g_build_path(G_DIR_SEPARATOR_S, path, sel, NULL); if (! g_file_test(filename, G_FILE_TEST_EXISTS) && @@ -2143,6 +2097,7 @@ doc->editor->line_breaking = !doc->editor->line_breaking; } + void on_replace_spaces_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -2219,6 +2174,7 @@ #endif } + gboolean on_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) @@ -2246,7 +2202,17 @@ on_customize_toolbar1_activate (GtkMenuItem *menuitem, gpointer user_data) { - toolbar_configure(); + GtkWidget *widget; + GtkNotebook *notebook; + + prefs_show_dialog(); + + /* select the KB page */ + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "vbox15"); + notebook = GTK_NOTEBOOK(ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2")); + + if (notebook != NULL && widget != NULL) + gtk_notebook_set_current_page(notebook, gtk_notebook_page_num(notebook, widget)); } @@ -2254,6 +2220,114 @@ on_button_customize_toolbar_clicked (GtkButton *button, gpointer user_data) { - toolbar_configure(); + toolbar_configure(GTK_WINDOW(ui_widgets.prefs_dialog)); +} + + +void +on_cut_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_CUTLINE); +} + + +void +on_copy_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_COPYLINE); +} + + +void +on_delete_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_DELETELINE); +} + + +void +on_duplicate_line_or_selection1_activate + (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_DUPLICATELINE); +} + + +void +on_select_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_LINE); +} + + +void +on_select_current_paragraph1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_PARAGRAPH); +} + + +void +on_insert_alternative_white_space1_activate + (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_INSERT, GEANY_KEYS_INSERT_ALTWHITESPACE); +} + + +void +on_go_to_next_marker1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_NEXTMARKER); +} + + +void +on_go_to_previous_marker1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_PREVIOUSMARKER); +} + + +void +on_reflow_lines_block1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH); +} + + +void +on_transpose_current_line1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_TRANSPOSELINE); +} + + +void +on_smart_line_indent1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_AUTOINDENT); +} + + +void +on_plugin_preferences1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ +#ifdef HAVE_PLUGINS + plugin_show_configure(NULL); +#endif } diff -Nru geany-0.18/src/callbacks.h geany-0.19/src/callbacks.h --- geany-0.18/src/callbacks.h 2009-06-25 18:29:37.000000000 +0100 +++ geany-0.19/src/callbacks.h 2010-04-11 22:56:23.000000000 +0100 @@ -1,8 +1,8 @@ /* * callbacks.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: callbacks.h 3899 2009-06-25 17:29:37Z eht16 $ + * $Id: callbacks.h 4818 2010-04-11 21:56:23Z eht16 $ */ @@ -102,18 +102,6 @@ gpointer user_data); void -on_images_and_text2_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - -void -on_images_only2_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - -void -on_text_only2_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - -void on_hide_toolbar1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -322,14 +310,6 @@ gpointer user_data); void -on_toolbar_large_icons1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - -void -on_toolbar_small_icons1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - -void on_set_file_readonly1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); @@ -416,10 +396,6 @@ gpointer user_data); void -on_menu_duplicate_line1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -void on_menu_increase_indent1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -599,10 +575,6 @@ on_send_selection_to_vte1_activate (GtkMenuItem *menuitem, gpointer user_data); -void -on_very_small_icons1_activate (GtkCheckMenuItem *menuitem, - gpointer user_data); - gboolean on_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); @@ -614,3 +586,57 @@ void on_button_customize_toolbar_clicked (GtkButton *button, gpointer user_data); + +void +on_cut_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_copy_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_delete_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_duplicate_line_or_selection1_activate + (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_select_current_line_s_1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_select_current_paragraph1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_insert_alternative_white_space1_activate + (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_go_to_next_marker1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_go_to_previous_marker1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_reflow_lines_block1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_transpose_current_line1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_smart_line_indent1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_plugin_preferences1_activate (GtkMenuItem *menuitem, + gpointer user_data); diff -Nru geany-0.18/src/dialogs.c geany-0.19/src/dialogs.c --- geany-0.18/src/dialogs.c 2009-07-21 23:12:13.000000000 +0100 +++ geany-0.19/src/dialogs.c 2010-05-16 19:22:24.000000000 +0100 @@ -1,8 +1,8 @@ /* * dialogs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: dialogs.c 4010 2009-07-21 22:12:13Z eht16 $ + * $Id: dialogs.c 4929 2010-05-16 18:22:24Z eht16 $ */ /* @@ -65,7 +65,11 @@ GEANY_RESPONSE_VIEW }; -#if ! GEANY_USE_WIN32_DIALOG + +static gboolean handle_save_as(const gchar *utf8_filename, gboolean open_new_tab, + gboolean rename_file); + + static GtkWidget *add_file_open_extra_widget(void); @@ -84,11 +88,11 @@ gint encoding_idx = gtk_combo_box_get_active(GTK_COMBO_BOX( ui_lookup_widget(GTK_WIDGET(dialog), "encoding_combo"))); GeanyFiletype *ft = NULL; - gchar *charset = NULL; + const gchar *charset = NULL; gboolean ro = (response == GEANY_RESPONSE_VIEW); /* View clicked */ /* ignore detect from file item */ - if (filetype_idx > 0 && filetype_idx < GEANY_MAX_BUILT_IN_FILETYPES) + if (filetype_idx > 0) ft = g_slist_nth_data(filetypes_by_title, filetype_idx); if (encoding_idx >= 0 && encoding_idx < GEANY_ENCODINGS_MAX) charset = encodings[encoding_idx].charset; @@ -203,7 +207,6 @@ g_signal_connect(ui_widgets.open_filesel, "response", G_CALLBACK(on_file_open_dialog_response), NULL); } -#endif /* This shows the file selection dialog to open a file. */ @@ -221,34 +224,35 @@ setptr(initdir, utils_get_locale_from_utf8(initdir)); -#if GEANY_USE_WIN32_DIALOG - win32_show_file_dialog(TRUE, initdir); -#else /* X11, not win32: use GTK_FILE_CHOOSER */ - - /* We use the same file selection widget each time, so first of all we create it - * if it hasn't already been created. */ - if (ui_widgets.open_filesel == NULL) - create_open_file_dialog(); - - if (initdir != NULL) - { - if (g_path_is_absolute(initdir)) - gtk_file_chooser_set_current_folder( - GTK_FILE_CHOOSER(ui_widgets.open_filesel), initdir); - } +#ifdef G_OS_WIN32 + if (interface_prefs.use_native_windows_dialogs) + win32_show_document_open_dialog(GTK_WINDOW(main_widgets.window), _("Open File"), initdir); + else +#endif + { + /* We use the same file selection widget each time, so first of all we create it + * if it hasn't already been created. */ + if (ui_widgets.open_filesel == NULL) + create_open_file_dialog(); - if (app->project && NZV(app->project->base_path)) - gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui_widgets.open_filesel), - app->project->base_path, NULL); + if (initdir != NULL) + { + if (g_path_is_absolute(initdir)) + gtk_file_chooser_set_current_folder( + GTK_FILE_CHOOSER(ui_widgets.open_filesel), initdir); + } - gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(ui_widgets.open_filesel)); - gtk_window_present(GTK_WINDOW(ui_widgets.open_filesel)); -#endif + if (app->project && NZV(app->project->base_path)) + gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ui_widgets.open_filesel), + app->project->base_path, NULL); + + gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(ui_widgets.open_filesel)); + gtk_window_present(GTK_WINDOW(ui_widgets.open_filesel)); + } g_free(initdir); } -#if ! GEANY_USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget() { GtkWidget *expander, *vbox, *table, *check_hidden; @@ -321,19 +325,15 @@ return expander; } -#endif -#if ! GEANY_USE_WIN32_DIALOG static void on_save_as_new_tab_toggled(GtkToggleButton *togglebutton, gpointer user_data) { gtk_widget_set_sensitive(GTK_WIDGET(user_data), ! gtk_toggle_button_get_active(togglebutton)); } -#endif -#if ! GEANY_USE_WIN32_DIALOG static gboolean handle_save_as(const gchar *utf8_filename, gboolean open_new_tab, gboolean rename_file) { GeanyDocument *doc = document_get_current(); @@ -412,10 +412,8 @@ if (success) gtk_widget_hide(ui_widgets.save_filesel); } -#endif -#if ! GEANY_USE_WIN32_DIALOG static void create_save_file_dialog(void) { GtkWidget *vbox, *check_open_new_tab, *rename_btn; @@ -472,15 +470,15 @@ gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.save_filesel), GTK_WINDOW(main_widgets.window)); } -#endif -#if ! GEANY_USE_WIN32_DIALOG static gboolean gtk_show_save_as(void) { GeanyDocument *doc = document_get_current(); gint resp; + g_return_val_if_fail(doc != NULL, FALSE); + if (G_UNLIKELY(ui_widgets.save_filesel == NULL)) create_save_file_dialog(); @@ -511,8 +509,7 @@ { gchar *fname = NULL; - if (doc->file_type != NULL && doc->file_type->id != GEANY_FILETYPES_NONE && - doc->file_type->extension != NULL) + if (doc->file_type != NULL && doc->file_type->extension != NULL) fname = g_strconcat(GEANY_STRING_UNTITLED, ".", doc->file_type->extension, NULL); else @@ -536,23 +533,29 @@ return (resp == GTK_RESPONSE_ACCEPT); } -#endif /** - * Show the Save As dialog for the current notebook page. + * Shows the Save As dialog for the current notebook page. * * @return @c TRUE if the file was saved, otherwise @c FALSE. **/ gboolean dialogs_show_save_as() { - gboolean result; + gboolean result = FALSE; -#if GEANY_USE_WIN32_DIALOG - result = win32_show_file_dialog(FALSE, utils_get_default_dir_utf8()); -#else - result = gtk_show_save_as(); +#ifdef G_OS_WIN32 + if (interface_prefs.use_native_windows_dialogs) + { + GeanyDocument *doc = document_get_current(); + gchar *utf8_name = win32_show_document_save_as_dialog(GTK_WINDOW(main_widgets.window), + _("Save File"), DOC_FILENAME(doc)); + if (utf8_name != NULL) + result = handle_save_as(utf8_name, FALSE, FALSE); + } + else #endif + result = gtk_show_save_as(); return result; } @@ -577,7 +580,7 @@ break; } gtk_window_set_title(GTK_WINDOW(dialog), title); - if (parent == NULL) + if (parent == NULL || GTK_IS_DIALOG(parent)) { GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); gtk_window_set_icon(GTK_WINDOW(dialog), pb); @@ -592,7 +595,7 @@ /** - * Show a message box of the type @a type with @a text. + * Shows a message box of the type @a type with @a text. * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows * message dialog box is shown. * @@ -606,12 +609,12 @@ #ifndef G_OS_WIN32 GtkWidget *dialog; #endif - gchar string[512]; + gchar *string; va_list args; GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; va_start(args, text); - g_vsnprintf(string, 511, text, args); + string = g_strdup_vprintf(text, args); va_end(args); #ifdef G_OS_WIN32 @@ -621,6 +624,7 @@ type, GTK_BUTTONS_OK, "%s", string); show_msgbox_dialog(dialog, type, parent); #endif + g_free(string); } @@ -697,11 +701,11 @@ #endif g_free(msg); - switch(ret) + switch (ret) { case GTK_RESPONSE_YES: { - if (doc->file_name == NULL) + if (document_need_save_as(doc)) { ret = dialogs_show_save_as(); } @@ -821,8 +825,8 @@ if (response == GTK_RESPONSE_ACCEPT) { const gchar *str = gtk_entry_get_text(GTK_ENTRY(entry)); - InputCallback input_cb = - (InputCallback) g_object_get_data(G_OBJECT(dialog), "input_cb"); + GeanyInputCallback input_cb = + (GeanyInputCallback) g_object_get_data(G_OBJECT(dialog), "input_cb"); if (persistent) { @@ -831,37 +835,37 @@ } input_cb(str); } - - if (persistent) - gtk_widget_hide(GTK_WIDGET(dialog)); - else - gtk_widget_destroy(GTK_WIDGET(dialog)); + gtk_widget_hide(GTK_WIDGET(dialog)); } static void add_input_widgets(GtkWidget *dialog, GtkWidget *vbox, - const gchar *label_text, const gchar *default_text, gboolean persistent) + const gchar *label_text, const gchar *default_text, gboolean persistent, + GCallback insert_text_cb) { - GtkWidget *label, *entry; + GtkWidget *entry; - label = gtk_label_new(label_text); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); + if (label_text) + { + GtkWidget *label = gtk_label_new(label_text); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_container_add(GTK_CONTAINER(vbox), label); + } if (persistent) /* remember previous entry text in a combo box */ { GtkWidget *combo = gtk_combo_box_entry_new_text(); entry = GTK_BIN(combo)->child; - ui_entry_add_clear_icon(entry); + ui_entry_add_clear_icon(GTK_ENTRY(entry)); g_object_set_data(G_OBJECT(dialog), "combo", combo); gtk_container_add(GTK_CONTAINER(vbox), combo); } else { entry = gtk_entry_new(); - ui_entry_add_clear_icon(entry); + ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_container_add(GTK_CONTAINER(vbox), entry); } @@ -872,6 +876,8 @@ gtk_entry_set_max_length(GTK_ENTRY(entry), 255); gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); + if (insert_text_cb != NULL) + g_signal_connect(entry, "insert-text", insert_text_cb, NULL); g_signal_connect(entry, "activate", G_CALLBACK(on_input_entry_activate), dialog); g_signal_connect(dialog, "show", G_CALLBACK(on_input_dialog_show), entry); g_signal_connect(dialog, "response", G_CALLBACK(on_input_dialog_response), entry); @@ -883,9 +889,9 @@ * in this case the dialog returned is not destroyed on a response, * and can be reshown. * Returns: the dialog widget. */ -GtkWidget * -dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, - gboolean persistent, InputCallback input_cb) +static GtkWidget * +dialogs_show_input_full(const gchar *title, const gchar *label_text, const gchar *default_text, + gboolean persistent, GeanyInputCallback input_cb, GCallback insert_text_cb) { GtkWidget *dialog, *vbox; @@ -899,20 +905,66 @@ g_object_set_data(G_OBJECT(dialog), "has_combo", GINT_TO_POINTER(persistent)); g_object_set_data(G_OBJECT(dialog), "input_cb", (gpointer) input_cb); - add_input_widgets(dialog, vbox, label_text, default_text, persistent); + add_input_widgets(dialog, vbox, label_text, default_text, persistent, insert_text_cb); if (persistent) + { + /* override default handler */ g_signal_connect(dialog, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); - else - g_signal_connect(dialog, "delete-event", G_CALLBACK(gtk_widget_destroy), NULL); - + gtk_widget_show_all(dialog); + return dialog; + } gtk_widget_show_all(dialog); - return dialog; + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + return NULL; +} + + +/* Remember previous entry text in a combo box. + * Returns: the dialog widget. */ +GtkWidget * +dialogs_show_input_persistent(const gchar *title, const gchar *label_text, const gchar *default_text, + GeanyInputCallback input_cb) +{ + return dialogs_show_input_full(title, label_text, default_text, TRUE, input_cb, NULL); +} + + +/* ugly hack - user_data not supported for callback */ +static gchar *dialog_input = NULL; + +static void on_dialog_input(const gchar *str) +{ + dialog_input = g_strdup(str); +} + + +/* Returns: newly allocated string - a copy of either the entry text or default_text. */ +gchar *dialogs_show_input(const gchar *title, const gchar *label_text, + const gchar *default_text) +{ + dialog_input = NULL; + dialogs_show_input_full(title, label_text, default_text, FALSE, on_dialog_input, NULL); + return NVL(dialog_input, g_strdup(default_text)); +} + + +/* Returns: newly allocated copy of the entry text or NULL on cancel. + * Specialised variant for Goto Line dialog. */ +gchar *dialogs_show_input_goto_line(const gchar *title, const gchar *label_text, + const gchar *default_text) +{ + dialog_input = NULL; + dialogs_show_input_full( + title, label_text, default_text, FALSE, on_dialog_input, + G_CALLBACK(ui_editable_insert_text_callback)); + return dialog_input; } /** - * Show an input box to enter a numerical value using a GtkSpinButton. + * Shows an input box to enter a numerical value using a GtkSpinButton. * If the dialog is aborted, @a value remains untouched. * * @param title The dialog title. @@ -950,7 +1002,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); spin = gtk_spin_button_new_with_range(min, max, step); - ui_entry_add_clear_icon(spin); + ui_entry_add_clear_icon(GTK_ENTRY(spin)); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), *value); g_signal_connect(spin, "activate", G_CALLBACK(on_input_numeric_activate), dialog); @@ -1050,8 +1102,7 @@ gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); - title = g_strdup_printf("%s", base_name); - label = gtk_label_new(title); + label = ui_label_new_bold(base_name); gtk_label_set_selectable(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); image = gtk_image_new_from_stock("gtk-file", GTK_ICON_SIZE_BUTTON); @@ -1061,7 +1112,6 @@ gtk_container_add(GTK_CONTAINER(hbox), image); gtk_container_add(GTK_CONTAINER(hbox), label); gtk_container_add(GTK_CONTAINER(vbox), hbox); - g_free(title); table = gtk_table_new(8, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 10); @@ -1345,19 +1395,44 @@ } -static gboolean show_question(GtkWidget *parent, const gchar *yes_btn, const gchar *no_btn, - const gchar *question_text, const gchar *extra_text) +/* extra_text can be NULL; otherwise it is displayed below main_text. + * if parent is NULL, main_widgets.window will be used + * btn_1, btn_2, btn_3 can be NULL. + * returns response_1, response_2 or response_3 */ +static gint show_prompt(GtkWidget *parent, + const gchar *btn_1, GtkResponseType response_1, + const gchar *btn_2, GtkResponseType response_2, + const gchar *btn_3, GtkResponseType response_3, + const gchar *question_text, const gchar *extra_text) { gboolean ret = FALSE; -#ifdef G_OS_WIN32 - gchar *string = (extra_text == NULL) ? g_strdup(question_text) : - g_strconcat(question_text, "\n\n", extra_text, NULL); - - ret = win32_message_dialog(parent, GTK_MESSAGE_QUESTION, string); - g_free(string); -#else GtkWidget *dialog; + GtkWidget *btn; + if (btn_2 == NULL) + { + btn_2 = GTK_STOCK_NO; + response_2 = GTK_RESPONSE_NO; + } + if (btn_3 == NULL) + { + btn_3 = GTK_STOCK_YES; + response_3 = GTK_RESPONSE_YES; + } + +#ifdef G_OS_WIN32 + /* our native dialog code doesn't support custom buttons */ + if (btn_3 == GTK_STOCK_YES && btn_2 == GTK_STOCK_NO && btn_1 == NULL) + { + gchar *string = (extra_text == NULL) ? g_strdup(question_text) : + g_strconcat(question_text, "\n\n", extra_text, NULL); + + ret = win32_message_dialog(parent, GTK_MESSAGE_QUESTION, string); + ret = ret ? response_3 : response_2; + g_free(string); + return ret; + } +#endif if (parent == NULL && main_status.main_window_realized) parent = main_widgets.window; @@ -1366,7 +1441,7 @@ GTK_BUTTONS_NONE, "%s", question_text); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); - if (parent == NULL) + if (parent == NULL || GTK_IS_DIALOG(parent)) { GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); gtk_window_set_icon(GTK_WINDOW(dialog), pb); @@ -1378,21 +1453,27 @@ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", extra_text); + if (btn_1 != NULL) + gtk_dialog_add_button(GTK_DIALOG(dialog), btn_1, response_1); + /* For a cancel button, use cancel response so user can press escape to cancel */ - gtk_dialog_add_button(GTK_DIALOG(dialog), no_btn, - utils_str_equal(no_btn, GTK_STOCK_CANCEL) ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_NO); - gtk_dialog_add_button(GTK_DIALOG(dialog), yes_btn, GTK_RESPONSE_YES); + btn = gtk_dialog_add_button(GTK_DIALOG(dialog), btn_2, + utils_str_equal(btn_2, GTK_STOCK_CANCEL) ? GTK_RESPONSE_CANCEL : response_2); + /* we don't want a default, but we need to override the apply button as default */ + gtk_widget_grab_default(btn); + gtk_dialog_add_button(GTK_DIALOG(dialog), btn_3, response_3); - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) - ret = TRUE; + ret = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); -#endif + + if (ret == GTK_RESPONSE_CANCEL) + ret = response_2; return ret; } /** - * Show a question message box with @a text and Yes/No buttons. + * Shows a question message box with @a text and Yes/No buttons. * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows * message dialog box is shown. * @@ -1403,16 +1484,21 @@ **/ gboolean dialogs_show_question(const gchar *text, ...) { - gboolean ret = FALSE; - gchar string[512]; + gchar *string; va_list args; GtkWidget *parent = (main_status.main_window_realized) ? main_widgets.window : NULL; + gint result; va_start(args, text); - g_vsnprintf(string, 511, text, args); + string = g_strdup_vprintf(text, args); va_end(args); - ret = show_question(parent, GTK_STOCK_YES, GTK_STOCK_NO, string, NULL); - return ret; + result = show_prompt(parent, + NULL, GTK_RESPONSE_NONE, + GTK_STOCK_NO, GTK_RESPONSE_NO, + GTK_STOCK_YES, GTK_RESPONSE_YES, + string, NULL); + g_free(string); + return (result == GTK_RESPONSE_YES); } @@ -1422,20 +1508,44 @@ gboolean dialogs_show_question_full(GtkWidget *parent, const gchar *yes_btn, const gchar *no_btn, const gchar *extra_text, const gchar *main_text, ...) { - gboolean ret = FALSE; - gchar string[512]; + gint result; + gchar *string; va_list args; - if (!yes_btn) - yes_btn = GTK_STOCK_YES; - if (!no_btn) - no_btn = GTK_STOCK_NO; + va_start(args, main_text); + string = g_strdup_vprintf(main_text, args); + va_end(args); + result = show_prompt(parent, + NULL, GTK_RESPONSE_NONE, + no_btn, GTK_RESPONSE_NO, + yes_btn, GTK_RESPONSE_YES, + string, extra_text); + g_free(string); + return (result == GTK_RESPONSE_YES); +} + + +/* extra_text can be NULL; otherwise it is displayed below main_text. + * if parent is NULL, main_widgets.window will be used + * btn_1, btn_2, btn_3 can be NULL. + * returns response_1, response_2 or response_3 */ +gint dialogs_show_prompt(GtkWidget *parent, + const gchar *btn_1, GtkResponseType response_1, + const gchar *btn_2, GtkResponseType response_2, + const gchar *btn_3, GtkResponseType response_3, + const gchar *extra_text, const gchar *main_text, ...) +{ + gchar *string; + va_list args; + gint result; va_start(args, main_text); - g_vsnprintf(string, 511, main_text, args); + string = g_strdup_vprintf(main_text, args); va_end(args); - ret = show_question(parent, yes_btn, no_btn, string, extra_text); - return ret; + result = show_prompt(parent, btn_1, response_1, btn_2, response_2, btn_3, response_3, + string, extra_text); + g_free(string); + return result; } diff -Nru geany-0.18/src/dialogs.h geany-0.19/src/dialogs.h --- geany-0.18/src/dialogs.h 2009-07-09 14:51:37.000000000 +0100 +++ geany-0.19/src/dialogs.h 2010-05-09 16:48:42.000000000 +0100 @@ -1,8 +1,8 @@ /* * dialogs.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: dialogs.h 3944 2009-07-09 13:51:37Z ntrel $ + * $Id: dialogs.h 4893 2010-05-09 15:48:42Z eht16 $ */ /** @@ -30,7 +30,7 @@ #ifndef GEANY_DIALOGS_H #define GEANY_DIALOGS_H 1 -typedef void (*InputCallback)(const gchar *); +typedef void (*GeanyInputCallback)(const gchar *text); void dialogs_show_open_file(void); @@ -45,8 +45,14 @@ void dialogs_show_color(gchar *colour); -GtkWidget *dialogs_show_input(const gchar *title, const gchar *label_text, - const gchar *default_text, gboolean persistent, InputCallback input_cb); +gchar *dialogs_show_input(const gchar *title, const gchar *label_text, + const gchar *default_text); + +gchar *dialogs_show_input_goto_line(const gchar *title, const gchar *label_text, + const gchar *default_text); + +GtkWidget *dialogs_show_input_persistent(const gchar *title, const gchar *label_text, + const gchar *default_text, GeanyInputCallback input_cb); gboolean dialogs_show_input_numeric(const gchar *title, const gchar *label_text, gdouble *value, gdouble min, gdouble max, gdouble step); @@ -58,6 +64,12 @@ gboolean dialogs_show_question_full(GtkWidget *parent, const gchar *yes_btn, const gchar *no_btn, const gchar *extra_text, const gchar *main_text, ...) G_GNUC_PRINTF (5, 6); +gint dialogs_show_prompt(GtkWidget *parent, + const gchar *btn_1, GtkResponseType response_1, + const gchar *btn_2, GtkResponseType response_2, + const gchar *btn_3, GtkResponseType response_3, + const gchar *extra_text, const gchar *main_text, ...) G_GNUC_PRINTF (9, 10); + void dialogs_show_msgbox(GtkMessageType type, const gchar *text, ...) G_GNUC_PRINTF (2, 3); void dialogs_show_msgbox_with_secondary(GtkMessageType type, const gchar *text, const gchar *secondary); diff -Nru geany-0.18/src/document.c geany-0.19/src/document.c --- geany-0.18/src/document.c 2009-08-16 17:20:41.000000000 +0100 +++ geany-0.19/src/document.c 2010-05-22 20:38:49.000000000 +0100 @@ -1,8 +1,8 @@ /* * document.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: document.c 4093 2009-08-16 16:20:41Z eht16 $ + * $Id: document.c 4940 2010-05-22 19:38:49Z eht16 $ */ /* @@ -41,7 +41,6 @@ # include #endif -#include #include /* gstdio.h also includes sys/stat.h */ @@ -66,7 +65,7 @@ #include "dialogs.h" #include "msgwindow.h" #include "templates.h" -#include "treeviews.h" +#include "sidebar.h" #include "ui_utils.h" #include "utils.h" #include "encodings.h" @@ -90,11 +89,11 @@ * file by then. * * You also need to check @c GeanyDocument::is_valid when iterating over this array, - * although usually you would just use the documents_foreach() macro. + * although usually you would just use the foreach_document() macro. * * Never assume that the order of document pointers is the same as the order of notebook tabs. * Notebook tabs can be reordered. Use @c document_get_from_page(). */ -GPtrArray *documents_array; +GPtrArray *documents_array = NULL; /* an undo action, also used for redo actions */ @@ -114,19 +113,20 @@ /* ignore the case of filenames and paths under WIN32, causes errors if not */ #ifdef G_OS_WIN32 -#define filenamecmp(a,b) utils_str_casecmp((a), (b)) +#define filenamecmp(a, b) utils_str_casecmp((a), (b)) #else -#define filenamecmp(a,b) strcmp((a), (b)) +#define filenamecmp(a, b) strcmp((a), (b)) #endif /** - * Find and retrieve a document with the given filename from the document list. + * Finds a document whose @c real_path field matches the given filename. * * @param realname The filename to search, which should be identical to the * string returned by @c tm_get_real_path(). * * @return The matching document, or @c NULL. * @note This is only really useful when passing a @c TMWorkObject::file_name. + * @see GeanyDocument::real_path. * @see document_find_by_filename(). * * @since 0.15 @@ -166,7 +166,7 @@ /** - * Find and retrieve a document with the given filename from the document list. + * Finds a document with the given filename. * This matches either an exact GeanyDocument::file_name string, or variant * filenames with relative elements in the path (e.g. @c "/dir/..//name" will * match @c "/name"). @@ -222,7 +222,10 @@ } -/* returns the index of the notebook page for the document. */ +/** Gets the notebook page index for a document. + * @param doc The document. + * @return The index. + * @since 0.19 */ gint document_get_notebook_page(GeanyDocument *doc) { g_return_val_if_fail(doc != NULL, -1); @@ -233,7 +236,7 @@ /** - * Find and retrieve the document for the given notebook page @a page_num. + * Finds the document for the given notebook page @a page_num. * * @param page_num The notebook page number to search. * @@ -254,7 +257,7 @@ /** - * Find and retrieve the current document. + * Finds the current document. * * @return A pointer to the current document or @c NULL if there are no opened documents. **/ @@ -339,7 +342,7 @@ /** - * Update the tab labels, the status bar, the window title and some save-sensitive buttons + * Updates the tab labels, the status bar, the window title and some save-sensitive buttons * according to the document's save state. * This is called by Geany mostly when opening or saving files. * @@ -467,7 +470,7 @@ #endif -void document_stop_file_monitoring(GeanyDocument *doc) +static void document_stop_file_monitoring(GeanyDocument *doc) { g_return_if_fail(doc != NULL); @@ -513,19 +516,43 @@ } +void document_try_focus(GeanyDocument *doc, GtkWidget *source_widget) +{ + /* doc might not be valid e.g. if user closed a tab whilst Geany is opening files */ + if (DOC_VALID(doc)) + { + GtkWidget *sci = GTK_WIDGET(doc->editor->sci); + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); + + if (source_widget == NULL) + source_widget = doc->priv->tag_tree; + + if (focusw == source_widget) + gtk_widget_grab_focus(sci); + } +} + + +static gboolean on_idle_focus(gpointer doc) +{ + document_try_focus(doc, NULL); + return FALSE; +} + + /* Creates a new document and editor, adding a tab in the notebook. * @return The created document */ static GeanyDocument *document_create(const gchar *utf8_filename) { - GeanyDocument *this; + GeanyDocument *doc; gint new_idx; gint cur_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); if (cur_pages == 1) { - GeanyDocument *doc = document_get_current(); + GeanyDocument *cur = document_get_current(); /* remove the empty document and open a new one */ - if (doc != NULL && doc->file_name == NULL && ! doc->changed) + if (cur != NULL && cur->file_name == NULL && ! cur->changed) document_remove_page(0); } @@ -537,38 +564,35 @@ new_idx = documents_array->len; g_ptr_array_add(documents_array, new_doc); } - this = documents[new_idx]; - init_doc_struct(this); /* initialize default document settings */ - this->index = new_idx; - - this->file_name = g_strdup(utf8_filename); + doc = documents[new_idx]; + init_doc_struct(doc); /* initialize default document settings */ + doc->index = new_idx; - this->editor = editor_create(this); + doc->file_name = g_strdup(utf8_filename); - editor_apply_update_prefs(this->editor); + doc->editor = editor_create(doc); - treeviews_openfiles_add(this); /* sets this->iter */ + sidebar_openfiles_add(doc); /* sets doc->iter */ - notebook_new_tab(this); + notebook_new_tab(doc); /* select document in sidebar */ { GtkTreeSelection *sel; sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, &this->priv->iter); + gtk_tree_selection_select_iter(sel, &doc->priv->iter); } ui_document_buttons_update(); - gtk_widget_grab_focus(GTK_WIDGET(this->editor->sci)); - - this->is_valid = TRUE; /* do this last to prevent UI updating with NULL items. */ - return this; + doc->is_valid = TRUE; /* do this last to prevent UI updating with NULL items. */ + return doc; } + /** - * Close the given document. + * Closes the given document. * * @param doc The document to remove. * @@ -585,7 +609,7 @@ /** - * Remove the given notebook tab at @a page_num and clear all related information + * Removes the given notebook tab at @a page_num and clears all related information * in the document list. * * @param page_num The notebook page number to remove. @@ -616,10 +640,13 @@ doc->is_valid = FALSE; - notebook_remove_page(page_num); - treeviews_remove_document(doc); - navqueue_remove_file(doc->file_name); - msgwin_status_add(_("File %s closed."), DOC_FILENAME(doc)); + if (! main_status.quitting) + { + notebook_remove_page(page_num); + sidebar_remove_document(doc); + navqueue_remove_file(doc->file_name); + msgwin_status_add(_("File %s closed."), DOC_FILENAME(doc)); + } g_free(doc->encoding); g_free(doc->priv->saved_encoding.encoding); g_free(doc->file_name); @@ -642,10 +669,11 @@ if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) { - treeviews_update_tag_list(NULL, FALSE); + sidebar_update_tag_list(NULL, FALSE); /*on_notebook1_switch_page(GTK_NOTEBOOK(main_widgets.notebook), NULL, 0, NULL);*/ ui_set_window_title(NULL); ui_save_buttons_toggle(FALSE); + ui_update_popup_reundo_items(NULL); ui_document_buttons_update(); build_menu_update(NULL); } @@ -674,7 +702,7 @@ /** * Creates a new document. - * After all, the "document-new" signal is emitted for plugins. + * Afterwards, the @c "document-new" signal is emitted for plugins. * * @param utf8_filename The file name in UTF-8 encoding, or @c NULL to open a file as "untitled". * @param ft The filetype to set or @c NULL to detect it from @a filename if not @c NULL. @@ -729,7 +757,9 @@ ui_document_show_hide(doc); /* update the document menu */ sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); - sci_goto_pos(doc->editor->sci, 0, TRUE); + /* bring it in front, jump to the start and grab the focus */ + editor_goto_pos(doc->editor, 0, FALSE); + document_try_focus(doc, NULL); #if USE_GIO_FILEMON monitor_file_setup(doc); @@ -750,8 +780,8 @@ /** - * Open a document specified by @a locale_filename. - * After all, the "document-open" signal is emitted for plugins. + * Opens a document specified by @a locale_filename. + * Afterwards, the @c "document-open" signal is emitted for plugins. * * @param locale_filename The filename of the document to load, in locale encoding. * @param readonly Whether to open the document in read-only mode. @@ -996,8 +1026,10 @@ /* Sets the cursor position on opening a file. First it sets the line when cl_options.goto_line * is set, otherwise it sets the line when pos is greater than zero and finally it sets the column - * if cl_options.goto_column is set. */ -static void set_cursor_position(GeanyEditor *editor, gint pos) + * if cl_options.goto_column is set. + * + * returns the new position which may have changed */ +static gint set_cursor_position(GeanyEditor *editor, gint pos) { if (cl_options.goto_line >= 0) { /* goto line which was specified on command line and then undefine the line */ @@ -1013,11 +1045,14 @@ if (cl_options.goto_column >= 0) { /* goto column which was specified on command line and then undefine the column */ - gint cur_pos = sci_get_current_position(editor->sci); - sci_set_current_position(editor->sci, cur_pos + cl_options.goto_column, FALSE); + + gint new_pos = sci_get_current_position(editor->sci) + cl_options.goto_column; + sci_set_current_position(editor->sci, new_pos, FALSE); editor->scroll_percent = 0.5F; cl_options.goto_column = -1; + return new_pos; } + return sci_get_current_position(editor->sci); } @@ -1069,6 +1104,11 @@ gint pos = sci_get_position_from_line(sci, line); gchar c; + /* most code will have indent total <= 24, otherwise it's more likely to be + * alignment than indentation */ + if (sci_get_line_indentation(sci, line) > 24) + continue; + c = sci_get_char_at(sci, pos); if (c == '\t') tabs++; @@ -1093,24 +1133,25 @@ } -static void set_indentation(GeanyEditor *editor) +void document_apply_indent_settings(GeanyDocument *doc) { - const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); + GeanyIndentType type = iprefs->type; - switch (FILETYPE_ID(editor->document->file_type)) + switch (FILETYPE_ID(doc->file_type)) { case GEANY_FILETYPES_MAKE: /* force using tabs for indentation for Makefiles */ - editor_set_indent_type(editor, GEANY_INDENT_TYPE_TABS); + editor_set_indent_type(doc->editor, GEANY_INDENT_TYPE_TABS); return; case GEANY_FILETYPES_F77: /* force using spaces for indentation for Fortran 77 */ - editor_set_indent_type(editor, GEANY_INDENT_TYPE_SPACES); + editor_set_indent_type(doc->editor, GEANY_INDENT_TYPE_SPACES); return; } if (iprefs->detect_type) { - GeanyIndentType type = detect_indent_type(editor); + type = detect_indent_type(doc->editor); if (type != iprefs->type) { @@ -1131,10 +1172,10 @@ /* For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs * and Spaces), the second one is the filename */ ui_set_statusbar(TRUE, _("Setting %s indentation mode for %s."), name, - DOC_FILENAME(editor->document)); + DOC_FILENAME(doc)); } - editor_set_indent_type(editor, type); } + editor_set_indent_type(doc->editor, type); } @@ -1150,7 +1191,7 @@ return TRUE; if (update_tags_from_buffer(doc)) - treeviews_update_tag_list(doc, TRUE); + sidebar_update_tag_list(doc, TRUE); return TRUE; } @@ -1204,116 +1245,109 @@ if (doc != NULL) { ui_add_recent_file(utf8_filename); /* either add or reorder recent item */ + /* show the doc before reload dialog */ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), - gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), - (GtkWidget*) doc->editor->sci)); - g_free(utf8_filename); - g_free(locale_filename); + gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), + (GtkWidget*) doc->editor->sci)); document_check_disk_status(doc, TRUE); /* force a file changed check */ - set_cursor_position(doc->editor, pos); - return doc; } } - display_filename = utils_str_middle_truncate(utf8_filename, 100); - - /* if default encoding for opening files is set, use it if no forced encoding is set */ - if (file_prefs.default_open_encoding >= 0 && forced_enc == NULL) - forced_enc = encodings[file_prefs.default_open_encoding].charset; + if (reload || doc == NULL) + { /* doc possibly changed */ + display_filename = utils_str_middle_truncate(utf8_filename, 100); - if (! load_text_file(locale_filename, display_filename, &filedata, forced_enc)) - { - g_free(display_filename); - g_free(utf8_filename); - g_free(locale_filename); - return NULL; - } + if (! load_text_file(locale_filename, display_filename, &filedata, forced_enc)) + { + g_free(display_filename); + g_free(utf8_filename); + g_free(locale_filename); + return NULL; + } - if (! reload) - { - doc = document_create(utf8_filename); - g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ + if (! reload) + { + doc = document_create(utf8_filename); + g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ - /* file exists on disk, set real_path */ - setptr(doc->real_path, tm_get_real_path(locale_filename)); + /* file exists on disk, set real_path */ + setptr(doc->real_path, tm_get_real_path(locale_filename)); - doc->priv->is_remote = utils_is_remote_path(locale_filename); - monitor_file_setup(doc); - } + doc->priv->is_remote = utils_is_remote_path(locale_filename); + monitor_file_setup(doc); + } - sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ - sci_empty_undo_buffer(doc->editor->sci); + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ + sci_empty_undo_buffer(doc->editor->sci); - /* add the text to the ScintillaObject */ - sci_set_readonly(doc->editor->sci, FALSE); /* to allow replacing text */ - sci_set_text(doc->editor->sci, filedata.data); /* NULL terminated data */ - queue_colourise(doc); /* Ensure the document gets colourised. */ - - /* detect & set line endings */ - editor_mode = utils_get_line_endings(filedata.data, filedata.len); - sci_set_eol_mode(doc->editor->sci, editor_mode); - g_free(filedata.data); + /* add the text to the ScintillaObject */ + sci_set_readonly(doc->editor->sci, FALSE); /* to allow replacing text */ + sci_set_text(doc->editor->sci, filedata.data); /* NULL terminated data */ + queue_colourise(doc); /* Ensure the document gets colourised. */ - sci_set_undo_collection(doc->editor->sci, TRUE); + /* detect & set line endings */ + editor_mode = utils_get_line_endings(filedata.data, filedata.len); + sci_set_eol_mode(doc->editor->sci, editor_mode); + g_free(filedata.data); - doc->priv->mtime = filedata.mtime; /* get the modification time from file and keep it */ - g_free(doc->encoding); /* if reloading, free old encoding */ - doc->encoding = filedata.enc; - doc->has_bom = filedata.bom; - store_saved_encoding(doc); /* store the opened encoding for undo/redo */ + sci_set_undo_collection(doc->editor->sci, TRUE); - doc->readonly = readonly || filedata.readonly; - sci_set_readonly(doc->editor->sci, doc->readonly); + doc->priv->mtime = filedata.mtime; /* get the modification time from file and keep it */ + g_free(doc->encoding); /* if reloading, free old encoding */ + doc->encoding = filedata.enc; + doc->has_bom = filedata.bom; + store_saved_encoding(doc); /* store the opened encoding for undo/redo */ - /* update line number margin width */ - doc->priv->line_count = sci_get_line_count(doc->editor->sci); - sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + doc->readonly = readonly || filedata.readonly; + sci_set_readonly(doc->editor->sci, doc->readonly); - /* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */ - set_cursor_position(doc->editor, pos); + /* update line number margin width */ + doc->priv->line_count = sci_get_line_count(doc->editor->sci); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); - if (! reload) - { + if (! reload) + { - /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ - g_signal_connect(doc->editor->sci, "sci-notify", G_CALLBACK(editor_sci_notify_cb), - doc->editor); + /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ + g_signal_connect(doc->editor->sci, "sci-notify", G_CALLBACK(editor_sci_notify_cb), + doc->editor); - use_ft = (ft != NULL) ? ft : filetypes_detect_from_document(doc); - } - else - { /* reloading */ - document_undo_clear(doc); + use_ft = (ft != NULL) ? ft : filetypes_detect_from_document(doc); + } + else + { /* reloading */ + document_undo_clear(doc); - use_ft = ft; - } - /* update taglist, typedef keywords and build menu if necessary */ - document_set_filetype(doc, use_ft); + use_ft = ft; + } + /* update taglist, typedef keywords and build menu if necessary */ + document_set_filetype(doc, use_ft); - /* set indentation settings after setting the filetype */ - if (reload) - editor_set_indent_type(doc->editor, doc->editor->indent_type); /* resetup sci */ - else - set_indentation(doc->editor); + /* set indentation settings after setting the filetype */ + if (reload) + editor_set_indent_type(doc->editor, doc->editor->indent_type); /* resetup sci */ + else + document_apply_indent_settings(doc); - document_set_text_changed(doc, FALSE); /* also updates tab state */ - ui_document_show_hide(doc); /* update the document menu */ + document_set_text_changed(doc, FALSE); /* also updates tab state */ + ui_document_show_hide(doc); /* update the document menu */ - /* finally add current file to recent files menu, but not the files from the last session */ - if (! main_status.opening_session_files) - ui_add_recent_file(utf8_filename); + /* finally add current file to recent files menu, but not the files from the last session */ + if (! main_status.opening_session_files) + ui_add_recent_file(utf8_filename); - if (! reload) - g_signal_emit_by_name(geany_object, "document-open", doc); + if (! reload) + g_signal_emit_by_name(geany_object, "document-open", doc); - if (reload) - ui_set_statusbar(TRUE, _("File %s reloaded."), display_filename); - else - /* For translators: this is the status window message for opening a file. %d is the number - * of the newly opened file, %s indicates whether the file is opened read-only - * (it is replaced with the string ", read-only"). */ - msgwin_status_add(_("File %s opened(%d%s)."), - display_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)), - (readonly) ? _(", read-only") : ""); + if (reload) + ui_set_statusbar(TRUE, _("File %s reloaded."), display_filename); + else + /* For translators: this is the status window message for opening a file. %d is the number + * of the newly opened file, %s indicates whether the file is opened read-only + * (it is replaced with the string ", read-only"). */ + msgwin_status_add(_("File %s opened(%d%s)."), + display_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)), + (readonly) ? _(", read-only") : ""); + } g_free(display_filename); g_free(utf8_filename); @@ -1323,6 +1357,14 @@ * based on a configurable interval */ /*g_timeout_add(10000, auto_update_tag_list, doc);*/ + /* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */ + pos = set_cursor_position(doc->editor, pos); + /* now bring the file in front */ + editor_goto_pos(doc->editor, pos, FALSE); + + /* finally, let the editor widget grab the focus so you can start coding + * right away */ + g_idle_add(on_idle_focus, doc); return doc; } @@ -1383,6 +1425,7 @@ } } + /** * Reloads the document with the specified file encoding * @a forced_enc or @c NULL to auto-detect the file encoding. @@ -1464,21 +1507,24 @@ g_return_if_fail(doc != NULL); g_return_if_fail(doc->file_type != NULL); - filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc->file_type)->extension, NULL); + if (doc->file_type->extension) + filebase = g_strconcat("\\<", GEANY_STRING_UNTITLED, "\\.\\w+", NULL); + else + filebase = g_strdup(GEANY_STRING_UNTITLED); + filename = g_path_get_basename(doc->file_name); /* only search the first 3 lines */ ttf.chrg.cpMin = 0; ttf.chrg.cpMax = sci_get_position_from_line(doc->editor->sci, 3); - ttf.lpstrText = (gchar*)filebase; + ttf.lpstrText = filebase; - if (sci_find_text(doc->editor->sci, SCFIND_MATCHCASE, &ttf) != -1) + if (search_find_text(doc->editor->sci, SCFIND_MATCHCASE | SCFIND_REGEXP, &ttf) != -1) { sci_set_target_start(doc->editor->sci, ttf.chrgText.cpMin); sci_set_target_end(doc->editor->sci, ttf.chrgText.cpMax); sci_replace_target(doc->editor->sci, filename, FALSE); } - g_free(filebase); g_free(filename); } @@ -1516,6 +1562,16 @@ } +/* Return TRUE if the document hasn't been saved before, i.e. either the filename or + * the real_path is not set. */ +gboolean document_need_save_as(GeanyDocument *doc) +{ + g_return_val_if_fail(doc != NULL, FALSE); + + return (doc->file_name == NULL || doc->real_path == NULL); +} + + /** * Saves the document, detecting the filetype. * @@ -1642,10 +1698,7 @@ g_return_val_if_fail(doc != NULL, g_strdup(g_strerror(EINVAL))); g_return_val_if_fail(data != NULL, g_strdup(g_strerror(EINVAL))); - /* we never use g_file_set_contents() for remote files as Geany only writes such files - * 'into' the Fuse mountpoint, the file itself is then written by GVfs on the target - * remote filesystem. */ - if (! file_prefs.use_safe_file_saving || doc->priv->is_remote) + if (! file_prefs.use_safe_file_saving) { fp = g_fopen(locale_filename, "wb"); if (G_UNLIKELY(fp == NULL)) @@ -1685,10 +1738,12 @@ /** - * Save the document. Saving includes replacing tabs by spaces, + * Saves the document. Saving includes replacing tabs by spaces, * stripping trailing spaces and adding a final new line at the end of the file (all only if - * user enabled these features). The filetype is set again or auto-detected if it wasn't - * set yet. After all, the "document-save" signal is emitted for plugins. + * user enabled these features). Then the @c "document-before-save" signal is emitted, + * allowing plugins to modify the document before it is saved, and data is + * actually written to disk. The filetype is set again or auto-detected if it wasn't set yet. + * Afterwards, the @c "document-save" signal is emitted for plugins. * * If the file is not modified, this functions does nothing unless force is set to @c TRUE. * @@ -1727,6 +1782,9 @@ if (file_prefs.final_new_line) editor_ensure_final_newline(doc->editor); + /* notify plugins which may wish to modify the document before it's saved */ + g_signal_emit_by_name(geany_object, "document-before-save", doc); + len = sci_get_length(doc->editor->sci) + 1; if (doc->has_bom && encodings_is_unicode_charset(doc->encoding)) { /* always write a UTF-8 BOM because in this moment the text itself is still in UTF-8 @@ -1749,7 +1807,7 @@ if (doc->encoding != NULL && ! utils_str_equal(doc->encoding, "UTF-8") && ! utils_str_equal(doc->encoding, encodings[GEANY_ENCODING_NONE].charset)) { - if (! save_convert_to_encoding(doc, &data, &len)) + if (! save_convert_to_encoding(doc, &data, &len)) { g_free(data); return FALSE; @@ -1903,7 +1961,7 @@ if (search_backwards) search_pos = sci_search_prev(doc->editor->sci, flags, text); else - search_pos = sci_search_next(doc->editor->sci, flags, text); + search_pos = search_find_next(doc->editor->sci, text, flags); if (search_pos != -1) { @@ -1987,7 +2045,7 @@ gint replace_len; /* search next/prev will select matching text, which we use to set the replace target */ sci_target_from_selection(doc->editor->sci); - replace_len = sci_replace_target(doc->editor->sci, replace_text, flags & SCFIND_REGEXP); + replace_len = search_replace_target(doc->editor->sci, replace_text, flags & SCFIND_REGEXP); /* select the replacement - find text will skip past the selected text */ sci_set_selection_start(doc->editor->sci, search_pos); sci_set_selection_end(doc->editor->sci, search_pos + replace_len); @@ -2060,54 +2118,12 @@ sci = doc->editor->sci; - sci_start_undo_action(sci); ttf.chrg.cpMin = start; ttf.chrg.cpMax = end; ttf.lpstrText = (gchar*)find_text; - while (TRUE) - { - gint search_pos; - gint find_len = 0, replace_len = 0; - - search_pos = sci_find_text(sci, flags, &ttf); - find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; - if (search_pos == -1) - break; /* no more matches */ - if (find_len == 0 && ! NZV(replace_text)) - break; /* nothing to do */ - - if (search_pos + find_len > end) - break; /* found text is partly out of range */ - else - { - gint movepastEOL = 0; - - sci_set_target_start(sci, search_pos); - sci_set_target_end(sci, search_pos + find_len); - - if (find_len <= 0) - { - gchar chNext = sci_get_char_at(sci, sci_get_target_end(sci)); - - if (chNext == '\r' || chNext == '\n') - movepastEOL = 1; - } - replace_len = sci_replace_target(sci, replace_text, - flags & SCFIND_REGEXP); - count++; - if (search_pos == end) - break; /* Prevent hang when replacing regex $ */ - - /* make the next search start after the replaced text */ - start = search_pos + replace_len + movepastEOL; - if (find_len == 0) - start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */ - ttf.chrg.cpMin = start; - end += replace_len - find_len; /* update end of range now text has changed */ - ttf.chrg.cpMax = end; - } - } + sci_start_undo_action(sci); + count = search_replace_range(sci, &ttf, flags, replace_text); sci_end_undo_action(sci); if (count > 0) @@ -2116,7 +2132,7 @@ sci_goto_pos(sci, ttf.chrg.cpMin, TRUE); if (new_range_end != NULL) - *new_range_end = end; + *new_range_end = ttf.chrg.cpMax; } return count; } @@ -2224,8 +2240,8 @@ } -/* returns TRUE if at least one replacement was made. */ -gboolean document_replace_all(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, +/* returns number of replacements made. */ +gint document_replace_all(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, gint flags, gboolean escaped_chars) { gint len, count; @@ -2239,7 +2255,7 @@ doc, find_text, replace_text, flags, 0, len, TRUE, NULL); show_replace_summary(doc, count, find_text, replace_text, escaped_chars); - return (count > 0); + return count; } @@ -2265,7 +2281,7 @@ void document_update_tag_list(GeanyDocument *doc, gboolean update) { - /* We must call treeviews_update_tag_list() before returning, + /* We must call sidebar_update_tag_list() before returning, * to ensure that the symbol list is always updated properly (e.g. * when creating a new document with a partial filename set. */ gboolean success = FALSE; @@ -2275,15 +2291,18 @@ ! filetype_has_tags(doc->file_type) || ! doc->file_name) { /* set the default (empty) tag list */ - treeviews_update_tag_list(doc, FALSE); + sidebar_update_tag_list(doc, FALSE); return; } if (doc->tm_file == NULL) { gchar *locale_filename = utils_get_locale_from_utf8(doc->file_name); + const gchar *name; - doc->tm_file = tm_source_file_new(locale_filename, FALSE, doc->file_type->name); + /* lookup the name rather than using filetype name to support custom filetypes */ + name = tm_source_file_get_lang_name(doc->file_type->lang); + doc->tm_file = tm_source_file_new(locale_filename, FALSE, name); g_free(locale_filename); if (doc->tm_file) @@ -2307,7 +2326,7 @@ if (G_UNLIKELY(! success)) geany_debug("tag list updating failed"); } - treeviews_update_tag_list(doc, success); + sidebar_update_tag_list(doc, success); } @@ -2428,7 +2447,11 @@ tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); doc->tm_file = NULL; } - highlighting_set_styles(doc->editor->sci, type->id); + /* load tags files before highlighting (some lexers highlight global typenames) */ + if (type->id != GEANY_FILETYPES_NONE) + symbols_global_tags_loaded(type->id); + + highlighting_set_styles(doc->editor->sci, type); editor_set_indentation_guides(doc->editor); build_menu_update(doc); queue_colourise(doc); @@ -2447,11 +2470,13 @@ void document_set_filetype(GeanyDocument *doc, GeanyFiletype *type) { gboolean ft_changed; + GeanyFiletype *old_ft; g_return_if_fail(doc); if (type == NULL) type = filetypes[GEANY_FILETYPES_NONE]; + old_ft = doc->file_type; geany_debug("%s : %s (%s)", (doc->file_name != NULL) ? doc->file_name : "unknown", (type->name != NULL) ? type->name : "unknown", @@ -2459,6 +2484,9 @@ ft_changed = (doc->file_type != type); /* filetype has changed */ document_load_config(doc, type, ft_changed); + + if (ft_changed) + g_signal_emit_by_name(geany_object, "document-filetype-set", doc, old_ft); } @@ -2717,13 +2745,13 @@ /** - * Gets the status colour of the document, or @c NULL if default widget colouring should be used. - * Returned colours are red if the document has changes, green is the document is read-only + * Gets the status color of the document, or @c NULL if default widget coloring should be used. + * Returned colors are red if the document has changes, green if the document is read-only * or simply @c NULL if the document is unmodified but writable. * * @param doc The document to use. * - * @return The colour for the document or @c NULL if the default colour should be used. The colour + * @return The color for the document or @c NULL if the default color should be used. The color * object is owned by Geany and should not be modified or freed. * * @since 0.16 @@ -2806,7 +2834,7 @@ for (p = 0; p < page_count; p++) { doc = document_get_from_page(p); - if (doc->changed) + if (DOC_VALID(doc) && doc->changed) { if (! dialogs_show_unsaved_file(doc)) return FALSE; @@ -2839,9 +2867,9 @@ } main_status.closing_all = TRUE; - while (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) > 0) + foreach_document(i) { - document_remove_page(0); + document_close(documents[i]); } main_status.closing_all = FALSE; @@ -2870,7 +2898,7 @@ base_name); if (want_reload) - document_reload_file(doc, NULL); + document_reload_file(doc, doc->encoding); g_free(base_name); return want_reload; @@ -2880,19 +2908,33 @@ static gboolean monitor_resave_missing_file(GeanyDocument *doc) { gboolean want_reload = FALSE; + gboolean file_saved = FALSE; + gint ret; - /* file is missing - set unsaved state */ - document_set_text_changed(doc, TRUE); - /* don't prompt more than once */ - setptr(doc->real_path, NULL); - - if (dialogs_show_question_full(NULL, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, - _("Try to resave the file?"), - _("File \"%s\" was not found on disk!"), doc->file_name)) + ret = dialogs_show_prompt(NULL, + _("Close _without saving"), GTK_RESPONSE_CLOSE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL, + _("File \"%s\" was not found on disk! Try to resave the file?"), + doc->file_name); + if (ret == GTK_RESPONSE_ACCEPT) { - dialogs_show_save_as(); + file_saved = dialogs_show_save_as(); want_reload = TRUE; } + else if (ret == GTK_RESPONSE_CLOSE) + { + document_close(doc); + } + if (ret != GTK_RESPONSE_CLOSE && ! file_saved) + { + /* file is missing - set unsaved state */ + document_set_text_changed(doc, TRUE); + /* don't prompt more than once */ + setptr(doc->real_path, NULL); + } + return want_reload; } @@ -2950,11 +2992,13 @@ } g_free(locale_filename); - old_status = doc->priv->file_disk_status; - doc->priv->file_disk_status = FILE_OK; - if (old_status != doc->priv->file_disk_status) - ui_update_tab_status(doc); - + if (DOC_VALID(doc)) + { /* doc can get invalid when a document was closed by monitor_resave_missing_file() */ + old_status = doc->priv->file_disk_status; + doc->priv->file_disk_status = FILE_OK; + if (old_status != doc->priv->file_disk_status) + ui_update_tab_status(doc); + } return ret; } diff -Nru geany-0.18/src/document.h geany-0.19/src/document.h --- geany-0.18/src/document.h 2009-08-09 21:31:03.000000000 +0100 +++ geany-0.19/src/document.h 2010-05-16 18:45:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * document.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: document.h 4063 2009-08-09 20:31:03Z eht16 $ + * $Id: document.h 4928 2010-05-16 17:45:39Z eht16 $ */ /** @@ -51,6 +51,7 @@ gboolean strip_trailing_spaces; gboolean replace_tabs; gboolean tab_order_ltr; + gboolean tab_order_beside; gboolean show_tab_cross; guint mru_length; gint default_eol_character; @@ -109,15 +110,23 @@ extern GPtrArray *documents_array; -/** Wrap documents_array so it can be used with C array syntax. +/** Wraps documents_array so it can be used with C array syntax. * Example: documents[0]->sci = NULL; * @see document_index(). */ #define documents ((GeanyDocument **)GEANY(documents_array)->pdata) +/** @deprecated Use @ref foreach_document() instead. + * Iterates all valid documents. + * Use like a @c for statement. + * @param i @c guint index for document_index(). */ +#ifndef GEANY_DISABLE_DEPRECATED +#define documents_foreach(i) foreach_document(i) +#endif + /** Iterates all valid documents. * Use like a @c for statement. * @param i @c guint index for document_index(). */ -#define documents_foreach(i) \ +#define foreach_document(i) \ for (i = 0; i < GEANY(documents_array)->len; i++)\ if (!documents[i]->is_valid)\ {}\ @@ -132,8 +141,8 @@ (G_LIKELY((doc_ptr) != NULL) && G_LIKELY((doc_ptr)->is_valid)) /** - * DOC_FILENAME returns the filename of the document passed or - * GEANY_STRING_UNTITLED (e.g. _("untitled")) if the document's filename was not yet set. + * Returns the filename of the document passed or @c GEANY_STRING_UNTITLED + * (e.g. _("untitled")) if the document's filename was not yet set. * This macro never returns @c NULL. **/ #define DOC_FILENAME(doc) \ @@ -184,6 +193,8 @@ gboolean document_remove_page(guint page_num); +void document_try_focus(GeanyDocument *doc, GtkWidget *source_widget); + gboolean document_close(GeanyDocument *doc); gboolean document_account_for_unsaved(void); @@ -208,7 +219,7 @@ gint document_replace_text(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, gint flags, gboolean search_backwards); -gboolean document_replace_all(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, +gint document_replace_all(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, gint flags, gboolean escaped_chars); void document_replace_sel(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, gint flags, @@ -240,4 +251,8 @@ gchar *document_get_basename_for_display(GeanyDocument *doc, gint length); +gboolean document_need_save_as(GeanyDocument *doc); + +void document_apply_indent_settings(GeanyDocument *doc); + #endif diff -Nru geany-0.18/src/documentprivate.h geany-0.19/src/documentprivate.h --- geany-0.18/src/documentprivate.h 2009-08-09 21:31:03.000000000 +0100 +++ geany-0.19/src/documentprivate.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * document-private.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: documentprivate.h 4063 2009-08-09 20:31:03Z eht16 $ + * $Id: documentprivate.h 4518 2010-01-01 22:55:18Z eht16 $ */ diff -Nru geany-0.18/src/editor.c geany-0.19/src/editor.c --- geany-0.18/src/editor.c 2009-08-15 18:21:30.000000000 +0100 +++ geany-0.19/src/editor.c 2010-06-10 16:43:50.000000000 +0100 @@ -1,9 +1,9 @@ /* * editor.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven - * Copyright 2009 Frank Lanitz + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven + * Copyright 2009-2010 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 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: editor.c 4087 2009-08-15 17:21:30Z eht16 $ + * $Id: editor.c 5015 2010-06-10 15:43:50Z ntrel $ */ /** @@ -44,6 +44,12 @@ #include "SciLexer.h" #include "geany.h" +#ifdef HAVE_REGEX_H +# include +#else +# include "gnuregex.h" +#endif + #include "support.h" #include "editor.h" #include "document.h" @@ -59,14 +65,16 @@ #include "keybindings.h" #include "project.h" #include "projectprivate.h" -#include "queue.h" +#include "main.h" -/* Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. */ +/* Note: use sciwrappers.h instead where possible. + * Do not use SSM in files unrelated to scintilla. */ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) -static GeanyQueue *snippet_queue = NULL; +static GHashTable *snippet_hash = NULL; +static GQueue *snippet_offsets = NULL; static gint snippet_cursor_insert_pos; /* holds word under the mouse or keyboard cursor */ @@ -87,6 +95,14 @@ ScintillaObject *sci; } calltip = {NULL, FALSE, NULL, 0, 0, NULL}; +static enum +{ + AUTOC_CANCELLED, + AUTOC_SCOPE, + AUTOC_TAGS, + AUTOC_DOC_WORDS +} autocompletion_mode = AUTOC_CANCELLED; + static gchar indent[100]; @@ -100,13 +116,15 @@ static void auto_table(GeanyEditor *editor, gint pos); static void close_block(GeanyEditor *editor, gint pos); static void editor_highlight_braces(GeanyEditor *editor, gint cur_pos); -static void editor_auto_latex(GeanyEditor *editor, gint pos); +static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, + const gchar *wc, gboolean stem); +static gsize count_indent_size(GeanyEditor *editor, const gchar *base_indent); void editor_snippets_free(void) { - g_hash_table_destroy(editor_prefs.snippets); - queue_destroy(snippet_queue); + g_hash_table_destroy(snippet_hash); + g_queue_free(snippet_offsets); } @@ -121,7 +139,7 @@ GKeyFile *userconfig = g_key_file_new(); GHashTable *tmp; - snippet_queue = queue_init(); + snippet_offsets = g_queue_new(); sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, "snippets.conf", NULL); userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "snippets.conf", NULL); @@ -136,7 +154,7 @@ g_key_file_load_from_file(userconfig, userconfigfile, G_KEY_FILE_NONE, NULL); /* keys are strings, values are GHashTables, so use g_free and g_hash_table_destroy */ - editor_prefs.snippets = + snippet_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_hash_table_destroy); /* first read all globally defined auto completions */ @@ -146,7 +164,7 @@ keys_sys = g_key_file_get_keys(sysconfig, groups_sys[i], &len_keys, NULL); /* create new hash table for the read section (=> filetype) */ tmp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - g_hash_table_insert(editor_prefs.snippets, g_strdup(groups_sys[i]), tmp); + g_hash_table_insert(snippet_hash, g_strdup(groups_sys[i]), tmp); for (j = 0; j < len_keys; j++) { @@ -162,11 +180,11 @@ { keys_user = g_key_file_get_keys(userconfig, groups_user[i], &len_keys, NULL); - tmp = g_hash_table_lookup(editor_prefs.snippets, groups_user[i]); + tmp = g_hash_table_lookup(snippet_hash, groups_user[i]); if (tmp == NULL) { /* new key found, create hash table */ tmp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - g_hash_table_insert(editor_prefs.snippets, g_strdup(groups_user[i]), tmp); + g_hash_table_insert(snippet_hash, g_strdup(groups_user[i]), tmp); } for (j = 0; j < len_keys; j++) { @@ -270,27 +288,61 @@ } -static void fold_symbol_click(ScintillaObject *sci, SCNotification *nt) +gint editor_get_long_line_type(void) { - gint line = sci_get_line_from_position(sci, nt->position); + if (app->project) + switch (app->project->long_line_behaviour) + { + case 0: /* marker disabled */ + return 2; + case 1: /* use global settings */ + break; + case 2: /* custom (enabled) */ + return editor_prefs.long_line_global_type; + } + + if (!editor_prefs.long_line_global_enabled) + return 2; + else + return editor_prefs.long_line_global_type; +} + + +gint editor_get_long_line_column(void) +{ + if (app->project && app->project->long_line_behaviour != 1 /* use global settings */) + return app->project->long_line_column; + else + return editor_prefs.long_line_global_column; +} + + +void editor_toggle_fold(GeanyEditor *editor, gint line, gint modifiers) +{ + ScintillaObject *sci; + + g_return_if_fail(editor != NULL); + + sci = editor->sci; + + sci_toggle_fold(sci, line); - SSM(sci, SCI_TOGGLEFOLD, line, 0); /* extra toggling of child fold points * use when editor_prefs.unfold_all_children is set and Shift is NOT pressed or when * editor_prefs.unfold_all_children is NOT set but Shift is pressed */ - if ((editor_prefs.unfold_all_children && ! (nt->modifiers & SCMOD_SHIFT)) || - (! editor_prefs.unfold_all_children && (nt->modifiers & SCMOD_SHIFT))) + if ((editor_prefs.unfold_all_children && ! (modifiers & SCMOD_SHIFT)) || + (! editor_prefs.unfold_all_children && (modifiers & SCMOD_SHIFT))) { gint last_line = SSM(sci, SCI_GETLASTCHILD, line, -1); gint i; - if (SSM(sci, SCI_GETLINEVISIBLE, line + 1, 0)) + if (sci_get_line_is_visible(sci, line + 1)) { /* unfold all children of the current fold point */ for (i = line; i < last_line; i++) { - if (! SSM(sci, SCI_GETLINEVISIBLE, i, 0)) + if (! sci_get_line_is_visible(sci, i)) { - SSM(sci, SCI_TOGGLEFOLD, SSM(sci, SCI_GETFOLDPARENT, i, 0), 0); + sci_toggle_fold(sci, sci_get_fold_parent(sci, i)); } } } @@ -301,8 +353,8 @@ gint level = sci_get_fold_level(sci, i); if (level & SC_FOLDLEVELHEADERFLAG) { - if (SSM(sci, SCI_GETFOLDEXPANDED, i, 0)) - SSM(sci, SCI_TOGGLEFOLD, i, 0); + if (sci_get_fold_expanded(sci, i)) + sci_toggle_fold(sci, i); } } } @@ -310,21 +362,21 @@ } -static void on_margin_click(ScintillaObject *sci, SCNotification *nt) +static void on_margin_click(GeanyEditor *editor, SCNotification *nt) { /* left click to marker margin marks the line */ if (nt->margin == 1) { - gint line = sci_get_line_from_position(sci, nt->position); - gboolean set = sci_is_marker_set_at_line(sci, line, 1); + gint line = sci_get_line_from_position(editor->sci, nt->position); /*sci_marker_delete_all(editor->sci, 1);*/ - sci_set_marker_at_line(sci, line, ! set, 1); /* toggle the marker */ + sci_toggle_marker_at_line(editor->sci, line, 1); /* toggle the marker */ } /* left click on the folding margin to toggle folding state of current line */ else if (nt->margin == 2 && editor_prefs.folding) { - fold_symbol_click(sci, nt); + gint line = sci_get_line_from_position(editor->sci, nt->position); + editor_toggle_fold(editor, line, nt->modifiers); } } @@ -489,17 +541,8 @@ } -typedef struct -{ - gint message; - gint pos; - gchar *text; -} CalltipReshowInfo; - - static gboolean reshow_calltip(gpointer data) { - CalltipReshowInfo *cri = data; GeanyDocument *doc; g_return_val_if_fail(calltip.sci != NULL, FALSE); @@ -512,22 +555,7 @@ /* we use the position where the calltip was previously started as SCI_GETCURRENTPOS * may be completely wrong in case the user cancelled the auto completion with the mouse */ SSM(calltip.sci, SCI_CALLTIPSHOW, calltip.pos, (sptr_t) calltip.text); - - /* now autocompletion has been cancelled by SCI_CALLTIPSHOW, so do it manually */ - if (cri->message == SCN_AUTOCSELECTION) - { - gint pos = SSM(calltip.sci, SCI_GETCURRENTPOS, 0, 0); - - sci_set_selection_start(calltip.sci, cri->pos); - sci_set_selection_end(calltip.sci, pos); - sci_replace_sel(calltip.sci, ""); /* clear root of word */ - SSM(calltip.sci, SCI_INSERTTEXT, cri->pos, (sptr_t) cri->text); - sci_goto_pos(calltip.sci, cri->pos + strlen(cri->text), FALSE); - } } - g_free(cri->text); - g_free(cri); - return FALSE; } @@ -536,16 +564,13 @@ { if (calltip.set) { - CalltipReshowInfo *cri = g_new0(CalltipReshowInfo, 1); - cri->message = nt->nmhdr.code; - cri->message = nt->lParam; - cri->text = g_strdup(nt->text); /* delay the reshow of the calltip window to make sure it is actually displayed, * without it might be not visible on SCN_AUTOCCANCEL */ - g_idle_add(reshow_calltip, cri); + g_idle_add(reshow_calltip, NULL); } } + static void autocomplete_scope(GeanyEditor *editor) { ScintillaObject *sci = editor->sci; @@ -587,7 +612,10 @@ tags = tm_workspace_find_scope_members(obj ? obj->tags_array : NULL, name, TRUE, FALSE); if (tags) + { + autocompletion_mode = AUTOC_SCOPE; show_tags_list(editor, tags, 0); + } } } @@ -705,7 +733,7 @@ { if (doExpand) { - if (!SSM(sci, SCI_GETFOLDEXPANDED, *line, 0)) + if (!sci_get_fold_expanded(sci, *line)) SSM(sci, SCI_SETFOLDEXPANDED, *line, 1); expand(sci, line, TRUE, force, visLevels - 1, -1); } @@ -736,7 +764,7 @@ } else if (levelPrev & SC_FOLDLEVELHEADERFLAG) { - if (! SSM(sci, SCI_GETFOLDEXPANDED, line, 0)) + if (! sci_get_fold_expanded(sci, line)) { /* Removing the fold from one that has been contracted so should expand * otherwise lines are left invisible with no way to make them visible */ SSM(sci, SCI_SETFOLDEXPANDED, line, 1); @@ -747,13 +775,13 @@ ((levelPrev & SC_FOLDLEVELNUMBERMASK) > (levelNow & SC_FOLDLEVELNUMBERMASK))) { /* See if should still be hidden */ - gint parentLine = SSM(sci, SCI_GETFOLDPARENT, line, 0); + gint parentLine = sci_get_fold_parent(sci, line); if (parentLine < 0) { SSM(sci, SCI_SHOWLINES, line, line); } - else if (SSM(sci, SCI_GETFOLDEXPANDED, parentLine, 0) && - SSM(sci, SCI_GETLINEVISIBLE, parentLine, 0)) + else if (sci_get_fold_expanded(sci, parentLine) && + sci_get_line_is_visible(sci, parentLine)) { SSM(sci, SCI_SHOWLINES, line, line); } @@ -792,6 +820,54 @@ } +static void partial_complete(ScintillaObject *sci, const gchar *text) +{ + gint pos = sci_get_current_position(sci); + + sci_insert_text(sci, pos, text); + sci_set_current_position(sci, pos + strlen(text), TRUE); +} + + +/* Complete the next word part from @a entry */ +static gboolean check_partial_completion(GeanyEditor *editor, const gchar *entry) +{ + gchar *stem, *ptr, *text = utils_strdupa(entry); + + read_current_word(editor, -1, current_word, sizeof current_word, NULL, TRUE); + stem = current_word; + if (strstr(text, stem) != text) + return FALSE; /* shouldn't happen */ + if (strlen(text) <= strlen(stem)) + return FALSE; + + text += strlen(stem); /* skip stem */ + ptr = strstr(text + 1, "_"); + if (ptr) + { + ptr[1] = '\0'; + partial_complete(editor->sci, text); + return TRUE; + } + else + { + /* CamelCase */ + foreach_str(ptr, text + 1) + { + if (!ptr[0]) + break; + if (g_ascii_isupper(*ptr) && g_ascii_islower(ptr[1])) + { + ptr[0] = '\0'; + partial_complete(editor->sci, text); + return TRUE; + } + } + } + return FALSE; +} + + /* Callback for the "sci-notify" signal to emit a "editor-notify" signal. * Plugins can connect to the "editor-notify" signal. */ void editor_sci_notify_cb(G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED gint scn, @@ -815,22 +891,19 @@ switch (nt->nmhdr.code) { case SCN_SAVEPOINTLEFT: - { document_set_text_changed(doc, TRUE); break; - } + case SCN_SAVEPOINTREACHED: - { document_set_text_changed(doc, FALSE); break; - } + case SCN_MODIFYATTEMPTRO: - { utils_beep(); break; - } + case SCN_MARGINCLICK: - on_margin_click(sci, nt); + on_margin_click(editor, nt); break; case SCN_UPDATEUI: @@ -838,13 +911,11 @@ break; case SCN_MODIFIED: - { if (editor_prefs.show_linenumber_margin && (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) && nt->linesAdded) { /* automatically adjust Scintilla's line numbers margin width */ auto_update_margin_width(editor); } - if (nt->modificationType & SC_STARTACTION && ! ignore_callback) { /* get notified about undo changes */ @@ -856,19 +927,18 @@ fold_changed(sci, nt->line, nt->foldLevelNow, nt->foldLevelPrev); } break; - } + case SCN_CHARADDED: on_char_added(editor, nt); break; case SCN_USERLISTSELECTION: - { if (nt->listType == 1) { - SSM(sci, SCI_ADDTEXT, strlen(nt->text), (sptr_t) nt->text); + sci_add_text(sci, nt->text); } break; - } + case SCN_AUTOCSELECTION: if (g_str_equal(nt->text, "...")) { @@ -878,34 +948,29 @@ } /* fall through */ case SCN_AUTOCCANCELLED: - { /* now that autocomplete is finishing or was cancelled, reshow calltips * if they were showing */ + autocompletion_mode = AUTOC_CANCELLED; request_reshowing_calltip(nt); break; - } + #ifdef GEANY_DEBUG case SCN_STYLENEEDED: - { geany_debug("style"); break; - } #endif case SCN_NEEDSHOWN: - { ensure_range_visible(sci, nt->position, nt->position + nt->length, FALSE); break; - } + case SCN_URIDROPPED: - { if (nt->text != NULL) { document_open_file_list(nt->text, -1); } break; - } + case SCN_CALLTIPCLICK: - { if (nt->position > 0) { switch (nt->position) @@ -920,7 +985,11 @@ editor_show_calltip(editor, -1); } break; - } + + case SCN_ZOOM: + /* recalculate line margin width */ + sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin, 0); + break; } /* we always return FALSE here to let plugins handle the event too */ return FALSE; @@ -982,7 +1051,7 @@ } -/** Get the indentation prefs for the editor. +/** Gets the indentation prefs for the editor. * In future, the prefs might be different according to project or filetype. * @warning Always get a fresh result instead of keeping a pointer to it if the editor * settings may have changed, or if this function has been called for a different @a editor. @@ -1015,7 +1084,6 @@ static void on_new_line_added(GeanyEditor *editor) { ScintillaObject *sci = editor->sci; - gint pos = sci_get_current_position(sci); gint line = sci_get_current_line(sci); /* simple indentation */ @@ -1029,11 +1097,6 @@ auto_multiline(editor, line); } - if (editor_prefs.complete_snippets) - { - editor_auto_latex(editor, pos); - } - if (editor_prefs.newline_strip) { /* strip the trailing spaces on the previous line */ editor_strip_line_trailing_spaces(editor, line - 1); @@ -1043,7 +1106,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) { - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); + gint lexer = sci_get_lexer(sci); switch (lexer) { @@ -1293,7 +1356,7 @@ line = sci_get_line_from_position(sci, pos); line_len = sci_get_line_length(sci, line); /* set eol_char_len to 0 if on last line, because there is no EOL char */ - eol_char_len = (line == (SSM(sci, SCI_GETLINECOUNT, 0, 0) - 1)) ? 0 : + eol_char_len = (line == (sci_get_line_count(sci) - 1)) ? 0 : editor_get_eol_char_len(editor); /* check that the line is empty, to not kill text in the line */ @@ -1324,7 +1387,7 @@ text = g_strconcat(ind, "}", NULL); line_start = sci_get_position_from_line(sci, line); sci_set_anchor(sci, line_start); - SSM(sci, SCI_REPLACESEL, 0, (sptr_t) text); + sci_replace_sel(sci, text); g_free(text); g_free(ind); return; @@ -1349,7 +1412,7 @@ * position can be -1, then the current position is used. * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */ static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, - const gchar *wc, gboolean stem) + const gchar *wc, gboolean stem) { gint line, line_start, startword, endword; gchar *chunk; @@ -1453,10 +1516,10 @@ gchar c; gint orig_pos = pos; - c = SSM(sci, SCI_GETCHARAT, pos, 0); + c = sci_get_char_at(sci, pos); while (pos >= 0 && pos > orig_pos - 300) { - c = SSM(sci, SCI_GETCHARAT, pos, 0); + c = sci_get_char_at(sci, pos); pos--; if (utils_is_opening_brace(c, editor_prefs.brace_match_ltgt)) return pos; @@ -1471,10 +1534,10 @@ gint brackets = 0; gint orig_pos = pos; - c = SSM(sci, SCI_GETCHARAT, pos, 0); + c = sci_get_char_at(sci, pos); while (pos > 0 && pos > orig_pos - 300) { - c = SSM(sci, SCI_GETCHARAT, pos, 0); + c = sci_get_char_at(sci, pos); if (c == ')') brackets++; else if (c == '(') brackets--; pos--; @@ -1631,12 +1694,12 @@ sci = editor->sci; - lexer = SSM(sci, SCI_GETLEXER, 0, 0); + lexer = sci_get_lexer(sci); if (pos == -1) { /* position of '(' is unknown, so go backwards from current position to find it */ - pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); + pos = sci_get_current_position(sci); pos--; orig_pos = pos; pos = (lexer == SCLEX_LATEX) ? find_previous_brace(sci, pos) : @@ -1646,7 +1709,7 @@ } /* the style 1 before the brace (which may be highlighted) */ - style = SSM(sci, SCI_GETSTYLEAT, pos - 1, 0); + style = sci_get_style_at(sci, pos - 1); if (! is_code_style(lexer, style)) return FALSE; @@ -1736,6 +1799,7 @@ tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc->file_type->lang); if (tags) { + autocompletion_mode = AUTOC_TAGS; show_tags_list(editor, tags, rootlen); return tags->len > 0; } @@ -1765,15 +1829,13 @@ /* Algorithm based on based on Scite's StartAutoCompleteWord() */ -static gboolean autocomplete_doc_word(GeanyEditor *editor, gchar *root, gsize rootlen) +static GString *get_doc_words(ScintillaObject *sci, gchar *root, gsize rootlen) { - ScintillaObject *sci = editor->sci; gchar *word; gint len, current, word_end; gint pos_find, flags; guint word_length; gsize nmatches = 0; - gboolean ret = FALSE; GString *words; struct Sci_TextToFind ttf; @@ -1788,6 +1850,7 @@ flags = SCFIND_WORDSTART | SCFIND_MATCHCASE; words = g_string_sized_new(256); + /* put space before first entry to make searching with strstr easy */ g_string_append_c(words, ' '); /* search the whole document for the word root and collect results */ @@ -1816,10 +1879,7 @@ g_free(word); if (nmatches == editor_prefs.autocompletion_max_entries) - { - g_string_append(words, "... "); break; - } } } ttf.chrg.cpMin = word_end; @@ -1830,14 +1890,59 @@ { g_strdelimit(words->str, " ", '\n'); words->str[words->len - 1] = '\0'; /* remove the trailing '\n' */ - show_autocomplete(sci, rootlen, words->str + 1); - ret = TRUE; + return words; } - else + g_string_free(words, TRUE); + return NULL; +} + + +static gboolean autocomplete_doc_word(GeanyEditor *editor, gchar *root, gsize rootlen) +{ + ScintillaObject *sci = editor->sci; + GString *words; + GString *str; + gchar *ptr; + GSList *node, *list = NULL; + + words = get_doc_words(sci, root, rootlen); + if (!words) + { scintilla_send_message(sci, SCI_AUTOCCANCEL, 0, 0); + autocompletion_mode = AUTOC_CANCELLED; + return FALSE; + } + /* words are unsorted, make list of words */ + foreach_str(ptr, words->str) + { + if (*ptr == '\n') + { + list = g_slist_prepend(list, ptr + 1); + /* terminate previous string in list */ + ptr[0] = 0x0; + ptr++; + } + } + list = g_slist_sort(list, (GCompareFunc)utils_str_casecmp); + + str = g_string_sized_new(words->len); + foreach_slist(node, list) + { + g_string_append(str, node->data); + if (node->next) + g_string_append_c(str, '\n'); + } + if (g_slist_length(list) >= editor_prefs.autocompletion_max_entries) + g_string_append(str, "\n..."); + + g_slist_free(list); g_string_free(words, TRUE); - return ret; + + autocompletion_mode = AUTOC_DOC_WORDS; + show_autocomplete(sci, rootlen, str->str); + g_string_free(str, TRUE); + return TRUE; } @@ -1847,7 +1952,7 @@ gchar *linebuf, *root; ScintillaObject *sci; gboolean ret = FALSE; - gchar *wordchars; + const gchar *wordchars; GeanyFiletype *ft; if (! editor_prefs.auto_complete_symbols && ! force) @@ -1869,8 +1974,8 @@ line_pos = pos - line_start - 1; current = pos - line_start; startword = current; - lexer = SSM(sci, SCI_GETLEXER, 0, 0); - style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); + lexer = sci_get_lexer(sci); + style = sci_get_style_at(sci, pos - 2); /* don't autocomplete in comments and strings */ if (!force && !is_code_style(lexer, style)) @@ -1894,10 +1999,19 @@ root = linebuf + startword; rootlen = current - startword; - if (rootlen > 0) + if (rootlen > 0 && autocompletion_mode != AUTOC_SCOPE) { if (autocomplete_check_for_html(ft->id, style)) { + /* Allow something like ""some text"". The above startword calculation + * only works on words but for HTML entity completion we also want to have completion + * based on '&' within words. */ + gchar *tmp = strchr(root, '&'); + if (tmp != NULL) + { + root = tmp; + rootlen = strlen(tmp); + } ret = autocomplete_html(sci, root, rootlen); } else @@ -1924,95 +2038,14 @@ } -static void editor_auto_latex(GeanyEditor *editor, gint pos) -{ - ScintillaObject *sci; - - g_return_if_fail(editor != NULL); - - if (editor->document->file_type->id != GEANY_FILETYPES_LATEX) - return; - - sci = editor->sci; - - if (sci_get_char_at(sci, pos - 2) == '}') - { - gchar *eol, *buf, *construct; - gchar env[50]; - gint line = sci_get_line_from_position(sci, pos - 2); - gint line_len = sci_get_line_length(sci, line); - gint i, start; - - /* get the line */ - buf = sci_get_line(sci, line); - - /* get to the first non-blank char (some kind of ltrim()) */ - start = 0; - /*while (isspace(buf[i++])) start++;*/ - while (isspace(buf[start])) start++; - - /* check for begin */ - if (strncmp(buf + start, "\\begin", 6) == 0) - { - gchar full_cmd[15]; - guint j = 0; - - /* take also "\begingroup" (or whatever there can be) and - * append "\endgroup" and so on. */ - i = start + 6; - while (i < line_len && buf[i] != '{' && j < (sizeof(full_cmd) - 1)) - { /* copy all between "\begin" and "{" to full_cmd */ - full_cmd[j] = buf[i]; - i++; - j++; - } - full_cmd[j] = '\0'; - - /* go through the line and get the environment */ - for (i = start + j; i < line_len; i++) - { - if (buf[i] == '{') - { - j = 0; - i++; - while (buf[i] != '}' && j < (sizeof(env) - 1)) - { /* this could be done in a shorter way, but so it remains readable ;-) */ - env[j] = buf[i]; - j++; - i++; - } - env[j] = '\0'; - break; - } - } - - /* get the indentation */ - if (editor->auto_indent) - read_indent(editor, pos); - eol = g_strconcat(editor_get_eol_char(editor), indent, NULL); - - construct = g_strdup_printf("%s\\end%s{%s}", eol, full_cmd, env); - - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci,pos, TRUE); - g_free(construct); - g_free(eol); - } - /* later there could be some else ifs for other keywords */ - - g_free(buf); - } -} - - -static gchar *snippets_find_completion_by_name(const gchar *type, const gchar *name) +static const gchar *snippets_find_completion_by_name(const gchar *type, const gchar *name) { gchar *result = NULL; GHashTable *tmp; g_return_val_if_fail(type != NULL && name != NULL, NULL); - tmp = g_hash_table_lookup(editor_prefs.snippets, type); + tmp = g_hash_table_lookup(snippet_hash, type); if (tmp != NULL) { result = g_hash_table_lookup(tmp, name); @@ -2021,7 +2054,7 @@ * the particular completion for this filetype is not set (result is NULL) */ if (tmp == NULL || result == NULL) { - tmp = g_hash_table_lookup(editor_prefs.snippets, "Default"); + tmp = g_hash_table_lookup(snippet_hash, "Default"); if (tmp != NULL) { result = g_hash_table_lookup(tmp, name); @@ -2030,7 +2063,7 @@ /* if result is still NULL here, no completion could be found */ /* result is owned by the hash table and will be freed when the table will destroyed */ - return g_strdup(result); + return result; } @@ -2040,7 +2073,7 @@ * ac_complete_constructs. Any hints to improve this are welcome. */ static GString *snippets_global_pattern = NULL; -void snippets_replace_specials(gpointer key, gpointer value, gpointer user_data) +static void snippets_replace_specials(gpointer key, gpointer value, gpointer user_data) { gchar *needle; @@ -2054,20 +2087,6 @@ } -static void snippets_replace_wildcards(GeanyEditor *editor, GString *text) -{ - gchar *year = utils_get_date_time(template_prefs.year_format, NULL); - gchar *date = utils_get_date_time(template_prefs.date_format, NULL); - gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); - gchar *basename = g_path_get_basename(DOC_FILENAME(editor->document)); - - templates_replace_all(text, year, date, datetime); - utils_string_replace_all(text, "{filename}", basename); - - utils_free_pointers(4, year, date, datetime, basename, NULL); -} - - /* this only works with spaces only indentation on the lines */ static void fix_line_indents(GeanyEditor *editor, gint line_start, gint line_end) { @@ -2092,20 +2111,54 @@ } -/* Insert text, replacing \t tab chars with the correct indent width, and \n newline - * chars with the correct line ending string. - * @param text Intended as e.g. "if (1)\n\tdo_something();" +static void replace_leading_tabs(GString *str, const gchar *whitespace) +{ + regex_t regex; + gssize pos; + regmatch_t matches[2]; + gchar *ptr; + + if (regcomp(®ex, "^ *(\t)", 0) != 0) + { + g_return_if_fail(FALSE); + } + ptr = str->str; + while (ptr) + { + if (regexec(®ex, ptr, + G_N_ELEMENTS(matches), matches, 0) != 0) + break; + + pos = matches[1].rm_so; + g_return_if_fail(pos >= 0); + pos += ptr - str->str; + g_string_erase(str, pos, 1); + g_string_insert(str, pos, whitespace); + ptr = str->str + pos + strlen(whitespace); + } + regfree(®ex); +} + + +/** Inserts text, replacing \\t tab chars (@c 0x9) and \\n newline chars (@c 0xA) + * accordingly for the document. + * - Leading tabs are replaced with the correct indentation. + * - Non-leading tabs are replaced with spaces (except when using 'Tabs' indent type). + * - Newline chars are replaced with the correct line ending string. + * This is very useful for inserting code without having to handle the indent + * type yourself (Tabs & Spaces mode can be tricky). + * @param editor Editor. + * @param text Intended as e.g. @c "if (foo)\n\tbar();". + * @param insert_pos Document position to insert text at. * @param cursor_index If >= 0, the index into @a text to place the cursor. * @param newline_indent_size Indentation size (in spaces) to insert for each newline; use * -1 to read the indent size from the line with @a insert_pos on it. - * @param replace_newlines Whether to replace newlines in text or not. If - * newlines have been replaced before, this should be false, to avoid multiple - * replacements of newlines, which is error prone on Windows. - * @warning Make sure all \t tab chars in @a text are intended as indent widths, - * NOT any hard tabs (you get those when copying document text with the Tabs - * & Spaces indent mode set). - * @note This doesn't scroll the cursor in view afterwards. */ -static void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint insert_pos, + * @param replace_newlines Whether to replace newlines. If + * newlines have been replaced already, this should be false, to avoid errors e.g. on Windows. + * @warning Make sure all \\t tab chars in @a text are intended as indent widths or alignment, + * not hard tabs, as those won't be preserved. + * @note This doesn't scroll the cursor in view afterwards. **/ +void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint insert_pos, gint cursor_index, gint newline_indent_size, gboolean replace_newlines) { ScintillaObject *sci = editor->sci; @@ -2114,36 +2167,52 @@ gchar *whitespace; GString *buf; const gchar cur_marker[] = "__GEANY_CURSOR_MARKER__"; + const gchar *eol = editor_get_eol_char(editor); + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); g_return_if_fail(text); + g_return_if_fail(editor != NULL); + g_return_if_fail(insert_pos >= 0); buf = g_string_new(text); if (cursor_index >= 0) g_string_insert(buf, cursor_index, cur_marker); /* remember cursor pos */ - /* Add line indents (in spaces) */ - if (newline_indent_size == -1) - newline_indent_size = sci_get_line_indentation(sci, line_start); + { + /* count indent size up to insert_pos instead of asking sci + * because there may be spaces after it */ + gchar *tmp = sci_get_line(sci, line_start); + gint idx = insert_pos - sci_get_position_from_line(sci, line_start); + tmp[idx] = '\0'; + newline_indent_size = count_indent_size(editor, tmp); + g_free(tmp); + } + /* Add line indents (in spaces) */ if (newline_indent_size > 0) { whitespace = g_strnfill(newline_indent_size, ' '); - setptr(whitespace, g_strconcat("\n", whitespace, NULL)); - utils_string_replace_all(buf, "\n", whitespace); + setptr(whitespace, g_strconcat(eol, whitespace, NULL)); + utils_string_replace_all(buf, eol, whitespace); g_free(whitespace); } /* transform line endings */ if (replace_newlines) - utils_string_replace_all(buf, "\n", editor_get_eol_char(editor)); + utils_string_replace_all(buf, "\n", eol); - /* transform tabs into indent widths (in spaces) */ - whitespace = g_strnfill(editor_get_indent_prefs(editor)->width, ' '); - utils_string_replace_all(buf, "\t", whitespace); + /* transform leading tabs into indent widths (in spaces) */ + whitespace = g_strnfill(iprefs->width, ' '); + replace_leading_tabs(buf, whitespace); + /* remaining tabs are for alignment */ + if (iprefs->type != GEANY_INDENT_TYPE_TABS) + utils_string_replace_all(buf, "\t", whitespace); g_free(whitespace); + sci_start_undo_action(sci); + if (cursor_index >= 0) { gint idx = utils_strpos(buf->str, cur_marker); @@ -2161,69 +2230,50 @@ fix_line_indents(editor, line_start, line_end); snippet_cursor_insert_pos = sci_get_current_position(sci); + sci_end_undo_action(sci); g_string_free(buf, TRUE); } /* Move the cursor to the next specified cursor position in an inserted snippet. * Can, and should, be optimized to give better results */ -void snippet_goto_next_cursor(ScintillaObject *sci, gint current_pos) +void editor_goto_next_snippet_cursor(GeanyEditor *editor) { - if (snippet_queue) + ScintillaObject *sci = editor->sci; + gint current_pos = sci_get_current_position(sci); + + if (snippet_offsets && !g_queue_is_empty(snippet_offsets)) { - gpointer offset; + gint offset; - snippet_queue = queue_delete(snippet_queue, &offset, FALSE); + offset = GPOINTER_TO_INT(g_queue_pop_head(snippet_offsets)); if (current_pos > snippet_cursor_insert_pos) - snippet_cursor_insert_pos = GPOINTER_TO_INT(offset) + current_pos; + snippet_cursor_insert_pos = offset + current_pos; else - snippet_cursor_insert_pos += GPOINTER_TO_INT(offset); + snippet_cursor_insert_pos += offset; sci_set_current_position(sci, snippet_cursor_insert_pos, FALSE); } + else + { + utils_beep(); + } } -static gboolean snippets_complete_constructs(GeanyEditor *editor, gint pos, const gchar *word) +static gssize snippets_make_replacements(GeanyEditor *editor, GString *pattern, + gsize indent_size) { - ScintillaObject *sci = editor->sci; - gchar *str, *whitespace; - GString *pattern; - gint i, str_len, tmp_pos, whitespace_len, nl_count = 0; gssize cur_index = -1; - gint ft_id = FILETYPE_ID(editor->document->file_type); + gchar *whitespace; + gint i, tmp_pos, whitespace_len, nl_count = 0; GHashTable *specials; - GeanyQueue *temp_list; - const GeanyIndentPrefs *iprefs; - gsize indent_size; + GList *temp_list = NULL; + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); gint cursor_steps, old_cursor = 0; - str = g_strdup(word); - g_strstrip(str); - pattern = g_string_new(snippets_find_completion_by_name(filetypes[ft_id]->name, str)); - if (pattern == NULL || pattern->len == 0) - { - g_free(str); - g_string_free(pattern, TRUE); - return FALSE; - } - - temp_list = queue_init(); - iprefs = editor_get_indent_prefs(editor); - read_indent(editor, pos); - indent_size = strlen(indent); - - /* remove the typed word, it will be added again by the used auto completion - * (not really necessary but this makes the auto completion more flexible, - * e.g. with a completion like hi=hello, so typing "hi" will result in "hello") */ - str_len = strlen(str); - sci_set_selection_start(sci, pos - str_len); - sci_set_selection_end(sci, pos); - sci_replace_sel(sci, ""); - pos -= str_len; /* pos has changed while deleting */ - /* replace 'special' completions */ - specials = g_hash_table_lookup(editor_prefs.snippets, "Special"); + specials = g_hash_table_lookup(snippet_hash, "Special"); if (G_LIKELY(specials != NULL)) { /* ugly hack using global_pattern */ @@ -2231,8 +2281,8 @@ g_hash_table_foreach(specials, snippets_replace_specials, NULL); } - /* replace any %template% wildcards */ - snippets_replace_wildcards(editor, pattern); + /* replace any template {foo} wildcards */ + templates_replace_common(pattern, editor->document->file_name, editor->document->file_type, NULL); /* transform other wildcards */ /* convert to %newlines%, else we get endless loops */ @@ -2274,11 +2324,11 @@ /* modify cursor_steps to take indentation count and type into account */ /* We're saving the relative offset to each cursor position in a simple - * linked list, including intendations between them. */ + * linked list, including indentations between them. */ if (i++ > 0) { cursor_steps += (nl_count * indent_size); - queue_append(temp_list, GINT_TO_POINTER(cursor_steps - old_cursor)); + temp_list = g_list_append(temp_list, GINT_TO_POINTER(cursor_steps - old_cursor)); } else { @@ -2291,20 +2341,72 @@ utils_string_replace_all(pattern, "%newline%", editor_get_eol_char(editor)); utils_string_replace_all(pattern, "%ws%", whitespace); g_free(whitespace); - /* We create a new list, where the cursor positions for the most recent - * parsed snipped come first, followed by the remaining positions */ - if (temp_list->data) - snippet_queue = queue_concat_copy(temp_list, snippet_queue); + + /* escape % last */ + /* Bug: {ob}pc{cb} will be replaced by % too */ + templates_replace_valist(pattern, "{pc}", "%", NULL); + + /* We put the cursor positions for the most recent + * parsed snippet first, followed by any remaining positions */ + i = 0; + if (temp_list) + { + GList *node; + + foreach_list(node, temp_list) + g_queue_push_nth(snippet_offsets, node->data, i++); + + /* limit length of queue */ + while (g_queue_get_length(snippet_offsets) > 20) + g_queue_pop_tail(snippet_offsets); + + g_list_free(temp_list); + } if (cur_index < 0) cur_index = pattern->len; + return cur_index; +} + + +static gboolean snippets_complete_constructs(GeanyEditor *editor, gint pos, const gchar *word) +{ + ScintillaObject *sci = editor->sci; + gchar *str; + GString *pattern; + gssize cur_index = -1; + gint str_len; + gint ft_id = FILETYPE_ID(editor->document->file_type); + + str = g_strdup(word); + g_strstrip(str); + pattern = g_string_new(snippets_find_completion_by_name(filetypes[ft_id]->name, str)); + if (pattern == NULL || pattern->len == 0) + { + g_free(str); + g_string_free(pattern, TRUE); + return FALSE; + } + + read_indent(editor, pos); + + /* remove the typed word, it will be added again by the used auto completion + * (not really necessary but this makes the auto completion more flexible, + * e.g. with a completion like hi=hello, so typing "hi" will result in "hello") */ + str_len = strlen(str); + sci_set_selection_start(sci, pos - str_len); + sci_set_selection_end(sci, pos); + sci_replace_sel(sci, ""); + pos -= str_len; /* pos has changed while deleting */ + + cur_index = snippets_make_replacements(editor, pattern, strlen(indent)); + /* finally insert the text and set the cursor */ editor_insert_text_block(editor, pattern->str, pos, cur_index, -1, FALSE); sci_scroll_caret(sci); g_free(str); g_string_free(pattern, TRUE); - return TRUE; } @@ -2331,23 +2433,21 @@ gboolean editor_complete_snippet(GeanyEditor *editor, gint pos) { gboolean result = FALSE; - gint lexer, style; - gchar *wc; + const gchar *wc; const gchar *word; ScintillaObject *sci; g_return_val_if_fail(editor != NULL, FALSE); sci = editor->sci; + if (sci_has_selection(sci)) + return FALSE; /* return if we are editing an existing line (chars on right of cursor) */ if (keybindings_lookup_item(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_COMPLETESNIPPET)->key == GDK_space && ! editor_prefs.complete_snippets_whilst_editing && ! at_eol(sci, pos)) return FALSE; - lexer = SSM(sci, SCI_GETLEXER, 0, 0); - style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); - wc = snippets_find_completion_by_name("Special", "wordchars"); word = editor_read_word_stem(editor, pos, wc); @@ -2359,10 +2459,8 @@ result = snippets_complete_constructs(editor, pos, word); sci_end_undo_action(sci); if (result) - SSM(sci, SCI_CANCEL, 0, 0); /* cancel any autocompletion list, etc */ + sci_cancel(sci); /* cancel any autocompletion list, etc */ } - - g_free(wc); return result; } @@ -2422,7 +2520,7 @@ static gboolean handle_xml(GeanyEditor *editor, gint pos, gchar ch) { ScintillaObject *sci = editor->sci; - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); + gint lexer = sci_get_lexer(sci); gint min, style; gchar *str_found, sel[512]; gboolean result = FALSE; @@ -2513,7 +2611,7 @@ gint indent_pos; const gchar *indent_str; - if (SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_HTML) return; + if (sci_get_lexer(sci) != SCLEX_HTML) return; read_indent(editor, pos); indent_pos = sci_get_line_indent_position(sci, sci_get_line_from_position(sci, pos)); @@ -2614,7 +2712,7 @@ static gint get_multiline_comment_style(GeanyEditor *editor, gint line_start) { - gint lexer = SSM(editor->sci, SCI_GETLEXER, 0, 0); + gint lexer = sci_get_lexer(editor->sci); gint style_comment; /* List only those lexers which support multi line comments */ @@ -2695,7 +2793,7 @@ if (co_len == 0) return 0; - SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); + sci_start_undo_action(editor->sci); for (i = first_line; (i <= last_line) && (! break_loop); i++) { @@ -2759,7 +2857,7 @@ } } } - SSM(editor->sci, SCI_ENDUNDOACTION, 0, 0); + sci_end_undo_action(editor->sci); /* restore selection if there is one * but don't touch the selection if caller is editor_do_comment_toggle */ @@ -2826,7 +2924,7 @@ if (co_len == 0) return; - SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); + sci_start_undo_action(editor->sci); for (i = first_line; (i <= last_line) && (! break_loop); i++) { @@ -2893,7 +2991,7 @@ } } - SSM(editor->sci, SCI_ENDUNDOACTION, 0, 0); + sci_end_undo_action(editor->sci); co_len += tm_len; @@ -2918,19 +3016,25 @@ gint eol_len = editor_get_eol_char_len(editor); if (count_uncommented > 0) { - sci_set_selection_start(editor->sci, sel_start - co_len - eol_len); - sci_set_selection_end(editor->sci, sel_end - co_len - eol_len); + sci_set_selection_start(editor->sci, sel_start - co_len + eol_len); + sci_set_selection_end(editor->sci, sel_end - co_len + eol_len); } - else + else if (count_commented > 0) { - sci_set_selection_start(editor->sci, sel_start + co_len + eol_len); - sci_set_selection_end(editor->sci, sel_end + co_len + eol_len); + sci_set_selection_start(editor->sci, sel_start + co_len - eol_len); + sci_set_selection_end(editor->sci, sel_end + co_len - eol_len); } } } else if (count_uncommented > 0) { - sci_set_current_position(editor->sci, sel_start - co_len, TRUE); + gint eol_len = single_line ? 0: editor_get_eol_char_len(editor); + sci_set_current_position(editor->sci, sel_start - co_len + eol_len, TRUE); + } + else if (count_commented > 0) + { + gint eol_len = single_line ? 0: editor_get_eol_char_len(editor); + sci_set_current_position(editor->sci, sel_start + co_len - eol_len, TRUE); } } @@ -2983,7 +3087,7 @@ if (co_len == 0) return; - SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); + sci_start_undo_action(editor->sci); for (i = first_line; (i <= last_line) && (! break_loop); i++) { @@ -3040,7 +3144,7 @@ } } } - SSM(editor->sci, SCI_ENDUNDOACTION, 0, 0); + sci_end_undo_action(editor->sci); /* restore selection if there is one * but don't touch the selection if caller is editor_do_comment_toggle */ @@ -3185,8 +3289,12 @@ /* Use the start of the line enter was pressed on, to avoid any doc keyword styles */ indent_pos = sci_get_line_indent_position(sci, cur_line - 1); style = sci_get_style_at(sci, indent_pos); + if (!in_block_comment(lexer, style)) + return; - if (in_block_comment(lexer, style)) + /* Check whether the comment block continues on this line */ + indent_pos = sci_get_line_indent_position(sci, cur_line); + if (sci_get_style_at(sci, indent_pos) == style) { gchar *previous_line = sci_get_line(sci, cur_line - 1); /* the type of comment, '*' (C/C++/Java), '+' and the others (D) */ @@ -3569,6 +3677,8 @@ g_return_if_fail(editor != NULL && editor->document->file_type != NULL && editor->document->file_type->comment_open != NULL); + sci_start_undo_action(editor->sci); + doc = editor->document; if (doc->file_type->comment_close != NULL && strlen(doc->file_type->comment_close) > 0) @@ -3595,7 +3705,6 @@ sci_insert_text(editor->sci, pos, text); g_free(text); - /* select the inserted lines for commenting */ sci_set_selection_start(editor->sci, pos); sci_set_selection_end(editor->sci, pos + text_len); @@ -3614,6 +3723,8 @@ sci_set_current_position(editor->sci, pos, TRUE); /* reset the selection */ sci_set_anchor(editor->sci, pos); + + sci_end_undo_action(editor->sci); } @@ -3851,7 +3962,7 @@ if (pos == -1) pos = first_sel_start; - SSM(sci, SCI_BEGINUNDOACTION, 0, 0); + sci_start_undo_action(sci); smart_line_indentation(editor, first_line, last_line); @@ -3870,7 +3981,7 @@ sci_set_selection_end(sci, sci_get_position_from_line(sci, last_line + 1)); } - SSM(sci, SCI_ENDUNDOACTION, 0, 0); + sci_end_undo_action(sci); } @@ -3893,7 +4004,7 @@ if (pos == -1) pos = sel_start; - SSM(editor->sci, SCI_BEGINUNDOACTION, 0, 0); + sci_start_undo_action(editor->sci); for (i = first_line; i <= last_line; i++) { @@ -3937,7 +4048,7 @@ else sci_set_current_position(editor->sci, pos + count, FALSE); - SSM(editor->sci, SCI_ENDUNDOACTION, 0, 0); + sci_end_undo_action(editor->sci); } @@ -4092,7 +4203,7 @@ /* don't set the indicator on whitespace */ while (isspace(linebuf[i])) i++; - while (len > 1 && len > i && isspace(linebuf[len-1])) + while (len > 1 && len > i && isspace(linebuf[len - 1])) { len--; end--; @@ -4155,6 +4266,16 @@ } +/** + * Retrieves the localized name (for displaying) of the used end of line characters + * (LF, CR/LF, CR) in the given editor. + * If @a editor is @c NULL, the default end of line characters are used. + * + * @param editor The editor to operate on, or @c NULL to query the default value. + * @return The name of the end of line characters. + * + * @since 0.19 + */ const gchar *editor_get_eol_char_name(GeanyEditor *editor) { gint mode = file_prefs.default_eol_character; @@ -4166,7 +4287,16 @@ } -/* returns the end-of-line character(s) length of the specified editor */ +/** + * Retrieves the length of the used end of line characters (LF, CR/LF, CR) in the given editor. + * If @a editor is @c NULL, the default end of line characters are used. + * The returned value is 1 for CR and LF and 2 for CR/LF. + * + * @param editor The editor to operate on, or @c NULL to query the default value. + * @return The length of the end of line characters. + * + * @since 0.19 + */ gint editor_get_eol_char_len(GeanyEditor *editor) { gint mode = file_prefs.default_eol_character; @@ -4182,7 +4312,16 @@ } -/* returns the end-of-line character(s) of the specified editor */ +/** + * Retrieves the used end of line characters (LF, CR/LF, CR) in the given editor. + * If @a editor is @c NULL, the default end of line characters are used. + * The returned value is either "\n", "\r\n" or "\r". + * + * @param editor The editor to operate on, or @c NULL to query the default value. + * @return The end of line characters. + * + * @since 0.19 + */ const gchar *editor_get_eol_char(GeanyEditor *editor) { gint mode = file_prefs.default_eol_character; @@ -4212,6 +4351,7 @@ for (i = 0; i < lines; i++) { gint level = sci_get_fold_level(editor->sci, i); + if (level & SC_FOLDLEVELHEADERFLAG) { if (sci_get_fold_expanded(editor->sci, i) == want_fold) @@ -4255,7 +4395,7 @@ if (search_pos == -1) break; - pos_in_line = sci_get_col_from_position(editor->sci,search_pos); + pos_in_line = sci_get_col_from_position(editor->sci, search_pos); current_tab_true_length = tab_len - (pos_in_line % tab_len); tab_str = g_strnfill(current_tab_true_length, ' '); sci_set_target_start(editor->sci, search_pos); @@ -4328,7 +4468,7 @@ i--; ch = sci_get_char_at(editor->sci, i); } - if (i < (line_end-1)) + if (i < (line_end - 1)) { sci_set_target_start(editor->sci, i + 1); sci_set_target_end(editor->sci, line_end); @@ -4415,7 +4555,7 @@ } -/** Set the indent type for @a editor. +/** Sets the indent type for @a editor. * @param editor Editor. * @param type Indent type. * @@ -4431,9 +4571,20 @@ sci_set_use_tabs(sci, use_tabs); if (type == GEANY_INDENT_TYPE_BOTH) + { sci_set_tab_width(sci, iprefs->hard_tab_width); + if (iprefs->hard_tab_width != 8) + { + static gboolean warn = TRUE; + if (warn) + ui_set_statusbar(TRUE, _("Warning: non-standard hard tab width: %d != 8!"), + iprefs->hard_tab_width); + warn = FALSE; + } + } else sci_set_tab_width(sci, iprefs->width); + SSM(sci, SCI_SETINDENT, iprefs->width, 0); /* remove indent spaces on backspace, if using any spaces to indent */ @@ -4442,15 +4593,22 @@ /* Convenience function for editor_goto_pos() to pass in a line number. */ -gboolean editor_goto_line(GeanyEditor *editor, gint line) +gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gint offset) { gint pos; g_return_val_if_fail(editor, FALSE); - if (line < 0 || line >= sci_get_line_count(editor->sci)) + if (line_no < 0 || line_no >= sci_get_line_count(editor->sci)) return FALSE; - pos = sci_get_position_from_line(editor->sci, line); + if (offset != 0) + { + gint current_line = sci_get_current_line(editor->sci); + line_no *= offset; + line_no = current_line + line_no; + } + + pos = sci_get_position_from_line(editor->sci, line_no); return editor_goto_pos(editor, pos, TRUE); } @@ -4471,7 +4629,7 @@ /* mark the tag with the yellow arrow */ sci_marker_delete_all(editor->sci, 0); - sci_set_marker_at_line(editor->sci, line, TRUE, 0); + sci_set_marker_at_line(editor->sci, line, 0); } sci_goto_pos(editor->sci, pos, TRUE); @@ -4567,7 +4725,7 @@ sci_clear_cmdkey(sci, '\\' | (SCMOD_CTRL << 16)); /* Next word part */ sci_clear_cmdkey(sci, SCK_UP | (SCMOD_CTRL << 16)); /* scroll line up */ sci_clear_cmdkey(sci, SCK_DOWN | (SCMOD_CTRL << 16)); /* scroll line down */ - sci_clear_cmdkey(sci, SCK_HOME); /* line start */ + sci_clear_cmdkey(sci, SCK_HOME); /* line start */ sci_clear_cmdkey(sci, SCK_END); /* line end */ sci_clear_cmdkey(sci, SCK_END | (SCMOD_ALT << 16)); /* visual line end */ @@ -4621,6 +4779,12 @@ SSM(sci, SCI_REGISTERIMAGE, 1, (sptr_t)classviewer_var); SSM(sci, SCI_REGISTERIMAGE, 2, (sptr_t)classviewer_method); + /* necessary for column mode editing, implemented in Scintilla since 2.0 */ + SSM(sci, SCI_SETADDITIONALSELECTIONTYPING, 1, 0); + + /* virtual space */ + SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); + /* only connect signals if this is for the document notebook, not split window */ if (editor->sci == NULL) { @@ -4634,7 +4798,7 @@ } -/** Create a new Scintilla @c GtkWidget based on the settings for @a editor. +/** Creates a new Scintilla @c GtkWidget based on the settings for @a editor. * @param editor Editor settings. * @return The new widget. * @@ -4652,6 +4816,7 @@ editor_set_indent_type(editor, iprefs->type); editor_set_font(editor, interface_prefs.editor_font); + editor_apply_update_prefs(editor); /* if editor already had a widget, restore it */ if (old) @@ -4699,6 +4864,26 @@ } +gboolean editor_complete_word_part(GeanyEditor *editor) +{ + gchar *entry; + + g_return_val_if_fail(editor, FALSE); + + if (!SSM(editor->sci, SCI_AUTOCACTIVE, 0, 0)) + return FALSE; + + entry = sci_get_string(editor->sci, SCI_AUTOCGETCURRENTTEXT, 0); + + /* if no word part, complete normally */ + if (!check_partial_completion(editor, entry)) + SSM(editor->sci, SCI_AUTOCCOMPLETE, 0, 0); + + g_free(entry); + return TRUE; +} + + void editor_init(void) { static GeanyIndentPrefs indent_prefs; @@ -4717,7 +4902,7 @@ } -/** TODO: Should these be user-defined instead of hard-coded? */ +/* TODO: Should these be user-defined instead of hard-coded? */ void editor_set_indentation_guides(GeanyEditor *editor) { gint mode; @@ -4791,10 +4976,13 @@ g_return_if_fail(editor != NULL); + if (main_status.quitting) + return; + sci = editor->sci; - sci_set_mark_long_lines(sci, editor_prefs.long_line_type, - editor_prefs.long_line_column, editor_prefs.long_line_color); + sci_set_mark_long_lines(sci, editor_get_long_line_type(), + editor_get_long_line_column(), editor_prefs.long_line_color); /* update indent width, tab width */ editor_set_indent_type(editor, editor->indent_type); @@ -4812,6 +5000,9 @@ sci_set_folding_margin_visible(sci, editor_prefs.folding); + /* virtual space */ + SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); + /* (dis)allow scrolling past end of document */ sci_set_scroll_stop_at_last_line(sci, editor_prefs.scroll_stop_at_last_line); } @@ -4902,5 +5093,3 @@ sci_set_current_line(sci, lstart); } } - - diff -Nru geany-0.18/src/editor.h geany-0.19/src/editor.h --- geany-0.18/src/editor.h 2009-07-24 16:44:14.000000000 +0100 +++ geany-0.19/src/editor.h 2010-05-09 16:48:55.000000000 +0100 @@ -1,8 +1,8 @@ /* * editor.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: editor.h 4025 2009-07-24 15:44:14Z ntrel $ + * $Id: editor.h 4894 2010-05-09 15:48:55Z eht16 $ */ @@ -28,7 +28,7 @@ #include "Scintilla.h" #include "ScintillaWidget.h" -/** Default character set to define which characters shoud be treated as part of a word. */ +/** Default character set to define which characters should be treated as part of a word. */ #define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" #define GEANY_MAX_WORD_LENGTH 192 @@ -51,6 +51,14 @@ } GeanyAutoIndent; +typedef enum +{ + GEANY_VIRTUAL_SPACE_DISABLED = 0, + GEANY_VIRTUAL_SPACE_SELECTION = 1, + GEANY_VIRTUAL_SPACE_ALWAYS = 3 +} +GeanyVirtualSpace; + /* Auto-close brackets/quotes */ enum { @@ -92,21 +100,24 @@ GeanyIndentPrefs; -/* Default prefs when creating a new editor window. - * Some of these can be overridden per document. */ +/** Default prefs when creating a new editor window. + * Some of these can be overridden per document or per project. */ typedef struct GeanyEditorPrefs { GeanyIndentPrefs *indentation; /*< Default indentation prefs. @see editor_get_indent_prefs(). */ gboolean show_white_space; gboolean show_indent_guide; gboolean show_line_endings; - gint long_line_type; /* 0 - line, 1 - background, 2 - none */ - gint long_line_column; + /* 0 - line, 1 - background. This setting may be overriden when a project is opened. Use + * @c editor_get_long_line_type(). */ + gint long_line_global_type; + /* This setting may be overriden when a project is opened. Use @c editor_get_long_line_column(). */ + gint long_line_global_column; gchar *long_line_color; gboolean show_markers_margin; /* view menu */ gboolean show_linenumber_margin; /* view menu */ gboolean show_scrollbars; /* hidden pref */ - gboolean scroll_stop_at_last_line; /* hidden pref */ + gboolean scroll_stop_at_last_line; gboolean line_wrapping; gboolean use_indicators; gboolean folding; @@ -120,7 +131,6 @@ gboolean complete_snippets; gint symbolcompletion_min_chars; gint symbolcompletion_max_height; - GHashTable *snippets; gboolean brace_match_ltgt; /* whether to highlight < and > chars (hidden pref) */ gboolean use_gtk_word_boundaries; /* hidden pref */ gboolean complete_snippets_whilst_editing; /* hidden pref */ @@ -131,6 +141,10 @@ guint autoclose_chars; gboolean autocomplete_doc_words; gboolean completion_drops_rest_of_word; + gchar *color_scheme; + gint show_virtual_space; + /* This setting may be overriden when a project is opened. Use @c editor_get_long_line_type(). */ + gboolean long_line_global_enabled; } GeanyEditorPrefs; @@ -174,7 +188,9 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean force); -void snippet_goto_next_cursor(ScintillaObject *sci, gint current_pos); +gboolean editor_complete_word_part(GeanyEditor *editor); + +void editor_goto_next_snippet_cursor(GeanyEditor *editor); gboolean editor_complete_snippet(GeanyEditor *editor, gint pos); @@ -212,6 +228,11 @@ void editor_snippets_free(void); +/* 0 - line, 1 - background, 2 - disabled */ +gint editor_get_long_line_type(void); + +gint editor_get_long_line_column(void); + /* General editing functions */ void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen, @@ -267,7 +288,7 @@ gboolean editor_goto_pos(GeanyEditor *editor, gint pos, gboolean mark); -gboolean editor_goto_line(GeanyEditor *editor, gint line_no); +gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gint offset); void editor_set_indentation_guides(GeanyEditor *editor); @@ -275,4 +296,10 @@ gchar *editor_get_calltip_text(GeanyEditor *editor, const TMTag *tag); +void editor_insert_text_block(GeanyEditor *editor, const gchar *text, + gint insert_pos, gint cursor_index, + gint newline_indent_size, gboolean replace_newlines); + +void editor_toggle_fold(GeanyEditor *editor, gint line, gint modifiers); + #endif diff -Nru geany-0.18/src/encodings.c geany-0.19/src/encodings.c --- geany-0.18/src/encodings.c 2009-07-21 23:12:13.000000000 +0100 +++ geany-0.19/src/encodings.c 2010-04-25 18:43:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * encodings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: encodings.c 4010 2009-07-21 22:12:13Z eht16 $ + * $Id: encodings.c 4862 2010-04-25 17:43:39Z eht16 $ */ /* @@ -232,6 +232,7 @@ return enc->charset; } + static GtkWidget *radio_items[GEANY_ENCODINGS_MAX]; @@ -522,11 +523,11 @@ { gchar *locale_charset = NULL; gchar *regex_charset = NULL; - gchar *charset; + const gchar *charset; gchar *utf8_content; gboolean check_regex = FALSE; gboolean check_locale = FALSE; - gint i, len; + gint i, len, preferred_charset; if ((gint)size == -1) { @@ -546,22 +547,41 @@ /* current locale is not UTF-8, we have to check this charset */ check_locale = ! g_get_charset((const gchar**) &charset); - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + /* First check for preferred charset, if specified */ + preferred_charset = file_prefs.default_open_encoding; + + if (preferred_charset == encodings[GEANY_ENCODING_NONE].idx || + preferred_charset < 0 || + preferred_charset >= GEANY_ENCODINGS_MAX) + { + preferred_charset = -1; + } + + /* -1 means "Preferred charset" */ + for (i = -1; i < GEANY_ENCODINGS_MAX; i++) { - if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx) || G_UNLIKELY(i == -1)) + if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx)) continue; - if (check_regex) + if (i == -1) + { + if (preferred_charset != -1) + { + charset = encodings[preferred_charset].charset; + geany_debug("Preferred charset: %s", charset); + } + else + continue; + } + else if (check_regex) { check_regex = FALSE; charset = regex_charset; - i = -1; } else if (check_locale) { check_locale = FALSE; charset = locale_charset; - i = -1; } else charset = encodings[i].charset; @@ -636,7 +656,7 @@ if (bom_len) *bom_len = 2; - if ((guchar)string[0]==0xfe && (guchar)string[1] == 0xff) + if ((guchar)string[0] == 0xfe && (guchar)string[1] == 0xff) { return GEANY_ENCODING_UTF_16BE; /* Big endian */ } diff -Nru geany-0.18/src/encodings.h geany-0.19/src/encodings.h --- geany-0.18/src/encodings.h 2009-06-14 11:24:06.000000000 +0100 +++ geany-0.19/src/encodings.h 2010-04-25 18:43:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * encodings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: encodings.h 3864 2009-06-14 10:24:06Z eht16 $ + * $Id: encodings.h 4862 2010-04-25 17:43:39Z eht16 $ */ @@ -63,9 +63,9 @@ /** Internally used member for grouping */ GeanyEncodingGroup group; /** String representation of the encoding, e.g. "ISO-8859-3" */ - gchar *charset; + const gchar *charset; /** Translatable and descriptive name of the encoding, e.g. "South European" */ - gchar *name; + const gchar *name; } GeanyEncoding; diff -Nru geany-0.18/src/filetypes.c geany-0.19/src/filetypes.c --- geany-0.18/src/filetypes.c 2009-07-30 13:38:10.000000000 +0100 +++ geany-0.19/src/filetypes.c 2010-04-06 17:37:27.000000000 +0100 @@ -1,8 +1,8 @@ /* * filetypes.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: filetypes.c 4048 2009-07-30 12:38:10Z ntrel $ + * $Id: filetypes.c 4803 2010-04-06 16:37:27Z ntrel $ */ /** @@ -26,6 +26,9 @@ * Filetype detection, file extensions and filetype menu items. */ +/* Note: we use filetype_id for some function arguments, but GeanyFiletype is better; we should + * only use GeanyFiletype for API functions. */ + #include #include @@ -60,7 +63,9 @@ #ifdef HAVE_REGCOMP regex_t error_regex; gboolean error_regex_compiled; + gchar *last_string; /* last one compiled */ #endif + gboolean custom; } GeanyFiletypePrivate; @@ -112,7 +117,7 @@ ft->lang = -2; ft->name = g_strdup(_("None")); ft->title = g_strdup(_("None")); - ft->extension = g_strdup("*"); + ft->extension = NULL; ft->pattern = utils_strv_new("*", NULL); ft->comment_open = NULL; ft->comment_close = NULL; @@ -375,6 +380,28 @@ ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; +#define TXT2TAGS + ft = filetypes[GEANY_FILETYPES_TXT2TAGS]; + ft->lang = 37; + ft->name = g_strdup("Txt2tags"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->extension = g_strdup("t2t"); + ft->pattern = utils_strv_new("*.t2t", "*.txt2tags", NULL); + ft->comment_open = NULL; + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; + +#define ABC + ft = filetypes[GEANY_FILETYPES_ABC]; + ft->lang = 38; + ft->name = g_strdup("Abc"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->extension = g_strdup("abc"); + ft->pattern = utils_strv_new("*.abc", "*.abp", NULL); + ft->comment_open = NULL; + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; + #define SH ft = filetypes[GEANY_FILETYPES_SH]; ft->lang = 16; @@ -478,6 +505,17 @@ ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; +#define VERILOG + ft = filetypes[GEANY_FILETYPES_VERILOG]; + ft->lang = 39; + ft->name = g_strdup("Verilog"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->extension = g_strdup("v"); + ft->pattern = utils_strv_new("*.v", "*.verilog", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; + #define DIFF ft = filetypes[GEANY_FILETYPES_DIFF]; ft->lang = 20; @@ -536,7 +574,7 @@ #define R ft = filetypes[GEANY_FILETYPES_R]; - ft->lang = 34; + ft->lang = 40; ft->name = g_strdup("R"); ft->title = g_strdup_printf(_("%s script file"), "R"); ft->extension = g_strdup("R"); @@ -620,8 +658,7 @@ GeanyFiletype *ft = g_new0(GeanyFiletype, 1); ft->lang = -2; /* assume no tagmanager parser */ - ft->programs = g_new0(struct build_programs, 1); - ft->actions = g_new0(struct build_actions, 1); + ft->project_list_entry = -1; /* no entry */ ft->priv = g_new0(GeanyFiletypePrivate, 1); return ft; @@ -656,6 +693,55 @@ } +static void add_custom_filetype(const gchar *filename) +{ + gchar *fn = utils_strdupa(strstr(filename, ".") + 1); + gchar *dot = g_strrstr(fn, ".conf"); + GeanyFiletype *ft; + + g_return_if_fail(dot); + + *dot = 0x0; + + if (g_hash_table_lookup(filetypes_hash, fn)) + return; + + ft = filetype_new(); + ft->name = g_strdup(fn); + filetype_make_title(ft, TITLE_FILE); + ft->pattern = g_new0(gchar*, 1); + ft->group = GEANY_FILETYPE_GROUP_CUSTOM; + ft->priv->custom = TRUE; + filetype_add(ft); + geany_debug("Added filetype %s (%d).", ft->name, ft->id); +} + + +static void init_custom_filetypes(const gchar *path) +{ + GDir *dir; + const gchar *filename; + + g_return_if_fail(path); + + dir = g_dir_open(path, 0, NULL); + if (dir == NULL) + return; + + foreach_dir(filename, dir) + { + const gchar prefix[] = "filetypes."; + + if (g_str_has_prefix(filename, prefix) && + g_str_has_suffix(filename + strlen(prefix), ".conf")) + { + add_custom_filetype(filename); + } + } + g_dir_close(dir); +} + + /* Create the filetypes array and fill it with the known filetypes. */ void filetypes_init_types() { @@ -679,6 +765,8 @@ { filetype_add(filetypes[ft_id]); } + init_custom_filetypes(app->datadir); + init_custom_filetypes(utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL)); } @@ -698,7 +786,7 @@ * The user can do this manually with 'Tools->Reload Configuration' */ filetypes_load_config(GEANY_FILETYPES_NONE, TRUE); - documents_foreach(i) + foreach_document(i) document_reload_config(documents[i]); } } @@ -739,22 +827,25 @@ create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_SCRIPT, _("_Scripting Languages")); create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MARKUP, _("_Markup Languages")); create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MISC, _("M_iscellaneous Languages")); + create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_CUSTOM, _("_Custom Filetypes")); /* Append all filetypes to the filetype menu */ foreach_slist(node, filetypes_by_title) { GeanyFiletype *ft = node->data; - if (ft->id != GEANY_FILETYPES_NONE) + if (ft->group != GEANY_FILETYPE_GROUP_NONE) create_radio_menu_item(group_menus[ft->group], ft); + else + create_radio_menu_item(filetype_menu, ft); } - create_radio_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_NONE]); } void filetypes_init() { filetypes_init_types(); + create_set_filetype_menu(); setup_config_file_menus(); } @@ -871,7 +962,7 @@ if (strncmp(tmp, "env ", 4) == 0 && strlen(tmp) > 4) { /* skip "env" and read the following interpreter */ - basename_interpreter +=4; + basename_interpreter += 4; } if (strncmp(basename_interpreter, "sh", 2) == 0) @@ -976,7 +1067,7 @@ #ifdef HAVE_PLUGINS /* Currently only used by external plugins (e.g. geanyprj). */ /** - * Detect filetype based on a shebang line in the file, or the filename extension. + * Detects filetype based on a shebang line in the file or the filename extension. * * @param utf8_filename The filename in UTF-8 encoding. * @@ -1083,12 +1174,9 @@ g_free(ft->comment_open); g_free(ft->comment_close); g_free(ft->context_action_cmd); - g_free(ft->programs->compiler); - g_free(ft->programs->linker); - g_free(ft->programs->run_cmd); - g_free(ft->programs->run_cmd2); - g_free(ft->programs); - g_free(ft->actions); + g_free(ft->filecmds); + g_free(ft->ftdefcmds); + g_free(ft->execcmds); set_error_regex(ft, NULL); g_strfreev(ft->pattern); @@ -1160,57 +1248,46 @@ filetypes[ft_id]->context_action_cmd = result; } - /* read build settings */ - result = g_key_file_get_string(configh, "build_settings", "compiler", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "compiler", NULL); - if (G_LIKELY(result != NULL)) - { - filetypes[ft_id]->programs->compiler = result; - filetypes[ft_id]->actions->can_compile = TRUE; + result = utils_get_setting_string(configh, "settings", "tag_parser", NULL); + if (!result) + result = utils_get_setting_string(config, "settings", "tag_parser", NULL); + if (result) + { + ft->lang = tm_source_file_get_named_lang(result); + if (ft->lang < 0) + geany_debug("Cannot find tag parser '%s' for custom filetype '%s'.", result, ft->name); + g_free(result); + } + + result = utils_get_setting_string(configh, "settings", "lexer_filetype", NULL); + if (!result) + result = utils_get_setting_string(config, "settings", "lexer_filetype", NULL); + if (result) + { + ft->lexer_filetype = filetypes_lookup_by_name(result); + if (!ft->lexer_filetype) + geany_debug("Cannot find lexer filetype '%s' for custom filetype '%s'.", result, ft->name); + g_free(result); } - result = g_key_file_get_string(configh, "build_settings", "linker", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "linker", NULL); - if (result != NULL) - { - filetypes[ft_id]->programs->linker = result; - filetypes[ft_id]->actions->can_link = TRUE; - } - - result = g_key_file_get_string(configh, "build_settings", "run_cmd", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "run_cmd", NULL); - if (G_LIKELY(result != NULL)) - { - filetypes[ft_id]->programs->run_cmd = result; - filetypes[ft_id]->actions->can_exec = TRUE; - } - - result = g_key_file_get_string(configh, "build_settings", "run_cmd2", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "run_cmd2", NULL); - if (result != NULL) - { - filetypes[ft_id]->programs->run_cmd2 = result; - filetypes[ft_id]->actions->can_exec = TRUE; - } - - result = g_key_file_get_string(configh, "build_settings", "error_regex", NULL); - if (result == NULL) result = g_key_file_get_string(config, "build_settings", "error_regex", NULL); - if (result != NULL) - { - set_error_regex(ft, result); - } + /* read build settings */ + build_load_menu(config, GEANY_BCS_FT, (gpointer)ft); + build_load_menu(configh, GEANY_BCS_HOME_FT, (gpointer)ft); } /* simple wrapper function to print file errors in DEBUG mode */ static void load_system_keyfile(GKeyFile *key_file, const gchar *file, GKeyFileFlags flags, - G_GNUC_UNUSED GError **just_for_compatibility) + GeanyFiletype *ft) { GError *error = NULL; gboolean done = g_key_file_load_from_file(key_file, file, flags, &error); - if (G_UNLIKELY(! done) && G_UNLIKELY(error != NULL)) + + if (error != NULL) { - geany_debug("Failed to open %s (%s)", file, error->message); + if (!done && !ft->priv->custom) + geany_debug("Failed to open %s (%s)", file, error->message); + g_error_free(error); error = NULL; } @@ -1224,10 +1301,12 @@ { GKeyFile *config, *config_home; GeanyFiletypePrivate *pft; + GeanyFiletype *ft; g_return_if_fail(ft_id >= 0 && ft_id < (gint) filetypes_array->len); - pft = filetypes[ft_id]->priv; + ft = filetypes[ft_id]; + pft = ft->priv; /* when reloading, proceed only if the settings were already loaded */ if (reload && G_UNLIKELY(! pft->keyfile_loaded)) @@ -1248,7 +1327,7 @@ gchar *f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", ext, NULL); - load_system_keyfile(config, f0, G_KEY_FILE_KEEP_COMMENTS, NULL); + load_system_keyfile(config, f0, G_KEY_FILE_KEEP_COMMENTS, ft); g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); g_free(ext); @@ -1267,6 +1346,10 @@ gchar *filetypes_get_conf_extension(gint filetype_idx) { gchar *result; + GeanyFiletype *ft = filetypes[filetype_idx]; + + if (ft->priv->custom) + return g_strconcat(ft->name, ".conf", NULL); /* Handle any special extensions different from lowercase filetype->name */ switch (filetype_idx) @@ -1274,7 +1357,7 @@ case GEANY_FILETYPES_CPP: result = g_strdup("cpp"); break; case GEANY_FILETYPES_CS: result = g_strdup("cs"); break; case GEANY_FILETYPES_MAKE: result = g_strdup("makefile"); break; - default: result = g_ascii_strdown(filetypes[filetype_idx]->name, -1); break; + default: result = g_ascii_strdown(ft->name, -1); break; } return result; } @@ -1284,38 +1367,27 @@ { gchar *conf_prefix = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", NULL); - gint i; + guint i; - for (i = 1; i < GEANY_MAX_BUILT_IN_FILETYPES; i++) + for (i = 1; i < filetypes_array->len; i++) { - struct build_programs *bp = filetypes[i]->programs; GKeyFile *config_home; gchar *fname, *ext, *data; - if (! bp->modified) - continue; - - ext = filetypes_get_conf_extension(i); - fname = g_strconcat(conf_prefix, ext, NULL); - g_free(ext); - - config_home = g_key_file_new(); - g_key_file_load_from_file(config_home, fname, G_KEY_FILE_KEEP_COMMENTS, NULL); - - if (NZV(bp->compiler)) - g_key_file_set_string(config_home, "build_settings", "compiler", bp->compiler); - if (NZV(bp->linker)) - g_key_file_set_string(config_home, "build_settings", "linker", bp->linker); - if (NZV(bp->run_cmd)) - g_key_file_set_string(config_home, "build_settings", "run_cmd", bp->run_cmd); - if (NZV(bp->run_cmd2)) - g_key_file_set_string(config_home, "build_settings", "run_cmd2", bp->run_cmd2); - - data = g_key_file_to_data(config_home, NULL, NULL); - utils_write_file(fname, data); - g_free(data); - g_key_file_free(config_home); - g_free(fname); + if (filetypes[i]->home_save_needed) + { + ext = filetypes_get_conf_extension(i); + fname = g_strconcat(conf_prefix, ext, NULL); + g_free(ext); + config_home = g_key_file_new(); + g_key_file_load_from_file(config_home, fname, G_KEY_FILE_KEEP_COMMENTS, NULL); + build_save_menu(config_home, (gpointer)(filetypes[i]), GEANY_BCS_HOME_FT); + data = g_key_file_to_data(config_home, NULL, NULL); + utils_write_file(fname, data); + g_free(data); + g_key_file_free(config_home); + g_free(fname); + } } g_free(conf_prefix); } @@ -1365,7 +1437,8 @@ } -/* Indicates whether there is a tag parser for the filetype or not. */ +/* Indicates whether there is a tag parser for the filetype or not. + * Only works for custom filetypes if the filetype settings have been loaded. */ gboolean filetype_has_tags(GeanyFiletype *ft) { g_return_val_if_fail(ft != NULL, FALSE); @@ -1374,7 +1447,7 @@ } -/** Find a filetype pointer from its @a name field. +/** Finds a filetype pointer from its @a name field. * @param name Filetype name. * @return The filetype found, or @c NULL. * @@ -1401,9 +1474,9 @@ } -static void compile_regex(GeanyFiletype *ft, regex_t *regex) +static void compile_regex(GeanyFiletype *ft, regex_t *regex, gchar *regstr) { - gint retval = regcomp(regex, ft->error_regex_string, REG_EXTENDED); + gint retval = regcomp(regex, regstr, REG_EXTENDED); ft->priv->error_regex_compiled = (retval == 0); /* prevent recompilation */ @@ -1422,22 +1495,41 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message, gchar **filename, gint *line) { + gchar *regstr; + gchar **tmp; + GeanyDocument *doc; +#ifdef HAVE_REGCOMP + regex_t *regex; + regmatch_t pmatch[3]; +#endif + if (ft == NULL) + { + doc = document_get_current(); + if (doc != NULL) + ft = doc->file_type; + } + tmp = build_get_regex(build_info.grp, ft, NULL); + if (tmp == NULL) + return FALSE; + regstr = *tmp; #ifndef HAVE_REGCOMP - if (!NZV(ft->error_regex_string)) + if (!NZV(regstr)) geany_debug("No regex support - maybe you should configure with --enable-gnu-regex!"); return FALSE; #else - regex_t *regex = &ft->priv->error_regex; - regmatch_t pmatch[3]; + regex = &ft->priv->error_regex; *filename = NULL; *line = -1; - if (!NZV(ft->error_regex_string)) + if (!NZV(regstr)) return FALSE; - if (!ft->priv->error_regex_compiled) - compile_regex(ft, regex); + if (!ft->priv->error_regex_compiled || regstr != ft->priv->last_string) + { + compile_regex(ft, regex, regstr); + ft->priv->last_string = regstr; + } if (!ft->priv->error_regex_compiled) /* regex error */ return FALSE; @@ -1487,7 +1579,6 @@ "filetype_extensions.conf", NULL); gchar *userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "filetype_extensions.conf", NULL); - gchar **list; GKeyFile *sysconfig = g_key_file_new(); GKeyFile *userconfig = g_key_file_new(); @@ -1499,20 +1590,30 @@ { gboolean userset = g_key_file_has_key(userconfig, "Extensions", filetypes[i]->name, NULL); - list = g_key_file_get_string_list( + gchar **list = g_key_file_get_string_list( (userset) ? userconfig : sysconfig, "Extensions", filetypes[i]->name, &len, NULL); + if (G_LIKELY(list) && G_LIKELY(len > 0)) { g_strfreev(filetypes[i]->pattern); filetypes[i]->pattern = list; } - else g_strfreev(list); + else + g_strfreev(list); } g_free(sysconfigfile); g_free(userconfigfile); g_key_file_free(sysconfig); g_key_file_free(userconfig); + + foreach_document(i) + { + GeanyDocument *doc = documents[i]; + if (doc->file_type->id != GEANY_FILETYPES_NONE) + continue; + document_set_filetype(doc, filetypes_detect_from_document(doc)); + } } @@ -1527,3 +1628,31 @@ { return (idx >= 0 && idx < (gint) filetypes_array->len) ? filetypes[idx] : NULL; } + + +void filetypes_reload(void) +{ + guint i; + GeanyDocument *current_doc; + + /* save possibly changed commands before re-reading them */ + filetypes_save_commands(); + + /* reload filetype configs */ + for (i = 0; i < filetypes_array->len; i++) + { + /* filetypes_load_config() will skip not loaded filetypes */ + filetypes_load_config(i, TRUE); + } + /* update document styling */ + current_doc = document_get_current(); + foreach_document(i) + { + if (current_doc != documents[i]) + document_reload_config(documents[i]); + } + /* process the current document at last */ + document_reload_config(current_doc); +} + + diff -Nru geany-0.18/src/filetypes.h geany-0.19/src/filetypes.h --- geany-0.18/src/filetypes.h 2009-08-11 14:22:42.000000000 +0100 +++ geany-0.19/src/filetypes.h 2010-03-12 18:15:48.000000000 +0000 @@ -1,8 +1,8 @@ /* * filetypes.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: filetypes.h 4066 2009-08-11 13:22:42Z ntrel $ + * $Id: filetypes.h 4757 2010-03-12 18:15:48Z ntrel $ */ @@ -28,10 +28,14 @@ #include "Scintilla.h" #include "ScintillaWidget.h" +#ifdef GEANY_PRIVATE +#include "build.h" +#endif + typedef enum { - GEANY_FILETYPES_NONE = 0, /* first filetype is always None */ + GEANY_FILETYPES_NONE = 0, /* first filetype is always None & must be 0 */ GEANY_FILETYPES_PHP, GEANY_FILETYPES_BASIC, /* FreeBasic */ @@ -77,6 +81,9 @@ GEANY_FILETYPES_ADA, GEANY_FILETYPES_CMAKE, GEANY_FILETYPES_MARKDOWN, + GEANY_FILETYPES_TXT2TAGS, + GEANY_FILETYPES_ABC, + GEANY_FILETYPES_VERILOG, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } @@ -89,6 +96,7 @@ GEANY_FILETYPE_GROUP_SCRIPT, GEANY_FILETYPE_GROUP_MARKUP, GEANY_FILETYPE_GROUP_MISC, + GEANY_FILETYPE_GROUP_CUSTOM, GEANY_FILETYPE_GROUP_COUNT } GeanyFiletypeGroupID; @@ -99,23 +107,6 @@ #define FILETYPE_ID(filetype_ptr) \ (((filetype_ptr) != NULL) ? (filetype_ptr)->id : GEANY_FILETYPES_NONE) - -struct build_actions -{ - gboolean can_compile; - gboolean can_link; - gboolean can_exec; -}; - -struct build_programs -{ - gchar *compiler; - gchar *linker; - gchar *run_cmd; - gchar *run_cmd2; - gboolean modified; -}; - /** Represents a filetype. */ struct GeanyFiletype { @@ -123,25 +114,38 @@ /** Represents the langType of tagmanager (see the table * in tagmanager/parsers.h), -1 represents all, -2 none. */ langType lang; - gchar *name; /**< Used as name for tagmanager. E.g. "C". */ + gchar *name; /**< Short name, e.g. "C". */ gchar *title; /**< Shown in the file open dialog. E.g. "C source file". */ - gchar *extension; /**< Default file extension for new files. */ + gchar *extension; /**< Default file extension for new files, or @c NULL. */ gchar **pattern; /**< Array of filename-matching wildcard strings. */ gchar *context_action_cmd; gchar *comment_open; gchar *comment_close; gboolean comment_use_indent; - struct build_programs *programs; - struct build_actions *actions; /* TODO: make private */ - GeanyFiletypeGroupID group; + GeanyFiletypeGroupID group; gchar *error_regex_string; + GeanyFiletype *lexer_filetype; struct GeanyFiletypePrivate *priv; /* must be last, append fields before this item */ +#ifdef GEANY_PRIVATE + /* Do not use following fields in plugins */ + GeanyBuildCommand *filecmds; /* these need to be visible since used in build.c so not in private part */ + GeanyBuildCommand *ftdefcmds; /* filetype dependent defaults for non_ft commands */ + GeanyBuildCommand *execcmds; + GeanyBuildCommand *homefilecmds; + GeanyBuildCommand *homeexeccmds; + GeanyBuildCommand *projfilecmds; + GeanyBuildCommand *projexeccmds; + gint project_list_entry; + gchar *projerror_regex_string; + gchar *homeerror_regex_string; + gboolean home_save_needed; +#endif }; extern GPtrArray *filetypes_array; -/** Wrap filetypes_array so it can be used with C array syntax. +/** Wraps filetypes_array so it can be used with C array syntax. * Example: filetypes[GEANY_FILETYPES_C]->name = ...; * @see filetypes_index(). */ #define filetypes ((GeanyFiletype **)GEANY(filetypes_array)->pdata) @@ -160,6 +164,9 @@ void filetypes_read_extensions(void); +void filetypes_reload(void); + + GeanyFiletype *filetypes_index(gint idx); GeanyFiletype *filetypes_detect_from_document(GeanyDocument *doc); diff -Nru geany-0.18/src/gb.c geany-0.19/src/gb.c --- geany-0.18/src/gb.c 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/gb.c 2010-04-25 18:43:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * gb.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: gb.c 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: gb.c 4862 2010-04-25 17:43:39Z eht16 $ */ /* @@ -35,30 +35,31 @@ #define MAX_PICS 10 #define LOOP_DELAY 200000 /* micro seconds */ -#define IMAGE_LOGO 10 -#define IMAGE_BUTTON_UP 11 -#define IMAGE_BUTTON_DOWN 12 +#define IMAGE_BUTTON_UP 10 +#define IMAGE_BUTTON_DOWN 11 -unsigned short lap; +gushort bout; gint points; -unsigned short iconset; +gushort iconset; GtkWidget *image1, *image2, *image3, *image4, *label1, *label2, *label3, *okbutton1, *textview1; gchar info_texts[4][50]; -gchar *help_text; +const gchar *help_text; gboolean is_running; static GdkPixbuf **icons; +static GtkWidget *gb_window = NULL; + static gint gb_destroyapp (GtkWidget *widget, gpointer gdata); static gint destroydialog (GtkWidget *widget, gpointer data); static void update_labels(GtkWidget *window, gint init, gint won); -static void on_button1_clicked(GtkButton *button, gpointer user_data); -static void on_button4_clicked(GtkButton *button, gpointer user_data); -static void on_button5_clicked(GtkButton *button, gpointer user_data); +static void arm_clicked_cb(GtkButton *button, gpointer user_data); +static void help_clicked_cb(GtkButton *button, gpointer user_data); +static void close_clicked_cb(GtkButton *button, gpointer user_data); -static void create_window(void) +static void create_window(GtkWindow *parent) { GtkWidget *vbox1; GtkWidget *hbox1; @@ -76,8 +77,7 @@ gtk_window_set_skip_taskbar_hint(GTK_WINDOW(gb_window), FALSE); gtk_window_set_modal(GTK_WINDOW(gb_window), TRUE); gtk_window_set_skip_pager_hint(GTK_WINDOW(gb_window), TRUE); - gtk_window_set_icon(GTK_WINDOW(gb_window), icons[IMAGE_LOGO]); - gdk_pixbuf_unref(icons[IMAGE_LOGO]); + gtk_window_set_transient_for(GTK_WINDOW(gb_window), parent); vbox1 = gtk_vbox_new(FALSE, 0); gtk_widget_show(vbox1); @@ -139,14 +139,15 @@ gtk_box_pack_start(GTK_BOX(hbox2), button5, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(button5), 5); - g_signal_connect(button1, "clicked", G_CALLBACK(on_button1_clicked), NULL); - g_signal_connect(button4, "clicked", G_CALLBACK(on_button4_clicked), NULL); - g_signal_connect(button5, "clicked", G_CALLBACK(on_button5_clicked), NULL); + g_signal_connect(button1, "clicked", G_CALLBACK(arm_clicked_cb), NULL); + g_signal_connect(button4, "clicked", G_CALLBACK(help_clicked_cb), parent); + g_signal_connect(button5, "clicked", G_CALLBACK(close_clicked_cb), NULL); gtk_widget_grab_focus(button4); } -static GtkWidget *create_help_dialog(void) + +static GtkWidget *create_help_dialog(GtkWindow *parent) { GtkWidget *help_dialog; GtkWidget *dialog_vbox1; @@ -158,6 +159,7 @@ gtk_window_set_title(GTK_WINDOW(help_dialog), "Help"); gtk_window_set_type_hint(GTK_WINDOW(help_dialog), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_modal(GTK_WINDOW(help_dialog), TRUE); + gtk_window_set_transient_for(GTK_WINDOW(help_dialog), parent); dialog_vbox1 = GTK_DIALOG(help_dialog)->vbox; gtk_widget_show(dialog_vbox1); @@ -204,13 +206,13 @@ } -static void on_button5_clicked(GtkButton *button, gpointer user_data) +static void close_clicked_cb(GtkButton *button, gpointer user_data) { - gb_destroyapp(GTK_WIDGET(button), user_data); + gb_destroyapp(GTK_WIDGET(button), user_data); } -static gint get_points(unsigned short a, unsigned short b, unsigned short c) +static gint get_points(gushort a, gushort b, gushort c) { if (a == b && b == c) { @@ -230,16 +232,35 @@ } -static void on_button1_clicked(GtkButton *button, gpointer user_data) +/* ensure all three icons are different */ +static void ensure_different_icons(gushort *a, gushort *b, gushort *c) +{ + if (*a == *b) + { + (*b)++; + if (*b > 9) + *b = 0; + } + if (*b == *c) + { + (*c)++; + if (*c > 9) + *c = 0; + } +} + + +static void arm_clicked_cb(GtkButton *button, gpointer user_data) { - unsigned short erg_a, erg_b, erg_c, i, l, m, n, loops; + gushort erg_a, erg_b, erg_c, i, l, m, n, loops; - if (is_running) return; /* prevent multiple clicks */ + if (is_running) + return; /* prevent multiple clicks */ is_running = TRUE; /* change button-image */ gtk_image_set_from_pixbuf(GTK_IMAGE(image4), icons[IMAGE_BUTTON_DOWN]); - lap++; + bout++; update_labels(gb_window, FALSE, 3); l = g_random_int_range(0, MAX_PICS); @@ -249,9 +270,11 @@ erg_b = g_random_int_range(0, MAX_PICS); erg_c = g_random_int_range(0, MAX_PICS); + ensure_different_icons(&l, &m, &n); + /* assign icons */ loops = 30; - for(i = 0; i < loops; i++) + for (i = 0; i < loops; i++) { if (l > 9) l = 0; if (m > 9) m = 0; @@ -288,9 +311,9 @@ } -static void on_button4_clicked(GtkButton *button, gpointer user_data) +static void help_clicked_cb(GtkButton *button, gpointer user_data) { - GtkWidget *dialog = create_help_dialog(); + GtkWidget *dialog = create_help_dialog(user_data); GtkTextBuffer *buffer; g_signal_connect(dialog, "delete-event", G_CALLBACK(destroydialog), G_OBJECT(dialog)); @@ -325,740 +348,1227 @@ } gtk_label_set_text(GTK_LABEL(label3), info_texts[won]); - g_snprintf(pts, 50, "Points: %4d\tRound: %2d\n", points, lap); + g_snprintf(pts, 50, "Points: %4d\tRound: %2d\n", points, bout); gtk_label_set_text(GTK_LABEL(label1), pts); } -static const GdkPixdata pic10 = { - 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 891, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ - 32, /* width */ - 32, /* height */ - /* pixel_data: */ - (guint8*) - "\217\377\377\377\202333\234\377\377\377\203333\3\0\0\0""333\377\377\377" - "\202333\227\377\377\377\1\20\0\0\205\0\0\0\3\"\"\"\21\21\21DDD\225\377" - "\377\377\202\21\21\21\204DDD\1\21\21\21\203\0\0\0\1\21\21\21\224\377" - "\377\377\1\21\21\21\206\314\230f\6DDD\21\21\21\"\"\"DDD\"\"\"\21\21\21" - "\222\377\377\377\2\21\21\21\314\230f\207\377\313\231\3DDDUUU\314\230" - "f\202DDD\1\21\21\21\220\377\377\377\2\21\21\21\314\230f\211\377\313\231" - "\1DDD\203\377\313\231\2\314\230f\21\21\21\217\377\377\377\1\21\21\21" - "\217\377\313\231\1\21\21\21\216\377\377\377\2\21\21\21\314\230f\217\377" - "\313\231\2\314\230f\21\21\21\215\377\377\377\1\21\21\21\220\377\313\231" - "\2\314\230f\21\21\21\214\377\377\377\2\21\21\21\314\230f\220\377\313" - "\231\2\314\230f\21\21\21\214\377\377\377\2\21\21\21\314\230f\205\377" - "\313\231\202\21\21\21\211\377\313\231\2\314\230f\21\21\21\215\377\377" - "\377\202\21\21\21\1\314\230f\203\377\313\231\2UUU\210\210\210\203\377" - "\313\231\202\21\21\21\204\377\313\231\2\314\230f\21\21\21\217\377\377" - "\377\202\21\21\21\1\314\230f\206\377\313\231\2UUU\210\210\210\204\377" - "\313\231\2\314\230f\21\21\21\221\377\377\377\202\21\21\21\202\314\230" - "f\202\"\"\"\207\377\313\231\2\314\230f\21\21\21\223\377\377\377\202\21" - "\21\21\2\"\"\"www\202\314\230f\204\377\313\231\202\314\230f\1\21\21\21" - "\214\377\377\377\205\21\21\21\1\"\"\"\202333\4\"\"\"333\20\0\0\"\"\"" - "\210UUU\1\21\21\21\213\377\377\377\1\21\21\21\202\314\230f\202www\3U" - "UUDDD333\202\"\"\"\2\21\21\21\20\0\0\202\21\21\21\3\"\"\"333DDD\202U" - "UU\2\314\230f\21\21\21\214\377\377\377\1\21\21\21\205\377\313\231\202" - "www\204DDD\202www\204\377\313\231\1\21\21\21\215\377\377\377\2\21\21" - "\21\314\230f\217\377\313\231\2\314\230f\21\21\21\216\377\377\377\1\21" - "\21\21\217\377\313\231\1\21\21\21\217\377\377\377\2\21\21\21\314\230" - "f\215\377\313\231\2\314\230f\21\21\21\216\377\377\377\1www\202\21\21" - "\21\1\314\230f\213\377\313\231\1\314\230f\203\21\21\21\1www\214\377\377" - "\377\1\21\21\21\202\377\313\231\2\21\21\21\314\230f\211\377\313\231\1" - "\314\230f\202\21\21\21\202\377\313\231\1\21\21\21\214\377\377\377\1w" - "ww\202\21\21\21\1\230\313\313\202\21\21\21\207\314\230f\202\21\21\21" - "\202\230\313\313\202\21\21\21\1www\216\377\377\377\1\21\21\21\203\230" - "\313\313\207\21\21\21\204\230\313\313\1\21\21\21\221\377\377\377\202" - "\21\21\21\204\231\314\377\2DDD3\231e\204\231\314\377\202\21\21\21\223" - "\377\377\377\1\21\21\21\204\231\314\377\2DDD3\231e\204\231\314\377\1" - "\21\21\21\224\377\377\377\1\21\21\21\204\231\314\377\2DDD3\231e\204\231" - "\314\377\1\21\21\21\224\377\377\377\1\21\21\21\204\231\314\377\2DDD3" - "\231e\204\231\314\377\1\21\21\21\223\377\377\377\1\21\21\21\205\231\314" - "\377\202\21\21\21\205\231\314\377\1\21\21\21\222\377\377\377\206\21\21" - "\21\202\377\377\377\206\21\21\21\211\377\377\377" -}; - - +/* The icons pic1 to pic10 are taken from the Rodent icon theme and are licenced as GPLv2. */ static const GdkPixdata pic1 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1519, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2645, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\214\377\377\377\210\21\21\21\226\377\377\377\202\21\21\21\210\314e\0" - "\202\21\21\21\222\377\377\377\202\21\21\21\202\314e\0\210\375\230\0\202" - "\314e\0\202\21\21\21\217\377\377\377\1\21\21\21\202\314e\0\215\375\230" - "\0\2\314e\0\21\21\21\215\377\377\377\2\21\21\21\314e\0\220\375\230\0" - "\2\314e\0\21\21\21\213\377\377\377\2\21\21\21\314e\0\222\375\230\0\2" - "\314e\0\21\21\21\211\377\377\377\2\21\21\21\2302\0\207\375\230\0\1\375" - "e\0\204\2302\0\1\375e\0\207\375\230\0\2\2302\0\21\21\21\210\377\377\377" - "\1\21\21\21\206\375\230\0\2\314e\0e22\202\"\"\"\202\314\230f\202\"\"" - "\"\2e22\314e\0\205\375\230\0\2\314e\0\21\21\21\207\377\377\377\2\21\21" - "\21\2302\0\205\375\230\0\204\"\"\"\1\314\230f\202\377\313\231\1\314\230" - "f\203\"\"\"\1e22\205\375\230\0\2\2302\0\21\21\21\206\377\377\377\2\21" - "\21\21\314e\0\203\375\230\0\1\375e\0\204\"\"\"\1\210\210\210\204\377" - "\313\231\2\252\252\252www\203\"\"\"\1\375e\0\203\375\230\0\2\314e\0\21" - "\21\21\205\377\377\377\2\21\21\21\314e\0\204\375\230\0\203\"\"\"\1\210" - "\210\210\202\377\377\377\1\210\210\210\202\377\313\231\1\252\252\252" - "\202\377\377\377\1\273\273\273\203\"\"\"\1\375e\0\203\375\230\0\2\230" - "2\0\21\21\21\204\377\377\377\2\21\21\21\314e\0\203\375\230\0\1\314e\0" - "\202\"\"\"\1\210\210\210\204\377\377\377\202\210\210\210\204\377\377" - "\377\1\210\210\210\202\"\"\"\1\314e\0\203\375\230\0\2\314e\0\21\21\21" - "\204\377\377\377\2\21\21\21\314e\0\203\375\230\0\203\"\"\"\1\210\210" - "\210\205\377\377\377\1\210\210\210\204\377\377\377\1\210\210\210\203" - "\"\"\"\203\375\230\0\2\314e\0\21\21\21\204\377\377\377\2\21\21\21\314" - "e\0\202\375\230\0\1\375e\0\203\"\"\"\1\210\210\210\203\377\377\377\5" - "\0\0\0\377\377\377\210\210\210\377\377\377\0\0\0\202\377\377\377\1\210" - "\210\210\203\"\"\"\1\314e\0\202\375\230\0\2\314e\0\21\21\21\204\377\377" - "\377\2\21\21\21\314e\0\202\375\230\0\1\314e\0\203\"\"\"\1\210\210\210" - "\205\377\377\377\1\210\210\210\204\377\377\377\1\210\210\210\203\"\"" - "\"\1\314e\0\202\375\230\0\2\314e\0\21\21\21\204\377\377\377\2\21\21\21" - "\314e\0\202\375\230\0\1\314e\0\203\"\"\"\1\210\210\210\205\377\377\377" - "\1\210\210\210\204\377\377\377\1\210\210\210\203\"\"\"\1\314e\0\202\375" - "\230\0\2\314e\0\21\21\21\204\377\377\377\2\21\21\21\314e\0\202\375\230" - "\0\2\314e\0e22\202\"\"\"\1fff\204\377\377\377\3\210\210\210\377\313\231" - "\210\210\210\203\377\377\377\1\210\210\210\202\"\"\"\2e22\314e\0\202" - "\375\230\0\2\314e\0\21\21\21\204\377\377\377\2\21\21\21\2302\0\202\375" - "\230\0\2\375e\0\375\230\0\203\"\"\"\1fff\202\377\377\377\1\210\210\210" - "\203\377\313\231\3\210\210\210\377\377\377\210\210\210\203\"\"\"\2\314" - "e\0\375e\0\202\375\230\0\2\2302\0\21\21\21\205\377\377\377\2\21\21\21" - "\314e\0\202\375\230\0\202\314e\0\203\"\"\"\202\210\210\210\205\377\313" - "\231\1\210\210\210\204\"\"\"\203\375\230\0\2\314e\0\21\21\21\206\377" - "\377\377\2\21\21\21\314e\0\202\375\230\0\1\375e\0\202\314e\0\203\"\"" - "\"\202\314\230f\202\377\313\231\202\314\230f\204\"\"\"\202\314e\0\202" - "\375\230\0\2\314e\0\21\21\21\207\377\377\377\2\21\21\21\314e\0\202\375" - "\230\0\1\314e\0\202\375\230\0\203\"\"\"\1\210\210\210\202\314\230f\1" - "\210\210\210\203\"\"\"\3e22\375\230\0\314e\0\203\375\230\0\1\21\21\21" - "\210\377\377\377\2\21\21\21\2302\0\203\375\230\0\1\314e\0\202\375\230" - "\0\1\314e\0\206\"\"\"\1\314e\0\202\375e\0\1\314e\0\203\375\230\0\2\230" - "2\0\21\21\21\211\377\377\377\2\21\21\21\314e\0\203\375\230\0\2\375e\0" - "\314e\0\203\375\230\0\202\314e\0\1\230e\0\202\375\230\0\2\314e\0\375" - "e\0\203\375\230\0\2\314e\0\21\21\21\213\377\377\377\2\21\21\21\314e\0" - "\204\375\230\0\203\314e\0\3\3142\0\375e\0\3142\0\202\314e\0\204\375\230" - "\0\2\314e\0\21\21\21\215\377\377\377\2\21\21\21\314e\0\206\375\230\0" - "\3\3142\0\375\230\0\3142\0\205\375\230\0\1\314e\0\202\21\21\21\214\377" - "\377\377\2\21\21\21\314e\0\202\21\21\21\202\314e\0\203\375\230\0\3\314" - "2\0\375\230\0\3142\0\203\375\230\0\202\314e\0\1\21\21\21\202\314e\0\1" - "\21\21\21\212\377\377\377\2\21\21\21\314e\0\202\375\230\0\1\314e\0\202" - "\21\21\21\205\314e\0\1\3142\0\203\314e\0\202\21\21\21\1\314e\0\202\375" - "\230\0\1\21\21\21\212\377\377\377\2\21\21\21\314e\0\204\375\230\0\1\314" - "e\0\211\21\21\21\1\314e\0\204\375\230\0\2\314e\0\21\21\21\210\377\377" - "\377\2\21\21\21\314e\0\202\375\230\0\1\314e\0\207\375\230\0\1\3142\0" - "\207\375\230\0\4\314e\0\375\230\0\314e\0\21\21\21\210\377\377\377\2\"" - "\"\"\2302\0\202\314e\0\2\3142\0\314e\0\206\375\230\0\1\3142\0\206\375" - "\230\0\5\314e\0\3142\0\314e\0\2302\0\"\"\"\210\377\377\377\203\"\"\"" - "\3DDD\3142\0\314e\0\206\375\230\0\1\3142\0\206\375\230\0\3\314e\0\314" - "2\0DDD\202\"\"\"\211\377\377\377\203\"\"\"\2\3142\0\314e\0\206\375\230" - "\0\1\3142\0\206\375\230\0\2\314e\0\3142\0\202\"\"\"\205\377\377\377" + "\315\0\0\0\0\7\0\0\0\16\0\0\0\25\0\0\0\33\0\0\0\37\0\0\0\26\0\0\0\21" + "\0\0\0\6\202\0\0\0\0\1\0\0\0\1\223\0\0\0\0\14\0\0\0\2\3\2\1:\2\2\1e\15" + "\13\3\251\10\6\2\317\0\0\0\335\0\0\0\340\6\4\0\325\15\12\2\275\10\6\2" + "|\1\1\0K\0\0\0\30\222\0\0\0\0\22\0\0\0\2\1\1\0""7\20\15\5\242\7\6\2\347" + "\0\0\0\377\12\10\2\377*!\13\3776*\16\3779-\16\377-#\11\377\31\23\4\377" + "\0\0\0\377\3\2\0\374\16\12\1\277\15\11\2_\0\0\0\22\0\0\0\0\0\0\0\1\213" + "\0\0\0\0\24\11\4\4\0\0\0\0\0\0\0\0\4\16\13\4v\2\1\0\337\0\0\0\3770'\17" + "\377\225y0\375\300\234<\376\334\261A\376\350\271B\376\353\272>\376\336" + "\2565\376\307\232+\376\244|\37\375Q=\14\377\0\0\0\377\0\0\0\366\15\11" + "\1\244\0\0\0&\213\0\0\0\0\26\1\0\0\0\0\0\0\0\0\0\0\25\14\11\4\217\1\1" + "\0\377\22\17\5\377\244\2078\377\355\304S\376\360\306T\377\352\300Q\376" + "\344\272L\377\340\267G\376\337\263B\377\337\261=\376\341\2607\377\345" + "\2611\376\345\255)\377\302\220\34\376;+\6\377\0\0\0\377\20\13\1\277\1" + "\1\0C\214\0\0\0\0\25\15\12\4\207\0\0\0\3770(\20\377\326\261M\376\360" + "\311Z\377\341\275W\376\343\276X\377\343\276V\376\342\273R\377\341\271" + "N\376\337\266H\377\336\262B\376\334\256:\377\331\2523\376\327\244+\377" + "\334\245$\377\337\244\34\377kM\11\377\0\0\0\377\17\13\0\301\0\0\0(\212" + "\0\0\0\0\27\14\11\4f\0\0\0\376)\"\15\377\356\306X\376\352\305\\\377\344" + "\302^\377\345\304`\376\345\304a\377\345\303_\376\344\300Z\377\342\275" + "U\376\341\271N\377\337\266H\376\334\261\77\377\333\2558\376\331\250/" + "\377\326\242'\376\327\237\37\377\351\251\27\376mN\7\377\0\0\0\377\14" + "\10\1\245\0\0\0\13\210\0\0\0\0\31\0\0\0\215\2\2\0\330\27\22\7\377\334" + "\267O\376\370\321a\377\356\312c\376\350\310f\377\347\310h\376\347\311" + "i\377\346\307f\376\345\304`\377\344\300Z\376\342\274R\377\340\270L\376" + "\336\263C\377\334\256;\376\331\2512\377\331\245*\376\335\245\"\377\340" + "\244\32\376\350\246\20\377J4\3\377\0\0\0\366\4\3\0\250\0\0\0!\206\0\0" + "\0\0\1\0\0\0a\202\0\0\0\377\24\27\23\10\376hW&\377\263\230I\377\312\256" + "X\376\364\325s\377\374\336{\376\363\326w\377\351\314n\376\345\305e\377" + "\344\302^\376\341\275V\377\336\270N\376\336\264F\377\344\266@\376\352" + "\2678\377\347\261/\376\300\220\37\377\254~\24\376jM\10\377&\33\1\376" + "\202\0\0\0\377\1\0\0\0\213\206\0\0\0\0\25\0\0\0\234\0\0\0\377\0\0\0\376" + "\0\0\0\377\0\0\0\376\0\0\0\377\17\15\6\376D\0\0\0!\233\0\0\0\0\6\0\0\0\11\0\0\0\201" + "\23\1\0\344'\4\2\351\13\0\0\332\0\0\0E\231\0\0\0\0\10\0\0\0O\6\0\0\312" + "\\\16\6\377\261\30\13\377\266\25\11\377\217\15\6\377\35\1\0\364\0\0\0" + "<\223\0\0\0\0\27\10\2\1\30\0\0\0-\0\0\0+\0\0\0I\0\0\0\254<\13\5\374\232" + "\33\14\377\307\37\15\375\262\30\13\377\254\24\11\377\264\21\7\376\214" + "\11\4\377\25\0\0\334\0\0\0'\0\0\0)\0\0\0O\0\0\0r\0\0\0\212\0\0\0}\0\0" + "\0q\0\0\0c\0\0\0C\2\0\0\34\211\0\0\0\0\30\0\0\0+*\13\5\377\\\30\13\377" + "X\26\11\377\227\"\17\377\315)\23\377\305#\20\376\267\35\14\376\263\30" + "\13\377\257\25\11\377\252\20\7\376\266\14\5\376L\3\1\377!\0\0\371\77" + "\0\0\376J\0\0\377d\0\0\377u\0\0\377g\0\0\377U\0\0\377B\0\0\377\34\0\0" + "\332\0\0\0\216\0\0\0)\210\0\0\0\0\30\0\0\0\22Z\31\13\377\374D\37\375" + "\3428\31\376\320/\25\376\302'\22\377\275\"\17\377\267\35\14\377\263\30" + "\13\376\257\25\11\377\252\20\7\376\246\14\5\377\217\7\3\376L\0\0\377" + "\264\0\0\376\243\0\0\377\237\0\0\376\235\0\0\376\237\0\0\376\242\0\0" + "\377\256\0\0\377p\0\0\377\0\0\0\260\0\0\0D\207\0\0\0\0\31\33\7\3\1\0" + "\0\0\0""8\20\7\351\3208\31\377\3245\27\376\312.\24\376\303'\22\377\275" + "\"\17\376\267\35\14\377\263\30\13\376\257\25\11\377\252\20\7\376\243" + "\13\5\377\257\10\3\376>\1\0\377x\0\0\376\237\0\0\377\231\0\0\376\230" + "\0\0\377\231\0\0\377\227\0\0\376\247\0\0\377U\0\0\377\0\0\0\221\0\0\0" + "\1\206\0\0\0\0\1\305.\27\0\202\0\0\0\0\26\14\4\1\263\2671\26\377\330" + "6\30\377\312.\24\376\303'\22\377\275\"\17\376\267\35\14\377\263\30\13" + "\376\257\25\11\377\262\21\7\376\257\15\5\377e\5\2\376A\0\0\377\224\0" + "\0\376\233\0\0\377\231\0\0\376\230\0\0\376\234\0\0\376\244\0\0\377X\0" + "\0\377\0\0\0\245\0\0\0\13\206\0\0\0\0\30\37\12\2\0\0\0\0\0\0\0\0\25\0" + "\0\0\201#\10\3\364\241+\23\377\3347\30\377\311.\24\376\303'\22\377\273" + "!\17\376\267\34\14\377\276\32\14\376\276\26\12\377\215\16\6\376G\4\1" + "\377M\0\0\376\237\0\0\377\233\0\0\376\230\0\0\377\227\0\0\376\240\0\0" + "\376\234\0\0\377E\0\0\377\0\0\0\207\202\0\0\0\0\1\4\0\0\0\206\0\0\0\0" + "\26\0\0\0d(\12\5\344\225\"\17\377\213\35\15\377\205%\21\376\3459\32\377" + "\3210\25\376\310)\23\377\276#\20\376\253\34\14\377o\20\7\376A\7\3\377" + "J\1\0\376~\0\0\377\244\0\0\376\230\0\0\377\232\0\0\376\237\0\0\377\233" + "\0\0\377p\0\0\377&\0\0\350\0\0\0G\210\0\0\0\0\27\0\0\0\14\0\0\0\244e" + "\30\13\377\315.\25\377\316'\21\377\247\31\12\376Q\23\10\377\204#\20\377" + "s\32\13\376b\20\7\377P\7\3\376A\1\0\377k\0\0\376\224\0\0\377\234\0\0" + "\376\236\0\0\377\227\0\0\376\240\0\0\377\240\0\0\376o\0\0\377G\23\2\377" + "\0\0\0\377\3\13\0\263\210\0\0\0\0\31\0\0\0\36\0\0\0\274\203\37\16\377" + "\321,\24\376\274\40\16\376\265\32\13\377\263\25\11\377\212\13\4\376l" + "\2\0\377r\0\0\376\200\0\0\377\227\0\0\376\247\0\0\377\236\0\0\376\231" + "\0\0\377\237\0\0\376\231\0\0\377\225\0\0\376`\0\0\377=\4\0\376}[\12\377" + "\322\236\30\376\\B\7\376\0\0\0\377\21\14\0\211\206\0\0\0\0\35\0\0\0\15" + "\0\0\0\245\202\35\15\377\322)\22\377\271\35\15\376\260\26\12\376\253" + "\21\7\376\244\13\4\377\244\5\1\376\241\0\0\377\236\0\0\376\234\0\0\377" + "\232\0\0\376\237\0\0\377\250\0\0\376\222\0\0\377k\0\0\376_\22\7\377I" + "2\20\376]ZE\377\211\220\211\376\205{\\\377\277\214\25\376\341\241\21" + "\376,\37\1\377\0\0\0\361\13\7\0""6\0\0\0\0\1\0\0\0\203\0\0\0\0\35\0\0" + "\0D\12\2\0\305\236\34\14\377\306\34\14\377\270\25\11\377\260\16\6\377" + "\251\10\3\377\243\2\0\376\237\0\0\377\233\0\0\377\232\0\0\376\225\0\0" + "\377\226\0\0\376q\15\15\377A\4\5\376^1\30\377\220|<\376\314\260J\377" + "\211v\77\376\370\372\377\377\377\377\377\376\377\377\377\377ynW\376\326" + "\226\7\376\241r\11\377\0\0\0\377\13\10\0\227\0\0\0\0\0\0\0\1\203\0\0" + "\0\0\34\0\0\0!\0\0\0\217.\6\2\360w\14\5\377u\10\3\377u\4\1\377z\0\0\377" + "p\0\0\376e\0\0\377e\7\2\377X\23\17\376XCD\377\20\13\13\376gmm\377\273" + "\306\312\376\263\241S\377\373\330i\376\330\261E\377\250\240\211\376\332" + "\334\342\377$$#\376\246\246\246\377\241\240\235\376\300\210\5\377\336" + "\235\15\376\34\24\1\377\7\5\0\326\10\6\0\24\205\0\0\0\0\33\5\0\0\16\0" + "\0\0,\0\0\0V\0\0\0^\0\0\0x\11\5\1\343\22\23\7\377\227\2023\376\307\254" + "J\377xtO\376\264\272\302\377\0\0\0\376\0\0\0\377yz~\376\307\253Y\377" + "\352\307_\376\341\271I\377\217\204e\376^bj\377\0\0\0\376*+.\377sqk\376" + "\315\222\12\377\332\232\14\377_C\5\377\2\1\0\376\4\2\0""8\211\0\0\0\0" + "\27\0\0\0\7\2\4\0\3300'\15\377\356\301H\376\363\311U\377\306\247O\376" + "jjg\377\37!)\37615=\377pfH\376\353\307]\377\341\274U\376\351\300O\377" + "\253\2139\376ggh\377\21\25\37\376:\376\263\214)\377\255\213<\376\261\207#\377\322\230\23" + "\376\322\225\15\377\336\235\14\376\215d\7\375\0\0\0\377\0\0\0Q\211\0" + "\0\0\0\27\0\0\0\22\10\7\1\327+\"\11\377\334\2557\376\340\264A\377\336" + "\264F\376\347\276N\377\347\275N\376\351\300P\377\345\275P\376\337\266" + "J\377\336\264E\376\334\260>\377\332\2547\376\341\255.\377\336\247#\376" + "\334\242\33\377\323\230\22\376\320\223\13\377\335\234\14\376yU\6\376" + "\0\0\0\377\2\1\0E\211\0\0\0\0\27\0\0\0\14\25\20\4\302\21\15\3\377\304" + "\230,\376\343\262:\377\345\267\77\376\350\272B\377\346\272D\376\347\273" + "F\377\346\271E\376\343\267B\377\341\263>\376\340\2607\377\340\2550\376" + "\337\251'\377\335\244\37\376\333\237\25\377\334\234\15\376\317\223\13" + "\377\335\234\14\376L6\4\377\6\4\0\370\5\3\0""4\212\0\0\0\0\26\24\17\3" + "u\0\0\0\377\223p\34\375\352\2642\377\227w'\376\250\2105\377\244\200%" + "\376\241}\40\377\254\205#\376\270\216$\377\301\223\40\376\270\213\33" + "\377\253\177\25\376\236s\14\377\233n\7\376\250{\26\377\205`\15\376\314" + "\220\13\376\324\226\14\376\7\5\0\377\11\6\0\301\15\10\0\7\212\0\0\0\0" + "\27\1\1\0>\17\13\2\370&\34\6\377\352\261)\376\230r\31\376BA=\377\261" + "\264\275\376\312\313\316\377\277\275\270\376\255\250\233\377\237\227" + "\203\376\251\242\223\377\271\266\257\376\307\307\310\377\302\307\321" + "\376VWY\377pP\13\376\346\242\13\377}X\7\377\0\0\0\377\21\14\0\205\0\0" + "\0\0\0\0\0\1\212\0\0\0\0\24\27\21\2\237\0\0\0\377zZ\17\377\357\262\"" + "\377\313\231\"\377~g1\376\261\261\260\377\333\340\353\376\377\377\377" + "\377\377\377\377\376\377\377\377\377\350\356\372\376\276\300\304\377" + "\200nF\376\261}\12\377\347\243\13\377\277\207\13\376\12\7\0\377\6\4\0" + "\331\0\0\0\33\214\0\0\0\0\23\5\4\0""3\24\16\2\341\0\0\0\377\234q\20\376" + "\352\253\33\376\345\250\32\376\247v\11\377\224p\36\376\214yO\377\206" + "~l\376\212zV\377\220o$\376\231i\0\377\325\225\6\376\342\240\15\377\324" + "\226\14\376%\32\2\377\4\2\0\377\21\14\0f\216\0\0\0\0\21\13\10\0J\24\16" + "\1\360\0\0\0\377}Y\10\376\330\232\20\377\346\244\20\377\326\227\11\376" + "\313\215\1\377\307\210\0\376\312\213\0\377\321\221\3\376\337\235\12\376" + "\345\242\15\377\255z\11\376\37\25\1\377\0\0\0\377\17\11\0\211\215\0\0" + "\0\0\1\36\7\3\0\202\0\0\0\0\22\0\0\0k\14\12\0\350\0\0\0\377\37\33\0\376" + "\211c\7\377\314\220\13\376\332\232\14\377\330\231\14\376\327\231\14\377" + "\331\231\14\376\247w\11\376K9\3\377\0\0\0\377\0\0\0\376\20\12\0\255\0" + "\0\0\16\0\0\0\0\21\4\1\1\215\0\0\0\0\5F\23\10\254\234+\23\376\2745\27" + "\375p\37\15\371/\10\6\377\202\0\0\0\377\13\40\30\1\3777'\3\377,\40\2" + "\377\0\6\0\377\0\0\0\376\24\0\3\377\\\30\13\374\2756\30\375\3047\31\373" + "l\36\15\361\0\0\0.\215\0\0\0\0\23\0\0\0G\236&\21\377\3375\30\377\321" + "2\26\376\3355\30\377\3335\27\376\251(\21\376y\34\13\376\20\2\1\370\0" + "\0\0\375\0\0\0\371O\21\7\373\235%\20\377\3100\25\376\3416\30\377\320" + "2\26\377\3171\26\376\3212\26\377>\16\6\255\215\0\0\0\0\24""9\11\4x\250" + "\36\15\377\301\"\17\377\275\"\17\377\274\"\17\377\276\"\17\376\307$\20" + "\376\324'\21\376Y\20\7\376\0\0\0\376\31\4\1\376\272\"\16\376\317&\21" + "\377\301#\17\376\274!\17\377\275\"\17\376\274!\17\377\277\"\17\377s\24" + "\10\326\0\0\0\12\214\0\0\0\0\24'\5\1g\230\23\10\377\272\27\12\377\261" + "\26\12\376\262\26\12\376\265\27\12\377\270\27\12\377\277\27\12\377I\10" + "\3\377\0\0\0\377\24\2\0\377\244\24\10\377\276\27\12\377\267\27\12\377" + "\263\26\12\376\261\26\12\376\262\26\12\376\267\27\12\377]\13\4\316\0" + "\0\0\1\214\0\0\0\0\25\0\0\0!V\6\2\370\236\13\4\377\257\14\4\377\250\14" + "\4\377\222\12\4\377\177\12\3\377v\11\3\3672\3\0\256\1\0\0\253\24\0\0" + "\246e\7\2\331\177\12\3\377\211\12\3\377\241\13\4\377\257\14\4\377\247" + "\14\4\377{\11\3\377\14\0\0o\0\0\0\0A\6\3\0\212\0\0\0\0\11""6\2\1\0\0" + "\0\0\0\0\0\0#9\1\0\232L\1\0\320H\1\0\2730\0\0w\0\0\0A\0\0\0+\203\0\0" + "\0\0\11\0\0\0\22\0\0\0=\36\0\0ZB\1\0\244L\1\0\320F\1\0\270\12\0\0U\0" + "\0\0\0\"\2\0\1\204\0\0\0\0", }; static const GdkPixdata pic3 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1017, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2383, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\215\377\377\377\206f2\0\231\377\377\377\1f2\0\206\377\3143\1f2\0\226" - "\377\377\377\203\21\21\21\206\230e\0\204\21\21\21\221\377\377\377\202" - "\21\21\21\215\0e\230\202\21\21\21\215\377\377\377\202\21\21\21\202\0" - "e\230\215\0\231\314\202\0e\230\202\21\21\21\212\377\377\377\1\21\21\21" - "\202\0e\230\221\0\231\314\202\0e\230\1\21\21\21\210\377\377\377\2\21" - "\21\21\0e\230\225\0\231\314\2\0e\230\21\21\21\206\377\377\377\2\21\21" - "\21\0e\230\210\0\231\314\212\0\230\230\205\0\231\314\2\0e\230\21\21\21" - "\204\377\377\377\2\21\21\21\0e\230\204\0\231\314\204\0\230\230\214e\230" - "\0\203\0\230\230\3\0\231\314\0e\230\21\21\21\204\377\377\377\2\21\21" - "\21\0e\230\202\0\231\314\1\0\230\230\205e\230\0\214\375\313\0\204e\230" - "\0\3\0\230\230\0e\230\21\21\21\202\377\377\377\2\21\21\21\0e\230\202" - "\0\231\314\202e\230\0\205\375\313\0\214\313\230\230\204\375\313\0\202" - "e\230\0\1\21\21\21\202\377\377\377\2\21\21\21\0e\230\202e\230\0\202\375" - "\313\0\205\313\230\230\213\377\313\231\1\314\230f\204\313\230\230\202" - "\375\313\0\1e\230\0\202\21\21\21\202e\230\0\202\375\313\0\202\313\230" - "\230\203\377\313\231\202\230\230e\1\231e3\210\377\313\231\203\230\230" - "e\204\377\313\231\202\313\230\230\1\375\313\0\202\21\21\21\202\375\313" - "\0\202\313\230\230\210\377\313\231\3\230\230e\231e3\230ee\202\377\313" - "\231\3\314\230fee2\230\230e\211\377\313\231\1\313\230\230\202\21\21\21" - "\202\313\230\230\214\377\313\231\1\230\230e\202ee2\1\230\230e\213\377" - "\313\231\1\314\230f\202\21\21\21\1\314\230f\213\377\313\231\202\314\230" - "f\1\230ee\202\230\230e\1\231e3\202\230\230e\211\377\313\231\1\314\230" - "f\202\21\21\21\1\314\230f\210\377\313\231\202\230\230e\1\314\230f\202" - "\230\230e\204\377\313\231\4\313\313\230\230\230eee2\230\230e\207\377" - "\313\231\1\314\230f\202\21\21\21\1\314\230f\207\377\313\231\203\230\230" - "e\211\377\313\231\1\313\230\230\202\230ee\206\377\313\231\5\314\230f" - "\21\21\21\377\377\377\21\21\21\314\230f\232\377\313\231\2\314\230f\21" - "\21\21\202\377\377\377\2\21\21\21\314\230f\232\377\313\231\2\314\230" - "f\21\21\21\202\377\377\377\3T\0\0\21\21\21\314\230f\230\377\313\231\5" - "\314\230f\21\21\21T\0\0\377\377\377T\0\0\202\314\0\0\2\21\21\21\314\230" - "f\210\377\313\231\3\231e3\21\21\21\0\20\0\202\0\0\0\1ee2\210\377\313" - "\231\2\314\230f\21\21\21\202\314\0\0\1T\0\0\204\314\0\0\1\21\21\21\202" - "\314\230f\206\377\313\231\1""333\205\0\0\0\1""21\0\206\377\313\231\2" - "\314\230f\21\21\21\211\314\0\0\202\21\21\21\202\314\230f\205\377\313" - "\231\6""21\0\"\"\"\314\230fe22\0\0\0\231e3\204\377\313\231\202\314\230" - "f\1\21\21\21\205\314\0\0\1T\0\0\206\314\0\0\202\21\21\21\202\314\230" - "f\213\377\313\231\202\314\230f\202\21\21\21\205\314\0\0\3T\0\0\375\230" - "\0T\0\0\207\314\0\0\202\21\21\21\213\314\230f\202\21\21\21\206\314\0" - "\0\5T\0\0\375\230\0\375\313\0\375\230\0T\0\0\210\314\0\0\213\21\21\21" - "\207\314\0\0\2T\0\0\375\230\0\203\375\313\0\2\375\230\0T\0\0\230\314" - "\0\0\2T\0\0\375\230\0\204\375\313\0\2\375\230\0T\0\0\214\314\0\0\1\21" - "\21\21\213\314\0\0\2T\0\0\375\230\0\205\375\313\0\2\375\230\0T\0\0\226" - "\314\0\0\2T\0\0\375\230\0\205\375\313\0\202\375\230\0\1T\0\0\213\314" - "\0\0\1\21\21\21\212\314\0\0\1T\0\0\202\375\230\0\203\375\313\0\1\375" - "\230\0\202T\0\0\230\314\0\0\202T\0\0\202\375\230\0" + "\354\0\0\0\0\10\1\1\0\34\0\0\0H\0\0\0Z\0\0\0k\0\0\0o\0\0\0\\\0\0\0N\1" + "\1\0(\225\0\0\0\0\16\0\0\0\3\1\0\0<\2\2\1\230\0\0\0\310\0\0\0\366\14" + "\11\2\377\26\21\5\377\30\23\5\377\16\12\2\377\0\0\0\375\0\0\0\321\0\0" + "\0\244\5\3\0S\0\0\0\12\221\0\0\0\0\20\4\3\1\35\0\0\0\206\0\0\0\347\11" + "\7\2\377]J\34\377\241\201/\377\275\2275\375\310\2375\375\312\2361\376" + "\275\222*\375\245~\40\377jP\22\377\27\21\2\377\0\0\0\357\0\0\0\236\2" + "\1\0""5\217\0\0\0\0\22\2\2\0""0\0\0\0\276\1\0\0\377iV\"\377\332\263I" + "\377\357\304P\376\354\301M\377\350\275I\377\344\271E\376\343\265@\377" + "\344\264:\376\346\2623\377\346\260-\376\332\244#\377\177]\21\377\14\11" + "\0\377\0\0\0\324\2\1\0N\215\0\0\0\0\24\2\2\0-\0\0\0\311\20\15\5\377\261" + "\222=\376\370\316Y\376\341\274T\377\341\273S\377\342\273R\376\341\271" + "O\377\337\267J\376\336\263D\377\335\260>\376\333\2546\377\330\247/\376" + "\325\242'\376\347\254\"\376\300\214\24\375$\32\2\377\0\0\0\334\2\1\0" + "T\213\0\0\0\0\26\4\3\1\32\0\0\0\274\16\13\4\377\321\254I\377\356\307" + "Z\376\343\300[\377\351\306`\376\343\301]\377\343\300[\376\343\276W\377" + "\341\273R\376\340\267K\377\336\264D\376\333\257<\377\331\2524\376\334" + "\251-\377\327\242%\376\332\240\33\377\331\234\23\377$\32\2\377\0\0\0" + "\330\2\1\0""7\212\0\0\0\0\27\0\0\0|\0\0\0\377\254\216<\377\365\315]\376" + "\350\304Z\376\320\260P\377\270\235J\376\330\271X\377\356\314e\376\347" + "\304_\377\342\277X\376\341\272P\377\337\266H\376\345\270A\377\325\245" + "-\376\262\206\33\377\270\207\25\376\324\233\24\377\341\243\26\377\300" + "\210\13\375\16\12\0\377\0\0\0\247\0\0\0\13\210\0\0\0\0\30\0\0\0""0\0" + "\0\0\342^M\37\377\376\323\\\376\330\265Q\377i^<\376opp\377\222\222\221" + "\376iig\377\177p\77\376\357\315f\377\343\300\\\376\341\274T\377\353\300" + "N\376\236\200/\377^YM\376\220\217\217\377\204\204\205\376ZO5\377\264" + "\200\11\376\350\245\20\376\206_\7\377\0\0\0\363\6\3\0[\206\0\0\0\0\33" + "\0\0\0\1\0\0\0\0\4\3\1\211\0\0\0\377\322\255F\377\347\277Q\377k`@\377" + "\312\314\324\376\377\377\377\377\377\377\377\376\377\377\377\377\241" + "\244\256\376~l6\377\365\321h\376\347\301X\377\270\2269\376eee\377\377" + "\377\377\376\377\377\377\377\377\377\377\376\367\372\377\377SK7\376\311" + "\213\3\376\330\231\14\377\37\26\1\377\0\0\0\255\0\0\0\1\206\0\0\0\0\32" + "\0\0\0\17\0\0\0\276H;\26\377\357\304P\376\310\244B\376qrs\377\377\377" + "\377\376\301\301\301\377]]]\376\302\302\302\377\377\377\377\376leO\377" + "\341\300[\376\371\320_\377eU*\376\361\364\374\377\361\361\361\376xxx" + "\377\207\207\207\376\377\377\377\377\251\254\263\376\221d\1\377\347\243" + "\15\376tR\7\377\0\0\0\333\1\0\0""2\206\0\0\0\0\32\0\0\0""7\0\0\0\347" + "\222v,\377\357\304P\377\302\237>\376{{|\377\377\377\377\376\2\2\2\377" + "\0\0\0\376\5\5\5\377\351\353\360\376}wc\377\331\270U\376\373\321^\377" + "]O(\376\377\377\377\377a``\376\0\0\0\377\0\0\0\376\226\226\225\377\306" + "\312\321\376\211`\3\377\345\242\15\376\251w\11\376\2\1\0\377\0\0\0V\206" + "\0\0\0\0\32\0\0\0I\0\0\0\376\257\2152\377\350\275J\377\340\270H\376]" + "VD\377\377\377\377\376$$#\377\0\0\0\376,,+\377\273\276\306\376p`3\377" + "\365\317b\376\351\301U\377\237\2010\376\243\245\254\377\220\220\220\376" + "\0\0\0\377\0\0\0\376\262\263\265\377nkc\376\273\202\0\377\332\233\14" + "\376\277\207\13\375\25\17\1\377\0\0\0k\206\0\0\0\0\33\0\0\0V\14\11\2" + "\377\273\2252\376\351\274G\377\362\306P\376\310\245B\377ZUG\376\214\216" + "\225\377oqw\376npu\377e[\77\376\335\272T\377\343\275U\376\337\267M\377" + "\350\273D\376wb)\377vwy\376z}\204\377ux\201\376jf\\\377\242t\16\376\330" + "\225\0\377\267\200\7\376\311\216\14\376!\27\1\377\0\0\0\202\0\0\0\2\205" + "\0\0\0\0\33\0\0\0V\13\11\2\377\277\226/\376\323\251=\377\211p,\376\263" + "\2213\377\346\274H\376\257\223D\377\215zD\376\262\225D\377\343\275Q\376" + "\346\277U\377\337\270M\376\336\264F\377\335\262A\376\343\2628\377\266" + "\213!\376\221s+\377\246\200%\376\263~\2\377\226h\0\376yjL\377:6*\376" + "\312\215\6\376\37\26\1\377\0\0\0\201\0\0\0\2\205\0\0\0\0\32\0\0\0I\0" + "\0\0\376\265\214)\377\302\227+\377onm\376\237\237\237\377dW5\376\225" + "{2\377\326\256A\376\341\267E\377\332\261B\376\336\264B\377\340\265@\376" + "\337\262;\377\332\2532\376\323\242'\377\325\240\40\376\276\214\25\377" + "|[\20\376zmR\377\275\300\310\376\332\337\354\377\217o'\376\300\206\2" + "\375\24\16\1\377\0\0\0j\206\0\0\0\0\32\0\0\0""6\0\0\0\347\221o\35\377" + "\342\255+\377\206yX\376\377\377\377\377\374\377\377\376\310\312\316\377" + "\212\211\205\376soe\377~t\\\376\204tL\377\210s;\376\210q6\377\202pE\376" + "{pV\377plb\376\227\226\224\377\336\342\351\376\377\377\377\377\377\377" + "\377\376\253\256\263\377\234i\0\376\263~\11\376\1\0\0\377\0\0\0U\206" + "\0\0\0\0\32\0\0\0\15\0\0\0\276D3\13\377\370\2750\376eR#\376\361\364\374" + "\377\374\374\374\376\377\377\377\377\377\377\377\376\377\377\377\377" + "\377\377\377\376\354\357\364\377\334\337\345\376\332\334\342\377\354" + "\357\365\376\377\377\377\377\377\377\377\376\377\377\377\377\377\377" + "\377\376\372\372\372\377\377\377\377\376aR0\377\341\236\11\376uS\6\377" + "\0\0\0\333\1\0\0""1\205\0\0\0\0\33\0\0\0\1\0\0\0\0\3\3\0\206\0\0\0\377" + "\313\232\"\377\266\207\25\377\203\203\201\377\377\377\377\376\376\376" + "\376\377\376\376\376\376\377\377\377\377\377\377\377\376\377\377\377" + "\377\377\377\377\376\377\377\377\377\377\377\377\376\377\377\377\377" + "\377\377\377\376\376\376\376\377\376\376\376\376\377\377\377\377\235" + "\237\244\376\224d\0\376\342\240\15\377\35\25\1\377\0\0\0\253\0\0\2\0" + "\207\0\0\0\0\30\0\0\0-\0\0\0\340U\77\13\377\360\261\34\376s]*\377\344" + "\347\357\376\377\377\377\377\376\376\376\376\377\377\377\377\377\377" + "\377\376\377\377\377\377\377\377\377\376\377\377\377\377\377\377\377" + "\376\377\377\377\377\377\377\377\376\376\376\376\377\377\377\377\376" + "\364\367\376\377cS1\376\343\235\1\376\202\\\7\377\0\0\0\363\5\3\0W\211" + "\0\0\0\0\27\0\0\0x\0\0\0\377\247z\22\377\303\214\16\376nkc\376\377\377" + "\377\377\377\377\377\376\376\376\376\377\377\377\377\376\376\376\376" + "\377\377\377\377\376\376\376\376\377\377\377\377\376\377\377\377\377" + "\376\376\376\376\377\377\377\377\377\377\377\376lh`\376\271\200\0\377" + "\307\215\13\375\15\11\0\377\0\0\0\244\0\0\0\11\211\0\0\0\0\26\4\3\0\26" + "\0\0\0\270\12\7\0\377\312\222\23\377\255y\1\376onk\377\363\366\375\376" + "\377\377\377\377\377\377\377\376\377\377\377\377\377\377\377\376\377" + "\377\377\377\377\377\377\376\377\377\377\377\377\377\377\376\362\365" + "\375\377nli\376\245p\0\377\343\241\16\377%\32\2\377\0\0\0\325\2\2\0""1" + "\213\0\0\0\0\24\3\2\0(\0\0\0\307\13\7\0\377\255z\11\376\310\213\2\376" + "_K\40\377\243\246\254\377\326\332\342\376\377\377\377\377\377\377\377" + "\376\377\377\377\377\377\377\377\376\332\336\345\377\242\245\252\376" + "aN#\376\304\207\0\376\310\215\11\375\"\30\1\377\0\0\0\333\2\1\0N\215" + "\0\0\0\0\22\3\2\0+\0\0\0\274\0\0\0\377dF\5\377\316\221\10\377\244p\0" + "\376\217l\36\377\206uP\377}ua\376|tc\377\203tQ\376\212j\40\377\241m\0" + "\376\331\230\7\377~Y\7\377\11\6\0\377\0\0\0\323\2\2\0I\217\0\0\0\0\20" + "\4\3\0\31\0\0\0\177\0\0\0\346\12\10\0\377_C\3\377\230i\1\377\253u\0\376" + "\263z\0\375\265{\0\375\254v\0\375\237n\1\377oN\5\377\31\21\1\377\0\0" + "\0\357\0\0\0\227\2\1\0.\222\0\0\0\0\15\1\0\0""4\1\1\0\221\0\0\0\306\0" + "\0\0\362\11\6\0\377\21\14\1\377\23\16\1\377\12\7\0\377\0\0\0\371\0\0" + "\0\317\0\0\0\240\4\3\0I\0\0\0\5\225\0\0\0\0\10\1\1\0\25\0\0\0@\0\0\0" + "T\0\0\0e\0\0\0h\0\0\0W\0\0\0G\1\1\0!\227\0\0\0\0\1\0\0\0\1\324\0\0\0" + "\0", }; static const GdkPixdata pic4 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1034, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2995, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\215\377\377\377\205D\0\0\232\377\377\377\1D\0\0\205\314\0\0\1D\0\0\227" - "\377\377\377\2\0\0\0D\0\0\207\314\0\0\1D\0\0\202\0\0\0\222\377\377\377" - "\202\0\0\0\2\0""3fD\0\0\207\314\0\0\1D\0\0\202\0""3f\202\0\0\0\217\377" - "\377\377\1\0\0\0\203\0""3f\1D\0\0\207\314\0\0\1D\0\0\204\0""3f\1\0\0" - "\0\215\377\377\377\1\0\0\0\205\0""3f\1D\0\0\205\314\0\0\1D\0\0\206\0" - "3f\1\0\0\0\213\377\377\377\1\0\0\0\207\0""3f\205D\0\0\210\0""3f\1\0\0" - "\0\211\377\377\377\1\0\0\0\226\0""3f\1\0\0\0\210\377\377\377\1\0\0\0" - "\226\0""3f\1\0\0\0\207\377\377\377\1\0\0\0\230\0""3f\1\0\0\0\206\377" - "\377\377\1\0\0\0\204\0""3f\217\21\21\21\205\0""3f\1\0\0\0\205\377\377" - "\377\1\0\0\0\202\0""3f\203\21\21\21\217\314\0\0\204\21\21\21\202\0""3" - "f\1\0\0\0\204\377\377\377\1\0\0\0\202\21\21\21\226\314\0\0\202\21\21" - "\21\1\0\0\0\204\377\377\377\1D\0\0\207\314\0\0\214\31322\207\314\0\0" - "\1D\0\0\204\377\377\377\1D\0\0\203\314\0\0\1\31322\203\314\230f\1\252" - "\252\252\203\377\377\377\1\252\252\252\202\314\230f\1\252\252\252\203" - "\377\377\377\1\252\252\252\203\314\230f\1\31322\203\314\0\0\1D\0\0\204" - "\377\377\377\2D\0\0\314\0\0\202\314\230f\203\377\313\231\1\252\252\252" - "\205\377\377\377\202\252\252\252\205\377\377\377\1\252\252\252\203\377" - "\313\231\202\314\230f\2\314\0\0D\0\0\204\377\377\377\2\21\21\21\314\230" - "f\204\377\313\231\1\252\252\252\206\377\377\377\202\335\335\335\206\377" - "\377\377\1\252\252\252\204\377\313\231\2\314\230f\21\21\21\204\377\377" - "\377\2\21\21\21\314\230f\204\377\313\231\1\252\252\252\204\377\377\377" - "\2\0\0\0\377\377\377\202\335\335\335\2\377\377\377\0\0\0\204\377\377" - "\377\1\252\252\252\204\377\313\231\2\314\230f\21\21\21\204\377\377\377" - "\2\21\21\21\314\230f\204\377\313\231\1\252\252\252\206\377\377\377\202" - "\335\335\335\206\377\377\377\1\252\252\252\204\377\313\231\2\314\230" - "f\21\21\21\204\377\377\377\2\21\21\21\314\230f\204\377\313\231\1\252" - "\252\252\206\377\377\377\202\252\252\252\206\377\377\377\1\252\252\252" - "\204\377\313\231\2\314\230f\21\21\21\205\377\377\377\1\21\21\21\205\377" - "\313\231\1\252\252\252\204\377\377\377\1\252\252\252\202\377\313\231" - "\1\252\252\252\204\377\377\377\1\252\252\252\205\377\313\231\1\21\21" - "\21\206\377\377\377\2\21\21\21\314\230f\205\377\313\231\204\252\252\252" - "\204\377\313\231\204\252\252\252\205\377\313\231\2\314\230f\21\21\21" - "\207\377\377\377\1\21\21\21\226\377\313\231\1\21\21\21\210\377\377\377" - "\2\21\21\21\314\230f\224\377\313\231\2\314\230f\21\21\21\211\377\377" - "\377\2\21\21\21\314\230f\207\377\313\231\1\314\230f\202UUU\1\314\230" - "f\207\377\313\231\2\314\230f\21\21\21\213\377\377\377\2\21\21\21\314" - "\230f\206\377\313\231\1UUU\202\0\0\0\1UUU\206\377\313\231\2\314\230f" - "\21\21\21\215\377\377\377\2\21\21\21\314\230f\205\377\313\231\1UUU\202" - "\0\0\0\1UUU\205\377\313\231\2\314\230f\21\21\21\217\377\377\377\202\21" - "\21\21\1\314\230f\203\377\313\231\1\314\230f\202UUU\1\314\230f\203\377" - "\313\231\1\314\230f\202\21\21\21\220\377\377\377\2\21\21\21\314\0\0\202" - "\21\21\21\210\314\230f\202\21\21\21\2\314\0\0\21\21\21\217\377\377\377" - "\1\21\21\21\202f2\0\202\314\0\0\210\21\21\21\202\314\0\0\202f2\0\1\21" - "\21\21\215\377\377\377\1\21\21\21\204f2\0\205\314\0\0\1\0\0\0\204\314" - "\0\0\204f2\0\1\21\21\21\214\377\377\377\1\21\21\21\211f2\0\1\0\0\0\210" - "f2\0\1\21\21\21\206\377\377\377" + "\210\0\0\0\0\5\207\253\35\0\0\0\0\0\317\221\13\0\322\224\12\0\320\224" + "\12\1\203\321\223\14\1\7\320\224\14\1\320\223\14\1\320\225\14\1\320\224" + "\13\1\320\223\14\1\321\224\13\0\321\222\13\0\216\0\0\0\0\2\313\231\0" + "\0\327\222\24\0\223\0\0\0\0\1\321\224\13\0\207\0\0\0\0\3\316\223\14\0" + "\0\0\0\0\320\223\12\1\203\0\0\0\0\21\321\224\16\35\321\223\14@\320\223" + "\13q\321\224\13\211\320\224\13\244\321\223\14\274\321\223\14\327\321" + "\223\14\346\320\224\14\337\320\223\14\327\320\224\14\316\320\224\13\310" + "\320\223\14\274\321\224\13\227\321\223\13g\320\223\15E\321\224\13+\203" + "\0\0\0\0\1\320\223\13\1\204\0\0\0\0\2\321\213\27\0\322\227\10\0\202\0" + "\0\0\0\6\322\222\11\31\321\223\13\220\321\224\14\302\321\223\14\351\320" + "\224\14\377\321\224\13\377\202\320\223\14\377\2\321\224\14\377\323\225" + "\14\377\202\324\226\14\377\13\323\225\14\377\321\224\13\377\320\223\13" + "\377\321\224\13\377\320\223\14\377\320\224\13\377\320\224\14\377\321" + "\224\14\367\321\223\14\320\320\223\14{\322\220\11\27\202\0\0\0\0\11\320" + "\224\13\0\0\0\0\0\322\225\11\0\321\230\7\0\0\0\0\0\323\222\15\21\320" + "\223\13\230\321\224\13\377\321\223\14\377\202\320\223\13\377\25\321\223" + "\13\377\320\223\13\377\322\224\14\377\330\231\14\357\326\230\14\341\314" + "\220\13\331\305\214\13\324\304\213\13\327\313\220\13\327\326\227\14\325" + "\332\232\14\327\322\225\13\351\320\223\13\377\321\224\14\377\321\224" + "\13\377\321\223\14\377\320\224\13\377\321\223\14\377\321\224\13\377\320" + "\223\14\234\324\217\16\4\204\0\0\0\0\30\320\225\14\23\321\224\14\336" + "\321\223\13\377\320\223\14\377\321\224\14\377\320\223\13\377\321\224" + "\13\321\330\233\14\211\350\243\15F\271\203\12A`D\5`3%\3s\14\10\0m\0\0" + "\0o\0\0\0s\6\4\0k\35\24\2i8(\3N\231l\7*\364\253\15.\342\237\14N\321\224" + "\14{\320\223\13\303\321\224\14\377\202\321\223\13\377\22\320\224\13\377" + "\321\224\13\266\0\0\0\0\321\223\14\1\321\225\13\0\0\0\0\0\321\224\13" + "\204\320\223\14\377\321\224\14\377\321\224\13\336\320\224\13|\306\212" + "\4\13\0\0\0\0\0\0\0\1\0\0\0<\0\0\1\213\0\0\0\266\0\0\0\350\204\0\0\0" + "\377\5\0\0\0\357\0\0\0\301\0\0\0\226\0\0\0H\0\0\0\3\202\0\0\0\0\15\324" + "\231\13\23\320\224\14n\320\224\14\352\321\223\13\377\320\223\14\377\317" + "\222\14#\0\0\0\0\321\224\13\0\0\0\0\0\321\224\13\234\320\223\14\377\321" + "\224\14\377\321\223\13\242\202\0\0\0\0\20\2\1\0,\1\0\0\206\0\0\0\332" + "\0\0\0\377.%\15\377zb$\377\250\2070\376\262\2150\375\263\214,\375\250" + "\202%\375\203d\32\3778*\11\377\0\0\0\377\0\0\0\341\0\0\0\221\0\0\0""7" + "\202\0\0\0\0&\320\223\14i\320\224\14\355\321\223\13\377\321\224\14\377" + "\323\222\13&\0\0\0\0\312\232\14\0\0\0\0\0\320\224\14\77\321\223\14\377" + "\320\224\13\377\322\224\14\377\324\225\14\377\220f\7\311\24\16\2\270" + "\0\0\0\3716-\22\377\263\224<\377\357\304P\376\354\301N\377\354\300K\377" + "\351\273G\376\347\270@\377\350\267;\376\346\2623\377\346\257,\376\271" + "\213\35\377A0\10\377\0\0\0\377\21\13\1\307}X\7\276\321\224\13\357\322" + "\225\14\377\321\224\13\377\320\224\14\377\321\223\13\273\0\0\0\0\321" + "\223\14\1\203\0\0\0\0\33\320\223\14b\320\223\13\377\331\231\14\377\247" + "v\11\377G2\4\377\0\0\0\377jW%\377\361\310V\376\351\302W\377\340\273T" + "\377\342\274S\376\341\272P\377\337\267K\376\336\264E\377\335\260>\376" + "\332\2546\377\327\246/\376\333\245&\377\350\254\40\376xW\14\376\0\0\0" + "\377:(\2\377\233n\10\377\331\231\14\377\320\223\13\377\321\223\13\231" + "\327\215\13\10\203\0\0\0\0\1\320\224\15\0\202\0\0\0\0\30\377\306\15\21" + "\246v\11\226L6\4\361\0\0\0\377|g-\377\367\316\\\376\356\312_\377\370" + "\322f\376\360\314d\377\344\301]\376\343\277X\377\341\274S\376\340\270" + "K\377\336\264D\376\333\256<\377\347\2647\376\352\263-\377\345\253$\376" + "\346\250\32\377\214d\13\376\0\0\0\377C/\3\372\236p\11\271\377\302\17" + "\31\202\0\0\0\0\1\320\224\14\0\206\0\0\0\0\27\0\0\0M\0\0\0\347NA\33\377" + "\363\313Z\377\353\307]\376\251\220E\377k_8\376\226\202C\377\350\307b" + "\376\350\306b\377\344\300Y\376\341\273Q\377\342\271J\376\337\261:\377" + "\200f#\376aO%\377y]\32\376\323\231\24\377\347\246\24\376bE\5\377\0\0" + "\0\370\0\0\0^\0\0\0\2\210\0\0\0\0\30\0\0\0'\0\0\0\266\17\14\4\377\323" + "\257J\375\370\321a\377\206s:\376\226\227\235\377\375\377\377\376\276" + "\300\307\377oeC\376\354\313e\377\343\301^\376\341\274T\377\344\272G\376" + "p_4\377\310\314\324\376\377\377\377\377\316\323\337\376lX,\377\333\235" + "\21\376\325\226\13\376\40\27\1\377\0\0\0\312\0\0\0""4\210\0\0\0\0\32" + "\0\0\0U\0\0\0\345cQ\40\377\372\317Y\377\276\237E\377\224\221\212\376" + "\377\377\377\377\377\377\377\376\377\377\377\377\261\263\267\376\252" + "\223I\377\354\312d\376\347\302Y\377\270\2267\376\233\234\236\377\377" + "\377\377\376\331\331\330\377\377\377\377\376\264\265\267\377\227j\2\376" + "\350\244\14\377}X\7\377\0\0\0\354\2\2\0n\0\0\0\0\0\0\0\1\206\0\0\0\0" + "\31\6\5\1\226\0\0\0\372\271\227;\377\361\307U\377\234\2025\377\311\313" + "\321\376\273\273\274\377\0\0\0\376EED\377\353\355\363\376\203tE\377\365" + "\322g\376\355\306[\377\230}3\376\335\337\344\377iii\376\0\0\0\377778" + "\376\276\303\313\377\221g\6\376\332\231\12\377\312\217\13\377\0\0\0\377" + "\6\4\0\244\0\0\0\13\206\0\0\0\0\32\0\0\0\26\0\0\0\247\17\13\3\377\345" + "\271G\377\350\277Q\376\255\217:\377\257\257\260\376CDG\377\0\0\0\376" + "\0\0\0\377\203\206\216\376\250\223R\377\357\313b\376\345\277U\377\277" + "\2338\376\227\227\230\377WWY\376\0\0\0\377\23\24\30\376\242\245\254\377" + "\231k\2\376\330\230\12\377\332\233\14\376(\34\2\377\0\0\0\266\0\0\0%" + "\206\0\0\0\0\32\0\0\0%\0\0\0\263*!\13\377\347\271D\376\336\267J\376\355" + "\305V\377\202q@\376qu\200\377\32\33\37\376>AI\377]VB\376\351\304\\\377" + "\341\276W\376\340\271O\377\343\267C\376\212xH\377fjq\37658\77\377FKX" + "\376|b$\377\327\231\17\376\321\223\13\377\332\232\14\376H2\4\377\0\0" + "\0\307\0\0\0""4\206\0\0\0\0\32\0\0\0/\0\0\0\2759,\15\377\345\267@\377" + "\335\263E\376\341\272N\377\336\270O\376\231\204E\377}t[\376\224\203Q" + "\377\323\261Q\376\347\302X\377\341\273Q\376\340\267K\377\341\266D\376" + "\330\2525\377\240\177+\376\234\204K\377\236y\"\376\322\230\24\377\322" + "\226\17\376\320\223\13\377\333\233\14\376W=\4\377\0\0\0\323\0\0\0\77" + "\206\0\0\0\0\32\0\0\0#\0\0\0\261(\37\10\377\342\2639\376\333\257\77\376" + "\336\264E\377\343\272L\376\350\300P\377\343\274N\376\350\300R\377\347" + "\300T\376\340\270N\377\337\266I\376\336\263C\377\333\257=\376\334\255" + "6\377\341\255-\376\330\241\36\377\335\243\33\376\325\232\24\377\320\224" + "\14\376\320\223\13\377\332\232\14\377D0\3\377\0\0\0\305\0\0\0""3\206" + "\0\0\0\0\32\0\0\0\26\0\0\0\252\16\13\2\377\343\2604\377\330\2537\376" + "\335\261>\377\340\265C\376\336\265G\377\336\265I\376\337\266I\377\337" + "\266I\376\336\264F\377\335\262A\376\333\257<\377\332\2546\376\331\250" + "/\377\327\244(\376\325\237\40\377\323\233\30\376\324\227\17\377\321\224" + "\13\376\317\222\13\377\334\233\14\376(\34\2\377\0\0\0\267\0\0\0&\207" + "\0\0\0\0\31\6\5\1\220\0\0\0\367\255\204!\377\336\2541\376\330\2515\377" + "\342\262:\376\353\273=\377\355\276B\376\354\275C\377\351\273A\376\346" + "\267\77\377\343\263;\376\342\2616\377\343\2570\376\344\255)\377\345\253" + "#\376\344\247\32\377\340\241\17\376\327\230\13\377\316\222\13\376\321" + "\224\14\376\305\213\13\377\0\0\0\377\6\4\0\237\0\0\0\10\207\0\0\0\0\32" + "\0\0\0T\0\0\0\346[E\17\377\364\271-\377\263\214)\3778/\27\376xg>\377" + "xd1\376t]&\377\203h(\376\220q$\377\235y\35\376\234v\31\377\216l\34\376" + "\177b\34\377pV\31\376u\\$\377r]-\3765(\14\377\260~\15\376\350\244\14" + "\377yU\6\377\0\0\0\355\2\1\0n\0\0\0\0\0\0\0\1\206\0\0\0\0\30\0\0\0#\0" + "\0\0\254\10\5\1\377\277\217\34\375\345\255&\377\232u\32\376lia\377\332" + "\340\360\376\377\377\377\377\343\345\353\376\316\320\325\377\275\276" + "\303\376\275\277\303\377\316\320\326\376\344\347\355\377\377\377\377" + "\376\330\340\361\377lg\\\376\232l\6\377\334\233\14\377\315\221\13\376" + "\26\17\1\377\0\0\0\301\0\0\0.\211\0\0\0\0\27\0\0\0^\0\0\0\355\77.\7\377" + "\345\251\35\376\341\247\40\377\272\210\22\377v]#\376\202\201\200\377" + "\353\356\365\376\377\377\377\377\377\377\377\376\377\377\377\377\377" + "\377\377\376\350\353\362\377\200~|\376vY\27\377\271\177\0\376\332\232" + "\14\377\343\241\15\376Z@\5\377\0\0\0\374\0\0\0n\4\2\0\6\211\0\0\0\0\26" + "\0\0\0\27\5\3\0\221\0\0\0\374`F\10\377\341\243\26\377\333\240\31\377" + "\332\236\23\376\270\204\12\377uX\24\376iS\37\377\177nH\376~lD\377hP\33" + "\376vU\15\377\270~\0\376\327\226\4\377\326\230\14\377\337\236\14\377" + "\200Z\7\377\0\0\0\377\3\2\0\242\0\0\0$\213\0\0\0\0\26\0\0\0""4\0\0\0" + "\247\0\0\0\377R:\5\377\335\235\17\376\333\235\20\377\326\231\20\377\340" + "\240\20\376\342\240\15\377\315\217\4\376\316\217\4\377\341\237\13\376" + "\336\235\14\377\324\226\14\376\332\232\14\377\342\240\15\376kK\6\377" + "\0\0\0\377\0\0\0\266\0\0\0B\0\0\0\0\0\0\0\1\213\0\0\0\0\22\0\0\0""6\1" + "\0\0\235\0\0\0\364!\27\1\377\227k\10\375\327\230\13\376\342\240\14\377" + "\332\232\14\377\331\231\14\376\330\231\14\377\331\232\14\377\341\237" + "\14\377\333\233\14\376\242s\11\3751\"\2\377\0\0\0\374\0\0\0\253\1\0\0" + "B\217\0\0\0\0\20\0\0\0+\4\3\0\204\0\0\0\317\0\0\0\377'\34\2\377W=\4\377" + "\213b\10\377\241r\11\377\244t\11\377\216e\10\377cE\5\377.\40\2\377\0" + "\0\0\377\0\0\0\332\5\3\0\216\0\0\0""6\221\0\0\0\0\16\0\0\0\4\1\0\0G\0" + "\0\0~\0\0\0\304\0\0\0\341\0\0\0\352\0\0\0\361\0\0\0\363\0\0\0\353\0\0" + "\0\343\0\0\0\314\0\0\0\207\1\1\0M\0\0\0\11\224\0\0\0\0\12\0\0\0\17\0" + "\0\0&\0\0\0L\2\1\0j\4\3\0\201\5\3\0\205\2\1\0m\0\0\0Q\0\0\0*\0\0\0\22" + "\273\0\0\0\0\1\0\0\0\1\217\0\0\0\0", }; static const GdkPixdata pic5 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1451, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 3157, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\211\377\377\377\205\21\21\21\202\377\377\377\207\21\21\21\214\377\377" - "\377\206\21\21\21\205\252\252\252\202\21\21\21\207\252\252\252\205\21" - "\21\21\206\377\377\377\1\21\21\21\207\252\252\252\203\377\377\377\204" - "\252\252\252\205\377\377\377\206\252\252\252\1\21\21\21\204\377\377\377" - "\1\21\21\21\202\252\252\252\226\377\377\377\203\252\252\252\1\21\21\21" - "\203\377\377\377\2\21\21\21\252\252\252\225\377\377\377\205\252\252\252" - "\1\21\21\21\203\377\377\377\2\21\21\21\252\252\252\202\377\377\377\203" - "\252\252\252\203\377\377\377\203\252\252\252\203\377\377\377\203\252" - "\252\252\204\377\377\377\2\252\252\252\21\21\21\203\252\252\252\1\21" - "\21\21\203\377\377\377\3\21\21\21\252\252\252\377\377\377\202\252\252" - "\252\2\21\21\21\252\252\252\203\377\377\377\3\252\252\252\21\21\21\252" - "\252\252\203\377\377\377\3\252\252\252\21\21\21\252\252\252\204\377\377" - "\377\1\252\252\252\204\21\21\21\204\377\377\377\1\21\21\21\203\252\252" - "\252\202\21\21\21\202\252\252\252\2\377\377\377\252\252\252\202\21\21" - "\21\202\252\252\252\202\377\377\377\1\252\252\252\202\21\21\21\204\252" - "\252\252\3\21\21\21\252\252\252\21\21\21\207\377\377\377\203\21\21\21" - "\202\252\252\252\2\21\21\21\252\252\252\202\21\21\21\202\252\252\252" - "\1\21\21\21\203\252\252\252\1\21\21\21\202\252\252\252\204\21\21\21\202" - "\252\252\252\1\21\21\21\210\377\377\377\2\21\21\21\252\252\252\202\377" - "\377\377\2\252\252\252\21\21\21\202\252\252\252\202\377\377\377\5\252" - "\252\252\21\21\21\252\252\252\21\21\21\252\252\252\202\377\377\377\203" - "\252\252\252\1\21\21\21\202\252\252\252\1\21\21\21\210\377\377\377\2" - "\21\21\21\252\252\252\202\377\377\377\3\252\252\252\21\21\21\252\252" - "\252\204\377\377\377\3\252\252\252\21\21\21\252\252\252\205\377\377\377" - "\2\252\252\252\21\21\21\202\252\252\252\1\21\21\21\210\377\377\377\2" - "\21\21\21\252\252\252\202\377\377\377\3\252\252\252\21\21\21\252\252" - "\252\204\377\377\377\3\252\252\252\21\21\21\252\252\252\205\377\377\377" - "\2\252\252\252\21\21\21\202\252\252\252\1\21\21\21\210\377\377\377\2" - "\21\21\21\252\252\252\203\377\377\377\1\252\252\252\206\377\377\377\1" - "\252\252\252\206\377\377\377\2\252\252\252\21\21\21\202\252\252\252\1" - "\21\21\21\210\377\377\377\2\21\21\21\252\252\252\204\377\377\377\213" - "\252\252\252\203\377\377\377\4\252\252\252\377\377\377\252\252\252\21" - "\21\21\210\377\377\377\2\21\21\21\252\252\252\203\377\377\377\202\252" - "\252\252\212\21\21\21\202\252\252\252\203\377\377\377\2\252\252\252\21" - "\21\21\210\377\377\377\1\21\21\21\203\252\252\252\203\21\21\21\1f2\0" - "\203www\203f2\0\203\252\252\252\202\21\21\21\202\252\252\252\3\377\377" - "\377\252\252\252\21\21\21\210\377\377\377\2\21\21\21\252\252\252\202" - "\21\21\21\203f2\0\2www\335\335\335\202\377\377\377\3wwwf2\0\252\252\252" - "\202\377\377\377\3\335\335\335\252\252\252f2\0\202\21\21\21\202\252\252" - "\252\1\21\21\21\210\377\377\377\202\21\21\21\204f2\0\1www\205\377\377" - "\377\1\252\252\252\205\377\377\377\1\252\252\252\202f2\0\203\21\21\21" - "\210\377\377\377\202\"\"\"\203f2\0\1www\204\377\377\377\5\"\"\"\377\377" - "\377\273\273\273\377\377\377\"\"\"\204\377\377\377\1\252\252\252\202" - "f2\0\2DDD\"\"\"\210\377\377\377\202\"\"\"\203f2\0\1www\204\377\377\377" - "\5\252\252\252\377\377\377\252\252\252\377\377\377\252\252\252\204\377" - "\377\377\1\252\252\252\202f2\0\2""333\"\"\"\210\377\377\377\2\"\"\"\0" - "\0\0\203f2\0\1www\205\377\377\377\3wwwf2\0\252\252\252\205\377\377\377" - "\1\252\252\252\202f2\0\2\0\0\0\"\"\"\210\377\377\377\3\"\"\"\0\0\0\"" - "\"\"\203f2\0\1www\203\377\377\377\1\252\252\252\203f2\0\1\252\252\252" - "\203\377\377\377\1\252\252\252\202f2\0\3\"\"\"\0\0\0\"\"\"\210\377\377" - "\377\3\"\"\"\0\0\0\"\"\"\204f2\0\203www\205f2\0\203\252\252\252\203f" - "2\0\3\"\"\"\0\0\0\"\"\"\210\377\377\377\3\"\"\"\0\0\0\"\"\"\206f2\0\2" - "\0\0\0\"\"\"\203f2\0\2\"\"\"\0\0\0\205f2\0\3\"\"\"\0\0\0\"\"\"\210\377" - "\377\377\3\"\"\"\0\0\0\"\"\"\206f2\0\1\"\"\"\205\0\0\0\1\"\"\"\204f2" - "\0\1\"\"\"\202\0\0\0\1\"\"\"\210\377\377\377\1\"\"\"\202\0\0\0\1\"\"" - "\"\203f2\0\1\"\"\"\202\0\0\0\3\21\21\21\"\"\"\0\0\0\202\"\"\"\2\0\0\0" - "\21\21\21\203f2\0\1\"\"\"\202\0\0\0\1\"\"\"\210\377\377\377\1\"\"\"\202" - "\0\0\0\6\21\21\21\"\"\"f2\0\"\"\"\0\0\0\"\"\"\206f2\0\5\"\"\"\0\0\0\"" - "\"\"f2\0\"\"\"\203\0\0\0\1""333\211\377\377\377\1\"\"\"\203\0\0\0\3\"" - "\"\"\0\0\0\"\"\"\202f2\0\205\0\0\0\4f2\0\"\"\"\0\0\0\"\"\"\203\0\0\0" - "\1""333\212\377\377\377\1\"\"\"\205\0\0\0\204f2\0\3\"\"\"\0\0\0\"\"\"" - "\203f2\0\205\0\0\0\1""333\213\377\377\377\1\"\"\"\205\0\0\0\203\"\"\"" - "\203\0\0\0\202\"\"\"\205\0\0\0\1""333\215\377\377\377\1\"\"\"\220\0\0" - "\0\1""333\217\377\377\377\216\"\"\"\202333\211\377\377\377" + "\212\0\0\0\0\1\0\0\0\1\202\0\0\0\0\6\0\0\0\10\0\0\0\23\1\1\0\35\1\1\0" + "\34\0\0\0\23\0\0\0\7\230\0\0\0\0\12\3\2\0\27\0\0\0g\0\0\0\245\0\0\0\325" + "\0\0\0\346\0\0\0\345\0\0\0\323\0\0\0\236\0\0\0`\3\2\0\17\225\0\0\0\0" + "\14\0\0\0J\0\0\0\302\0\0\0\377\25\21\6\377<1\22\377P\77\25\377M<\23\377" + "8,\14\377\20\14\2\377\0\0\0\377\0\0\0\267\0\0\0>\222\0\0\0\0\20\0\0\0" + "\14\0\0\0~\0\0\0\361\0\0\0\377\206n-\376\317\252F\376\361\305N\376\362" + "\303I\376\361\300B\376\353\2708\376\305\227(\376uX\23\377\0\0\0\377\0" + "\0\0\351\1\0\0o\0\0\0\6\220\0\0\0\0\22\2\2\1}\0\0\0\3776-\23\377\312" + "\251K\377\366\316_\376\352\304Y\376\343\275T\377\340\271N\376\336\265" + "F\377\335\260>\376\341\2575\377\356\265.\376\264\206\32\377&\33\3\377" + "\0\0\0\377\2\1\0h\0\0\0\0\0\0\0\1\215\0\0\0\0\22\3\2\1""7\0\0\0\350%" + "\36\15\377\361\312[\376\345\301X\377\327\266U\377\346\304^\376\350\305" + "_\377\342\275V\376\337\270M\377\344\270E\376\324\245-\377\265\211\35" + "\376\325\234\30\377\327\235\27\376\20\13\0\377\0\0\0\333\3\2\0(\215\0" + "\0\0\0\24\0\0\0\23\0\0\0\272\1\1\0\377\307\246I\376\322\262U\376\205" + "\177p\376\234\234\233\377\203{^\376\340\301`\377\345\302^\376\344\276" + "T\377\304\237<\376\200yj\377\277\300\303\376~xi\377\304\217\25\376\246" + "v\13\376\0\0\0\377\0\0\0\246\0\0\0\13\214\0\0\0\0\24\2\1\0N\0\0\0\370" + "mZ%\377\357\306S\377\216\205l\377\377\377\377\376\377\377\377\377\357" + "\361\371\376\216}K\377\363\320f\376\360\307V\377\202qE\376\377\377\377" + "\377\351\351\350\376\377\377\377\377\212zS\376\334\231\4\377O8\4\377" + "\0\0\0\361\1\0\0;\212\0\0\0\0\26\0\0\0\1\0\0\0\0\2\2\0\227\0\0\0\377" + "\316\251E\377\336\270L\377\247\244\234\377\227\227\230\376\0\0\0\377" + "\227\231\237\376\224\210c\377\365\320e\376\347\277O\377\236\220l\376" + "\233\235\243\377\0\0\0\376mnp\377\234\226\210\376\320\221\2\377\250w" + "\11\377\0\0\0\377\2\2\0\201\214\0\0\0\0\26\0\0\0\266\23\17\4\377\350" + "\275K\376\335\267J\376\243\232~\377TW`\376\0\0\0\377LP[\376\235\213T" + "\377\360\313`\376\357\306T\377\225\177F\376}\202\216\377\0\0\0\3768=" + "I\377\232\200C\376\322\223\7\377\325\227\13\377\1\1\0\377\1\0\0\243\0" + "\0\0\0\0\0\0\1\211\0\0\0\0\25\0\0\0\13\0\0\0\301.$\13\377\346\272E\377" + "\345\274N\376\307\246H\377\202x\\\376d`V\377\202uL\376\347\302Y\377\341" + "\274T\376\337\267K\377\333\257<\376\210s>\377\213\201f\376\204l4\377" + "\310\220\21\376\323\225\14\377\330\231\14\376\25\17\1\377\0\0\0\265\213" + "\0\0\0\0\25\0\0\0\5\0\0\0\275#\33\10\377\345\267\77\376\333\262D\376" + "\346\276P\377\337\271L\376\314\252I\377\353\304U\376\342\274R\377\340" + "\270L\376\336\264D\377\334\257=\376\344\2611\377\315\230\33\376\334\242" + "\32\377\323\230\24\376\316\221\13\377\332\232\14\376\15\11\0\377\0\0" + "\0\257\214\0\0\0\0\26\0\0\0\252\4\3\0\377\335\2545\377\333\256;\376\344" + "\267C\377\343\270H\376\344\272K\377\337\266I\376\335\263F\377\334\261" + "A\376\333\255;\377\331\2514\376\327\245+\377\330\242#\376\326\234\31" + "\377\327\230\15\376\320\223\13\376\307\214\13\377\0\0\0\377\2\1\0\226" + "\0\0\0\0\0\0\0\1\212\0\0\0\0\24\3\2\0x\0\0\0\377\243}!\377\342\2604\377" + "\241\200-\377\315\2437\376\327\2512\377\325\2470\376\324\245-\377\323" + "\243*\376\322\240#\377\320\234\35\376\316\227\25\377\320\226\20\376\271" + "\205\20\377\242s\14\376\341\237\14\377\203\\\7\377\0\0\0\373\2\1\0c\214" + "\0\0\0\0\24\0\0\0.\0\0\0\345,\40\7\377\342\253(\376ya%\377]\\Z\376\241" + "\237\233\377\232\224\207\376\217\207v\377\216\205p\376\216\206q\377\216" + "\207v\376\236\231\215\377\226\225\224\376QOI\377\223i\12\377\325\226" + "\13\376\33\23\1\377\0\0\0\332\0\0\0\37\215\0\0\0\0\22\0\0\0o\0\0\0\377" + "sU\20\377\367\270%\377\260\206\"\376\225\214v\377\334\336\343\376\377" + "\377\377\377\377\377\377\376\377\377\377\377\377\377\377\376\305\305" + "\310\377\222\201Y\376\270\201\6\377\362\253\14\376W>\5\377\0\0\0\372" + "\0\0\0]\216\0\0\0\0\22\0\0\0B\0\0\0\336\0\0\0\377\224l\17\377\351\252" + "\30\376\321\225\14\377\233r\23\376{a&\377\210r\77\376\204l5\377{^\35" + "\376\250u\3\377\323\221\0\376\346\242\13\377\200Z\7\377\0\0\0\377\0\0" + "\0\316\0\0\0(\212\0\0\0\0\27*\33\2\0\0\0\0\0\0\0\0\15\0\0\0\250;)\3\372" + "\212b\7\377\211a\10\376&\32\1\377\77-\4\376\320\223\17\377\346\244\20" + "\376\353\246\15\377\342\237\7\376\344\240\7\377\352\245\13\376\343\241" + "\15\377\310\216\13\3766'\3\377$\32\1\377\203]\7\376yV\6\377)\35\2\362" + "\0\0\0\214\202\0\0\0\0\1\30\20\1\0\205\0\0\0\0\32\0\0\0\1\0\0\0\0\0\0" + "\0+\23\16\1\347\207`\7\377\333\233\14\377\337\236\14\377\327\230\14\376" + "\335\234\14\377cF\5\376\23\15\0\376pO\6\377\246v\11\376\262~\12\376\261" + "}\12\376\244t\11\376gI\5\377\23\15\0\376kL\6\377\340\236\15\376\327\230" + "\14\376\336\235\14\377\326\227\14\377rQ\6\377\11\5\0\316\0\0\0\24\207" + "\0\0\0\0\32\0\0\0\33\23\14\1\350\246u\11\377\343\240\15\375\316\222\13" + "\377\326\227\14\377\246v\11\377\253y\12\377\353\246\15\376\254z\11\376" + "\11\6\0\377\0\0\0\375\12\7\0\377\11\6\0\377\0\0\0\375\17\13\1\377\262" + "~\12\376\355\250\15\376\235o\10\377\271\203\12\377\322\225\14\377\316" + "\222\13\377\346\243\15\376\215d\10\377\5\3\0\316\0\0\0\6\205\0\0\0\0" + "\34\14\13\7\20\0\0\0\312\235o\10\377\337\236\14\376\322\224\14\376\321" + "\224\14\376\320\223\13\376\302\212\13\3768(\3\376\335\235\14\377\340" + "\236\14\376\264\177\12\377\10\5\0\356\0\0\1\221\0\0\0\225\16\12\0\360" + "\277\207\13\377\337\236\14\376\326\227\14\3776'\3\376\314\220\13\376" + "\317\222\13\376\321\224\14\377\321\224\14\376\343\241\15\376\202\\\7" + "\377\0\0\0\254:.\26\6\203\0\0\0\0\177\0\0\0\234\0\0\1\354dG\5\377\341" + "\237\14\377\324\226\14\377\277\207\12\377\317\223\13\376\327\230\13\376" + "\327\230\14\376\4\2\0\376\222e\1\377\344\241\14\377\345\242\15\377|V" + "\2\377\0\0\0\333\0\0\0\336\207^\4\377\342\240\15\377\345\242\14\377\200" + "Y\1\377\30\21\0\376\332\232\14\376\327\230\14\376\315\221\13\377\307" + "\215\13\377\322\224\14\377\340\236\14\377N7\4\377\0\0\1\347\2\1\1\220" + "\0\0\0\0\16\15\15\12\0\0\2\341I\77*\377\311\215\6\377\330\231\14\376" + "\266\201\13\3777(\7\377\330\230\13\376\244u\12\377\315\220\7\377YH\40" + "\37773,\376\250u\2\377\320\220\2\376Z@\6\376\220\223\231\377^bj\377g" + "G\1\376\336\233\7\376\246t\3\376(('\376kP\26\377\312\216\10\377\257|" + "\12\377\313\217\13\3776'\5\376\310\215\13\377\330\231\14\376\272\202" + "\5\377E@5\377\0\0\2\323\0\0\0\0\17\13\1\11\0\0\0\325kL\10\377\350\244" + "\14\376\344\241\14\3778(\4\376xV\13\377\336\235\14\376:+\12\377\311\214" + "\5\376\177\\\20\377\264\271\303\376\77<5\377RC\37\376\274\276\304\377" + "\332\332\331\376\261\261\260\377\250\252\254\376UB\31\37753-\376\250" + "\255\270\377\204\\\1\376\272\202\6\377G4\14\376\345\242\14\377\\C\14" + "\376R:\4\377\345\241\12\376\346\242\14\376V>\10\377\0\0\0\310\0\0\0\0" + "\13\10\0\14\0\0\0\330\204\\\3\377\315\216\3\376O7\2\377\0\0\1\376\325" + "\226\13\377\271\202\12\376+\37\2\377\351\245\14\376\201U\0\377\256\262" + "\274\376\232\233\237\377\377\377\377\376\343\343\343\377(((\376+++\377" + "\361\362\363\376y|\204\377\34\35!\37626A\377\227i\3\376\334\234\13\377" + "*\36\4\376\313\217\13\377\302\211\11\376\0\3\17\377iK\10\376\336\232" + "\4\377qO\5\377\0\0\0\310\0\0\0\0\177\20\20\20\12\0\0\0\326VN=\377laH" + "\376\31\36+\377B-\0\376\346\243\15\377~Y\7\3768(\3\377\363\254\14\376" + "\202V\0\377\245\251\265\376\230\230\230\377\377\377\377\376\311\311\311" + "\377\0\0\0\376\0\0\0\377\332\332\332\376AAA\377\0\0\0\376\16\22\33\377" + "\234o\12\376\355\247\14\377.!\2\376\236o\7\377\330\226\4\376RH.\377\213" + "\217\231\376[L(\377LE3\377\0\0\0\310\0\0\0\0""888\11\0\0\0\325\346\347" + "\352\377\377\377\377\37658@\377{U\0\376\350\244\14\3778*\15\3767'\3\377" + "\356\250\14\376\201U\0\377\244\251\265\376\230\230\231\377\377\377\377" + "\376\313\313\313\377\0\0\0\376\0\0\0\377\334\334\334\376III\377\0\0\0" + "\376\20\25\37\377\232m\11\376\345\242\14\377-\40\3\376J7\13\377\346\240" + "\7\376hK\10\377\316\322\331\376\377\377\377\377\311\312\315\377\0\0\0" + "\310\0\0\0\0""555\11\0\0\0\325\341\341\341\377\377\377\377\37614=\377" + "\204[\0\376\234j\0\377\77CK\3767(\7\377\350\244\15\376zO\0\377\246\252" + "\264\376\230\230\231\377\377\377\377\376\313\313\313\377\0\0\0\376\0" + "\0\0\377\334\334\334\376III\377\0\0\0\376\12\17\33\377\234m\4\376\337" + "\236\15\377'\35\6\376TSR\377\242j\0\376nK\0\377\275\277\306\376\377\377" + "\377\377\305\305\305\377\0\0\0\310\0\0\0\0""555\11\0\0\0\325\341\341" + "\341\377\377\377\377\376===\377\0\0\0\376CCE\377\260\261\264\376\0\0" + "\0\377kI\0\376YK+\377\350\351\354\376\216\216\217\377\377\377\377\376" + "\311\311\311\377\0\0\0\376\0\0\0\377\332\332\332\376III\377\0\0\0\376" + "BDH\377pZ'\376pM\1\377\0\0\0\376\310\311\314\377SQN\376CB@\377\362\362" + "\363\376\377\377\377\377\305\305\305\377\0\0\0\310\11\0\0\0\0""111\12" + "\0\0\0\332\350\350\350\377\377\377\377\377\77\77\77\377\0\0\0\377|||" + "\377\320\320\320\377\202\0\0\0\377\5\313\314\316\377\377\377\377\377" + "\215\215\215\377\377\377\377\377\320\320\320\377\202\0\0\0\377\5\341" + "\341\341\377KKK\377\0\0\0\377yyy\377\265\267\274\377\202\0\0\0\377\20" + "\353\353\353\377\377\377\377\377\220\220\220\377\376\376\376\377\377" + "\377\377\377\313\313\313\377\0\0\0\315\0\0\0\0\35\35\35\2\0\0\0\3172" + "22\377;;;\377\15\15\15\377\0\0\0\377\31\31\31\377,,,\377\202\0\0\0\377" + "\202888\377\3\35\35\35\377:::\377,,,\377\202\0\0\0\377\5""000\377\20" + "\20\20\377\0\0\0\377\31\31\31\377555\377\202\0\0\0\377\7""111\377:::" + "\377\35\35\35\377666\377:::\377,,,\377\0\0\0\277\202\0\0\0\0\7\10\10" + "\10$\0\0\0\77\0\0\0;\0\0\0\77\3\3\3D\0\0\0\77\0\0\0;\202\3\3\3D\202\0" + "\0\0;\12\0\0\0A\0\0\0;\0\0\0<\2\2\2C\1\1\1D\0\0\0;\0\0\0>\3\3\3F\0\0" + "\0\77\0\0\0;\202\3\3\3D\202\0\0\0;\1\0\0\0A\202\0\0\0;\3\0\0\0\77\13" + "\13\13\36\0\0\0\0", }; static const GdkPixdata pic6 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1305, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2626, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\204\377\377\377\230DDD\210\377\377\377\1DDD\226\356\356\356\1DDD\210" - "\377\377\377\1DDD\226\356\356\356\1DDD\210\377\377\377\1DDD\226\356\356" - "\356\1DDD\210\377\377\377\1DDD\226\356\356\356\1DDD\210\377\377\377\1" - "\210\0\0\226\314\0\0\1\210\0\0\210\377\377\377\1\210\0\0\226\314\0\0" - "\1\210\0\0\204\377\377\377\203DDD\2www\273\273\273\226\356\356\356\2" - "\273\273\273www\203DDD\204\377\377\377\3\21\21\21\0\0\0www\222\314\230" - "f\3www\0\0\0\21\21\21\210\377\377\377\3\21\21\21""21\0\314\230f\222\377" - "\313\231\3\314\230f21\0\21\21\21\210\377\377\377\3\21\21\21f2\0\314\230" - "f\222\377\313\231\3\314\230ff2\0\21\21\21\210\377\377\377\3\21\21\21" - "f2\0\314\230f\223\377\313\231\3\314\230ff2\0\21\21\21\206\377\377\377" - "\3\21\21\21""21\0\231e3\203\377\313\231\205\314\230f\205\377\313\231" - "\204\314\230f\204\377\313\231\3f2\0\314\230f\21\21\21\204\377\377\377" - "\2\21\21\21\314\230f\203UUU\2\314\230f\20\0\0\204\21\21\21\2\0\0\0ww" - "w\202\377\313\231\2www\"\0\0\204\21\21\21\1\20\0\0\202\314\230f\202U" - "UU\2\314\230f\21\21\21\204\377\377\377\5\21\21\21\314\230ff2\0\377\313" - "\231\210\210\210\202\21\21\21\205\"\"\"\5\0\0\0\210\210\210\252\252\252" - "\"\"\"\0\0\0\204\"\"\"\202\21\21\21\5UUU\377\313\231f2\0\314\230f\21" - "\21\21\204\377\377\377\3\21\21\21\314\230ff2\0\202\377\313\231\1\"\0" - "\0\206\"\"\"\5\0\0\20\210\210\210\377\313\231\0\0\"\21\21\21\205\"\"" - "\"\6\0\0\0\210\210\210\377\313\231f2\0\314\230f\21\21\21\205\377\377" - "\377\2\21\21\21\314\230f\202\377\313\231\1\314\230f\205\21\21\21\2\0" - "\0\0fff\202\377\313\231\2UUU\0\0\0\205\21\21\21\1""333\203\377\313\231" - "\2\314\230f\21\21\21\205\377\377\377\2\21\21\21\314\230f\203\377\313" - "\231\1fff\204DDD\1fff\204\377\313\231\1fff\204DDD\1fff\203\377\313\231" - "\2\314\230f\21\21\21\206\377\377\377\1\21\21\21\202\314\230f\225\377" - "\313\231\2\314\230f\21\21\21\207\377\377\377\2\21\21\21\314\230f\213" - "\377\313\231\1\314\230f\211\377\313\231\2\314\230f\21\21\21\210\377\377" - "\377\2\21\21\21\314\230f\210\377\313\231\202\314\230f\211\377\313\231" - "\2\314\230f\21\21\21\211\377\377\377\1\21\21\21\202\314\230f\206\377" - "\313\231\202\314\230f\2\377\313\231\314\230f\210\377\313\231\2\314\230" - "f\21\21\21\212\377\377\377\3\21\21\21\377\313\231\314\230f\204\377\313" - "\231\202\314\230f\202\377\313\231\203\314\230f\205\377\313\231\2\314" - "\230f\21\21\21\213\377\377\377\1\21\21\21\203\314\230f\202\377\313\231" - "\202\314\230f\202\377\313\231\1www\202\377\313\231\202\314\230f\203\377" - "\313\231\202\314\230f\1\21\21\21\214\377\377\377\2\21\21\21\377\313\231" - "\204\314\230f\202\377\313\231\4\"\"\"\0\0\0\314\230f\377\313\231\202" - "\314\230f\202\377\313\231\202\314\230f\1\21\21\21\215\377\377\377\3\21" - "\21\21\314\230f\377\313\231\202\314\230f\203\377\313\231\202\0\0\0\1" - "\314\230f\202\377\313\231\203\314\230f\2\377\313\231\21\21\21\215\377" - "\377\377\5\21\21\21\314ff\210\0\0\231e3\377\313\231\202\314\230f\202" - "\377\313\231\2\210\210\210www\203\377\313\231\202\314\230f\2\377\313" - "\231\21\21\21\215\377\377\377\1\21\21\21\202\375\0""2\4\3132e\210\0\0" - "\31322\377\313\231\203\314\230f\203\377\313\231\203\314\230f\4\377\313" - "\231\231e3\230e\0\21\21\21\213\377\377\377\13\21\21\21\3142\0\375\0""2" - "\314\0""2\3773e\334\0\0\210\0\0\3132e\231e3\314\230f\377\313\231\204" - "\314\230f\7\377\313\231\314\230fv\0\0\272\0\0\3773\230\272\0\0\21\21" - "\21\212\377\377\377\1\21\21\21\202\375\0""2\5\314\0""2\3132e\334\0\0" - "\377\231\231\31322\202\210\0\0\15\23133\210\0\0\230ee\23133\210\0\0\252" - "\0\0v\0\0\356\0\0\375\0""2\377\231\231\375\0""2\272\0\0\21\21\21\210" - "\377\377\377\3\21\21\21\31322\3132e\202\314\0""2\15\377\231\231\334\0" - "\0\377\231\231\37733\356\0\0\377\231\231\3773e\356\0\0\377\231\231\375" - "\0""2\356\0\0\375\0""2\377\231\231\202\375\0""2\1\377\231\231\203\375" - "\0""2\1\21\21\21\206\377\377\377\17\21\21\21\2302\0\31322\377\231\231" - "\314\0\0\37733\377\231\231\334\0\0\377\231\231\37733\356\0\0\377\231" - "\231\31322\356\0\0\377\231\231\202\375\0""2\7\375\0e\377\231\231\356" - "\0\0\375\0""2\377\231\231\356\0\0\377\231\231\202\375\0""2\202\21\21" - "\21\202\377\377\377" + "\316\0\0\0\0\4\0\0\0\10\0\0\0\15\0\0\0\16\0\0\0\11\231\0\0\0\0\12\0\0" + "\0\15\0\0\0\77\0\0\0_\0\0\0k\0\0\0\177\0\0\0\202\0\0\0l\0\0\0a\0\0\0" + "E\0\0\0\24\224\0\0\0\0\5\0\0\0\27\0\0\0`\3\2\0\246\0\0\0\320\0\0\0\371" + "\204\0\0\0\377\5\0\0\0\373\0\0\0\324\3\2\0\251\0\0\0k\0\0\0\36\221\0" + "\0\0\0\20\0\0\0B\0\0\0\236\0\0\0\347\0\0\0\377/&\15\377zb$\377\245\204" + "/\375\257\213/\376\257\211,\376\244\177%\375}_\31\3774'\10\377\0\0\0" + "\377\0\0\0\352\0\0\0\247\0\0\0O\216\0\0\0\0\24\2\1\0\4\0\0\0Z\0\0\0\311" + "\0\0\0\377<1\23\377\274\232\77\377\356\303O\376\354\301M\377\354\300" + "K\377\350\274F\376\347\270@\377\351\267;\376\346\2624\377\345\257,\376" + "\274\215\36\377B1\10\377\0\0\0\377\0\0\0\321\1\0\0h\0\0\0\13\214\0\0" + "\0\0\24\0\0\0Z\0\0\0\317\0\0\1\377\204n1\376\361\311Z\376\350\302Y\377" + "\345\300W\377\356\307X\376\347\277Q\377\337\267J\376\336\263D\377\344" + "\266@\376\347\266:\377\333\2521\376\332\246)\376\346\254\"\376\214f\20" + "\375\3\2\0\377\0\0\0\327\0\0\0j\212\0\0\0\0\30\5\3\0\27\0\0\0\215\0\0" + "\0\354\0\0\0\377>0\14\377VC\24\376I8\16\377L;\21\376\\M#\377xh4\376\322" + "\261R\377\361\311W\376\357\304P\377\307\241>\376nX\40\377XD\22\376H4" + "\10\377F3\7\376R;\7\377A.\4\377\0\0\0\377\0\0\0\356\0\0\0\224\6\5\1\24" + "\206\0\0\0\0\33\0\0\0\7\0\0\0\213\0\0\0\355K6\4\377\223h\10\377\250w" + "\11\376\274\204\11\377\301\210\11\376\306\214\12\377\277\207\11\376\250" + "u\6\377vP\0\376\4\377\336\235" + "\14\375\324\226\14\376\317\223\13\376\321\224\14\377\321\224\14\376\315" + "\221\13\377\315\221\13\376\323\225\14\377\331\232\14\376\273\204\12\377" + "hJ\6\376\0\0\0\377\0\0\0\376\0\0\0\377\5\3\0\376uR\6\377\277\207\13\376" + "\331\232\14\377\323\225\14\376\314\221\13\377\316\222\13\376\321\224" + "\14\377\320\223\13\376\317\223\13\376\325\227\14\376\334\233\14\375G" + "2\4\377\0\0\0\217\0\0\0\0\4\3\0\37\3\2\0\357\323\225\13\377\322\225\14" + "\376\320\223\13\377\321\224\14\376\320\223\13\377\332\232\14\376~Y\7" + "\377\24\16\1\376\12\7\0\377\0\0\0\376\0\0\0\377\0\0\0\376\0\0\0\377\0" + "\0\0\376\0\0\0\377\0\0\0\376\0\0\0\377\0\0\0\376\0\0\0\377\14\10\0\376" + "\24\16\1\377\215d\7\376\333\233\14\377\320\223\13\376\321\224\14\377" + "\320\223\13\376\325\226\14\376\307\215\13\377\0\0\0\343\25\16\1\21\0" + "\0\0""9(\34\2\370\324\226\14\377\317\222\13\376\327\230\14\377\324\226" + "\14\376\320\223\13\377\323\225\14\376\341\240\14\377\314\221\13\376\244" + "t\11\377\221g\10\376R:\4\377\0\0\0\376\0\0\0\377\0\0\0\376\0\0\0\377" + "\0\0\0\376\4\2\0\377[@\5\376\223h\10\377\247v\11\376\320\223\14\377\341" + "\237\15\376\321\224\14\377\320\223\13\376\325\226\14\377\326\230\14\376" + "\316\222\13\376\323\225\14\377\20\13\0\361\0\0\0'\0\0\0J@-\3\375\326" + "\227\14\377\321\224\14\377\261~\12\377\313\220\13\376\324\226\14\377" + "\301\211\13\376{W\7\377\312\217\13\376\360\252\15\377\344\241\15\376" + "\332\232\14\377\313\220\13\376`E\5\377\1\1\0\376\2\1\0\377oN\6\376\322" + "\224\14\377\332\232\14\376\345\242\15\377\357\251\15\376\304\212\13\377" + "vS\6\376\311\216\13\377\323\226\14\376\310\216\13\377\264\177\12\376" + "\321\224\14\376\324\226\14\377&\32\2\370\0\0\0""7B\0\0\0G=,\3\374\326" + "\227\14\377\333\233\14\377uS\6\377P8\4\376\344\241\15\377\312\217\13" + "\376F1\3\377\16\12\0\376I3\4\377\244s\10\376\320\222\12\377\331\231\13" + "\376\345\242\14\377\"\30\1\3761\"\2\377\360\251\15\376\326\227\13\377" + "\317\222\12\376\236p\10\377A-\3\376\15\11\0\377P8\4\376\322\224\14\377" + "\341\237\14\376\77,\3\377\207_\7\376\333\233\14\376\323\226\14\377#\31" + "\2\367\0\0\0""5\0\0\0A3$\3\373\325\227\14\377\323\225\14\376\326\227" + "\14\377\37\26\1\376pO\5\377\341\237\15\376\336\235\14\377\262~\12\376" + "\4\2\0\377\11\11\6\376\6\6\3\377\23\14\0\376\21\12\0\377\0\0\0\376\0" + "\0\0\377\25\15\0\376\21\14\0\377\7\5\2\376\5\4\2\377\20\13\0\376\275" + "\206\12\377\337\235\14\376\340\236\14\377\\@\5\376,\37\2\377\334\234" + "\14\376\321\224\14\376\324\226\14\377\33\23\1\365\0\0\0""0\0\0\0%\10" + "\6\0\363\202\327\230\14\377;\357\251\15\377eH\7\376\12\11\6\377\204\\" + "\4\376\342\240\14\377\341\237\14\376\244s\6\377L=\27\376\301\240D\377" + "\250\213:\376\240\2035\377\213q+\376\216r(\377\235|*\376\244\200'\377" + "\270\216%\376>-\10\377\264\177\11\376\340\237\14\377\341\237\15\376w" + "T\6\377\4\3\0\376zV\6\377\353\246\15\376\331\231\14\377\314\220\13\377" + "\0\0\0\350\14\10\0\30\0\0\0\0\0\0\0\256dG\5\377\277\207\12\377\234n\10" + "\377/\"\4\376\305\231/\377D6\23\376T;\1\377\332\232\14\376\263~\10\377" + "H8\22\376\355\301K\377\351\275I\376\353\275F\377\352\273B\376\350\270" + "<\377\347\2657\376\343\257/\377\341\253)\3769)\5\377\305\213\12\376\322" + "\225\14\377K4\3\376O8\3\377\264\177\11\3774$\2\376\244t\11\377\300\207" + "\12\377R:\4\377\0\0\0\232\202\0\0\0\0\36\0\0\0\"\0\0\0\272\21\14\0\344" + "\0\0\0\364\27\21\4\377\352\262.\376\346\2624\376x_\36\377.\40\3\376'" + "\34\3\377\252\210/\376\345\266\77\377\334\256<\376\333\2559\377\332\254" + "6\376\331\2511\377\330\246-\376\326\243'\377\336\246\"\376\226o\22\377" + "$\32\1\376/!\1\377~Y\6\376\337\236\14\377\343\241\15\376%\32\1\377\0" + "\0\0\370\17\12\0\351\0\0\0\260\0\0\0\30\204\0\0\0\0\32\0\0\0\23\0\0\0" + "\241\0\0\0\377\245}\33\377\341\253*\377\343\2570\377\324\2440\376\330" + "\2502\377\356\2704\376\344\260/\377\344\257/\376\343\256,\377\342\254" + "(\376\341\252$\377\341\247\40\376\337\244\32\377\335\240\24\376\345\244" + "\20\377\321\224\13\376\315\221\13\377\333\233\14\376\326\227\14\376\264" + "\177\12\377\0\0\0\377\0\0\0\256\0\0\0!\207\0\0\0\0\30\0\0\0Q\0\0\0\343" + "3%\6\377\343\251!\376\331\244$\377\332\245&\376\270\215&\377}g2\376\207" + "tE\377\214yI\376\215zJ\377\215xI\376\215xH\377\216yF\376\213uB\377\206" + "p=\376{b,\377\224l\22\376\323\225\12\377\321\224\14\376\344\241\15\376" + "\77-\3\377\0\0\0\351\0\0\0d\210\0\0\0\0\30\0\0\0\16\0\0\0\221\0\0\0\377" + "pQ\14\376\347\252\35\376\325\236\35\376\313\227\34\377\210j%\376\202" + "nC\377\225\206e\376\227\210f\377\215zM\376\216zN\377\230\212h\376\221" + "\201\\\377\202l=\376\200c\40\377\266\201\14\376\322\224\13\376\342\240" + "\15\376\177Y\7\376\0\0\0\377\0\0\0\241\0\0\0\31\211\0\0\0\0\26\0\0\0" + "6\1\1\0\300\0\0\0\377\221i\15\377\345\246\26\376\327\235\27\377\335\241" + "\30\376\337\241\23\377\317\224\13\376\317\223\12\377\333\234\15\376\331" + "\231\10\377\313\214\0\376\316\216\0\377\334\231\5\376\333\232\11\377" + "\326\227\14\376\342\240\15\376\237p\10\377\0\0\0\377\0\0\0\314\0\0\0" + "G\213\0\0\0\0\24\0\0\0M\0\0\0\312\0\0\0\377mM\6\376\335\235\16\376\331" + "\232\17\377\317\223\16\377\322\226\16\376\322\225\15\377\320\223\13\376" + "\321\223\13\377\322\225\13\376\322\224\14\377\316\222\13\376\326\230" + "\14\377\340\237\14\376~Y\7\376\0\0\0\377\0\0\0\323\1\0\0_\214\0\0\0\0" + "\24<1\1\0\0\0\0L\1\0\0\302\0\0\0\377/!\2\377\243t\11\377\336\235\14\376" + "\334\233\14\377\336\235\14\377\335\234\14\376\334\234\14\377\336\235" + "\14\376\334\234\14\377\336\235\14\376\255{\11\3777'\3\377\0\0\0\377\0" + "\0\0\313\1\0\0\\\0\0\0\5\216\0\0\0\0\20\0\0\0""6\0\0\0\223\0\0\0\343" + "\0\0\0\377\36\25\1\377dG\5\377\223h\10\376\237p\11\375\240q\11\375\224" + "i\10\376jK\6\377$\31\2\377\0\0\0\377\0\0\0\346\0\0\0\234\0\0\0B\221\0" + "\0\0\0\5\0\0\0\16\0\0\0S\3\2\0\236\0\0\0\306\0\0\0\360\204\0\0\0\377" + "\5\0\0\0\363\0\0\0\312\3\2\0\242\0\0\0_\0\0\0\25\224\0\0\0\0\12\0\0\0" + "\1\0\0\0/\0\0\0U\0\0\0a\0\0\0q\0\0\0s\0\0\0b\0\0\0X\0\0\0""6\0\0\0\6" + "\231\0\0\0\0\4\377\275\0\0\0\0\0\6\0\0\0\7\3\1\0\1\316\0\0\0\0", }; static const GdkPixdata pic7 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1274, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2443, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\377\377\377\377\220\377\377\377\1\"\"\"\2042\0\0\1\"\"\"\202\377\377" - "\377\1\230e\0\222\377\377\377\4\230e\0f2\0\377\377\377\"\"\"\2022\0\0" - "\204f2\0\2022\0\0\3\"\"\"\377\376ef2\0\203\377\377\377\203\"\"\"\204" - "\377\377\377\203\"\"\"\204\377\377\377\2f2\0\377\376e\2022\0\0\207f2" - "\0\6""2\0\0T\0\0\377\376ef2\0\377\377\377\"\"\"\2052\0\0\2\377\377\377" - "\"\"\"\2052\0\0\1\"\"\"\202\377\377\377\3f2\0\377\376eT\0\0\2032\0\0" - "\203f2\0\2032\0\0\2\21\21\21f2\0\2032\0\0\203f2\0\1""2\0\0\202\"\"\"" - "\1""2\0\0\206f2\0\2052\0\0\3fff\273\273\273\231\231\231\2032\0\0\3\231" - "\231\231\252\252\252DDD\2022\0\0\205f2\0\2""2\0\0\"\"\"\202\377\377\377" - "\2\"\"\"2\0\0\210f2\0\2""2\0\0\273\273\273\203\377\377\377\3\314\314" - "\3142\0\0\356\356\356\203\377\377\377\2\231\231\2312\0\0\204f2\0\2""2" - "\0\0\"\"\"\205\377\377\377\2022\0\0\205f2\0\2""2\0\0\273\273\273\205" - "\377\377\377\1\210\210\210\205\377\377\377\3UUU2\0\0f2\0\2022\0\0\211" - "\377\377\377\2052\0\0\1\21\21\21\206\377\377\377\1\314\314\314\206\377" - "\377\377\2032\0\0\213\377\377\377\1""2\0\0\202\"\"\"\2""2\0\0UUU\206" - "\377\377\377\1\210\210\210\206\377\377\377\4UUU2\0\0\"\"\"2\0\0\211\377" - "\377\377\1""2\0\0\202\"\"\"\5f2\0""2\0\0UUU\377\377\377\21\21\21\204" - "\377\377\377\3\0\0\"\377\377\377\21\21\21\204\377\377\377\4UUU2\0\0\"" - "\"\"2\0\0\211\377\377\377\2""2\0\0\"\"\"\202f2\0\2""2\0\0\21\21\21\205" - "\377\377\377\3www2\0\0\252\252\252\205\377\377\377\2""2\0\0f2\0\202\"" - "\"\"\1""2\0\0\207\377\377\377\1""2\0\0\202\"\"\"\203f2\0\2""2\0\0\210" - "\210\210\203\377\377\377\5\210\210\2102\0\0f2\0""2\0\0\210\210\210\203" - "\377\377\377\2www2\0\0\202f2\0\2\"\"\"2\0\0\207\377\377\377\2""2\0\0" - "\"\"\"\205f2\0\3""2\0\0""333DDD\2022\0\0\203f2\0\2022\0\0\3DDD3332\0" - "\0\203f2\0\202\"\"\"\1""2\0\0\206\377\377\377\2""2\0\0\"\"\"\206f2\0" - "\2022\0\0\1\20\0\0\206f2\0\2022\0\0\205f2\0\2\"\"\"2\0\0\206\377\377" - "\377\2""2\0\0\"\"\"\207f2\0\1""2\0\0\210f2\0\1""2\0\0\205f2\0\2\"\"\"" - "2\0\0\206\377\377\377\2""2\0\0\"\"\"\207f2\0\1""2\0\0\210f2\0\1""2\0" - "\0\205f2\0\2\"\"\"2\0\0\205\377\377\377\1""2\0\0\202\"\"\"\206f2\0\1" - "2\0\0\212f2\0\1""2\0\0\204f2\0\202\"\"\"\1""2\0\0\204\377\377\377\2""2" - "\0\0\"\"\"\207f2\0\1""2\0\0\212f2\0\1""2\0\0\205f2\0\2\"\"\"2\0\0\204" - "\377\377\377\2""2\0\0\"\"\"\206f2\0\3\"\"\"2\0\0f2\0\2102\0\0\3f2\0""2" - "\0\0\"\"\"\204f2\0\2\"\"\"2\0\0\204\377\377\377\2""2\0\0\"\"\"\206f2" - "\0\1\"\"\"\2022\0\0\1\210\210\210\202\313\230\313\2022\0""1\202\313\230" - "\313\1www\2022\0\0\1\"\"\"\204f2\0\2\"\"\"2\0\0\204\377\377\377\2""2" - "\0\0\"\"\"\207f2\0\5""2\0\0\2313e\313\230\313\20\0\0""2\0""1\202\314" - "f\230\5e222\0\0\313\230\313\314f\2302\0\0\205f2\0\2\"\"\"2\0\0\204\377" - "\377\377\2""2\0\0\"\"\"\207f2\0\14""2\0\0e22\230e\2302\0""1D\0\0\377" - "\231\313\377\231\3762\0""1\20\0\0\230e\230e22\"\0\0\205f2\0\2\"\"\"2" - "\0\0\204\377\377\377\2""2\0\0\"\"\"\210f2\0\3""2\0\0\230ee\377\231\313" - "\203\377e\313\4\377e\376\377\231\313\230e\2302\0""1\206f2\0\2\"\"\"2" - "\0\0\204\377\377\377\2""2\0\0\"\"\"\211f2\0\2""2\0\0\377e\376\2042\0" - "\0\2\377e\3762\0\0\207f2\0\2\"\"\"2\0\0\204\377\377\377\2""2\0\0\"\"" - "\"\230f2\0\2\"\"\"2\0\0\204\377\377\377\2""2\0\0\"\"\"\230f2\0\2\"\"" - "\"2\0\0\204\377\377\377\2""2\0\0\"\"\"\230f2\0\2\"\"\"2\0\0\204\377\377" - "\377\2""2\0\0\"\"\"\230f2\0\3\"\"\"2\0\0\377\377\377" + "\313\0\0\0\0\1\0\0\0\1\210\0\0\0\0\1\0\0\0\1\227\0\0\0\0\10\0\0\0\6\0" + "\0\0/\0\0\0C\0\0\0Q\0\0\0T\0\0\0F\0\0\0""5\0\0\0\17\226\0\0\0\0\15\0" + "\0\0#\3\3\1n\0\0\0\253\0\0\0\314\0\0\0\350\0\0\0\371\0\0\0\375\0\0\0" + "\354\0\0\0\326\0\0\0\264\5\3\0\202\0\0\0""1\0\0\0\1\221\0\0\0\0\20\0" + "\0\0\16\0\0\0\\\0\0\0\300\0\0\0\362\16\12\3\377QA\27\377\210m&\377\233" + "z)\377\236|&\377\215m\37\377eN\23\377\40\30\5\377\0\0\0\370\0\0\0\327" + "\0\0\0t\0\0\0\34\217\0\0\0\0\22\0\0\0\34\3\3\1\220\0\0\0\362!\33\12\377" + "\221v/\377\352\277L\377\351\276K\376\354\277I\377\353\275E\376\351\271" + "@\377\351\267:\376\344\2612\376\344\256+\376\256\202\33\3779*\7\377\0" + "\0\0\377\0\0\0\260\0\0\0/\215\0\0\0\0\24\0\0\0\31\0\0\0\233\0\0\0\374" + "SC\34\377\344\275P\375\356\306V\377\337\272R\377\340\272Q\376\340\271" + "N\377\337\266I\376\336\263C\377\335\260=\376\331\2536\377\326\245/\376" + "\335\247'\377\345\252\40\376{Z\15\377\0\0\0\377\0\0\0\277\0\0\0""2\211" + "\0\0\0\0\1\0\0\0\1\202\0\0\0\0\25\2\1\0\213\0\0\0\372\207p/\377\377\337" + "c\376\377\331e\376\373\325f\376\374\326g\377\373\325e\376\372\322`\377" + "\371\317[\376\367\313S\377\364\306K\376\362\301B\377\360\274:\376\355" + "\2660\377\356\263'\376\373\271\36\376\265\202\17\377\13\10\0\377\0\0" + "\0\265\0\2\3\23\207\0\0\0\0\34\0\0\0\1\0\0\0\0\0\0\0\202\0\0\0\315\0" + "\0\0\361\0\0\0\377>7\31\37671\31\37682\33\37792\35\376:3\34\377<3\33" + "\376=2\32\377>2\30\376\77""0\25\377@/\23\376@.\20\377\77,\15\376>*\11" + "\377=)\6\376:&\2\376E-\0\376\16\6\0\377\0\0\0\374\0\0\0\325\0\0\0\224" + "\0\0\0\0\0\0\0\1\205\0\0\0\0\32\0\0\0%\10\3\0\377U\"\11\377d-\12\377" + "b1\11\376S*\3\376Q-\1\376Q1\0\377O6\0\376D4\0\37772\3\376)/\5\377\35" + ".\7\376\20,\12\377\3*\14\376\4+\21\377\10,\26\376\13.\35\377\16.\"\376" + "\21""0(\377\24""1.\376#:4\376)>:\377(::\377\6\10\10\377\0\0\0D\206\0" + "\0\0\0\32\0\0\0\2051\21\5\377\363b\33\376\354l\30\377\350t\25\376\346" + "\177\23\377\344\211\21\376\342\224\16\377\340\235\14\376\305\232\20\377" + "\247\224\25\376\207\217\31\377j\212\36\376I\205#\377,\200'\376-\2013" + "\3775\203\77\376<\206K\377C\210W\376J\212d\377Q\214o\376Y\216|\377`\222" + "\210\376n\235\237\376\37*-\377\0\0\0\240\206\0\0\0\0\33\0\0\0\321y,\16" + "\377\350^\32\377\330c\26\377\327l\24\376\325v\21\377\324\177\20\376\322" + "\211\15\377\320\222\13\376\267\217\17\377\232\212\24\376}\205\27\377" + "b\200\34\376D|\40\377(w$\376*w/\3771z:\3768|F\377>~P\376E\200]\377K\202" + "g\376S\204s\377X\206}\376d\217\220\377E^d\377\0\0\0\340\11\14\14\20\204" + "\0\0\0\0\34\6\2\0""7\0\0\0\377\270C\26\377\353_\32\376\334e\26\377\326" + "l\24\376\325v\21\377\324\177\20\376\322\211\15\377\320\222\13\376\267" + "\217\17\377\232\212\24\376}\205\27\377b\200\34\376D|\40\377(w$\376*w" + "/\3771z:\3768|F\377>~P\376E\200]\377K\202g\376S\204s\377Z\211\200\376" + "e\221\222\377e\211\223\377\0\0\0\377\1\2\3I\204\0\0\0\0\34\0\0\0\17\0" + "\0\0\301\10\2\0\377}3\15\376\336e\27\377\353v\26\376\336z\22\377\325" + "\177\20\376\320\210\15\377\317\221\13\376\266\217\17\377\232\211\24\376" + "}\204\27\377b\200\34\376D|\40\377(w$\376)w/\3771y:\3768{F\377>}P\376" + "E\201]\377O\210l\376[\221~\377Z\207~\376C_`\376\14\20\22\377\0\0\0\333" + "\0\0\0\34\205\0\0\0\0\32\2\1\0@\1\1\0\356\0\0\0\377\36\11\1\377V'\5\376" + "\217L\11\377\304t\15\376\332\216\16\377\330\227\14\376\277\226\20\377" + "\243\221\25\376\204\215\31\377i\211\35\376H\204#\377+~&\376,~2\3774\177" + "=\376:\201I\377A\204T\376=vW\377*RF\376\23*-\377\3\17\25\376\0\0\0\376" + "\4\2\0\377\0\0\1_\206\0\0\0\0\32\0\0\0A\0\0\0\335t[\34\377q^\40\3771" + "+\21\376\26\24\11\377\0\0\0\376\0\0\0\377\26\14\0\376-\"\0\37794\4\376" + "AG\12\377AW\22\376-U\26\377\20A\23\376\7.\23\377\2\36\21\376\0\14\13" + "\377\0\0\5\376\0\0\0\377\34\20\0\376@(\0\377\202X\1\376\241r\10\376\3" + "\2\0\377\0\0\0[\206\0\0\0\0\32\0\0\0""5\0\0\0\317aJ\25\377\366\302>\376" + "\355\275B\376\322\252@\377\267\225;\376\237\2036\377\210q0\376hV&\377" + "M\77\35\3760$\21\377\25\15\7\376\25\13\5\3773!\13\376O8\20\377gK\22\376" + "\203`\24\377\225n\23\376\254}\21\377\312\217\15\376\344\241\14\377\352" + "\245\15\376\232m\11\377\0\0\0\374\0\0\0T\206\0\0\0\0\32\0\0\0!\0\0\0" + "\2722&\11\377\343\2602\376\331\2535\376\341\263=\377\350\272C\376\354" + "\277H\377\354\300J\376\352\276I\377\351\275H\376\346\271E\377\344\266" + "@\376\342\263;\377\342\2626\376\342\257/\377\342\254)\376\343\250!\377" + "\341\244\32\376\333\234\20\377\325\227\13\376\320\223\13\377\335\234" + "\14\377tR\6\377\0\0\0\343\0\0\0B\207\0\0\0\0\31\6\4\1\234\0\0\0\377\321" + "\237'\377\330\246.\377\335\2544\377\347\2668\376\345\265:\377\343\264" + "<\376\341\263=\377\337\261;\376\334\2569\377\332\2535\376\330\2501\377" + "\331\246,\376\331\245'\377\331\242\40\376\331\237\31\377\332\234\21\376" + "\333\232\12\377\333\233\13\376\316\222\13\377\337\235\14\376+\36\2\377" + "\0\0\0\272\0\0\0\31\207\0\0\0\0\32\1\1\0Y\0\0\0\352pT\21\377\352\261" + ")\377\303\226'\377\227w%\376\245~\37\377\257\205\34\376\276\220\40\377" + "\311\231#\376\325\242'\377\340\253*\376\346\256(\377\332\242\37\376\314" + "\224\25\377\277\210\12\376\262|\1\377\242n\0\376\234o\11\377\230l\14" + "\376\330\230\14\377\254z\11\377\0\0\0\374\5\3\0\216\0\0\0\0\0\0\0\1\206" + "\0\0\0\0\30\0\0\0\37\0\0\0\260\21\15\1\377\321\233\35\375\323\236!\376" + ":/\23\376nr|\377\256\254\245\376\234\224\202\377\210}a\376}mI\377r`4" + "\376lY*\377vd:\376\201qO\377\215\201h\376\243\234\215\377\250\250\252" + "\376;=A\377wU\11\376\352\245\14\3768(\3\377\0\0\0\333\0\0\0""9\211\0" + "\0\0\0\27\1\0\0T\0\0\0\352<+\6\377\343\246\33\376\340\244\33\376\202" + "e\37\377\222\222\220\376\343\351\365\377\377\377\377\376\377\377\377" + "\377\376\377\377\376\371\374\377\377\377\377\377\376\377\377\377\377" + "\377\377\377\376\303\310\325\377ujS\376\254x\6\376\361\252\14\376sQ\6" + "\377\0\0\0\377\0\0\0{\0\0\0\4\211\0\0\0\0\26\0\0\0\14\4\2\0\207\0\0\0" + "\367\\B\7\377\340\242\25\376\346\247\27\376\252w\2\376x^#\377sqk\376" + "\246\247\247\377\332\335\345\376\362\366\376\377\305\310\315\376\215" + "\213\207\377nfT\376\206\\\0\377\311\214\4\376\354\247\16\376\221f\10" + "\377\0\0\0\377\2\1\0\256\0\0\0!\213\0\0\0\0\24\0\0\0\32\0\0\0\226\0\0" + "\0\370@-\3\377\315\222\14\375\347\244\16\377\322\224\6\377\303\206\0" + "\376\241o\0\377{Y\14\376iN\23\377\212a\6\376\263z\0\377\310\211\0\376" + "\343\237\11\377\340\237\14\376lL\6\377\0\0\0\377\0\0\0\271\0\0\0""1\215" + "\0\0\0\0\22\0\0\0\34\4\3\0\212\0\0\0\355\26\20\1\377yV\7\377\324\226" + "\13\377\331\232\14\376\342\240\15\376\353\246\15\376\356\250\14\377\347" + "\244\15\376\335\235\15\376\333\233\14\377\232m\10\377.!\2\377\0\0\0\374" + "\2\1\0\252\0\0\0.\217\0\0\0\0\20\0\0\0\16\0\0\0Y\0\0\0\270\0\0\0\356" + "\5\3\0\377>,\3\377rQ\6\377\207_\7\377\215d\10\377xU\7\377T;\4\377\23" + "\16\1\377\0\0\0\365\0\0\0\320\0\0\0n\0\0\0\35\222\0\0\0\0\15\0\0\0#\2" + "\2\0i\4\2\0\246\0\0\0\304\0\0\0\340\0\0\0\362\0\0\0\366\0\0\0\345\0\0" + "\0\315\0\0\0\256\5\4\0|\0\0\0""0\0\0\0\2\225\0\0\0\0\10\0\0\0\5\0\0\0" + ".\0\0\0C\0\0\0Q\0\0\0T\0\0\0F\0\0\0""5\0\0\0\16\227\0\0\0\0\1\0\0\0\1" + "\210\0\0\0\0\1\0\0\0\1\313\0\0\0\0", }; static const GdkPixdata pic8 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1552, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2681, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\214\377\377\377\207\21\21\21\226\377\377\377\203\21\21\21\207\314\230" - "f\204\21\21\21\220\377\377\377\202\21\21\21\1\314\230f\203\377\313\231" - "\1\314\230f\206\377\313\231\203fff\1\21\21\21\216\377\377\377\2\21\21" - "\21\314\230f\203\377\313\231\202\314\230f\202\377\313\231\202\314\230" - "f\204\377\313\231\203fff\1\21\21\21\214\377\377\377\2\21\21\21\314\230" - "f\206\377\313\231\202\314\230f\203\377\313\231\1\314\230f\203\377\313" - "\231\202fff\1\21\21\21\213\377\377\377\2\21\21\21\314\230f\205\377\313" - "\231\202\314\230f\203\377\313\231\202\314\230f\205\377\313\231\202ff" - "f\1\21\21\21\212\377\377\377\2\21\21\21\314\230f\210\377\313\231\202" - "\314\230f\207\377\313\231\4\230eewww\314\230f\21\21\21\210\377\377\377" - "\2\21\21\21fff\206\377\313\231\203\314\230f\206\377\313\231\1\314\230" - "f\202UUU\4\314\230f\377\313\231\231\2303\21\21\21\207\377\377\377\1\21" - "\21\21\202fff\204\377\313\231\202\314\230f\206\377\313\231\1\314\230" - "f\203UUU\6\230\230e\314\230fUUU\377\313\231\231e3\21\21\21\207\377\377" - "\377\1\21\21\21\202fff\212\377\313\231\1\231e3\202UUU\202\314\230f\202" - "\377\313\231\2\314\230fUUU\202\314\230f\1\21\21\21\207\377\377\377\1" - "\21\21\21\202fff\205\377\313\231\1\314\230f\202\"\"\"\3ee2\314\230f\231" - "e3\202\314\230f\202\230\230e\202UUU\5\314\230f\230\230eUUU\314\230f\21" - "\21\21\207\377\377\377\1\21\21\21\202fff\202\377\313\231\202\314\230" - "f\2\231e3\20\0\0\202\210\210\210\5\0\0\20www\230\230e\230ee\314\230f" - "\202www\203\377\313\231\4\314\230fUUU\314\230f\21\21\21\207\377\377\377" - "\1\21\21\21\202fff\1\314\230f\202\230ee\11fff\0\0\0\356\356\356\335\335" - "\335\273\273\273\377\377\377\0\0\20UUU\230\230e\204\377\313\231\1\314" - "\230f\202UUU\202\314\230f\1\21\21\21\210\377\377\377\10\21\21\21fff\231" - "\231\231fff\377\313\231\314\230f\"\"\"\377\377\377\202\0\0\0\6\356\356" - "\356DDD\230\230e\314\230f\377\313\231\314\230f\203UUU\1\314\230f\202" - "\377\313\231\2\314\230f\21\21\21\210\377\377\377\16\21\21\21\314\230" - "f\377\313\231UUU\314\230fUUU\0\0\0\356\356\356\273\273\273\210\210\210" - "\377\377\377\21\21\21www\314\230f\202UUU\1\314\230f\205\377\313\231\2" - "\314\230f\21\21\21\210\377\377\377\12\21\21\21\231\2303\377\313\231\314" - "\230fUUU\377\313\231\230ee\"\"\"\314\314\314\273\273\273\202333\1\210" - "\210\210\211\377\313\231\2\314\230f\21\21\21\211\377\377\377\4\21\21" - "\21\314\230f\377\313\231UUU\202\377\313\231\4""333\0\0\20\0\0\"333\213" - "\377\313\231\1\21\21\21\213\377\377\377\3\21\21\21\377\313\231\231e3" - "\202e22\1\21\21\21\202DDD\1\21\21\21\202e22\2\377\313\231\314\230f\206" - "\377\313\231\2\314\230f\21\21\21\213\377\377\377\2\21\21\21\314\230f" - "\203\21\21\21\1DDD\202333\1DDD\202\21\21\21\1\314\230f\207\377\313\231" - "\1\21\21\21\215\377\377\377\2\21\21\21e22\202333\1\"\"\"\204333\1\21" - "\21\21\207\377\313\231\2\314\230f\21\21\21\215\377\377\377\6\21\21\21" - "\"\"\"DDD\"\"\"\21\21\21DDD\202333\3DDD333\21\21\21\202\377\313\231\202" - "\314\230f\3\377\313\231\314\230f\21\21\21\215\377\377\377\2\21\21\21" - "\"\"\"\202DDD\2\"\"\"\21\21\21\203333\202DDD\3""333\21\21\21\314\230" - "f\202\377\313\231\2\314\230f\21\21\21\216\377\377\377\4\21\21\21DDD3" - "33\"\"\"\205333\203DDD\2\21\21\21ee2\202\314\230f\2\"\"\"\0v\0\202\0" - "\"\0\214\377\377\377\1\21\21\21\202\"\"\"\1DDD\202333\10DDD333\"\"\"" - "333DDD333\"\"\"\21\21\21\202\"\"\"\4\0v\0\0\230\0\0D\0\0v\0\202\0\"\0" - "\212\377\377\377\4\21\21\21\"\"\"DDD\0\0\0\203\21\21\21\3DDD333\"\"\"" - "\203333\1\21\21\21\202\0v\0\202\0\230\0\2\0D\0\0\230\0\202\0v\0\202\0" - "\"\0\210\377\377\377\5\21\21\21""333\"\"\"\21\21\21\"\"\"\203\21\21\21" - "\6""333\"\"\"333DDD333\21\21\21\205\0D\0\203\0\230\0\202\0v\0\1\0\"\0" - "\207\377\377\377\2\21\21\21DDD\202\21\21\21\203\"\"\"\1\21\21\21\204" - "333\2\21\21\21\0v\0\212\0\230\0\2\0v\0\0\"\0\205\377\377\377\4\0\"\0" - "\0\230\0\21\21\21\0\0\0\203\21\21\21\2\"\"\"\21\21\21\202333\202\21\21" - "\21\214\0\230\0\2\0v\0\0\"\0\204\377\377\377\5\0\"\0\0\230\0\377\313" - "\231\21\21\21\"\"\"\204\21\21\21\1\"\"\"\202\21\21\21\2\0v\0\0D\0\215" - "\0\230\0\2\0v\0\0\"\0\203\377\377\377\2\0\"\0\0\230\0\202\377\313\231" - "\2\21\21\21\0\0\0\203\"\"\"\5\21\21\21fff\314\230f\0v\0\0D\0\215\0\230" - "\0\2\0v\0\0\"\0\202\377\377\377\4\0\"\0\0v\0\0\230\0\314\230f\202\377" - "\313\231\1www\203\21\21\21\5www\377\313\231\314\230f\0v\0\0D\0\215\0" - "\230\0\2\0v\0\0\"\0\202\377\377\377\2\0\"\0\0v\0\202\0\230\0\1\314\230" - "f\206\377\313\231\1\314\230f\202\0v\0\1\0D\0\215\0\230\0\2\0v\0\0\"\0" + "\217\0\0\0\0\1\0\0\0\1\203\0\0\0\0\1\0\0\0\1\235\0\0\0\0\1\0\0\0\1\232" + "\0\0\0\0\13\0\0\0\15\0\0\0%\2\1\0e\4\3\1\221\1\1\0\244\0\0\0\251\1\1" + "\0\242\4\3\0\222\2\1\0`\0\0\0'\0\0\0\12\224\0\0\0\0\15\2\1\0<\0\0\0\226" + "\0\0\0\336\0\0\0\362\0\0\0\376\14\11\2\377\35\26\6\377\12\10\2\377\0" + "\0\0\376\0\0\0\357\0\0\0\337\0\0\0\216\2\1\0<\221\0\0\0\0\23\0\0\0\23" + "\3\3\1\207\0\0\0\336\3\3\0\377G:\26\377\224x.\377\326\253\77\377\344" + "\266@\377\342\263;\377\340\2576\377\325\244-\377\215k\32\377D3\12\377" + "\0\0\0\377\0\0\0\341\3\2\0~\0\0\0\25\0\0\0\0\0\0\0\1\214\0\0\0\0\23\1" + "\1\0!\0\0\0\235\0\0\0\374>2\24\377\301\237A\375\362\307R\376\353\302" + "P\377\337\267J\376\334\263F\377\334\261A\376\332\255;\377\332\2525\376" + "\342\2570\377\352\262*\376\261\203\31\3756'\5\377\0\0\0\371\0\0\0\231" + "\2\1\0\34\214\0\0\0\0\25\0\0\0\24\1\0\0\246\0\0\0\377r^(\377\357\307" + "W\376\356\307Y\376\342\276W\376\342\276V\377\342\274T\376\341\272O\377" + "\337\266I\376\336\262B\377\334\257;\376\331\2523\377\327\245,\376\336" + "\247$\377\344\247\34\376^D\10\377\0\0\0\377\0\0\0\231\0\0\0\24\212\0" + "\0\0\0\26\0\0\0\4\0\0\0~\0\0\0\375mZ&\377\371\320\\\376\356\311_\376" + "\347\305c\377\351\310e\376\360\314d\377\343\301[\376\342\275V\377\341" + "\272P\376\337\265H\377\335\262@\376\345\265;\377\325\2461\376\323\240" + "'\377\337\246\40\377\345\246\27\376^C\6\377\0\0\0\371\3\2\0}\212\0\0" + "\0\0\27\0\0\0A\0\0\0\344A6\26\377\363\313Y\376\353\307^\377\241\213I" + "\376]M\40\377dT'\376\265\236U\377\356\314g\376\344\301\\\377\342\275" + "U\376\336\267L\377\354\277H\376\211n'\377N;\15\376M9\12\377}^\25\376" + "\334\241\31\377\340\240\17\3765%\2\377\0\0\0\340\2\1\0<\210\0\0\0\0\31" + "\0\0\0\3\3\2\1\237\0\0\0\377\306\244E\377\361\312]\377\226\201A\377c" + "C\0\376\307\212\5\377\275\203\2\376X=\0\377\267\240W\376\360\316g\377" + "\343\277Y\376\356\305S\377\214s0\376lJ\0\377\332\231\10\376\335\233\11" + "\377\201Z\4\376tV\20\377\353\250\22\377\253x\11\375\0\0\0\377\0\0\0\217" + "\0\0\0\12\207\0\0\0\0\31\0\0\0""3\0\0\0\330UE\33\377\360\306T\376\337" + "\275[\376=+\2\377\254w\1\376\241x\32\377\244z\33\376\222d\0\377J;\25" + "\376\351\312i\377\344\301[\376\354\303U\377A2\14\376\223h\11\377uZ\37" + "\376z]\34\377\232n\12\376>+\0\377\305\216\20\376\351\245\15\376C0\3\377" + "\0\0\0\335\0\0\0$\207\0\0\0\0\31\0\0\0[\0\0\0\377\236\2001\377\355\303" + "R\377\337\273R\376EA6\377\231\232\232\376\12\16\26\377\13\16\27\376\202" + "\203\204\377JC6\376\343\302^\377\347\303\\\376\322\256H\377_W\77\376" + "\210\215\231\377\0\0\7\376\0\0\7\377\214\220\233\376d]P\377\256{\6\376" + "\343\240\14\377\203]\7\377\0\0\0\360\2\1\0^\206\0\0\0\0\34\0\0\0\6\0" + "\0\0\201\21\15\4\377\307\240<\375\347\276O\377\332\264I\376\220\216\203" + "\377\214\215\221\376\0\0\0\377\0\0\0\376`bi\377\235\223u\376\344\300" + "X\377\342\277X\376\357\304P\377\200qJ\376\215\220\230\377\0\0\0\376\0" + "\0\0\377\235\241\252\376\205vS\377\322\224\11\376\322\225\13\377\307" + "\214\13\377\0\0\0\376\4\3\0\221\0\0\0\0\0\0\0\1\204\0\0\0\0\32\0\0\0" + "\13\0\0\0\226!\32\10\377\324\252>\376\344\273K\377\352\302R\376\230\201" + "A\377|~\207\376\27\32!\377\20\23\33\376[[\\\377\260\226I\376\355\310" + "]\377\342\274S\376\345\274M\377\266\2236\376jih\37747\77\376;\77G\377" + "vwz\376\234q\15\377\332\233\17\376\316\222\13\377\326\230\14\377\6\4" + "\0\377\2\1\0\242\206\0\0\0\0\32\0\0\0\17\0\0\0\250+!\12\377\335\260<" + "\376\341\267E\377\341\270L\376\353\302R\377\235\204\77\376odD\377nbA" + "\376\267\233K\377\355\307[\376\342\274S\377\340\271M\376\335\263F\377" + "\347\270\77\376\274\223,\377r]-\376mY+\377\254~\24\376\335\237\22\377" + "\320\223\14\376\317\222\13\377\327\230\14\377\27\20\1\377\0\0\0\251\206" + "\0\0\0\0\32\0\0\0\13\0\0\0\230!\31\7\377\322\2454\376\341\264@\377\336" + "\264E\376\336\266J\377\353\303S\376\355\305U\377\357\307V\376\351\302" + "V\377\337\272P\376\340\270L\377\336\265G\376\334\261@\377\332\2559\376" + "\335\2542\377\350\261,\376\346\254\"\377\330\237\33\376\320\225\20\377" + "\320\223\13\376\316\222\13\377\327\230\14\377\6\4\0\377\2\1\0\244\206" + "\0\0\0\0\34\0\0\0\6\0\0\0\177\21\15\3\377\301\226+\375\342\2629\377\334" + "\257=\376\334\262B\377\336\264F\376\340\267I\377\340\267J\376\337\266" + "I\377\336\265G\376\336\263C\377\335\260\77\376\333\2559\377\331\2523" + "\376\330\245,\377\327\242%\376\324\235\34\377\322\230\25\376\320\224" + "\14\377\320\223\13\376\321\224\14\376\306\214\13\377\0\0\0\375\4\2\0" + "\217\0\0\0\0\0\0\0\1\205\0\0\0\0\31\0\0\0_\0\0\0\377\240z\37\376\346" + "\2623\377\332\2526\376\334\256:\377\346\270\77\376\352\273B\377\351\273" + "B\376\346\270@\377\346\270\77\376\345\265<\377\343\2628\376\343\2572" + "\377\342\255,\376\340\251$\377\337\244\35\376\331\235\22\377\331\232" + "\15\376\323\225\13\377\317\223\14\376\334\233\14\377\214c\10\377\0\0" + "\0\362\2\1\0a\207\0\0\0\0\31\1\1\0""2\0\0\0\325P;\15\377\347\260+\376" + "\314\235+\376t]\"\377w^\40\376\205h\34\377\251\2103\376\245\202(\377" + "\231u\32\376\237y\32\377\246~\32\376\234s\23\377\230o\20\376\226m\15" + "\377\230m\13\376\247\200&\377iQ\32\376mP\22\377\317\222\11\376\343\241" + "\14\376B.\4\377\0\0\0\333\0\0\0\"\207\0\0\0\0\31\0\0\0\4\1\1\0\244\0" + "\0\0\377\302\221\36\377\352\257%\377~^\17\377\24\26\31\376FL\\\377\0" + "\0\1\376~\201\210\377\267\274\307\376\277\300\303\377\273\271\267\376" + "\303\304\306\377\302\305\314\376\273\300\315\377\250\260\300\376PT]\377" + "UC\33\376\273\204\14\377\340\237\14\376\261}\12\375\1\1\0\377\0\0\0\222" + "\0\0\0\14\210\0\0\0\0\27\2\1\0\77\0\0\0\3325%\0\377V>\3\376[\\`\377\377" + "\377\377\376ZXV\377\260\202\26\376\242}#\377uc8\376\257\256\255\377\313" + "\317\332\376\304\310\320\377\262\260\253\376\206wU\377tY\37\376\270\201" + "\7\377\333\232\11\376\326\227\13\376\332\233\14\3763$\2\377\0\0\0\334" + "\2\1\0""9\212\0\0\0\0\25\0\0\0\266\35\40%\377\270\272\300\376\377\377" + "\377\377\246\251\263\376S8\0\377\344\251\37\376\337\245\36\377\337\243" + "\31\376\241r\5\377\216f\14\376\223f\2\377\244p\0\376\313\215\2\377\341" + "\237\14\376\323\226\15\377\323\225\14\376\345\242\15\376bE\5\377\0\0" + "\0\372\3\2\0\202\211\0\0\0\0\3\0\0\0-\10\10\10\307\205\205\205\377\202" + "\377\377\377\377\22\365\366\370\376=4!\376\315\220\6\377\320\226\22\376" + "\321\226\21\377\322\226\20\376\331\233\16\377\331\231\12\376\332\231" + "\12\377\330\230\13\376\323\225\14\377\317\222\13\376\325\227\14\377\335" + "\235\14\376^B\5\377\0\0\0\377\0\0\0\227\0\0\0\21\205\0\0\0\0\1\12\7\0" + "\0\202\0\0\0\0\27\0\0\0\23314=\377\340\341\345\377\377\377\377\376\373" + "\373\373\377\377\377\377\377~\177\203\377\30\14\0\377\273\204\12\377" + "\336\236\14\376\335\235\14\377\331\231\13\376\326\227\13\377\324\226" + "\13\376\326\227\14\377\330\231\14\376\335\235\14\377\340\237\14\376\265" + "\200\12\3777&\3\377\0\0\0\373\1\1\0\240\1\0\0\36\205\0\0\0\0\32\0\0\1" + "\0\0\0\0\0\0\0\0%\33\23\1\365^D\11\377T<\7\377LH>\376\345\347\354\376" + "\377\377\377\377\335\335\335\377\0\0\0\342\0\0\0\325\0\0\0\377J4\4\377" + "\225j\10\377\266\201\12\375\306\214\13\376\317\222\14\376\305\213\13" + "\376\271\203\12\375\222g\10\377K5\4\377\0\0\0\377\0\0\0\342\0\0\0x\0" + "\0\0\20\206\0\0\0\0\31\10\4\0\1\0\0\0\0\21\14\0\255\244t\11\377\352\246" + "\14\375\353\247\16\377\232i\0\377FA5\376\377\377\377\377DDD\377\0\0\0" + "&\1\0\0""8\1\1\0\243\0\0\0\323\0\0\0\377\15\11\0\377\35\25\1\377&\33" + "\2\377\34\24\1\377\16\12\0\377\0\0\0\377\0\0\0\325\3\2\0\233\0\0\0<\0" + "\0\0\3\207\0\0\0\0\12\15\11\1\2\0\0\0\0""7&\3\362\323\225\14\377\324" + "\226\14\376\320\223\14\376\353\247\16\376_E\11\377^bj\377\0\0\0p\202" + "\0\0\0\0\12\0\0\0\2\1\0\0/\0\0\0^\0\0\0\177\0\0\0\230\0\0\0\247\0\0\0" + "\226\0\0\0\201\0\0\0Y\0\0\0""0\212\0\0\0\0\11\11\6\0\1\0\0\0\0\26\17" + "\1\302\264\177\12\377\337\236\14\376\320\223\13\376\344\241\14\376rQ" + "\13\377\0\0\10\314\206\0\0\0\0\5\0\0\0\6\0\0\0\13\0\0\0\17\0\0\0\13\0" + "\0\0\6\216\0\0\0\0\11\0\0\0""8B.\3\377\312\217\13\377\356\250\15\373" + "\315\221\13\377)\35\2\377\0\0\0\31\0\0\0\0\14\14\14\0\230\0\0\0\0\7\0" + "\0\0E)\34\1\350\77,\3\377$\31\1\355\0\0\0H\0\0\0\0\1\0\0\1\233\0\0\0" + "\0\1\0\0\0\6\202\0\0\0\0\1\205a\10\0\232\0\0\0\0\5\1\0\0\0\12\7\0\1\1" + "\0\0\0\6\4\0\1\1\0\0\0\230\0\0\0\0", }; static const GdkPixdata pic9 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 1124, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2523, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\207\377\377\377\207\0\0v\231\377\377\377\1\0\0v\20622\313\206\0\0v\224" - "\377\377\377\1\0\0v\20622\313\5ff\314\313\231\377\230f\314e3\23122\313" - "\207\0\0v\215\377\377\377\1\0\0v\20522\313\2""22e\314\230f\202\375\230" - "\0\2\3142\0e2e\20622\313\1\0\0v\216\377\377\377\1\0\0v\20422\313\6""2" - "2e\230\227\0\375\313\0\375\230\0\3142\0e22\20522\313\1\0\0v\217\377\377" - "\377\4\0\0D\0\0\210\0\0\2522\0\230\20233\231\4\"\"\"DDDe22e2e\20522\313" - "\1\0\0v\220\377\377\377\202\"\0\0\1\20\0\0\203\0\0\0\1\0\0\"\202\0\0" - "T\203\0\0v\202\0\0\210\2\0""2\230\0\0T\217\377\377\377\4\21\21\21\314" - "2\0\2302\0\3142\0\202\2302\0\202e22\2f2\0T\0\0\203D\0\0\4""2\0\0\"\0" - "\0\"\"\"\0\0\0\216\377\377\377\1\21\21\21\205\2302\0\1\3142\0\211\230" - "2\0\3\3142\0\2302\0\21\21\21\215\377\377\377\2\21\21\21\2302\0\205\314" - "2\0\1\2302\0\206\3142\0\204\2302\0\1\21\21\21\214\377\377\377\2\21\21" - "\21\231e3\202\314\230f\202\231e3\202\314\230f\4\377\313\231\314\230f" - "\313e2\3142\0\202\314\230f\205\3142\0\1\21\21\21\214\377\377\377\1\21" - "\21\21\217\377\313\231\4\314e\0\231e3\3142\0\21\21\21\213\377\377\377" - "\5\21\21\21\230e\0\377\313\231\314\230f\377\313\231\204\314\230f\1\377" - "\313\231\203\314\230f\206\377\313\231\2\231e3\21\21\21\213\377\377\377" - "\4\21\21\21\314\230f\377\313\231\314\230f\212\377\313\231\1\314\230f" - "\205\377\313\231\2\2302\0\21\21\21\211\377\377\377\2\21\21\21\"\0\0\203" - "\377\313\231\205\314\230f\206\377\313\231\202\314\230f\203\377\313\231" - "\2\2302\0\21\21\21\210\377\377\377\2\21\21\21\377\313\231\202\"\"\"\1" - "\314\230f\221\377\313\231\2\2302\0\21\21\21\210\377\377\377\1\21\21\21" - "\202\377\313\231\1\314\230f\203\"\"\"\2f2\0e22\202\231e3\1\230ee\203" - "\314\230f\207\377\313\231\2\2302\0\21\21\21\210\377\377\377\3\21\21\21" - "\377\313\231\314\230f\202\377\313\231\217\0\0\0\202\"\"\"\3\314\230f" - "\377\313\231\21\21\21\207\377\377\377\3\21\21\21\377\313\231\314\230" - "f\202\377\313\231\207\0\0\0\1\377\313\231\207\0\0\0\204\377\313\231\1" - "\21\21\21\207\377\377\377\3\21\21\21\377\313\231\314\230f\202\377\313" - "\231\207\0\0\0\1\377\313\231\207\0\0\0\5\377\313\231\314\230f\377\313" - "\231\314\230f\21\21\21\207\377\377\377\3\21\21\21\377\313\231\314\230" - "f\202\377\313\231\207\0\0\0\1\377\313\231\207\0\0\0\5\377\313\231\314" - "\230f\377\313\231\314\230f\21\21\21\210\377\377\377\1\21\21\21\203\377" - "\313\231\2\231e3e22\204\0\0\0\2\231e3\377\313\231\206\0\0\0\5e22\377" - "\313\231\314\230f\377\313\231\21\21\21\211\377\377\377\1\21\21\21\213" - "\377\313\231\1\314\230f\202\231e3\202e22\6\"\"\"\314\230f\377\313\231" - "\314\230f\377\313\231\21\21\21\211\377\377\377\1\21\21\21\224\377\313" - "\231\1\21\21\21\212\377\377\377\1\21\21\21\224\377\313\231\1\21\21\21" - "\212\377\377\377\1\21\21\21\202\377\313\231\1\314\230f\204\377\313\231" - "\1\314\230f\203\231e3\1\314\230f\207\377\313\231\2\314\230f\21\21\21" - "\212\377\377\377\1\21\21\21\202\377\313\231\202\314\230f\206\377\313" - "\231\2\314\230f\231e3\207\377\313\231\2\314\230f\21\21\21\213\377\377" - "\377\1\21\21\21\203\377\313\231\204\314\230f\210\377\313\231\202\314" - "\230f\3\377\313\231\314\230f\21\21\21\213\377\377\377\3\0\20\0\231e3" - "\314\230f\205\377\313\231\210\314\230f\203\377\313\231\2\231e3\21\21" - "\21\212\377\377\377\2\0\0v22\313\204\"\"\"\202\231e3\1\314\230f\211\377" - "\313\231\1\314\230f\202\"\"\"\1\0\0v\211\377\377\377\1\0\0v\20622\313" - "\215\"\"\"\20322\313\1\0\0\210\207\377\377\377\1\0\0v\21422\313\1\0\0" - "v\21322\313\1\0\0v\204\377\377\377" + "\313\0\0\0\0\1\0\0\0\1\210\0\0\0\0\1\0\0\0\1\227\0\0\0\0\3\0\0\0\5\0" + "\0\0/\0\0\0A\202\0\0\0X\3\0\0\0A\0\0\0.\0\0\0\5\226\0\0\0\0\4\0\0\0""1" + "\0\0\0\211\0\0\0\325\0\0\0\360\203\0\0\0\367\5\0\0\0\370\0\0\0\361\0" + "\0\0\326\0\0\0\211\0\0\0""2\222\0\0\0\0\20\0\0\0\36\0\0\0\222\0\0\0\370" + "\0\0\0\347\0\0\0\251\0\0\0r\0\0\0d\0\0\0^\0\0\0]\0\0\0c\0\0\0q\0\0\0" + "\250\0\0\0\347\0\0\0\370\0\0\0\223\0\0\0\36\217\0\0\0\0\10\0\0\0;\0\0" + "\0\341\0\0\0\366\0\0\0\214\0\0\0T\4\3\1x\0\0\0\253\0\0\0\306\202\0\0" + "\0\326\10\0\0\0\306\0\0\0\253\4\3\0u\0\0\0Q\0\0\0\211\0\0\0\364\0\0\0" + "\342\0\0\0=\215\0\0\0\0\24\0\0\0S\0\0\0\366\0\0\0\310\1\1\0W\0\0\0~\0" + "\0\0\335\0\0\0\377\25\21\5\377QA\26\377iT\33\377iR\31\377P>\21\377\25" + "\20\3\377\0\0\0\377\0\0\0\334\0\0\0{\1\1\0Q\0\0\0\307\0\0\0\367\0\0\0" + "S\213\0\0\0\0\26\0\0\0""8\0\0\0\365\0\0\0\266\0\0\0S\0\0\0\263\0\0\0" + "\377@5\25\377\273\231>\377\350\276L\377\352\276J\376\351\274E\376\350" + "\270\77\377\345\2648\376\341\255/\377\264\210\40\377=-\10\377\0\0\0\377" + "\0\0\0\263\0\0\0K\0\0\0\264\0\0\0\366\0\0\0""9\211\0\0\0\0\30\0\0\0\21" + "\0\0\0\324\0\0\0\320\2\1\0T\0\0\0\306\0\0\0\377\224z4\377\360\310W\376" + "\351\302W\377\340\273S\376\340\271P\377\337\267K\376\336\263D\377\333" + "\256=\376\330\2513\377\337\253,\377\344\253$\376\213e\20\377\0\0\0\377" + "\0\0\0\306\2\1\0K\0\0\0\315\0\0\0\326\0\0\0\21\206\0\0\0\0\34\0\0\0\1" + "\0\0\0\0\0\0\0\200\0\0\0\367\0\0\0h\0\0\0\260\0\0\0\377\256\221\77\377" + "\375\324b\376\366\321d\376\365\320f\377\350\305`\376\343\277Y\377\342" + "\275T\376\340\267K\377\334\262C\376\341\262<\377\346\2610\376\345\254" + "%\377\360\261\40\376\243u\16\377\0\0\0\377\0\0\0\256\0\0\0a\0\0\0\367" + "\0\0\0\204\0\0\0\0\0\0\0\1\203\0\0\0\0\36\33\0\0\0\0\0\0\0\0\0\0""3\0" + "\0\0\364\1\0\0\362\11\1\0\341\0\0\0\376\207p/\377\373\323`\377\302\245" + "M\377}pG\376\177qH\377\310\254V\376\357\315f\377\343\277Z\376\340\272" + "P\377\352\275I\376\256\211,\377tc9\376sb7\377\242x\22\376\351\251\25" + "\377}Y\7\377\0\0\0\377\12\1\0\333\0\0\0\357\0\0\0\366\0\0\0@\0\0\0\0" + "\243\0\0\0\203\0\0\0\0\34\5\0\0+\0\0\0\342j\0\0\377\330\0\0\377V\0\0" + "\377\40$\16\377\365\314Y\376\305\246K\377}|z\377\377\377\377\376\377" + "\377\377\377zyt\376\320\263Y\377\347\304`\376\345\277V\377\277\2339\376" + "\207\206\205\377\377\377\377\376\377\377\377\377\216\217\220\376\253" + "z\12\377\344\242\16\376\36\35\2\377N\0\0\377\305\0\0\377X\0\0\377\0\0" + "\0\344\2\0\0;\204\0\0\0\0\35\0\0\0\265\210\0\0\377\377\0\0\376\356\0" + "\0\376\0\0\0\376\230}2\376\377\325^\377|l=\376\377\377\377\377\321\321" + "\321\376\276\276\275\377\372\374\377\376\202sD\377\365\321h\376\362\312" + "Z\377|j7\376\377\377\377\377\232\232\231\376yyy\377\367\373\377\376v" + "]$\377\355\250\16\377\220e\7\376\0\0\0\376\351\0\0\376\361\0\0\376x\0" + "\0\377\0\0\0\300\0\0\0\6\202\0\0\0\0\36\0\0\0IA\0\0\377\377\0\0\376\370" + "\0\0\376\250\0\0\376\4\15\4\377\311\242@\376\373\320[\377\203uL\376\323" + "\325\334\377\0\0\0\376\0\0\0\377\273\275\304\376\206yQ\377\366\322f\376" + "\362\312X\377\205tF\376\310\313\322\377\0\0\0\376\0\0\0\377\254\260\270" + "\376\200h2\377\347\244\14\376\276\205\12\377\6\14\1\376\242\0\0\377\344" + "\0\0\376\343\0\0\3767\0\0\377\0\0\0[\202\0\0\0\0\36\0\0\0~v\0\0\377\377" + "\0\0\376\371\0\0\377}\0\0\376\40#\14\377\337\264E\376\355\304T\377\260" + "\225J\376~\201\206\377\10\12\16\376\0\0\0\377`af\376\275\243V\377\352" + "\306^\376\346\277S\377\274\231=\376}~\200\377+-4\376\10\13\22\377`bf" + "\376\256\200\26\377\332\233\15\376\321\223\13\377\36\35\2\376y\0\0\377" + "\346\0\0\377\342\0\0\376p\0\0\377\0\0\0\215\202\0\0\0\0^\0\0\0\245\250" + "\0\0\377\375\0\0\376\375\0\0\377b\0\0\376,-\17\377\353\274D\376\340\267" + "J\377\351\301R\376\217{A\377xtg\376gcU\377\227\203F\376\355\307[\377" + "\340\273S\376\336\267K\377\347\272C\376\232z(\377\207{^\376\200tX\377" + "\224n\27\376\333\235\20\377\321\224\14\376\336\234\14\377)&\3\376^\0" + "\0\377\352\0\0\376\331\0\0\376\233\0\0\377\0\0\0\265\3\0\0\4\0\0\0\0" + "\0\0\0\231\230\0\0\377\377\0\0\376\374\0\0\377l\0\0\376()\14\377\345" + "\265=\376\340\265D\377\340\267K\376\353\302R\377\314\251G\376\321\256" + "L\377\354\305W\376\341\273Q\377\340\270L\376\336\264E\377\333\257=\376" + "\344\2627\377\323\240#\376\320\231\30\377\335\242\32\376\320\225\17\377" + "\323\225\13\376\331\231\14\377&#\3\376h\0\0\377\351\0\0\376\333\0\0\376" + "\223\0\0\377\0\0\0\253@\0\0\1\0\0\0\0\0\0\0oa\0\0\377\377\0\0\375\367" + "\0\0\377\214\0\0\376\27\32\7\377\321\2421\376\341\263<\377\334\261A\376" + "\335\264F\377\344\272K\376\344\273L\377\337\267J\376\336\265G\377\335" + "\262C\376\334\257=\377\332\2536\376\330\246.\377\330\244'\376\326\237" + "\35\377\321\227\24\376\320\223\14\377\326\227\14\376\311\216\13\377\27" + "\27\1\376\207\0\0\377\344\0\0\376\346\0\0\376^\0\0\377\0\0\0\201\202" + "\0\0\0\0=\0\0\0""1\37\0\0\362\340\0\0\377\376\0\0\376\311\0\0\377\0\0" + "\0\377\263\210$\376\345\2636\377\330\2539\376\336\260:\377\331\2534\376" + "\335\2578\377\337\261:\376\342\262:\377\344\2638\376\342\2572\377\335" + "\251)\376\330\242\37\377\324\233\25\376\320\224\13\377\323\225\15\376" + "\316\221\14\377\334\233\14\376\257z\11\377\0\0\0\376\302\0\0\376\345" + "\0\0\376\322\0\0\377$\0\0\375\0\0\0>\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0\211" + "G\0\0\377\345\0\0\377\377\0\0\375#\0\0\376cP\22\376\361\267.\377x]\33" + "\376GB:\377\237\217h\376\224~F\377\230}:\376\235~/\377\242}%\376\240" + "|#\377\232x(\376\224u/\377\222x<\376\226\204\\\377>9-\376\214c\12\377" + "\350\244\14\377aI\5\376\40\0\0\376\377\0\0\376\342\0\0\377L\0\0\377\0" + "\0\0\232\202\0\0\0\0\40\2\0\0\0\0\0\0\0\25\0\0\20\0\0\0\221*\0\0\377" + "`\0\0\377:\0\0\377\0\1\0\377\314\230\37\376\343\252\"\377\223v2\377\213" + "\214\220\376\344\353\374\377\344\350\362\376\332\335\344\377\313\316" + "\325\376\315\320\327\377\334\340\350\376\346\353\367\377\335\345\370" + "\376\200}w\377\234t\32\376\337\234\7\377\307\215\13\376\0\1\0\377C\0" + "\0\377n\0\0\377,\0\0\377\0\0\0\234\35\0\0\23\0\0\0\0\1\0\0\0\204\0\0" + "\0\0\33\0\0\0H\0\0\0p\0\0\0\255\0\0\0\3553%\5\377\337\245\34\376\341" + "\246\34\377\270\207\20\376va.\377\261\256\243\376\312\315\323\377\330" + "\333\343\376\323\327\336\377\313\315\323\376\247\237\217\377vZ\32\376" + "\277\203\0\377\334\233\11\377\333\233\14\3762#\2\377\0\0\0\356\0\0\0" + "\246\0\0\0y\0\0\0GF\0\0\0\0\0\0\0\3\0\0\0\203\0\0\0\0\1\1\0\0\0\203\0" + "\0\0\0\24\1\0\0\22\0\0\0\206\0\0\0\377H3\6\377\336\240\24\376\341\244" + "\27\377\337\242\25\377\253y\6\376\231l\6\377\231q\27\376\231o\21\377" + "\227h\0\376\261z\0\377\337\235\12\376\335\234\15\377\335\235\14\376H" + "3\4\377\0\0\0\377\0\0\0\200\21\0\0\6\215\0\0\0\0\22\1\1\0\24\0\0\0\227" + "\0\0\0\367+\36\2\377\254y\12\375\344\242\16\376\341\237\14\377\332\232" + "\12\377\324\224\6\376\325\225\7\377\332\232\11\376\340\236\13\377\344" + "\241\15\376\254z\11\375-\40\2\377\0\0\0\370\0\0\0\223\4\3\0\13\215\0" + "\0\0\0\11\0\0\0\1\0\0\0\0\0\0\0\30\2\2\0\200\0\0\0\350\0\0\0\377F1\3" + "\377\213b\7\377\301\211\13\377\202\324\226\14\377\7\301\211\13\377\213" + "b\7\377F1\3\377\0\0\0\377\0\0\0\350\2\1\0{\0\0\0\21\221\0\0\0\0\6\0\0" + "\0\2\1\1\0I\0\0\0\234\0\0\0\345\0\0\0\362\0\0\0\376\202\0\0\0\377\5\0" + "\0\0\376\0\0\0\363\0\0\0\346\0\0\0\232\1\1\0D\225\0\0\0\0\4\0\0\0\20" + "\0\0\0""0\2\1\0n\3\2\0\226\202\3\2\0\244\4\3\2\0\225\2\1\0k\0\0\0-\0" + "\0\0\15\271\0\0\0\0\1\0\0\0\1\202\0\0\0\0\1\0\0\0\1\316\0\0\0\0", }; -static const GdkPixdata logo = { +static const GdkPixdata pic10 = { 0x47646b50, /* Pixbuf magic: 'GdkP' */ - 24 + 2058, /* header length + pixel_data length */ - 0x2010001, /* pixdata_type */ - 96, /* rowstride */ + 24 + 2261, /* header length + pixel_data length */ + 0x2010002, /* pixdata_type */ + 128, /* rowstride */ 32, /* width */ 32, /* height */ /* pixel_data: */ (guint8*) - "\217\377\377\377\203\0\0\0\203\377\377\377\213\0\0\0\216\377\377\377" - "\11\0\0\0\252\252\252UUUff3\0\0\0\377\377\377\0\0\0\231\231\231\314\377" - "\314\202\314\314\314\3\335\335\335\314\314\314\335\335\335\202\314\314" - "\314\2\335\335\335\0\0\0\216\377\377\377\1\0\0\0\202UUU\6\231\231\231" - "\0\0\0\377\377\377\0\0\0\335\335\335\231\231f\203\0\0\0\1\0\21\0\205" - "\0\0\0\215\377\377\377\11\0\0\0DDDwwwfffwww\0\0\0\377\377\377\0\0\0\335" - "\335\335\202\0\0\0\5wwwfffwww\210\210\210\21\21\21\202www\1\0\0\0\214" - "\377\377\377\7\0\0\0UUUwwwDDDfffUUU\21\21\21\202\0\0\0\1\314\314\314" - "\202\0\0\0\10""333UUUDDD333\21\21\21""333UUU\0\0\0\213\377\377\377\3" - "\0\0\0DDDwww\202\"\"\"\3UUU\252\252\252\"\"\"\202\0\0\0\1\335\335\335" - "\202\0\0\0\1UUU\203333\202\21\21\21\2fff\0\0\0\212\377\377\377\11\0\0" - "\0UUUwww\"\"\"\21\21\21\0\0\0UUU\252\252\252\"\"\"\202\0\0\0\1\314\314" - "\314\202\0\0\0\5\21\0\0""333\21\21\21\0\21\0\21\21\21\203\0\0\0\211\377" - "\377\377\5\0\0\0UUU\210\210\210\"\"\"\21\21\21\202\0\0\0\3UUU\273\273" - "\273\"\"\"\202\0\0\0\1\314\377\314\202\0\0\0\2\210\210\210UUU\202\21" - "\21\21\2www\210\210\210\202\0\0\0\210\377\377\377\6\0\0\0UUU\231\231" - "\231\"\"\"\21\21\21\0\0\0\202\377\377\377\3UUU\252\252\252333\202\0\0" - "\0\1\314\314\314\202\0\0\0\1\"\"\"\202333\1\21\21\21\202\"\"\"\202\0" - "\0\0\207\377\377\377\6\0\0\0\252\252\252\231\231\231UUU\21\21\21\0\0" - "\0\202\377\377\377\4\0\0\0DDD\273\273\273\"\"\"\202\0\0\0\1\335\335\335" - "\202\0\0\0\4www\"\"\"DDD\21\21\21\204\0\0\0\205\377\377\377\202\0\0\0" - "\5\252\252\252UUUwwwDDD\0\0\0\203\377\377\377\3\0\0\0\252\252\252\231" - "\231\231\203\0\0\0\1\314\314\231\202\0\0\0\3\0\21\0\"\"\"\0\0\21\205" - "\0\0\0\204\377\377\377\3\0\0\0UUU\252\252\252\202\0\0\0\3www\"\"\"\0" - "\0\0\202\377\377\377\4\0\0\0UUU\314\314\314UUU\203\0\0\0\6\273\273\273" - "\231\231\231\0\0\0\21\21\21\"\"\"\21\0\0\205\0\0\0\204\377\377\377\2" - "\0\0\0\252\252\252\202\0\0\0\3\252\252\252UUU\0\0\0\203\377\377\377\4" - "\0\0\0UUU\314\314\314UUU\203\0\0\0\13\231\231\231\314\314\231\273\273" - "\273\314\314\231\231\314\314\314\314\231\273\273\273\314\314\231\273" - "\273\273\314\314\231\0\0\0\204\377\377\377\3\0\0\0UUU\0\0\0\202UUU\1" - "\0\0\0\204\377\377\377\5UUU\314\314\314\273\273\273\314\314\314UUU\204" - "\0\0\0\1\210\210\210\210\0\0\0\205\377\377\377\2\0\0\0\377\377\377\202" - "\0\0\0\204\377\377\377\6\0\0\0\231\231\231\231\231f\231\231\231DDDUU" - "U\203\0\0\0\4\231\231fwww\231\231f\210\210\210\202www\4\210\210\210f" - "\231fwww\0\0\0\213\377\377\377\202\0\0\0\7\314\314\314\314\314\231\314" - "\314\314\273\273\273\314\314\231\231\314\314\314\314\231\202\0\0\0\1" - "\210\210\210\206\0\0\0\1\21\0\0\202\0\0\0\212\377\377\377\4\0\0\0UUU" - "\0\0\0\314\314\314\202\210\210\210\4\231\231f\231\231\231\231\231f\231" - "\231\314\202\0\0\0\6f\231f\0\0\0wwwf\231f\231fff\231f\203www\2\0\0\0" - "\377\377\377\211\0\0\0\202UUU\12\0\21\0\273\273\273\210\210\210\314\314" - "\231\252\252\252\210\210\210f\231f\314\314\231www\0\0\0\202\252\252\252" - "\7\231\314\231\314\231\231\210\210\210\252\252\252\231\231\231\231\231" - "f\252\252\252\202\0\0\0\3\252\252\252UUUff3\205UUU\1ff3\202\252\252\252" - "\12\0\0\0\314\314\231\210\210\210\231\314\231\231\231\231\231\231f\210" - "\210\210\252\252\252f\231f\0\0\0\202www\1fff\202f\231f\4fffwwwfffff3" - "\202\0\0\0\3UUUfff3f3\202\252\252\252\202\210\210\210\1fff\203UUU\21" - "\0\0\0\273\273\273\210\210\210\231\231f\231\231\231f\231\231\231\231" - "f\252\252\252www\0\0\0\252\252\252\231\231f\231\231\231\210\210\210\231" - "ff\231\231\231\231\231f\202\231\231\231\202\0\0\0\3UUUff3\0\0\21\202" - "\0\0\0\13\21\21\21\"\"\"333\0\21\0\0\0\0UUU\0\0\0\273\273\273\231\231" - "ff\231\231\231\231f\202\210\210\210\6\252\252\252wwwfffff3f\231ffff\202" - "f\231f\202fff\7ff3UUU\0\21\0\0\0\0UUU\252\252\252\0\0\0\202\377\377\377" - "\207\0\0\0\3\314\314\231\231\314\314\314\231\231\204\252\252\252\2\231" - "\231f\231\314\231\202\231\231\231\7\231\231f\231ffwww\231\231f\210\210" - "\210\231\231f\231\231\231\202\0\0\0\3UUU\231\231\231\0\0\0\210\377\377" - "\377\202\0\0\0\2\231\231ff\231f\202www\6ff3f\231ffffUUUwwwff3\203fff" - "\4UUUff33ffff3\202\0\0\0\3UUUwww\"\"\"\210\377\377\377\23\0\0\0\252\252" - "\252\231\231\231\252\252\252\231\231\231\231\231f\231\231\231\210\210" - "\210\231\231f\231\231\231\231\231fwww\210\210\210f\231fffff\231fwww\210" - "\210\210www\202\0\0\0\4UUUfff\"\"\"\0\0\0\210\377\377\377\4\0\0\0""3" - "3\0UUUfff\204UUU\1""3f3\203DDD\2""333DDD\204333\202\0\0\0\2\231\231\231" - "UUU\202\0\0\0\211\377\377\377\1\0\0\21\202\0\0\0\16\0\21\0ff3wwwfffU" - "UUfffUUUff3UUUff3DDD3f3ff33f3\202\0\0\0\4UUU\231\231\231\252\252\252" - "\0\0\0\213\377\377\377\7\0\0\0\21\21\21UUUf\231f\231\231f\210\210\210" - "\231\231f\202www\6f\231ffff\231ffwwwfffwww\202\0\0\0\4DDDwwwUUU\252\252" - "\252\202\0\0\0\212\377\377\377\2\0\21\0UUU\202fff\12ff3DDDUUU3f3DDDf" - "333f333333\0DDD\202\0\0\0\2\"\"\"www\202\0\0\0\3\252\252\252UUU\0\0\0" - "\210\377\377\377\24\0\0\0\21\0\0UUU\231\231f\210\210\210f\231\231\231" - "\231fwww\210\210\210wwwf\231ffffwwwfffff3\0\0\0\377\377\377\0\0\0UUU" - "\252\252\252\202\0\0\0\2\252\252\252\0\0\0\210\377\377\377\1\0\0\0\203" - "fff\11UUUff3UUU3f3f333f3333DDD33\0\202333\1\0\0\0\202\377\377\377\1\0" - "\0\0\202UUU\3\0\0\0UUU\0\0\0\210\377\377\377\7\0\0\0ffff\231f\231\231" - "\231\231\231f\210\210\210UUU\206\0\0\0\1\0\21\0\202\0\0\0\203\377\377" - "\377\202\0\0\0\2\377\377\377\0\0\0\211\377\377\377\220\0\0\0" + "\316\0\0\0\0\1\0\0\0\1\202\0\0\0\0\6\0\0\0\20\4\3\1\35\5\4\1""0\5\4\1" + "'\0\1\0\30\0\0\0\11\230\0\0\0\0\12\3\2\1&\0\0\0~\0\0\0\302\0\0\0\351" + "\0\0\0\353\0\0\0\351\0\0\0\340\0\0\0\241\0\0\0]\13\7\2\7\224\0\0\0\0" + "\15\0\0\0\2\6\4\2a\0\0\0\325\11\7\2\377A4\24\377u^!\377\215p&\377\202" + "e\37\377[F\23\377$\33\6\377\0\0\0\377\0\0\0\243\0\0\0""0\222\0\0\0\0" + "\17\2\2\1\15\0\0\0\225\0\0\0\3727-\23\377\307\244E\375\361\306R\376\357" + "\304O\377\350\274G\376\350\270\77\377\357\2729\376\332\246*\376\205d" + "\25\377\0\0\0\377\0\0\0\333\1\1\0R\221\0\0\0\0\20\3\2\0\201\0\0\0\377" + "\177j-\377\365\315]\376\373\324c\376\344\301Z\376\341\275U\377\340\272" + "O\376\336\264F\377\333\256<\376\346\2634\377\366\272+\376\305\221\31" + "\377%\33\2\377\0\0\0\336\0\0\0""2\217\0\0\0\0\22\1\1\0;\0\0\0\355^N!" + "\377\377\331b\376\270\234K\376\226\202G\377\333\273\\\376\352\307b\377" + "\343\276W\376\337\267L\377\343\266@\376\234|+\377\201g+\376\310\223\25" + "\377\311\222\23\377\0\0\0\377\0\0\0\250\11\7\0\10\215\0\0\0\0\23\0\0" + "\0\20\0\0\0\276%\36\14\377\352\302T\376\262\231O\376\255\257\265\376" + "\377\377\377\377\201}p\376\341\301^\377\344\301^\376\357\306T\377\214" + "t5\376\326\331\341\377\377\377\377\376\217\205o\377\320\224\15\376\207" + "_\6\377\0\0\0\377\0\0\0c\215\0\0\0\0\24\4\3\1=\0\0\0\363\220v0\377\352" + "\302O\377\230\221{\377\367\370\373\376\241\241\240\377\344\345\352\376" + "\240\215R\377\364\320f\376\322\255D\377\252\241\211\376\312\314\321\377" + "www\376\303\306\314\377\240u\24\377\337\234\11\376(\34\2\377\0\0\0\254" + "\0\0\0\14\214\0\0\0\0\24\2\2\0{\0\0\0\377\335\264G\377\332\265I\377\247" + "\241\221\377deg\376\0\0\0\377\214\216\223\376\241\220Z\377\364\317c\376" + "\323\255B\377\251\237\206\376!#)\377\0\0\0\376MOV\377\255\203#\376\352" + "\244\11\377dG\5\377\0\0\0\347\2\1\0\36\214\0\0\0\0\24\0\0\0\223\34\26" + "\6\377\345\272F\377\345\276O\376\256\227V\377OR[\376\30\33#\377ONI\376" + "\342\301^\377\342\277X\376\355\302O\377\234\202=\376`ci\37727C\376l`" + "F\377\306\216\17\376\336\235\13\377\207`\7\377\0\0\0\354\4\3\0""3\212" + "\0\0\0\0\26\0\0\0\1\0\0\0\0\0\0\0\236&\36\10\377\344\266@\377\337\266" + "I\376\345\275O\377\251\220J\376\217\177Q\377\312\253Q\376\352\303W\377" + "\340\271O\376\336\264F\377\342\263;\376\256\2121\377\223v0\376\316\227" + "\30\377\325\230\20\376\330\230\13\376\225i\10\377\0\0\0\356\4\3\0\77" + "\214\0\0\0\0\24\0\0\0\213\20\14\3\377\343\2639\377\333\257\77\376\340" + "\267H\377\350\277N\376\355\304Q\377\344\275P\376\337\267K\377\336\264" + "F\376\334\260>\377\331\2536\376\337\253-\377\340\250\"\376\325\234\27" + "\377\321\225\15\376\334\234\14\377}Y\7\377\0\0\0\354\4\3\0*\214\0\0\0" + "\0\24\4\3\0d\0\0\0\372\277\224(\377\334\2546\377\335\257:\377\351\271" + "=\376\351\273B\377\352\274B\376\352\273A\377\350\267=\376\347\2645\377" + "\345\257,\376\342\251!\377\337\242\26\376\330\230\13\377\316\221\13\376" + "\343\241\15\376K5\4\377\0\0\0\323\0\0\0\25\214\0\0\0\0\24\0\0\0\27\0" + "\0\0\343dK\21\377\357\267/\376`O$\377}nI\376\231\204P\377\213t=\376\204" + "l0\377\210m*\376\204i)\377\205k,\376\220v;\377\216xE\376UF$\377\261~" + "\14\376\315\220\12\375\21\14\0\377\0\0\0\222\0\0\0\4\214\0\0\0\0\23\0" + "\0\0N\0\0\0\345\0\0\0\377\264\205\32\376\317\234$\377\203pD\376\275\302" + "\315\377\367\374\377\376\377\377\377\377\377\377\377\376\377\377\377" + "\377\377\377\377\376\325\334\352\377\224\214}\376\232o\15\376\345\242" + "\14\376F1\3\377\0\0\0\347\2\1\0""6\213\0\0\0\0\24\5\7\11\4\0\0\0\252" + "@<6\377\215\203w\377OJF\376\17\11\0\377\336\243\32\377\342\245\27\376" + "\256~\20\377\235\206S\376\227\216{\377\246\240\225\376\237\227\202\377" + "\236\216k\376\236t\25\377\301\204\0\376\356\250\14\376\214c\10\377\0" + "\0\0\377\4\3\0w\211\0\0\0\0\1\0\0\0\1\202\0\0\0\0\24\0\0\0\177und\377" + "\344\326\304\377\255\242\224\376\377\370\343\376son\376\31\17\0\377\236" + "r\16\376\223j\13\377U:\0\376E.\0\377D-\0\376O4\0\377fD\0\376\267\177" + "\3\377\333\233\14\376oN\6\377\0\0\0\377\0\0\0\255\0\0\0\12\207\0\0\0" + "\0\1\3\3\0\0\202\0\0\0\0\25\0\0\0\24\0\0\0V\5\6\11\341\321\303\262\377" + "\370\351\325\377}uk\376\350\332\307\377\351\332\310\376\0\0\0\377!\27" + "\2\376`C\4\377\212a\7\376\240q\11\377\244t\12\376\227k\11\377pO\6\376" + "8(\3\376\35\25\1\377\0\0\0\356\0\0\0\222\3\2\0\32\207\0\0\0\0\30\0\0" + "\0\1\0\0\0\0""76\0\1\0\0\0q\"\30\1\366dF\1\3779*\11\377\312\276\261\376" + "\377\361\335\376\260\245\226\376\213\202v\377\225\217\211\376A-\0\377" + "\351\245\16\375\362\253\16\375\361\252\15\376\357\251\15\376\354\247" + "\15\377\342\240\15\377\340\237\14\376\331\231\14\376|W\6\377\5\3\0\367" + "\2\0\0""0\207\0\0\0\0\33\3\3\0\0\0\0\0\0\0\0\0#\0\0\0\307\\A\5\377\311" + "\216\13\377\357\251\15\375\211^\0\376_^`\377\372\354\335\377\377\366" + "\341\376\375\355\331\377b\\U\377\0\0\0\360/!\3\377<+\3\377M6\4\377H3" + "\4\3761#\2\377\35\25\1\377\227k\10\376\327\230\14\377\347\243\15\376" + "xU\6\377\0\0\0\247\0\0\0\0\0\0\0\1\206\0\0\0\0\32\0\0\0\11\13\10\0\326" + "\236p\11\377\356\251\15\377\330\231\14\376\321\224\14\377\332\232\14" + "\377jI\0\376HB6\377\206~v\377JE\77\377\0\0\0\270\0\0\0\1\0\0\0\35\0\0" + "\0Q\0\0\0]\0\0\0\353~Y\7\377\331\232\14\377\322\225\14\377\320\223\13" + "\377\336\235\14\376\224i\10\377\0\0\0\270\0\0\0\0\0\0\0\1\206\0\0\0\0" + "\13\0\0\0.,\40\2\377\271\203\12\377dF\5\377\310\216\13\377\322\225\14" + "\376\321\224\14\377\344\242\15\376\274\204\6\376%\27\0\377\0\0\0\211" + "\205\0\0\0\0\10\6\4\0\276J5\4\377lL\6\377\276\206\12\376\325\227\14\377" + "\332\233\14\377Z@\5\377\0\0\0q\211\0\0\0\0\13\4\3\0\220\3\2\0\377oO\6" + "\376\332\232\14\377\316\222\13\376\271\203\12\377\260}\12\377\336\235" + "\14\376\303\212\12\377\25\17\1\347\0\0\0'\204\0\0\0\0\12\0\0\0E\33\23" + "\1\377\210`\7\377\306\214\13\376\322\225\14\376\336\235\14\377\215d\10" + "\377\0\0\0\262\0\0\0\0\0\0\0\1\207\0\0\0\0\15\0\0\0\13=*\3\377\353\246" + "\15\377\216e\10\376\261}\12\377\253y\12\376W=\4\377\330\231\14\377\334" + "\234\14\376\221f\10\377\0\0\0\275\0\0\0\0\12\11\1\0\202\0\0\0\0\10\0" + "\0\0A+\36\2\377\337\235\15\377\333\233\14\377\330\230\14\377\313\217" + "\13\377<*\3\377\0\0\0\217\210\0\0\0\0\15\0\0\0\1\0\0\0\0\0\0\0\241;)" + "\3\377O8\4\376\351\245\15\377\233m\10\376\0\0\0\377\324\226\14\376\330" + "\231\14\376\333\233\14\376=+\3\377\0\0\0,\204\0\0\0\0\6\0\0\0\215\40" + "\27\1\377_C\5\377=+\3\377\0\0\0\355\0\0\0\206\213\0\0\0\0\13*\36\3\17" + "\0\0\0\253S:\4\377\347\244\15\377dG\5\377\0\0\0\271F1\4\377\254y\12\377" + "\335\235\14\377H2\4\377\0\0\0_\205\0\0\0\0\4\0\0\0:\0\0\0f\0\0\0O\5\3" + "\0\26\213\0\0\0\0\1\17\13\1\0\202\0\0\0\0\11\0\0\0\2345%\2\377\4\3\0" + "\305\0\0\0\0\0\0\0Y\6\5\0\261\2\1\0\322\14\7\0\257\2\2\0\24\230\0\0\0" + "\0\2\0\0\0""8\0\0\0\26\203\0\0\0\0\1,\40\0\4\323\0\0\0\0", }; @@ -1203,44 +1713,48 @@ icons[7] = gdk_pixbuf_from_pixdata(&pic8, FALSE, NULL); icons[8] = gdk_pixbuf_from_pixdata(&pic9, FALSE, NULL); icons[9] = gdk_pixbuf_from_pixdata(&pic10, FALSE, NULL); - icons[10] = gdk_pixbuf_from_pixdata(&logo, FALSE, NULL); - icons[11] = gdk_pixbuf_from_pixdata(&bup, FALSE, NULL); - icons[12] = gdk_pixbuf_from_pixdata(&bdown, FALSE, NULL); + icons[IMAGE_BUTTON_UP] = gdk_pixbuf_from_pixdata(&bup, FALSE, NULL); + icons[IMAGE_BUTTON_DOWN] = gdk_pixbuf_from_pixdata(&bdown, FALSE, NULL); } static void init_images(void) { - gint i; + gushort l, m, n; /* define start images */ - i = g_random_int_range(0, MAX_PICS); - gtk_image_set_from_pixbuf(GTK_IMAGE(image1), icons[i]); - i = g_random_int_range(0, MAX_PICS); - gtk_image_set_from_pixbuf(GTK_IMAGE(image2), icons[i]); - i = g_random_int_range(0, MAX_PICS); - gtk_image_set_from_pixbuf(GTK_IMAGE(image3), icons[i]); + l = g_random_int_range(0, MAX_PICS); + m = g_random_int_range(0, MAX_PICS); + n = g_random_int_range(0, MAX_PICS); + + ensure_different_icons(&l, &m, &n); + + gtk_image_set_from_pixbuf(GTK_IMAGE(image1), icons[l]); + gtk_image_set_from_pixbuf(GTK_IMAGE(image2), icons[m]); + gtk_image_set_from_pixbuf(GTK_IMAGE(image3), icons[n]); } /* main exit function */ gint gb_destroyapp(GtkWidget *widget, gpointer gdata) { - if (is_running) return TRUE; - if (GTK_IS_WINDOW(gb_window)) gtk_widget_destroy(gb_window); + if (is_running) + return TRUE; + if (GTK_IS_WINDOW(gb_window)) + gtk_widget_destroy(gb_window); gb_window = NULL; return FALSE; } -void gb_start_easteregg(void) +static void gb_start_bandit(GtkWindow *parent) { load_images(); - create_window(); + create_window(parent); g_signal_connect(gb_window, "delete-event", G_CALLBACK(gb_destroyapp), NULL); points = 0; - lap = 0; + bout = 0; init_images(); init_strings(); update_labels(gb_window, TRUE, 3); @@ -1287,7 +1801,8 @@ { text[4] = 'y'; text[5] = '\0'; - if (utils_str_equal(text, "geany")) gb_start_easteregg(); + if (utils_str_equal(text, "geany")) + gb_start_bandit(GTK_WINDOW(widget)); return TRUE; break; } diff -Nru geany-0.18/src/geanyentryaction.c geany-0.19/src/geanyentryaction.c --- geany-0.18/src/geanyentryaction.c 2009-02-05 19:04:54.000000000 +0000 +++ geany-0.19/src/geanyentryaction.c 2010-05-09 16:48:55.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanyentryaction.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven * * 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 @@ -33,8 +33,7 @@ typedef struct _GeanyEntryActionPrivate GeanyEntryActionPrivate; -#define GEANY_ENTRY_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ - GEANY_ENTRY_ACTION_TYPE, GeanyEntryActionPrivate)) +#define GEANY_ENTRY_ACTION_GET_PRIVATE(obj) (GEANY_ENTRY_ACTION(obj)->priv) struct _GeanyEntryActionPrivate @@ -53,7 +52,7 @@ static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE(GeanyEntryAction, geany_entry_action, GTK_TYPE_ACTION); +G_DEFINE_TYPE(GeanyEntryAction, geany_entry_action, GTK_TYPE_ACTION) static GtkWidget *geany_entry_action_create_tool_item(GtkAction *action) @@ -65,7 +64,7 @@ if (priv->numeric) gtk_entry_set_width_chars(GTK_ENTRY(priv->entry), 9); - ui_entry_add_clear_icon(priv->entry); + ui_entry_add_clear_icon(GTK_ENTRY(priv->entry)); gtk_widget_show(priv->entry); @@ -94,21 +93,13 @@ } -static void entry_insert_text_cb(GtkEditable *editable, gchar *new_text, gint new_text_len, - gint *position, GeanyEntryAction *action) -{ - /* don't insert any text when it is not a digit */ - if (! isdigit(*new_text)) - g_signal_stop_emission_by_name(editable, "insert-text"); -} - - static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widget) { GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action); if (priv->numeric) - g_signal_connect(priv->entry, "insert-text", G_CALLBACK(entry_insert_text_cb), action); + g_signal_connect(priv->entry, "insert-text", + G_CALLBACK(ui_editable_insert_text_callback), NULL); g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action); g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action); @@ -147,8 +138,12 @@ static void geany_entry_action_init(GeanyEntryAction *action) { - GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action); + GeanyEntryActionPrivate *priv; + + action->priv = G_TYPE_INSTANCE_GET_PRIVATE(action, + GEANY_ENTRY_ACTION_TYPE, GeanyEntryActionPrivate); + priv = action->priv; priv->entry = NULL; priv->numeric = FALSE; } diff -Nru geany-0.18/src/geanyentryaction.h geany-0.19/src/geanyentryaction.h --- geany-0.18/src/geanyentryaction.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/geanyentryaction.h 2010-04-01 16:57:19.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanyentryaction.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven * * 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 @@ -38,9 +38,12 @@ typedef struct _GeanyEntryAction GeanyEntryAction; typedef struct _GeanyEntryActionClass GeanyEntryActionClass; +struct _GeanyEntryActionPrivate; + struct _GeanyEntryAction { GtkAction parent; + struct _GeanyEntryActionPrivate *priv; }; struct _GeanyEntryActionClass diff -Nru geany-0.18/src/geany.h geany-0.19/src/geany.h --- geany-0.18/src/geany.h 2009-07-14 14:05:51.000000000 +0100 +++ geany-0.19/src/geany.h 2010-05-16 19:22:24.000000000 +0100 @@ -1,8 +1,8 @@ /* * geany.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: geany.h 3964 2009-07-14 13:05:51Z ntrel $ + * $Id: geany.h 4929 2010-05-16 18:22:24Z eht16 $ */ /* Main header - should be included first in all source files. @@ -47,16 +47,15 @@ * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" -#define GEANY_CODENAME "Kaine" +#define GEANY_CODENAME "Vellam" #define GEANY_HOMEPAGE "http://www.geany.org/" -#define GEANY_USE_WIN32_DIALOG 0 #define GEANY_STRING_UNTITLED _("untitled") -#define GEANY_WINDOW_MINIMAL_WIDTH 550 -#define GEANY_WINDOW_MINIMAL_HEIGHT 350 +#define GEANY_DEFAULT_DIALOG_HEIGHT 350 #define GEANY_WINDOW_DEFAULT_WIDTH 900 #define GEANY_WINDOW_DEFAULT_HEIGHT 600 + /* Common forward declarations */ typedef struct GeanyDocument GeanyDocument; typedef struct GeanyEditor GeanyEditor; @@ -91,4 +90,9 @@ /* prototype is here so that all files can use it. */ void geany_debug(gchar const *format, ...) G_GNUC_PRINTF (1, 2); + +#ifndef G_GNUC_WARN_UNUSED_RESULT +#define G_GNUC_WARN_UNUSED_RESULT +#endif + #endif diff -Nru geany-0.18/src/geanymenubuttonaction.c geany-0.19/src/geanymenubuttonaction.c --- geany-0.18/src/geanymenubuttonaction.c 2009-06-20 17:51:32.000000000 +0100 +++ geany-0.19/src/geanymenubuttonaction.c 2010-05-16 18:43:35.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanymenubuttonaction.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Enrico Tröger - * Copyright 2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -32,25 +32,31 @@ typedef struct _GeanyMenubuttonActionPrivate GeanyMenubuttonActionPrivate; -#define GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ - GEANY_MENU_BUTTON_ACTION_TYPE, GeanyMenubuttonActionPrivate)) +#define GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(obj) (GEANY_MENU_BUTTON_ACTION(obj)->priv) struct _GeanyMenubuttonActionPrivate { GtkWidget *menu; + + gchar *tooltip_arrow; }; enum { - BUTTON_CLICKED, + PROP_0, + PROP_TOOLTIP_ARROW +}; +enum +{ + BUTTON_CLICKED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE(GeanyMenubuttonAction, geany_menu_button_action, GTK_TYPE_ACTION); +G_DEFINE_TYPE(GeanyMenubuttonAction, geany_menu_button_action, GTK_TYPE_ACTION) static void geany_menu_button_action_finalize(GObject *object) @@ -58,6 +64,7 @@ GeanyMenubuttonActionPrivate *priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(object); g_object_unref(priv->menu); + g_free(priv->tooltip_arrow); (* G_OBJECT_CLASS(geany_menu_button_action_parent_class)->finalize)(object); } @@ -69,18 +76,75 @@ } +static void set_arrow_tooltip(GtkMenuToolButton *button, const gchar *tooltip) +{ +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_menu_tool_button_set_arrow_tooltip_text(button, tooltip); +#else + static GtkTooltips *tooltips = NULL; + + if (G_UNLIKELY(tooltips == NULL)) + tooltips = gtk_tooltips_new(); + + gtk_menu_tool_button_set_arrow_tooltip(button, tooltips, tooltip, NULL); +#endif +} + + +static void geany_menu_button_action_set_property(GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + switch (prop_id) + { + case PROP_TOOLTIP_ARROW: + { + GeanyMenubuttonActionPrivate *priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(object); + g_free(priv->tooltip_arrow); + priv->tooltip_arrow = g_value_dup_string(value); + break; + } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + + +static GtkWidget *geany_menu_button_action_create_tool_item(GtkAction *action) +{ + GtkWidget *toolitem; + GeanyMenubuttonActionPrivate *priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action); + + toolitem = g_object_new(GTK_TYPE_MENU_TOOL_BUTTON, NULL); + set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(toolitem), priv->tooltip_arrow); + + return toolitem; +} + + static void geany_menu_button_action_class_init(GeanyMenubuttonActionClass *klass) { GtkActionClass *action_class = GTK_ACTION_CLASS(klass); GObjectClass *g_object_class = G_OBJECT_CLASS(klass); g_object_class->finalize = geany_menu_button_action_finalize; + g_object_class->set_property = geany_menu_button_action_set_property; action_class->activate = delegate_button_activated; + action_class->create_tool_item = geany_menu_button_action_create_tool_item; action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON; g_type_class_add_private(klass, sizeof(GeanyMenubuttonActionPrivate)); + g_object_class_install_property(g_object_class, + PROP_TOOLTIP_ARROW, + g_param_spec_string( + "tooltip-arrow", + "Arrow tooltip", + "A special tooltip for the arrow button", + "", + G_PARAM_WRITABLE)); + signals[BUTTON_CLICKED] = g_signal_new("button-clicked", G_TYPE_FROM_CLASS(klass), (GSignalFlags) 0, @@ -94,19 +158,28 @@ static void geany_menu_button_action_init(GeanyMenubuttonAction *action) { - /* nothing to do */ + GeanyMenubuttonActionPrivate *priv; + + action->priv = G_TYPE_INSTANCE_GET_PRIVATE(action, + GEANY_MENU_BUTTON_ACTION_TYPE, GeanyMenubuttonActionPrivate); + + priv = action->priv; + priv->tooltip_arrow = NULL; + priv->menu = NULL; } GtkAction *geany_menu_button_action_new(const gchar *name, const gchar *label, const gchar *tooltip, + const gchar *tooltip_arrow, const gchar *stock_id) { GtkAction *action = g_object_new(GEANY_MENU_BUTTON_ACTION_TYPE, "name", name, "label", label, "tooltip", tooltip, + "tooltip-arrow", tooltip_arrow, "stock-id", stock_id, NULL); @@ -126,20 +199,56 @@ } -void geany_menu_button_action_set_menu(GeanyMenubuttonAction *action, GtkWidget *menu) +static void menu_items_changed_cb(GtkContainer *container, GtkWidget *widget, GeanyMenubuttonAction *action) { GeanyMenubuttonActionPrivate *priv; + gboolean enable; GSList *l; g_return_if_fail(action != NULL); - g_return_if_fail(menu != NULL); priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action); - - priv->menu = menu; + if (priv->menu != NULL) + enable = (g_list_length(gtk_container_get_children(GTK_CONTAINER(priv->menu))) > 0); + else + enable = FALSE; foreach_slist(l, gtk_action_get_proxies(GTK_ACTION(action))) { - gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(l->data), priv->menu); + /* On Windows a GtkImageMenuItem proxy is created for whatever reason. So we filter + * by type and act only on GtkMenuToolButton proxies. */ + /* TODO find why the GtkImageMenuItem proxy is created */ + if (! GTK_IS_MENU_TOOL_BUTTON(l->data)) + continue; + + if (enable) + { + if (gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(l->data)) == NULL) + gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(l->data), priv->menu); + } + else + gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(l->data), NULL); + } +} + + +void geany_menu_button_action_set_menu(GeanyMenubuttonAction *action, GtkWidget *menu) +{ + GeanyMenubuttonActionPrivate *priv; + + g_return_if_fail(action != NULL); + + priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action); + + if (priv->menu != NULL && GTK_IS_WIDGET(priv->menu)) + g_signal_handlers_disconnect_by_func(priv->menu, menu_items_changed_cb, action); + if (menu != NULL) + { + g_signal_connect(menu, "add", G_CALLBACK(menu_items_changed_cb), action); + g_signal_connect(menu, "remove", G_CALLBACK(menu_items_changed_cb), action); } + + priv->menu = menu; + + menu_items_changed_cb(GTK_CONTAINER(menu), NULL, action); } diff -Nru geany-0.18/src/geanymenubuttonaction.h geany-0.19/src/geanymenubuttonaction.h --- geany-0.18/src/geanymenubuttonaction.h 2009-06-20 17:51:32.000000000 +0100 +++ geany-0.19/src/geanymenubuttonaction.h 2010-04-01 16:57:19.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanymenubuttonaction.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -38,9 +38,12 @@ typedef struct _GeanyMenubuttonAction GeanyMenubuttonAction; typedef struct _GeanyMenubuttonActionClass GeanyMenubuttonActionClass; +struct _GeanyMenubuttonActionPrivate; + struct _GeanyMenubuttonAction { GtkAction parent; + struct _GeanyMenubuttonActionPrivate *priv; }; struct _GeanyMenubuttonActionClass @@ -52,6 +55,7 @@ GtkAction* geany_menu_button_action_new (const gchar *name, const gchar *label, const gchar *tooltip, + const gchar *tooltip_arrow, const gchar *stock_id); GtkWidget* geany_menu_button_action_get_menu (GeanyMenubuttonAction *action); diff -Nru geany-0.18/src/geanyobject.c geany-0.19/src/geanyobject.c --- geany-0.18/src/geanyobject.c 2009-07-16 16:04:21.000000000 +0100 +++ geany-0.19/src/geanyobject.c 2010-04-25 18:43:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanyobject.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: geanyobject.c 3976 2009-07-16 15:04:21Z ntrel $ + * $Id: geanyobject.c 4862 2010-04-25 17:43:39Z eht16 $ */ /* A GObject used for connecting and emitting signals when certain events happen, @@ -46,9 +46,6 @@ typedef struct _GeanyObjectPrivate GeanyObjectPrivate; -#define GEANY_OBJECT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ - GEANY_OBJECT_TYPE, GeanyObjectPrivate)) - struct _GeanyObjectPrivate { /* to avoid warnings (g_type_class_add_private: assertion `private_size > 0' failed) */ @@ -56,7 +53,7 @@ }; -G_DEFINE_TYPE(GeanyObject, geany_object, G_TYPE_OBJECT); +G_DEFINE_TYPE(GeanyObject, geany_object, G_TYPE_OBJECT) @@ -91,6 +88,36 @@ } +static void geany_cclosure_marshal_VOID__POINTER_POINTER(GClosure *closure, GValue *ret_val, + guint n_param_vals, const GValue *param_values, gpointer hint, gpointer mdata) +{ + typedef gboolean (*GeanyMarshalFunc_VOID__POINTER_POINTER) + (gpointer data1, gconstpointer arg_1, gconstpointer arg_2, gpointer data2); + + register GeanyMarshalFunc_VOID__POINTER_POINTER callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail(n_param_vals == 3); + + if (G_CCLOSURE_SWAP_DATA(closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer(param_values + 0); + } + else + { + data1 = g_value_peek_pointer(param_values + 0); + data2 = closure->data; + } + callback = (GeanyMarshalFunc_VOID__POINTER_POINTER) (mdata ? mdata : cc->callback); + callback(data1, + g_value_get_pointer(param_values + 1), + g_value_get_pointer(param_values + 2), + data2); +} + + static gboolean boolean_handled_accumulator(GSignalInvocationHint *ihint, GValue *return_accu, const GValue *handler_return, gpointer dummy) { @@ -104,7 +131,7 @@ } -static void geany_cclosure_marshal_BOOL__POINTER_POINTER( GClosure *closure, GValue *return_value, +static void geany_cclosure_marshal_BOOL__POINTER_POINTER(GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { @@ -162,6 +189,15 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + geany_object_signals[GCB_DOCUMENT_BEFORE_SAVE] = g_signal_new ( + "document-before-save", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, document_before_save), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_SAVE] = g_signal_new ( "document-save", G_OBJECT_CLASS_TYPE (g_object_class), @@ -171,6 +207,15 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + geany_object_signals[GCB_DOCUMENT_FILETYPE_SET] = g_signal_new ( + "document-filetype-set", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, document_filetype_set), + NULL, NULL, + geany_cclosure_marshal_VOID__POINTER_POINTER, + G_TYPE_NONE, 2, + G_TYPE_POINTER, G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_ACTIVATE] = g_signal_new ( "document-activate", G_OBJECT_CLASS_TYPE (g_object_class), @@ -238,6 +283,16 @@ G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_POINTER); + /* General signals */ + geany_object_signals[GCB_GEANY_STARTUP_COMPLETE] = g_signal_new ( + "geany-startup-complete", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, geany_startup_complete), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + /* Core-only signals */ geany_object_signals[GCB_SAVE_SETTINGS] = g_signal_new ( "save-settings", diff -Nru geany-0.18/src/geanyobject.h geany-0.19/src/geanyobject.h --- geany-0.18/src/geanyobject.h 2009-07-16 16:04:21.000000000 +0100 +++ geany-0.19/src/geanyobject.h 2010-01-17 15:17:30.000000000 +0000 @@ -1,8 +1,8 @@ /* * geanyobject.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: geanyobject.h 3976 2009-07-16 15:04:21Z ntrel $ + * $Id: geanyobject.h 4527 2010-01-17 15:17:30Z eht16 $ */ @@ -34,7 +34,9 @@ { GCB_DOCUMENT_NEW, GCB_DOCUMENT_OPEN, + GCB_DOCUMENT_BEFORE_SAVE, GCB_DOCUMENT_SAVE, + GCB_DOCUMENT_FILETYPE_SET, GCB_DOCUMENT_ACTIVATE, GCB_DOCUMENT_CLOSE, GCB_PROJECT_OPEN, @@ -42,6 +44,7 @@ GCB_PROJECT_CLOSE, GCB_UPDATE_EDITOR_MENU, GCB_EDITOR_NOTIFY, + GCB_GEANY_STARTUP_COMPLETE, GCB_SAVE_SETTINGS, GCB_LOAD_SETTINGS, GCB_MAX @@ -76,7 +79,9 @@ void (*document_new)(GeanyDocument *doc); void (*document_open)(GeanyDocument *doc); + void (*document_before_save)(GeanyDocument *doc); void (*document_save)(GeanyDocument *doc); + void (*document_filetype_set)(GeanyDocument *doc, GeanyFiletype *filetype_old); void (*document_activate)(GeanyDocument *doc); void (*document_close)(GeanyDocument *doc); void (*project_open)(GKeyFile *keyfile); @@ -84,6 +89,7 @@ void (*project_close)(void); void (*update_editor_menu)(const gchar *word, gint click_pos, GeanyDocument *doc); gboolean (*editor_notify)(GeanyEditor *editor, gpointer scnt); + void (*geany_startup_complete)(void); void (*save_settings)(GKeyFile *keyfile); void (*load_settings)(GKeyFile *keyfile); }; diff -Nru geany-0.18/src/geanywraplabel.c geany-0.19/src/geanywraplabel.c --- geany-0.18/src/geanywraplabel.c 2009-04-15 23:47:33.000000000 +0100 +++ geany-0.19/src/geanywraplabel.c 2010-04-25 18:43:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * geanywraplabel.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Enrico Tröger - * Copyright 2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: geanywraplabel.c 3708 2009-04-15 22:47:33Z eht16 $ + * $Id: geanywraplabel.c 4862 2010-04-25 17:43:39Z eht16 $ */ /* @@ -33,8 +33,7 @@ -#define GEANY_WRAP_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ - GEANY_WRAP_LABEL_TYPE, GeanyWrapLabelPrivate)) +#define GEANY_WRAP_LABEL_GET_PRIVATE(obj) (GEANY_WRAP_LABEL(obj)->priv) struct _GeanyWrapLabelClass @@ -42,22 +41,23 @@ GtkLabelClass parent_class; }; -struct _GeanyWrapLabel -{ - GtkLabel parent; -}; - typedef struct { gsize wrap_width; } GeanyWrapLabelPrivate; +struct _GeanyWrapLabel +{ + GtkLabel parent; + GeanyWrapLabelPrivate *priv; +}; + static void geany_wrap_label_size_request (GtkWidget *widget, GtkRequisition *req); static void geany_wrap_label_size_allocate (GtkWidget *widget, GtkAllocation *alloc); static void geany_wrap_label_set_wrap_width (GtkWidget *widget, gsize width); -G_DEFINE_TYPE(GeanyWrapLabel, geany_wrap_label, GTK_TYPE_LABEL); +G_DEFINE_TYPE(GeanyWrapLabel, geany_wrap_label, GTK_TYPE_LABEL) static void geany_wrap_label_class_init(GeanyWrapLabelClass *klass) @@ -73,8 +73,12 @@ static void geany_wrap_label_init(GeanyWrapLabel *self) { - GeanyWrapLabelPrivate *priv = GEANY_WRAP_LABEL_GET_PRIVATE(self); + GeanyWrapLabelPrivate *priv; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, + GEANY_WRAP_LABEL_TYPE, GeanyWrapLabelPrivate); + priv = self->priv; priv->wrap_width = 0; } diff -Nru geany-0.18/src/geanywraplabel.h geany-0.19/src/geanywraplabel.h --- geany-0.18/src/geanywraplabel.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/geanywraplabel.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * geanywraplabel.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: geanywraplabel.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: geanywraplabel.h 4518 2010-01-01 22:55:18Z eht16 $ */ #ifndef __GEANY_WRAP_LABEL_H__ diff -Nru geany-0.18/src/highlighting.c geany-0.19/src/highlighting.c --- geany-0.18/src/highlighting.c 2009-08-11 15:18:44.000000000 +0100 +++ geany-0.19/src/highlighting.c 2010-06-06 19:40:35.000000000 +0100 @@ -1,8 +1,8 @@ /* * highlighting.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: highlighting.c 4067 2009-08-11 14:18:44Z ntrel $ + * $Id: highlighting.c 5007 2010-06-06 18:40:35Z eht16 $ */ /** @@ -40,16 +40,20 @@ #include "symbols.h" #include "ui_utils.h" #include "utils.h" +#include "main.h" +#include "support.h" +#include "sciwrappers.h" -/* Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. */ -#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) +#define GEANY_COLORSCHEMES_SUBDIR "colorschemes" /* Whitespace has to be set after setting wordchars. */ #define GEANY_WHITESPACE_CHARS " \t" "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~" + static gchar *whitespace_chars; + static void styleset_markup(ScintillaObject *sci, gboolean set_keywords); @@ -59,10 +63,12 @@ GeanyLexerStyle *styling; /* array of styles, NULL if not used or uninitialised */ gchar **keywords; gchar *wordchars; /* NULL used for style sets with no styles */ + gchar **property_keys; + gchar **property_values; } StyleSet; -/* each filetype has a styleset except GEANY_FILETYPES_NONE, which uses common_style_set */ -static StyleSet style_sets[GEANY_MAX_BUILT_IN_FILETYPES] = {{0, NULL, NULL, NULL}}; +/* each filetype has a styleset but GEANY_FILETYPES_NONE uses common_style_set for styling */ +static StyleSet *style_sets = NULL; enum /* Geany common styling */ @@ -85,33 +91,23 @@ GCS_MARKER_MARK, GCS_MARKER_TRANSLUCENCY, GCS_LINE_HEIGHT, + GCS_CALLTIPS, GCS_MAX }; -typedef struct -{ - /* can take values 1 or 2 (or 3) */ - guint marker:2; - guint lines:2; - guint draw_line:3; -} FoldingStyle; - static struct { GeanyLexerStyle styling[GCS_MAX]; - FoldingStyle folding_style; - gboolean invert_all; - gchar *wordchars; -} common_style_set; + /* icon style, 1-4 */ + gint fold_marker; + /* vertical line style, 0-2 */ + gint fold_lines; + /* horizontal line when folded, 0-2 */ + gint fold_draw_line; -/* used for default styles */ -typedef struct -{ - gchar *name; - gchar *named_style; - GeanyLexerStyle *style; -} StyleEntry; + gchar *wordchars; +} common_style_set; /* For filetypes.common [named_styles] section. @@ -119,11 +115,22 @@ * e.g. "comment" => &GeanyLexerStyle{0x0000d0, 0xffffff, FALSE, FALSE} */ static GHashTable *named_style_hash = NULL; -/* 0xBBGGRR format. */ +/* 0xBBGGRR format, set by "default" named style. */ static GeanyLexerStyle gsd_default = {0x000000, 0xffffff, FALSE, FALSE}; -static void new_style_array(gint file_type_id, gint styling_count) +/* Note: use sciwrappers.h instead where possible. + * Do not use SSM in files unrelated to scintilla. */ +#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) + +/* filetypes should use the filetypes.foo [lexer_properties] group instead of hardcoding */ +static void sci_set_property(ScintillaObject *sci, const gchar *name, const gchar *value) +{ + SSM(sci, SCI_SETPROPERTY, (uptr_t) name, (sptr_t) value); +} + + +static void new_styleset(gint file_type_id, gint styling_count) { StyleSet *set = &style_sets[file_type_id]; @@ -132,7 +139,7 @@ } -static void styleset_free(gint file_type_id) +static void free_styleset(gint file_type_id) { StyleSet *style_ptr; style_ptr = &style_sets[file_type_id]; @@ -144,14 +151,19 @@ style_ptr->keywords = NULL; g_free(style_ptr->wordchars); style_ptr->wordchars = NULL; + g_strfreev(style_ptr->property_keys); + style_ptr->property_keys = NULL; + g_strfreev(style_ptr->property_values); + style_ptr->property_values = NULL; } static void get_keyfile_keywords(GKeyFile *config, GKeyFile *configh, - const gchar *key, gint ft_id, gint pos, const gchar *default_value) + const gchar *key, gint ft_id, gint pos) { const gchar section[] = "keywords"; gchar *result; + const gchar *default_value = ""; if (config == NULL || configh == NULL) { @@ -286,7 +298,7 @@ static void get_keyfile_style(GKeyFile *config, GKeyFile *configh, - const gchar *key_name, const GeanyLexerStyle *default_style, GeanyLexerStyle *style) + const gchar *key_name, GeanyLexerStyle *style) { gchar **list; gsize len; @@ -294,28 +306,17 @@ g_return_if_fail(config); g_return_if_fail(configh); g_return_if_fail(key_name); - g_return_if_fail(default_style); g_return_if_fail(style); list = g_key_file_get_string_list(configh, "styling", key_name, &len, NULL); if (list == NULL) list = g_key_file_get_string_list(config, "styling", key_name, &len, NULL); - parse_keyfile_style(list, default_style, style); + parse_keyfile_style(list, &gsd_default, style); g_strfreev(list); } -static void get_keyfile_named_style(GKeyFile *config, GKeyFile *configh, - const gchar *key_name, gchar *named_style, GeanyLexerStyle *style) -{ - GeanyLexerStyle def; - - read_named_style(named_style, &def); - get_keyfile_style(config, configh, key_name, &def, style); -} - - /* Convert 0xRRGGBB to 0xBBGGRR, which scintilla expects. */ static gint rotate_rgb(gint color) { @@ -325,43 +326,24 @@ } -/* Convert a hard-coded style to scintilla format, allowing -1 to use the default color. */ -static void convert_hex_style(GeanyLexerStyle *style) -{ - - if (style->foreground == -1) - style->foreground = gsd_default.foreground; - else - style->foreground = rotate_rgb(style->foreground); - - if (style->background == -1) - style->background = gsd_default.background; - else - style->background = rotate_rgb(style->background); -} - - -/* foreground and background are in 0xRRGGBB format */ -static void get_keyfile_hex(GKeyFile *config, GKeyFile *configh, - const gchar *key, - gint foreground, gint background, gboolean bold, - GeanyLexerStyle *style) +static void convert_int(const gchar *int_str, gint *val) { - GeanyLexerStyle def = {foreground, background, bold, FALSE}; + gchar *end; + gint v = strtol(int_str, &end, 10); - convert_hex_style(&def); - get_keyfile_style(config, configh, key, &def, style); + if (int_str != end) + *val = v; } -/* FIXME: is not safe for badly formed key e.g. "key=" */ +/* Get first and second integer numbers, store in foreground and background fields of @a style. */ static void get_keyfile_int(GKeyFile *config, GKeyFile *configh, const gchar *section, const gchar *key, gint fdefault_val, gint sdefault_val, GeanyLexerStyle *style) { gchar **list; - gchar *end1, *end2; gsize len; + GeanyLexerStyle def = {fdefault_val, sdefault_val, FALSE, FALSE}; g_return_if_fail(config); g_return_if_fail(configh); @@ -372,28 +354,41 @@ if (list == NULL) list = g_key_file_get_string_list(config, section, key, &len, NULL); - if (G_LIKELY(list != NULL) && G_LIKELY(list[0] != NULL) ) - style->foreground = strtol(list[0], &end1, 10); - else - style->foreground = fdefault_val; - if (G_LIKELY(list != NULL) && G_LIKELY(list[1] != NULL) ) - style->background = strtol(list[1], &end2, 10); - else - style->background = sdefault_val; - - /* if there was an error, strtol() returns 0 and end is list[x], so then we use default_val */ - if (G_UNLIKELY(list == NULL) || G_UNLIKELY(list[0] == end1)) - style->foreground = fdefault_val; - if (G_UNLIKELY(list == NULL) || G_UNLIKELY(list[1] == end2)) - style->background = sdefault_val; + *style = def; + if (!list) + return; + if (list[0]) + { + convert_int(list[0], &style->foreground); + if (list[1]) + { + convert_int(list[1], &style->background); + } + } g_strfreev(list); } +/* first or second can be NULL. */ +static void get_keyfile_ints(GKeyFile *config, GKeyFile *configh, const gchar *section, + const gchar *key, + gint fdefault_val, gint sdefault_val, + gint *first, gint *second) +{ + GeanyLexerStyle tmp_style; + + get_keyfile_int(config, configh, section, key, fdefault_val, sdefault_val, &tmp_style); + if (first) + *first = tmp_style.foreground; + if (second) + *second = tmp_style.background; +} + + static guint invert(guint icolour) { - if (common_style_set.invert_all) + if (interface_prefs.highlighting_invert_all) return utils_invert_color(icolour); return icolour; @@ -402,7 +397,7 @@ static GeanyLexerStyle *get_style(guint ft_id, guint styling_index) { - g_assert(ft_id < GEANY_MAX_BUILT_IN_FILETYPES); + g_assert(ft_id < filetypes_array->len); if (G_UNLIKELY(ft_id == GEANY_FILETYPES_NONE)) { @@ -432,13 +427,16 @@ void highlighting_free_styles() { - gint i; + guint i; - for (i = 0; i < GEANY_MAX_BUILT_IN_FILETYPES; i++) - styleset_free(i); + for (i = 0; i < filetypes_array->len; i++) + free_styleset(i); if (named_style_hash) g_hash_table_destroy(named_style_hash); + + if (style_sets) + g_free(style_sets); } @@ -525,16 +523,45 @@ } -static void styleset_common_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +static GKeyFile *utils_key_file_new(const gchar *filename) +{ + GKeyFile *config = g_key_file_new(); + + g_key_file_load_from_file(config, filename, G_KEY_FILE_KEEP_COMMENTS, NULL); + return config; +} + + +static void load_named_styles(GKeyFile *config, GKeyFile *config_home) { - /* named styles */ + const gchar *scheme = editor_prefs.color_scheme; + gboolean free_kf = FALSE; + if (named_style_hash) g_hash_table_destroy(named_style_hash); /* reloading */ named_style_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + if (NZV(scheme)) + { + gchar *path, *path_home; + + path = g_build_path(G_DIR_SEPARATOR_S, app->datadir, GEANY_COLORSCHEMES_SUBDIR, scheme, NULL); + path_home = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_COLORSCHEMES_SUBDIR, scheme, NULL); + + if (g_file_test(path, G_FILE_TEST_EXISTS) || g_file_test(path_home, G_FILE_TEST_EXISTS)) + { + config = utils_key_file_new(path); + config_home = utils_key_file_new(path_home); + free_kf = TRUE; + } + /* if color scheme is missing, use default */ + g_free(path); + g_free(path_home); + } /* first set default to the "default" named style */ add_named_style(config, "default"); + read_named_style("default", &gsd_default); /* in case user overrides but not with both colors */ add_named_style(config_home, "default"); read_named_style("default", &gsd_default); @@ -542,68 +569,64 @@ /* home overrides any system named style */ get_named_styles(config_home); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &common_style_set.styling[GCS_DEFAULT]); - get_keyfile_hex(config, config_home, "selection", 0xc0c0c0, 0x7f0000, FALSE, &common_style_set.styling[GCS_SELECTION]); - get_keyfile_hex(config, config_home, "brace_good", 0x000000, 0xffffff, FALSE, &common_style_set.styling[GCS_BRACE_GOOD]); - get_keyfile_hex(config, config_home, "brace_bad", 0xff0000, 0xffffff, FALSE, &common_style_set.styling[GCS_BRACE_BAD]); - get_keyfile_hex(config, config_home, "margin_linenumber", 0x000000, 0xd0d0d0, FALSE, &common_style_set.styling[GCS_MARGIN_LINENUMBER]); - get_keyfile_hex(config, config_home, "margin_folding", 0x000000, 0xdfdfdf, FALSE, &common_style_set.styling[GCS_MARGIN_FOLDING]); - get_keyfile_hex(config, config_home, "current_line", 0x000000, 0xe5e5e5, TRUE, &common_style_set.styling[GCS_CURRENT_LINE]); - get_keyfile_hex(config, config_home, "caret", 0x000000, 0x000000, FALSE, &common_style_set.styling[GCS_CARET]); - get_keyfile_hex(config, config_home, "indent_guide", 0xc0c0c0, 0xffffff, FALSE, &common_style_set.styling[GCS_INDENT_GUIDE]); - get_keyfile_hex(config, config_home, "white_space", 0xc0c0c0, 0xffffff, TRUE, &common_style_set.styling[GCS_WHITE_SPACE]); - get_keyfile_hex(config, config_home, "marker_line", 0x000000, 0xffff00, FALSE, &common_style_set.styling[GCS_MARKER_LINE]); - get_keyfile_hex(config, config_home, "marker_search", 0x000000, 0x00007f, FALSE, &common_style_set.styling[GCS_MARKER_SEARCH]); - get_keyfile_hex(config, config_home, "marker_mark", 0x000000, 0xb8f4b8, FALSE, &common_style_set.styling[GCS_MARKER_MARK]); - { - /* hack because get_keyfile_int uses a Style struct */ - GeanyLexerStyle tmp_style; - get_keyfile_int(config, config_home, "styling", "folding_style", - 1, 1, &tmp_style); - common_style_set.folding_style.marker = tmp_style.foreground; - common_style_set.folding_style.lines = tmp_style.background; - get_keyfile_int(config, config_home, "styling", "invert_all", - 0, 0, &tmp_style); - common_style_set.invert_all = tmp_style.foreground; - get_keyfile_int(config, config_home, "styling", "folding_horiz_line", - 2, 0, &tmp_style); - common_style_set.folding_style.draw_line = tmp_style.foreground; - get_keyfile_int(config, config_home, "styling", "caret_width", - 1, 0, &tmp_style); - common_style_set.styling[GCS_CARET].background = tmp_style.foreground; - get_keyfile_int(config, config_home, "styling", "line_wrap_visuals", - 3, 0, &tmp_style); - common_style_set.styling[GCS_LINE_WRAP_VISUALS].foreground = tmp_style.foreground; - common_style_set.styling[GCS_LINE_WRAP_VISUALS].background = tmp_style.background; - get_keyfile_int(config, config_home, "styling", "line_wrap_indent", - 0, 0, &tmp_style); - common_style_set.styling[GCS_LINE_WRAP_INDENT].foreground = tmp_style.foreground; - common_style_set.styling[GCS_LINE_WRAP_INDENT].background = tmp_style.background; - get_keyfile_int(config, config_home, "styling", "translucency", - 256, 256, &tmp_style); - common_style_set.styling[GCS_TRANSLUCENCY].foreground = tmp_style.foreground; - common_style_set.styling[GCS_TRANSLUCENCY].background = tmp_style.background; - get_keyfile_int(config, config_home, "styling", "marker_translucency", - 256, 256, &tmp_style); - common_style_set.styling[GCS_MARKER_TRANSLUCENCY].foreground = tmp_style.foreground; - common_style_set.styling[GCS_MARKER_TRANSLUCENCY].background = tmp_style.background; - get_keyfile_int(config, config_home, "styling", "line_height", - 0, 0, &tmp_style); - common_style_set.styling[GCS_LINE_HEIGHT].foreground = tmp_style.foreground; - common_style_set.styling[GCS_LINE_HEIGHT].background = tmp_style.background; + if (free_kf) + { + g_key_file_free(config); + g_key_file_free(config_home); } +} + + +static void styleset_common_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + load_named_styles(config, config_home); + + get_keyfile_style(config, config_home, "default", &common_style_set.styling[GCS_DEFAULT]); + get_keyfile_style(config, config_home, "selection", &common_style_set.styling[GCS_SELECTION]); + get_keyfile_style(config, config_home, "brace_good", &common_style_set.styling[GCS_BRACE_GOOD]); + get_keyfile_style(config, config_home, "brace_bad", &common_style_set.styling[GCS_BRACE_BAD]); + get_keyfile_style(config, config_home, "margin_linenumber", &common_style_set.styling[GCS_MARGIN_LINENUMBER]); + get_keyfile_style(config, config_home, "margin_folding", &common_style_set.styling[GCS_MARGIN_FOLDING]); + get_keyfile_style(config, config_home, "current_line", &common_style_set.styling[GCS_CURRENT_LINE]); + get_keyfile_style(config, config_home, "caret", &common_style_set.styling[GCS_CARET]); + get_keyfile_style(config, config_home, "indent_guide", &common_style_set.styling[GCS_INDENT_GUIDE]); + get_keyfile_style(config, config_home, "white_space", &common_style_set.styling[GCS_WHITE_SPACE]); + get_keyfile_style(config, config_home, "marker_line", &common_style_set.styling[GCS_MARKER_LINE]); + get_keyfile_style(config, config_home, "marker_search", &common_style_set.styling[GCS_MARKER_SEARCH]); + get_keyfile_style(config, config_home, "marker_mark", &common_style_set.styling[GCS_MARKER_MARK]); + get_keyfile_style(config, config_home, "calltips", &common_style_set.styling[GCS_CALLTIPS]); + + get_keyfile_ints(config, config_home, "styling", "folding_style", + 1, 1, &common_style_set.fold_marker, &common_style_set.fold_lines); + get_keyfile_ints(config, config_home, "styling", "folding_horiz_line", + 2, 0, &common_style_set.fold_draw_line, NULL); + get_keyfile_ints(config, config_home, "styling", "caret_width", + 1, 0, &common_style_set.styling[GCS_CARET].background, NULL); /* caret.foreground used earlier */ + get_keyfile_int(config, config_home, "styling", "line_wrap_visuals", + 3, 0, &common_style_set.styling[GCS_LINE_WRAP_VISUALS]); + get_keyfile_int(config, config_home, "styling", "line_wrap_indent", + 0, 0, &common_style_set.styling[GCS_LINE_WRAP_INDENT]); + get_keyfile_int(config, config_home, "styling", "translucency", + 256, 256, &common_style_set.styling[GCS_TRANSLUCENCY]); + get_keyfile_int(config, config_home, "styling", "marker_translucency", + 256, 256, &common_style_set.styling[GCS_MARKER_TRANSLUCENCY]); + get_keyfile_int(config, config_home, "styling", "line_height", + 0, 0, &common_style_set.styling[GCS_LINE_HEIGHT]); - common_style_set.invert_all = interface_prefs.highlighting_invert_all = - (common_style_set.invert_all || interface_prefs.highlighting_invert_all); get_keyfile_wordchars(config, config_home, &common_style_set.wordchars); whitespace_chars = get_keyfile_whitespace_chars(config, config_home); } -static void styleset_common(ScintillaObject *sci) +static void styleset_common(ScintillaObject *sci, filetype_id ft_id) { SSM(sci, SCI_STYLECLEARALL, 0, 0); + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) (ft_id == GEANY_FILETYPES_NONE ? + common_style_set.wordchars : style_sets[ft_id].wordchars)); + /* have to set whitespace after setting wordchars */ + SSM(sci, SCI_SETWHITESPACECHARS, 0, (sptr_t) whitespace_chars); + /* caret colour, style and width */ SSM(sci, SCI_SETCARETFORE, invert(common_style_set.styling[GCS_CARET].foreground), 0); SSM(sci, SCI_SETCARETWIDTH, common_style_set.styling[GCS_CARET].background, 0); @@ -661,7 +684,7 @@ SSM(sci, SCI_SETMARGINMASKN, 2, SC_MASK_FOLDERS); /* drawing a horizontal line when text if folded */ - switch (common_style_set.folding_style.draw_line) + switch (common_style_set.fold_draw_line) { case 1: { @@ -681,65 +704,86 @@ } /* choose the folding style - boxes or circles, I prefer boxes, so it is default ;-) */ - switch (common_style_set.folding_style.marker) + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEREND, SC_MARK_EMPTY); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPENMID, SC_MARK_EMPTY); + switch (common_style_set.fold_marker) { case 2: - { - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPEN, SC_MARK_CIRCLEMINUS); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDER, SC_MARK_CIRCLEPLUS); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDEREND, SC_MARK_CIRCLEPLUSCONNECTED); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPENMID, SC_MARK_CIRCLEMINUSCONNECTED); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPEN, SC_MARK_CIRCLEMINUS); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDER, SC_MARK_CIRCLEPLUS); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEREND, SC_MARK_CIRCLEPLUSCONNECTED); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPENMID, SC_MARK_CIRCLEMINUSCONNECTED); break; - } default: - { - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPEN, SC_MARK_BOXMINUS); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDER, SC_MARK_BOXPLUS); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDEREND, SC_MARK_BOXPLUSCONNECTED); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPENMID, SC_MARK_BOXMINUSCONNECTED); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPEN, SC_MARK_BOXMINUS); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDER, SC_MARK_BOXPLUS); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEREND, SC_MARK_BOXPLUSCONNECTED); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPENMID, SC_MARK_BOXMINUSCONNECTED); + break; + case 3: + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPEN, SC_MARK_ARROWDOWN); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDER, SC_MARK_ARROW); + break; + case 4: + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDEROPEN, SC_MARK_MINUS); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDER, SC_MARK_PLUS); break; - } } /* choose the folding style - straight or curved, I prefer straight, so it is default ;-) */ - switch (common_style_set.folding_style.lines) + switch (common_style_set.fold_lines) { case 2: - { - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERMIDTAIL, SC_MARK_TCORNERCURVE); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERTAIL, SC_MARK_LCORNERCURVE); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERMIDTAIL, SC_MARK_TCORNERCURVE); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERTAIL, SC_MARK_LCORNERCURVE); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERSUB, SC_MARK_VLINE); break; - } default: - { - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERMIDTAIL, SC_MARK_TCORNER); - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERTAIL, SC_MARK_LCORNER); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERMIDTAIL, SC_MARK_TCORNER); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERTAIL, SC_MARK_LCORNER); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERSUB, SC_MARK_VLINE); + break; + case 0: + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERMIDTAIL, SC_MARK_EMPTY); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERTAIL, SC_MARK_EMPTY); + SSM(sci, SCI_MARKERDEFINE, SC_MARKNUM_FOLDERSUB, SC_MARK_EMPTY); break; - } } - SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERSUB, SC_MARK_VLINE); - - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPEN, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPEN, 0x000000); - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDER, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDER, 0x000000); - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERSUB, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERSUB, 0x000000); - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERTAIL, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERTAIL, 0x000000); - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEREND, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEREND, 0x000000); - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPENMID, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPENMID, 0x000000); - SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, 0xffffff); - SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, 0x000000); - - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.compact", (sptr_t) "0"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.comment", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.preprocessor", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.at.else", (sptr_t) "1"); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPEN, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPEN, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDER, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDER, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERSUB, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERSUB, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEREND, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEREND, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPENMID, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPENMID, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + + sci_set_property(sci, "fold", "1"); + sci_set_property(sci, "fold.compact", "0"); + sci_set_property(sci, "fold.comment", "0"); + sci_set_property(sci, "fold.preprocessor", "1"); + sci_set_property(sci, "fold.at.else", "1"); /* bold (3rd argument) is whether to override default foreground selection */ @@ -751,8 +795,9 @@ SSM(sci, SCI_SETSTYLEBITS, SSM(sci, SCI_GETSTYLEBITSNEEDED, 0, 0), 0); + /* TODO maybe we want to split the colour and hicolour to allow more fine-grained control */ SSM(sci, SCI_SETFOLDMARGINCOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); - /*SSM(sci, SCI_SETFOLDMARGINHICOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background));*/ + SSM(sci, SCI_SETFOLDMARGINHICOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); set_sci_style(sci, STYLE_LINENUMBER, GEANY_FILETYPES_NONE, GCS_MARGIN_LINENUMBER); set_sci_style(sci, STYLE_BRACELIGHT, GEANY_FILETYPES_NONE, GCS_BRACE_GOOD); set_sci_style(sci, STYLE_BRACEBAD, GEANY_FILETYPES_NONE, GCS_BRACE_BAD); @@ -763,16 +808,22 @@ invert(common_style_set.styling[GCS_WHITE_SPACE].foreground)); SSM(sci, SCI_SETWHITESPACEBACK, common_style_set.styling[GCS_WHITE_SPACE].italic, invert(common_style_set.styling[GCS_WHITE_SPACE].background)); + + if (common_style_set.styling[GCS_CALLTIPS].bold) + SSM(sci, SCI_CALLTIPSETFORE, invert(common_style_set.styling[GCS_CALLTIPS].foreground), 1); + if (common_style_set.styling[GCS_CALLTIPS].italic) + SSM(sci, SCI_CALLTIPSETBACK, invert(common_style_set.styling[GCS_CALLTIPS].background), 1); } -/* Assign global typedefs and user secondary keywords */ -static void assign_global_and_user_keywords(ScintillaObject *sci, - const gchar *user_words, gint lang) +/* Merge & assign global typedefs and user secondary keywords. + * keyword_idx is used for both style_sets[].keywords and scintilla keyword style number */ +static void merge_type_keywords(ScintillaObject *sci, gint ft_id, gint keyword_idx) { + const gchar *user_words = style_sets[ft_id].keywords[keyword_idx]; GString *s; - s = get_global_typenames(lang); + s = get_global_typenames(filetypes[ft_id]->lang); if (G_UNLIKELY(s == NULL)) s = g_string_sized_new(200); else @@ -780,7 +831,7 @@ g_string_append(s, user_words); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); + sci_set_keywords(sci, keyword_idx, s->str); g_string_free(s, TRUE); } @@ -793,504 +844,289 @@ SSM(sci, SCI_SETLEXER, lexer, 0); - SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[ft_id].wordchars); - /* have to set whitespace after setting wordchars */ - SSM(sci, SCI_SETWHITESPACECHARS, 0, (sptr_t) whitespace_chars); - - SSM(sci, SCI_AUTOCSETMAXHEIGHT, editor_prefs.symbolcompletion_max_height, 0); - - styleset_common(sci); + styleset_common(sci, ft_id); } #define foreach_range(i, size) \ for (i = 0; i < size; i++) -/* entries contains the default styles for the filetype. - * If used, entries[n].style should have foreground and background in 0xRRGGBB format, or -1. */ +/* names: the style names for the filetype. */ static void load_style_entries(GKeyFile *config, GKeyFile *config_home, gint filetype_idx, - StyleEntry *entries, gsize entries_len) + const gchar **names, gsize names_len) { guint i; - foreach_range(i, entries_len) + foreach_range(i, names_len) { - StyleEntry *entry = &entries[i]; + const gchar *name = names[i]; GeanyLexerStyle *style = &style_sets[filetype_idx].styling[i]; - if (entry->named_style) - get_keyfile_named_style(config, config_home, entry->name, entry->named_style, style); - else - if (entry->style) - { - GeanyLexerStyle *def = entry->style; - - convert_hex_style(def); - get_keyfile_style(config, config_home, entry->name, def, style); - } + get_keyfile_style(config, config_home, name, style); } } -/* call new_style_array(filetype_idx, >= 20) before using this. */ -static void -styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, gint filetype_idx) +/* styles: the style IDs for the filetype. + * STYLE_DEFAULT will be set to match the first style. */ +static void apply_style_entries(ScintillaObject *sci, gint filetype_idx, + gint *styles, gsize styles_len) { - static GeanyLexerStyle uuid = {0x404080, -1, FALSE, FALSE}; - static GeanyLexerStyle verbatim = {0x301010, -1, FALSE, FALSE}; - static GeanyLexerStyle regex = {0x105090, -1, FALSE, FALSE}; - StyleEntry entries[] = - { - {"default", "default", NULL}, - {"comment", "comment", NULL}, - {"commentline", "comment", NULL}, - {"commentdoc", "commentdoc", NULL}, - {"number", "number", NULL}, - {"word", "word", NULL}, - {"word2", "word2", NULL}, - {"string", "string", NULL}, - {"character", "string", NULL}, - {"uuid", NULL, &uuid}, - {"preprocessor","preprocessor", NULL}, - {"operator", "operator", NULL}, - {"identifier", "default", NULL}, - {"stringeol", "stringeol", NULL}, - {"verbatim", NULL, &verbatim}, - {"regex", NULL, ®ex}, - {"commentlinedoc", "commentdoc,bold", NULL}, - {"commentdockeyword", "commentdoc,bold,italic", NULL}, - {"commentdockeyworderror", "commentdoc", NULL}, - {"globalclass", "type", NULL} - }; - - load_style_entries(config, config_home, filetype_idx, entries, G_N_ELEMENTS(entries)); -} + guint i; + g_return_if_fail(styles_len > 0); -static void styleset_c_like(ScintillaObject *sci, gint filetype_idx) -{ set_sci_style(sci, STYLE_DEFAULT, filetype_idx, 0); - set_sci_style(sci, SCE_C_DEFAULT, filetype_idx, 0); - set_sci_style(sci, SCE_C_COMMENT, filetype_idx, 1); - set_sci_style(sci, SCE_C_COMMENTLINE, filetype_idx, 2); - set_sci_style(sci, SCE_C_COMMENTDOC, filetype_idx, 3); - set_sci_style(sci, SCE_C_NUMBER, filetype_idx, 4); - set_sci_style(sci, SCE_C_WORD, filetype_idx, 5); - set_sci_style(sci, SCE_C_WORD2, filetype_idx, 6); - set_sci_style(sci, SCE_C_STRING, filetype_idx, 7); - set_sci_style(sci, SCE_C_CHARACTER, filetype_idx, 8); - set_sci_style(sci, SCE_C_UUID, filetype_idx, 9); - set_sci_style(sci, SCE_C_PREPROCESSOR, filetype_idx, 10); - set_sci_style(sci, SCE_C_OPERATOR, filetype_idx, 11); - set_sci_style(sci, SCE_C_IDENTIFIER, filetype_idx, 12); - set_sci_style(sci, SCE_C_STRINGEOL, filetype_idx, 13); - set_sci_style(sci, SCE_C_VERBATIM, filetype_idx, 14); - set_sci_style(sci, SCE_C_REGEX, filetype_idx, 15); - set_sci_style(sci, SCE_C_COMMENTLINEDOC, filetype_idx, 16); - set_sci_style(sci, SCE_C_COMMENTDOCKEYWORD, filetype_idx, 17); - set_sci_style(sci, SCE_C_COMMENTDOCKEYWORDERROR, filetype_idx, 18); - /* is used for local structs and typedefs */ - set_sci_style(sci, SCE_C_GLOBALCLASS, filetype_idx, 19); -} - -static void styleset_c_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) -{ - new_style_array(GEANY_FILETYPES_C, 21); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_C); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", - 1, 0, &style_sets[GEANY_FILETYPES_C].styling[20]); - - style_sets[GEANY_FILETYPES_C].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_C, 0, "if const struct char int float double void long for while do case switch return"); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_C, 1, ""); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_C, 2, "TODO FIXME"); - style_sets[GEANY_FILETYPES_C].keywords[3] = NULL; + foreach_range(i, styles_len) + set_sci_style(sci, styles[i], filetype_idx, i); } -static void styleset_c(ScintillaObject *sci) -{ - const filetype_id ft_id = GEANY_FILETYPES_C; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_C].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_C].keywords[2]); - - /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_C].keywords[1], - filetypes[ft_id]->lang); - - styleset_c_like(sci, GEANY_FILETYPES_C); - - if (style_sets[GEANY_FILETYPES_C].styling[20].foreground == 1) - SSM(sci, SCI_SETPROPERTY, (uptr_t) "styling.within.preprocessor", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.start.$(file.patterns.cpp)", (sptr_t) "if ifdef ifndef"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.middle.$(file.patterns.cpp)", (sptr_t) "else elif"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.end.$(file.patterns.cpp)", (sptr_t) "endif"); -} - - -static void styleset_cpp_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +/* call new_styleset(filetype_idx, >= 20) before using this. */ +static void +styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, gint filetype_idx) { - new_style_array(GEANY_FILETYPES_CPP, 21); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_CPP); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", - 1, 0, &style_sets[GEANY_FILETYPES_CPP].styling[20]); + const gchar *entries[] = + { + "default", + "comment", + "commentline", + "commentdoc", + "number", + "word", + "word2", + "string", + "character", + "uuid", + "preprocessor", + "operator", + "identifier", + "stringeol", + "verbatim", + "regex", + "commentlinedoc", + "commentdockeyword", + "commentdockeyworderror", + "globalclass" + }; - style_sets[GEANY_FILETYPES_CPP].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CPP, 0, "and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq"); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CPP, 1, ""); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_CPP, 2, "TODO FIXME"); - style_sets[GEANY_FILETYPES_CPP].keywords[3] = NULL; + new_styleset(filetype_idx, G_N_ELEMENTS(entries)); + load_style_entries(config, config_home, filetype_idx, entries, G_N_ELEMENTS(entries)); } -static void styleset_cpp(ScintillaObject *sci) +static void styleset_c_like(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CPP; + gint styles[] = { + SCE_C_DEFAULT, + SCE_C_COMMENT, + SCE_C_COMMENTLINE, + SCE_C_COMMENTDOC, + SCE_C_NUMBER, + SCE_C_WORD, + SCE_C_WORD2, + SCE_C_STRING, + SCE_C_CHARACTER, + SCE_C_UUID, + SCE_C_PREPROCESSOR, + SCE_C_OPERATOR, + SCE_C_IDENTIFIER, + SCE_C_STRINGEOL, + SCE_C_VERBATIM, + SCE_C_REGEX, + SCE_C_COMMENTLINEDOC, + SCE_C_COMMENTDOCKEYWORD, + SCE_C_COMMENTDOCKEYWORDERROR, + /* used for local structs and typedefs */ + SCE_C_GLOBALCLASS + }; apply_filetype_properties(sci, SCLEX_CPP, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CPP].keywords[0]); - /* for SCI_SETKEYWORDS = 1, see below*/ - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_CPP].keywords[2]); - - /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_CPP].keywords[1], - filetypes[ft_id]->lang); - - styleset_c_like(sci, GEANY_FILETYPES_CPP); - - if (style_sets[GEANY_FILETYPES_CPP].styling[20].foreground == 1) - SSM(sci, SCI_SETPROPERTY, (uptr_t) "styling.within.preprocessor", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.start.$(file.patterns.cpp)", (sptr_t) "if ifdef ifndef"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.middle.$(file.patterns.cpp)", (sptr_t) "else elif"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.end.$(file.patterns.cpp)", (sptr_t) "endif"); -} - - -static void styleset_glsl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) -{ - new_style_array(GEANY_FILETYPES_GLSL, 21); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_GLSL); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", - 1, 0, &style_sets[GEANY_FILETYPES_GLSL].styling[20]); - - style_sets[GEANY_FILETYPES_GLSL].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_GLSL, 0, - "if else switch case default for while do discard return break" - "continue true false struct void bool int uint float vec2 vec3" - "vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 uvec2 uvec3 uvec4 mat2" - "mat3 mat4 mat2x2 mat2x3 mat2x4 mat3x2 mat3x3 mat3x4 mat4x2 mat4x3" - "mat4x4 sampler1D sampler2D sampler3D samplerCube sampler1DShadow" - "sampler2DShadow sampler1DArray sampler2DArray sampler1DArrayShadow" - "sampler2DArrayShadow isampler1D isampler2D isampler3D isamplerCube" - "isampler1DArray isampler2DArray usampler1D usampler2D usampler3D" - "usamplerCube usampler1DArray usampler2DArray const invariant" - "centroid in out inout attribute uniform varying smooth flat" - "noperspective highp mediump lowp"); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_GLSL, 1, ""); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_GLSL, 2, "TODO FIXME"); - style_sets[GEANY_FILETYPES_GLSL].keywords[3] = NULL; + apply_style_entries(sci, ft_id, styles, G_N_ELEMENTS(styles)); } -static void styleset_glsl(ScintillaObject *sci) -{ - const filetype_id ft_id = GEANY_FILETYPES_GLSL; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_GLSL].keywords[0]); - /* for SCI_SETKEYWORDS = 1, see below*/ - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_GLSL].keywords[2]); - - /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_GLSL].keywords[1], - filetypes[ft_id]->lang); - - styleset_c_like(sci, GEANY_FILETYPES_GLSL); - - if (style_sets[GEANY_FILETYPES_GLSL].styling[20].foreground == 1) - SSM(sci, SCI_SETPROPERTY, (uptr_t) "styling.within.preprocessor", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.start.$(file.patterns.cpp)", (sptr_t) "if ifdef ifndef"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.middle.$(file.patterns.cpp)", (sptr_t) "else elif"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "preprocessor.end.$(file.patterns.cpp)", (sptr_t) "endif"); -} - -static void styleset_cs_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +static void styleset_c_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CS, 21); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_CS); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", - 1, 0, &style_sets[GEANY_FILETYPES_CS].styling[20]); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_CS].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CS, 0, "\ - abstract as base bool break byte case catch char checked class \ - const continue decimal default delegate do double else enum \ - event explicit extern false finally fixed float for foreach goto if \ - implicit in int interface internal is lock long namespace new null \ - object operator out override params private protected public \ - readonly ref return sbyte sealed short sizeof stackalloc static \ - string struct switch this throw true try typeof uint ulong \ - unchecked unsafe ushort using virtual void volatile while"); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CS, 1, ""); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_CS, 2, ""); - style_sets[GEANY_FILETYPES_CS].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_cs(ScintillaObject *sci) +static void styleset_c(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CS; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[ft_id].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[ft_id].keywords[2]); - - /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); - styleset_c_like(sci, ft_id); - if (style_sets[ft_id].styling[20].foreground == 1) - SSM(sci, ft_id, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); -} - - -static void styleset_vala_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) -{ - new_style_array(GEANY_FILETYPES_VALA, 21); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_VALA); - get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", - 1, 0, &style_sets[GEANY_FILETYPES_VALA].styling[20]); - - style_sets[GEANY_FILETYPES_VALA].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_VALA, 0, - "else if switch case default break continue return for foreach in do while is " - "try catch finally throw " - "namespace interface class struct enum signal errordomain " - "construct callback get set base " - "const static var weak " - "virtual abstract override inline extern " - "public protected private delegate " - "out ref " - - "lock using " - - "true false null " - - "generic new delete base this value typeof sizeof " - "throws requires ensures " - - "void bool char uchar int uint short ushort long ulong size_t ssize_t " - "int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string " - - /* these types are not referenced by the reference manual but are in glib.vapi - * as simple types */ - /*"constpointer time_t "*/ - ); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_VALA, 1, ""); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_VALA, 2, ""); - style_sets[GEANY_FILETYPES_VALA].keywords[3] = NULL; -} - - -static void styleset_vala(ScintillaObject *sci) -{ - const filetype_id ft_id = GEANY_FILETYPES_VALA; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[ft_id].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + /* SCI_SETKEYWORDS = 1 - secondary + global tags file types, see below */ + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + /* SCI_SETKEYWORDS = 3 is for current session types - see editor_lexer_get_type_keyword_idx() */ /* assign global types, merge them with user defined keywords and set them */ - assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); - - styleset_c_like(sci, ft_id); - - if (style_sets[ft_id].styling[20].foreground == 1) - SSM(sci, ft_id, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); + merge_type_keywords(sci, ft_id, 1); } static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PASCAL, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[0]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[1]); - get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[2]); - get_keyfile_hex(config, config_home, "comment2", 0x3f5fbf, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[3]); - get_keyfile_hex(config, config_home, "commentline", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[4]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[5]); - get_keyfile_hex(config, config_home, "preprocessor2", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[6]); - get_keyfile_hex(config, config_home, "number", 0x007F00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[7]); - get_keyfile_hex(config, config_home, "hexnumber", 0x007F00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[8]); - get_keyfile_hex(config, config_home, "word", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PASCAL].styling[9]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[10]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[11]); - get_keyfile_hex(config, config_home, "character", 0x404000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[12]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[13]); - get_keyfile_hex(config, config_home, "asm", 0x804080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[14]); - - style_sets[GEANY_FILETYPES_PASCAL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PASCAL, 0, - "asm begin byte case char class do else end for function if implementation integer \ - interface object procedure program real repeat string then to try unit until uses var word"); - style_sets[GEANY_FILETYPES_PASCAL].keywords[1] = NULL; + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "comment2", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "preprocessor2", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "hexnumber", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "asm", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_pascal(ScintillaObject *sci) +static void styleset_pascal(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PASCAL; - apply_filetype_properties(sci, SCLEX_PASCAL, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_PASCAL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PASCAL, 0); - set_sci_style(sci, SCE_PAS_DEFAULT, GEANY_FILETYPES_PASCAL, 0); - set_sci_style(sci, SCE_PAS_IDENTIFIER, GEANY_FILETYPES_PASCAL, 1); - set_sci_style(sci, SCE_PAS_COMMENT, GEANY_FILETYPES_PASCAL, 2); - set_sci_style(sci, SCE_PAS_COMMENT2, GEANY_FILETYPES_PASCAL, 3); - set_sci_style(sci, SCE_PAS_COMMENTLINE, GEANY_FILETYPES_PASCAL, 4); - set_sci_style(sci, SCE_PAS_PREPROCESSOR, GEANY_FILETYPES_PASCAL, 5); - set_sci_style(sci, SCE_PAS_PREPROCESSOR2, GEANY_FILETYPES_PASCAL, 6); - set_sci_style(sci, SCE_PAS_NUMBER, GEANY_FILETYPES_PASCAL, 7); - set_sci_style(sci, SCE_PAS_HEXNUMBER, GEANY_FILETYPES_PASCAL, 8); - set_sci_style(sci, SCE_PAS_WORD, GEANY_FILETYPES_PASCAL, 9); - set_sci_style(sci, SCE_PAS_STRING, GEANY_FILETYPES_PASCAL, 10); - set_sci_style(sci, SCE_PAS_STRINGEOL, GEANY_FILETYPES_PASCAL, 11); - set_sci_style(sci, SCE_PAS_CHARACTER, GEANY_FILETYPES_PASCAL, 12); - set_sci_style(sci, SCE_PAS_OPERATOR, GEANY_FILETYPES_PASCAL, 13); - set_sci_style(sci, SCE_PAS_ASM, GEANY_FILETYPES_PASCAL, 14); - - SSM(sci, SCI_SETPROPERTY, (uptr_t) "lexer.pascal.smart.highlighting", (sptr_t) "1"); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PAS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PAS_IDENTIFIER, ft_id, 1); + set_sci_style(sci, SCE_PAS_COMMENT, ft_id, 2); + set_sci_style(sci, SCE_PAS_COMMENT2, ft_id, 3); + set_sci_style(sci, SCE_PAS_COMMENTLINE, ft_id, 4); + set_sci_style(sci, SCE_PAS_PREPROCESSOR, ft_id, 5); + set_sci_style(sci, SCE_PAS_PREPROCESSOR2, ft_id, 6); + set_sci_style(sci, SCE_PAS_NUMBER, ft_id, 7); + set_sci_style(sci, SCE_PAS_HEXNUMBER, ft_id, 8); + set_sci_style(sci, SCE_PAS_WORD, ft_id, 9); + set_sci_style(sci, SCE_PAS_STRING, ft_id, 10); + set_sci_style(sci, SCE_PAS_STRINGEOL, ft_id, 11); + set_sci_style(sci, SCE_PAS_CHARACTER, ft_id, 12); + set_sci_style(sci, SCE_PAS_OPERATOR, ft_id, 13); + set_sci_style(sci, SCE_PAS_ASM, ft_id, 14); } static void styleset_makefile_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_MAKE, 7); - get_keyfile_hex(config, config_home, "default", 0x00002f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[0]); - get_keyfile_named_style(config, config_home, "comment", "comment", &style_sets[GEANY_FILETYPES_MAKE].styling[1]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[2]); - get_keyfile_hex(config, config_home, "identifier", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[3]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[4]); - get_keyfile_hex(config, config_home, "target", 0x0000ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[5]); - get_keyfile_hex(config, config_home, "ideol", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[6]); + new_styleset(ft_id, 7); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "target", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "ideol", &style_sets[ft_id].styling[6]); - style_sets[GEANY_FILETYPES_MAKE].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_makefile(ScintillaObject *sci) +static void styleset_makefile(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_MAKE; - apply_filetype_properties(sci, SCLEX_MAKEFILE, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_MAKE, 0); - set_sci_style(sci, SCE_MAKE_DEFAULT, GEANY_FILETYPES_MAKE, 0); - set_sci_style(sci, SCE_MAKE_COMMENT, GEANY_FILETYPES_MAKE, 1); - set_sci_style(sci, SCE_MAKE_PREPROCESSOR, GEANY_FILETYPES_MAKE, 2); - set_sci_style(sci, SCE_MAKE_IDENTIFIER, GEANY_FILETYPES_MAKE, 3); - set_sci_style(sci, SCE_MAKE_OPERATOR, GEANY_FILETYPES_MAKE, 4); - set_sci_style(sci, SCE_MAKE_TARGET, GEANY_FILETYPES_MAKE, 5); - set_sci_style(sci, SCE_MAKE_IDEOL, GEANY_FILETYPES_MAKE, 6); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MAKE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MAKE_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_MAKE_PREPROCESSOR, ft_id, 2); + set_sci_style(sci, SCE_MAKE_IDENTIFIER, ft_id, 3); + set_sci_style(sci, SCE_MAKE_OPERATOR, ft_id, 4); + set_sci_style(sci, SCE_MAKE_TARGET, ft_id, 5); + set_sci_style(sci, SCE_MAKE_IDEOL, ft_id, 6); } static void styleset_diff_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_DIFF, 8); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[1]); - get_keyfile_hex(config, config_home, "command", 0x7f7f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[2]); - get_keyfile_hex(config, config_home, "header", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[3]); - get_keyfile_hex(config, config_home, "position", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[4]); - get_keyfile_hex(config, config_home, "deleted", 0xff2727, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[5]); - get_keyfile_hex(config, config_home, "added", 0x34b034, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[6]); - get_keyfile_hex(config, config_home, "changed", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[7]); + new_styleset(ft_id, 8); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "header", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "position", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "deleted", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "added", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "changed", &style_sets[ft_id].styling[7]); - style_sets[GEANY_FILETYPES_DIFF].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_diff(ScintillaObject *sci) +static void styleset_diff(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_DIFF; - apply_filetype_properties(sci, SCLEX_DIFF, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_DIFF, 0); - set_sci_style(sci, SCE_DIFF_DEFAULT, GEANY_FILETYPES_DIFF, 0); - set_sci_style(sci, SCE_DIFF_COMMENT, GEANY_FILETYPES_DIFF, 1); - set_sci_style(sci, SCE_DIFF_COMMAND, GEANY_FILETYPES_DIFF, 2); - set_sci_style(sci, SCE_DIFF_HEADER, GEANY_FILETYPES_DIFF, 3); - set_sci_style(sci, SCE_DIFF_POSITION, GEANY_FILETYPES_DIFF, 4); - set_sci_style(sci, SCE_DIFF_DELETED, GEANY_FILETYPES_DIFF, 5); - set_sci_style(sci, SCE_DIFF_ADDED, GEANY_FILETYPES_DIFF, 6); - set_sci_style(sci, SCE_DIFF_CHANGED, GEANY_FILETYPES_DIFF, 7); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_DIFF_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_DIFF_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_DIFF_COMMAND, ft_id, 2); + set_sci_style(sci, SCE_DIFF_HEADER, ft_id, 3); + set_sci_style(sci, SCE_DIFF_POSITION, ft_id, 4); + set_sci_style(sci, SCE_DIFF_DELETED, ft_id, 5); + set_sci_style(sci, SCE_DIFF_ADDED, ft_id, 6); + set_sci_style(sci, SCE_DIFF_CHANGED, ft_id, 7); } static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_LATEX, 5); - get_keyfile_hex(config, config_home, "default", 0x00002f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LATEX].styling[0]); - get_keyfile_hex(config, config_home, "command", 0xff0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_LATEX].styling[1]); - get_keyfile_hex(config, config_home, "tag", 0x007f7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_LATEX].styling[2]); - get_keyfile_hex(config, config_home, "math", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LATEX].styling[3]); - get_keyfile_hex(config, config_home, "comment", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LATEX].styling[4]); + new_styleset(ft_id, 5); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "math", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[4]); - style_sets[GEANY_FILETYPES_LATEX].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_LATEX, 0, "section subsection begin item"); - style_sets[GEANY_FILETYPES_LATEX].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_latex(ScintillaObject *sci) +static void styleset_latex(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_LATEX; - apply_filetype_properties(sci, SCLEX_LATEX, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_LATEX].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_LATEX, 0); - set_sci_style(sci, SCE_L_DEFAULT, GEANY_FILETYPES_LATEX, 0); - set_sci_style(sci, SCE_L_COMMAND, GEANY_FILETYPES_LATEX, 1); - set_sci_style(sci, SCE_L_TAG, GEANY_FILETYPES_LATEX, 2); - set_sci_style(sci, SCE_L_MATH, GEANY_FILETYPES_LATEX, 3); - set_sci_style(sci, SCE_L_COMMENT, GEANY_FILETYPES_LATEX, 4); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_L_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_L_COMMAND, ft_id, 1); + set_sci_style(sci, SCE_L_TAG, ft_id, 2); + set_sci_style(sci, SCE_L_MATH, ft_id, 3); + set_sci_style(sci, SCE_L_COMMENT, ft_id, 4); } static void styleset_php_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - style_sets[GEANY_FILETYPES_PHP].styling = NULL; - style_sets[GEANY_FILETYPES_PHP].keywords = NULL; + style_sets[ft_id].styling = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_php(ScintillaObject *sci) +static void styleset_php(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PHP; - apply_filetype_properties(sci, SCLEX_HTML, ft_id); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "phpscript.mode", (sptr_t) "1"); - /* use the same colouring as for XML */ styleset_markup(sci, TRUE); } @@ -1298,15 +1134,13 @@ static void styleset_html_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - style_sets[GEANY_FILETYPES_HTML].styling = NULL; - style_sets[GEANY_FILETYPES_HTML].keywords = NULL; + style_sets[ft_id].styling = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_html(ScintillaObject *sci) +static void styleset_html(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_HTML; - apply_filetype_properties(sci, SCLEX_HTML, ft_id); /* use the same colouring for HTML; XML and so on */ @@ -1316,74 +1150,74 @@ static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_XML, 56); - get_keyfile_hex(config, config_home, "html_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[0]); - get_keyfile_hex(config, config_home, "html_tag", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[1]); - get_keyfile_hex(config, config_home, "html_tagunknown", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[2]); - get_keyfile_hex(config, config_home, "html_attribute", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[3]); - get_keyfile_hex(config, config_home, "html_attributeunknown", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[4]); - get_keyfile_hex(config, config_home, "html_number", 0x800080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[5]); - get_keyfile_hex(config, config_home, "html_doublestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[6]); - get_keyfile_hex(config, config_home, "html_singlestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[7]); - get_keyfile_hex(config, config_home, "html_other", 0x800080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[8]); - get_keyfile_hex(config, config_home, "html_comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[9]); - get_keyfile_hex(config, config_home, "html_entity", 0x800080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[10]); - get_keyfile_hex(config, config_home, "html_tagend", 0x000080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[11]); - get_keyfile_hex(config, config_home, "html_xmlstart", 0x000099, 0xf0f0f0, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[12]); - get_keyfile_hex(config, config_home, "html_xmlend", 0x000099, 0xf0f0f0, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[13]); - get_keyfile_hex(config, config_home, "html_script", 0x000080, 0xf0f0f0, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[14]); - get_keyfile_hex(config, config_home, "html_asp", 0x004f4f, 0xf0f0f0, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[15]); - get_keyfile_hex(config, config_home, "html_aspat", 0x004f4f, 0xf0f0f0, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[16]); - get_keyfile_hex(config, config_home, "html_cdata", 0x660099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[17]); - get_keyfile_hex(config, config_home, "html_question", 0x0000ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[18]); - get_keyfile_hex(config, config_home, "html_value", 0x660099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[19]); - get_keyfile_hex(config, config_home, "html_xccomment", 0x660099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[20]); - - get_keyfile_hex(config, config_home, "sgml_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[21]); - get_keyfile_hex(config, config_home, "sgml_comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[22]); - get_keyfile_hex(config, config_home, "sgml_special", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[23]); - get_keyfile_hex(config, config_home, "sgml_command", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_XML].styling[24]); - get_keyfile_hex(config, config_home, "sgml_doublestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[25]); - get_keyfile_hex(config, config_home, "sgml_simplestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[26]); - get_keyfile_hex(config, config_home, "sgml_1st_param", 0x404080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[27]); - get_keyfile_hex(config, config_home, "sgml_entity", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[28]); - get_keyfile_hex(config, config_home, "sgml_block_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[29]); - get_keyfile_hex(config, config_home, "sgml_1st_param_comment", 0x406090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[30]); - get_keyfile_hex(config, config_home, "sgml_error", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[31]); - - get_keyfile_hex(config, config_home, "php_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[32]); - get_keyfile_hex(config, config_home, "php_simplestring", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[33]); - get_keyfile_hex(config, config_home, "php_hstring", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[34]); - get_keyfile_hex(config, config_home, "php_number", 0x606000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[35]); - get_keyfile_hex(config, config_home, "php_word", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[36]); - get_keyfile_hex(config, config_home, "php_variable", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[37]); - get_keyfile_hex(config, config_home, "php_comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[38]); - get_keyfile_hex(config, config_home, "php_commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[39]); - get_keyfile_hex(config, config_home, "php_operator", 0x102060, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[40]); - get_keyfile_hex(config, config_home, "php_hstring_variable", 0x101060, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[41]); - get_keyfile_hex(config, config_home, "php_complex_variable", 0x105010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[42]); - - get_keyfile_hex(config, config_home, "jscript_start", 0x008080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[43]); - get_keyfile_hex(config, config_home, "jscript_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[44]); - get_keyfile_hex(config, config_home, "jscript_comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[45]); - get_keyfile_hex(config, config_home, "jscript_commentline", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[46]); - get_keyfile_hex(config, config_home, "jscript_commentdoc", 0x3f5fbf, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_XML].styling[47]); - get_keyfile_hex(config, config_home, "jscript_number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[48]); - get_keyfile_hex(config, config_home, "jscript_word", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[49]); - get_keyfile_hex(config, config_home, "jscript_keyword", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_XML].styling[50]); - get_keyfile_hex(config, config_home, "jscript_doublestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[51]); - get_keyfile_hex(config, config_home, "jscript_singlestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[52]); - get_keyfile_hex(config, config_home, "jscript_symbols", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[53]); - get_keyfile_hex(config, config_home, "jscript_stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[54]); - get_keyfile_hex(config, config_home, "jscript_regex", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[55]); + new_styleset(GEANY_FILETYPES_XML, 56); + get_keyfile_style(config, config_home, "html_default", &style_sets[GEANY_FILETYPES_XML].styling[0]); + get_keyfile_style(config, config_home, "html_tag", &style_sets[GEANY_FILETYPES_XML].styling[1]); + get_keyfile_style(config, config_home, "html_tagunknown", &style_sets[GEANY_FILETYPES_XML].styling[2]); + get_keyfile_style(config, config_home, "html_attribute", &style_sets[GEANY_FILETYPES_XML].styling[3]); + get_keyfile_style(config, config_home, "html_attributeunknown", &style_sets[GEANY_FILETYPES_XML].styling[4]); + get_keyfile_style(config, config_home, "html_number", &style_sets[GEANY_FILETYPES_XML].styling[5]); + get_keyfile_style(config, config_home, "html_doublestring", &style_sets[GEANY_FILETYPES_XML].styling[6]); + get_keyfile_style(config, config_home, "html_singlestring", &style_sets[GEANY_FILETYPES_XML].styling[7]); + get_keyfile_style(config, config_home, "html_other", &style_sets[GEANY_FILETYPES_XML].styling[8]); + get_keyfile_style(config, config_home, "html_comment", &style_sets[GEANY_FILETYPES_XML].styling[9]); + get_keyfile_style(config, config_home, "html_entity", &style_sets[GEANY_FILETYPES_XML].styling[10]); + get_keyfile_style(config, config_home, "html_tagend", &style_sets[GEANY_FILETYPES_XML].styling[11]); + get_keyfile_style(config, config_home, "html_xmlstart", &style_sets[GEANY_FILETYPES_XML].styling[12]); + get_keyfile_style(config, config_home, "html_xmlend", &style_sets[GEANY_FILETYPES_XML].styling[13]); + get_keyfile_style(config, config_home, "html_script", &style_sets[GEANY_FILETYPES_XML].styling[14]); + get_keyfile_style(config, config_home, "html_asp", &style_sets[GEANY_FILETYPES_XML].styling[15]); + get_keyfile_style(config, config_home, "html_aspat", &style_sets[GEANY_FILETYPES_XML].styling[16]); + get_keyfile_style(config, config_home, "html_cdata", &style_sets[GEANY_FILETYPES_XML].styling[17]); + get_keyfile_style(config, config_home, "html_question", &style_sets[GEANY_FILETYPES_XML].styling[18]); + get_keyfile_style(config, config_home, "html_value", &style_sets[GEANY_FILETYPES_XML].styling[19]); + get_keyfile_style(config, config_home, "html_xccomment", &style_sets[GEANY_FILETYPES_XML].styling[20]); + + get_keyfile_style(config, config_home, "sgml_default", &style_sets[GEANY_FILETYPES_XML].styling[21]); + get_keyfile_style(config, config_home, "sgml_comment", &style_sets[GEANY_FILETYPES_XML].styling[22]); + get_keyfile_style(config, config_home, "sgml_special", &style_sets[GEANY_FILETYPES_XML].styling[23]); + get_keyfile_style(config, config_home, "sgml_command", &style_sets[GEANY_FILETYPES_XML].styling[24]); + get_keyfile_style(config, config_home, "sgml_doublestring", &style_sets[GEANY_FILETYPES_XML].styling[25]); + get_keyfile_style(config, config_home, "sgml_simplestring", &style_sets[GEANY_FILETYPES_XML].styling[26]); + get_keyfile_style(config, config_home, "sgml_1st_param", &style_sets[GEANY_FILETYPES_XML].styling[27]); + get_keyfile_style(config, config_home, "sgml_entity", &style_sets[GEANY_FILETYPES_XML].styling[28]); + get_keyfile_style(config, config_home, "sgml_block_default", &style_sets[GEANY_FILETYPES_XML].styling[29]); + get_keyfile_style(config, config_home, "sgml_1st_param_comment", &style_sets[GEANY_FILETYPES_XML].styling[30]); + get_keyfile_style(config, config_home, "sgml_error", &style_sets[GEANY_FILETYPES_XML].styling[31]); + + get_keyfile_style(config, config_home, "php_default", &style_sets[GEANY_FILETYPES_XML].styling[32]); + get_keyfile_style(config, config_home, "php_simplestring", &style_sets[GEANY_FILETYPES_XML].styling[33]); + get_keyfile_style(config, config_home, "php_hstring", &style_sets[GEANY_FILETYPES_XML].styling[34]); + get_keyfile_style(config, config_home, "php_number", &style_sets[GEANY_FILETYPES_XML].styling[35]); + get_keyfile_style(config, config_home, "php_word", &style_sets[GEANY_FILETYPES_XML].styling[36]); + get_keyfile_style(config, config_home, "php_variable", &style_sets[GEANY_FILETYPES_XML].styling[37]); + get_keyfile_style(config, config_home, "php_comment", &style_sets[GEANY_FILETYPES_XML].styling[38]); + get_keyfile_style(config, config_home, "php_commentline", &style_sets[GEANY_FILETYPES_XML].styling[39]); + get_keyfile_style(config, config_home, "php_operator", &style_sets[GEANY_FILETYPES_XML].styling[40]); + get_keyfile_style(config, config_home, "php_hstring_variable", &style_sets[GEANY_FILETYPES_XML].styling[41]); + get_keyfile_style(config, config_home, "php_complex_variable", &style_sets[GEANY_FILETYPES_XML].styling[42]); + + get_keyfile_style(config, config_home, "jscript_start", &style_sets[GEANY_FILETYPES_XML].styling[43]); + get_keyfile_style(config, config_home, "jscript_default", &style_sets[GEANY_FILETYPES_XML].styling[44]); + get_keyfile_style(config, config_home, "jscript_comment", &style_sets[GEANY_FILETYPES_XML].styling[45]); + get_keyfile_style(config, config_home, "jscript_commentline", &style_sets[GEANY_FILETYPES_XML].styling[46]); + get_keyfile_style(config, config_home, "jscript_commentdoc", &style_sets[GEANY_FILETYPES_XML].styling[47]); + get_keyfile_style(config, config_home, "jscript_number", &style_sets[GEANY_FILETYPES_XML].styling[48]); + get_keyfile_style(config, config_home, "jscript_word", &style_sets[GEANY_FILETYPES_XML].styling[49]); + get_keyfile_style(config, config_home, "jscript_keyword", &style_sets[GEANY_FILETYPES_XML].styling[50]); + get_keyfile_style(config, config_home, "jscript_doublestring", &style_sets[GEANY_FILETYPES_XML].styling[51]); + get_keyfile_style(config, config_home, "jscript_singlestring", &style_sets[GEANY_FILETYPES_XML].styling[52]); + get_keyfile_style(config, config_home, "jscript_symbols", &style_sets[GEANY_FILETYPES_XML].styling[53]); + get_keyfile_style(config, config_home, "jscript_stringeol", &style_sets[GEANY_FILETYPES_XML].styling[54]); + get_keyfile_style(config, config_home, "jscript_regex", &style_sets[GEANY_FILETYPES_XML].styling[55]); style_sets[GEANY_FILETYPES_XML].keywords = g_new(gchar*, 7); - get_keyfile_keywords(config, config_home, "html", GEANY_FILETYPES_XML, 0, "a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml xml:lang"); - get_keyfile_keywords(config, config_home, "javascript", GEANY_FILETYPES_XML, 1, "abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with"); - get_keyfile_keywords(config, config_home, "vbscript", GEANY_FILETYPES_XML, 2, "and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant"); - get_keyfile_keywords(config, config_home, "python", GEANY_FILETYPES_XML, 3, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); - get_keyfile_keywords(config, config_home, "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor"); - get_keyfile_keywords(config, config_home, "sgml", GEANY_FILETYPES_XML, 5, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); + get_keyfile_keywords(config, config_home, "html", GEANY_FILETYPES_XML, 0); + get_keyfile_keywords(config, config_home, "javascript", GEANY_FILETYPES_XML, 1); + get_keyfile_keywords(config, config_home, "vbscript", GEANY_FILETYPES_XML, 2); + get_keyfile_keywords(config, config_home, "python", GEANY_FILETYPES_XML, 3); + get_keyfile_keywords(config, config_home, "php", GEANY_FILETYPES_XML, 4); + get_keyfile_keywords(config, config_home, "sgml", GEANY_FILETYPES_XML, 5); style_sets[GEANY_FILETYPES_XML].keywords[6] = NULL; } @@ -1405,9 +1239,10 @@ for (i = 0; i < 5; i++) { keywords = (set_keywords) ? style_sets[GEANY_FILETYPES_XML].keywords[i] : ""; - SSM(sci, SCI_SETKEYWORDS, i, (sptr_t) keywords); + sci_set_keywords(sci, i, keywords); } - SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_XML].keywords[5]); + /* always set SGML keywords */ + sci_set_keywords(sci, 5, style_sets[GEANY_FILETYPES_XML].keywords[5]); set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_XML, 0); set_sci_style(sci, SCE_H_DEFAULT, GEANY_FILETYPES_XML, 0); @@ -1467,7 +1302,7 @@ set_sci_style(sci, SCE_HB_DEFAULT, GEANY_FILETYPES_XML, 44); set_sci_style(sci, SCE_HB_COMMENTLINE, GEANY_FILETYPES_XML, 46); set_sci_style(sci, SCE_HB_NUMBER, GEANY_FILETYPES_XML, 48); - set_sci_style(sci, SCE_HB_WORD, GEANY_FILETYPES_XML, 49); + set_sci_style(sci, SCE_HB_WORD, GEANY_FILETYPES_XML, 50); /* keywords */ set_sci_style(sci, SCE_HB_STRING, GEANY_FILETYPES_XML, 51); set_sci_style(sci, SCE_HB_IDENTIFIER, GEANY_FILETYPES_XML, 53); set_sci_style(sci, SCE_HB_STRINGEOL, GEANY_FILETYPES_XML, 54); @@ -1477,7 +1312,7 @@ set_sci_style(sci, SCE_HBA_DEFAULT, GEANY_FILETYPES_XML, 44); set_sci_style(sci, SCE_HBA_COMMENTLINE, GEANY_FILETYPES_XML, 46); set_sci_style(sci, SCE_HBA_NUMBER, GEANY_FILETYPES_XML, 48); - set_sci_style(sci, SCE_HBA_WORD, GEANY_FILETYPES_XML, 49); + set_sci_style(sci, SCE_HBA_WORD, GEANY_FILETYPES_XML, 50); /* keywords */ set_sci_style(sci, SCE_HBA_STRING, GEANY_FILETYPES_XML, 51); set_sci_style(sci, SCE_HBA_IDENTIFIER, GEANY_FILETYPES_XML, 53); set_sci_style(sci, SCE_HBA_STRINGEOL, GEANY_FILETYPES_XML, 54); @@ -1539,480 +1374,428 @@ set_sci_style(sci, SCE_HPHP_HSTRING_VARIABLE, GEANY_FILETYPES_XML, 41); set_sci_style(sci, SCE_HPHP_COMPLEX_VARIABLE, GEANY_FILETYPES_XML, 42); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.html", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.html.preprocessor", (sptr_t) "0"); + /* note: normally this would be in the filetype file instead */ + sci_set_property(sci, "fold.html", "1"); + sci_set_property(sci, "fold.html.preprocessor", "0"); } static void styleset_java_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_JAVA, 20); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_JAVA); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_JAVA].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_JAVA, 0, "\ - abstract assert break case catch class \ - const continue default do else extends final finally for future \ - generic goto if implements import inner instanceof interface \ - native new outer package private protected public rest \ - return static super switch synchronized this throw throws \ - transient try var volatile while true false null"); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_JAVA, 1, "boolean byte char double float int long null short void"); - get_keyfile_keywords(config, config_home, "doccomment", GEANY_FILETYPES_JAVA, 2, "return param author throws"); - get_keyfile_keywords(config, config_home, "typedefs", GEANY_FILETYPES_JAVA, 3, ""); - style_sets[GEANY_FILETYPES_JAVA].keywords[4] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "doccomment", ft_id, 2); + get_keyfile_keywords(config, config_home, "typedefs", ft_id, 3); + style_sets[ft_id].keywords[4] = NULL; } -static void styleset_java(ScintillaObject *sci) +static void styleset_java(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_JAVA; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); + styleset_c_like(sci, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_JAVA].keywords[3]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + /* SCI_SETKEYWORDS = 1 - secondary + global tags file types, see below */ + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + /* SCI_SETKEYWORDS = 3 is for current session types - see editor_lexer_get_type_keyword_idx() */ + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[3]); - styleset_c_like(sci, GEANY_FILETYPES_JAVA); + /* assign global types, merge them with user defined keywords and set them */ + merge_type_keywords(sci, ft_id, 1); } static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PERL, 35); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[0]); - get_keyfile_hex(config, config_home, "error", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[1]); - get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_PERL].styling[2]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[3]); - get_keyfile_hex(config, config_home, "word", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PERL].styling[4]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[5]); - get_keyfile_hex(config, config_home, "character", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[6]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[7]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[8]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[9]); - get_keyfile_hex(config, config_home, "scalar", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[10]); - get_keyfile_hex(config, config_home, "pod", 0x035650, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[11]); - get_keyfile_hex(config, config_home, "regex", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[12]); - get_keyfile_hex(config, config_home, "array", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[13]); - get_keyfile_hex(config, config_home, "hash", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[14]); - get_keyfile_hex(config, config_home, "symboltable", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[15]); - get_keyfile_hex(config, config_home, "backticks", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[16]); - get_keyfile_hex(config, config_home, "pod_verbatim", 0x004000, 0xc0ffc0, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[17]); - get_keyfile_hex(config, config_home, "reg_subst", 0x000000, 0xf0e080, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[18]); - get_keyfile_hex(config, config_home, "datasection", 0x600000, 0xfff0d8, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[19]); - get_keyfile_hex(config, config_home, "here_delim", 0x000000, 0xddd0dd, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[20]); - get_keyfile_hex(config, config_home, "here_q", 0x7f007f, 0xddd0dd, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[21]); - get_keyfile_hex(config, config_home, "here_qq", 0x7f007f, 0xddd0dd, TRUE, &style_sets[GEANY_FILETYPES_PERL].styling[22]); - get_keyfile_hex(config, config_home, "here_qx", 0x7f007f, 0xddd0dd, TRUE, &style_sets[GEANY_FILETYPES_PERL].styling[23]); - get_keyfile_hex(config, config_home, "string_q", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[24]); - get_keyfile_hex(config, config_home, "string_qq", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[25]); - get_keyfile_hex(config, config_home, "string_qx", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[26]); - get_keyfile_hex(config, config_home, "string_qr", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[27]); - get_keyfile_hex(config, config_home, "string_qw", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[28]); - get_keyfile_hex(config, config_home, "variable_indexer", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[29]); - get_keyfile_hex(config, config_home, "punctuation", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[30]); - get_keyfile_hex(config, config_home, "longquote", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[31]); - get_keyfile_hex(config, config_home, "sub_prototype", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[32]); - get_keyfile_hex(config, config_home, "format_ident", 0xc000c0, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PERL].styling[33]); - get_keyfile_hex(config, config_home, "format", 0xc000c0, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[34]); - - - style_sets[GEANY_FILETYPES_PERL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PERL, 0, "\ - NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD \ - BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept \ - alarm and atan2 bind binmode bless caller chdir chmod chomp chop \ - chown chr chroot close closedir cmp connect continue cos crypt \ - dbmclose dbmopen defined delete die do dump each else elsif endgrent \ - endhostent endnetent endprotoent endpwent endservent eof eq eval \ - exec exists exit exp fcntl fileno flock for foreach fork format \ - formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname \ - gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername \ - getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent \ - getpwent getpwnam getpwuid getservbyname getservbyport getservent \ - getsockname getsockopt glob gmtime goto grep gt hex if index \ - int ioctl join keys kill last lc lcfirst le length link listen \ - local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv \ - msgsnd my ne next no not oct open opendir or ord our pack package \ - pipe pop pos print printf prototype push q qq qr quotemeta qu \ - qw qx rand read readdir readline readlink readpipe recv redo \ - ref rename require reset return reverse rewinddir rindex rmdir \ - s scalar seek seekdir select semctl semget semop send setgrent \ - sethostent setnetent setpgrp setpriority setprotoent setpwent \ - setservent setsockopt shift shmctl shmget shmread shmwrite shutdown \ - sin sleep socket socketpair sort splice split sprintf sqrt srand \ - stat study sub substr symlink syscall sysopen sysread sysseek \ - system syswrite tell telldir tie tied time times tr truncate \ - uc ucfirst umask undef unless unlink unpack unshift untie until \ - use utime values vec wait waitpid wantarray warn while write \ - x xor y"); - style_sets[GEANY_FILETYPES_PERL].keywords[1] = NULL; + new_styleset(ft_id, 35); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "scalar", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "pod", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "regex", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "array", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "hash", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "symboltable", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "backticks", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "pod_verbatim", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "reg_subst", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "here_delim", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "here_qq", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "here_qx", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "string_q", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "string_qq", &style_sets[ft_id].styling[25]); + get_keyfile_style(config, config_home, "string_qx", &style_sets[ft_id].styling[26]); + get_keyfile_style(config, config_home, "string_qr", &style_sets[ft_id].styling[27]); + get_keyfile_style(config, config_home, "string_qw", &style_sets[ft_id].styling[28]); + get_keyfile_style(config, config_home, "variable_indexer", &style_sets[ft_id].styling[29]); + get_keyfile_style(config, config_home, "punctuation", &style_sets[ft_id].styling[30]); + get_keyfile_style(config, config_home, "longquote", &style_sets[ft_id].styling[31]); + get_keyfile_style(config, config_home, "sub_prototype", &style_sets[ft_id].styling[32]); + get_keyfile_style(config, config_home, "format_ident", &style_sets[ft_id].styling[33]); + get_keyfile_style(config, config_home, "format", &style_sets[ft_id].styling[34]); + + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_perl(ScintillaObject *sci) +static void styleset_perl(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PERL; - apply_filetype_properties(sci, SCLEX_PERL, ft_id); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "styling.within.preprocessor", (sptr_t) "1"); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_PERL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PERL, 0); - set_sci_style(sci, SCE_PL_DEFAULT, GEANY_FILETYPES_PERL, 0); - set_sci_style(sci, SCE_PL_ERROR, GEANY_FILETYPES_PERL, 1); - set_sci_style(sci, SCE_PL_COMMENTLINE, GEANY_FILETYPES_PERL, 2); - set_sci_style(sci, SCE_PL_NUMBER, GEANY_FILETYPES_PERL, 3); - set_sci_style(sci, SCE_PL_WORD, GEANY_FILETYPES_PERL, 4); - set_sci_style(sci, SCE_PL_STRING, GEANY_FILETYPES_PERL, 5); - set_sci_style(sci, SCE_PL_CHARACTER, GEANY_FILETYPES_PERL, 6); - set_sci_style(sci, SCE_PL_PREPROCESSOR, GEANY_FILETYPES_PERL, 7); - set_sci_style(sci, SCE_PL_OPERATOR, GEANY_FILETYPES_PERL, 8); - set_sci_style(sci, SCE_PL_IDENTIFIER, GEANY_FILETYPES_PERL, 9); - set_sci_style(sci, SCE_PL_SCALAR, GEANY_FILETYPES_PERL, 10); - set_sci_style(sci, SCE_PL_POD, GEANY_FILETYPES_PERL, 11); - set_sci_style(sci, SCE_PL_REGEX, GEANY_FILETYPES_PERL, 12); - set_sci_style(sci, SCE_PL_ARRAY, GEANY_FILETYPES_PERL, 13); - set_sci_style(sci, SCE_PL_HASH, GEANY_FILETYPES_PERL, 14); - set_sci_style(sci, SCE_PL_SYMBOLTABLE, GEANY_FILETYPES_PERL, 15); - set_sci_style(sci, SCE_PL_BACKTICKS, GEANY_FILETYPES_PERL, 16); - set_sci_style(sci, SCE_PL_POD_VERB, GEANY_FILETYPES_PERL, 17); - set_sci_style(sci, SCE_PL_REGSUBST, GEANY_FILETYPES_PERL, 18); - set_sci_style(sci, SCE_PL_DATASECTION, GEANY_FILETYPES_PERL, 19); - set_sci_style(sci, SCE_PL_HERE_DELIM, GEANY_FILETYPES_PERL, 20); - set_sci_style(sci, SCE_PL_HERE_Q, GEANY_FILETYPES_PERL, 21); - set_sci_style(sci, SCE_PL_HERE_QQ, GEANY_FILETYPES_PERL, 22); - set_sci_style(sci, SCE_PL_HERE_QX, GEANY_FILETYPES_PERL, 23); - set_sci_style(sci, SCE_PL_STRING_Q, GEANY_FILETYPES_PERL, 24); - set_sci_style(sci, SCE_PL_STRING_QQ, GEANY_FILETYPES_PERL, 25); - set_sci_style(sci, SCE_PL_STRING_QX, GEANY_FILETYPES_PERL, 26); - set_sci_style(sci, SCE_PL_STRING_QR, GEANY_FILETYPES_PERL, 27); - set_sci_style(sci, SCE_PL_STRING_QW, GEANY_FILETYPES_PERL, 28); - set_sci_style(sci, SCE_PL_VARIABLE_INDEXER, GEANY_FILETYPES_PERL, 29); - set_sci_style(sci, SCE_PL_PUNCTUATION, GEANY_FILETYPES_PERL, 30); - set_sci_style(sci, SCE_PL_LONGQUOTE, GEANY_FILETYPES_PERL, 31); - set_sci_style(sci, SCE_PL_SUB_PROTOTYPE, GEANY_FILETYPES_PERL, 32); - set_sci_style(sci, SCE_PL_FORMAT_IDENT, GEANY_FILETYPES_PERL, 33); - set_sci_style(sci, SCE_PL_FORMAT, GEANY_FILETYPES_PERL, 34); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PL_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PL_ERROR, ft_id, 1); + set_sci_style(sci, SCE_PL_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_PL_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_PL_WORD, ft_id, 4); + set_sci_style(sci, SCE_PL_STRING, ft_id, 5); + set_sci_style(sci, SCE_PL_CHARACTER, ft_id, 6); + set_sci_style(sci, SCE_PL_PREPROCESSOR, ft_id, 7); + set_sci_style(sci, SCE_PL_OPERATOR, ft_id, 8); + set_sci_style(sci, SCE_PL_IDENTIFIER, ft_id, 9); + set_sci_style(sci, SCE_PL_SCALAR, ft_id, 10); + set_sci_style(sci, SCE_PL_POD, ft_id, 11); + set_sci_style(sci, SCE_PL_REGEX, ft_id, 12); + set_sci_style(sci, SCE_PL_ARRAY, ft_id, 13); + set_sci_style(sci, SCE_PL_HASH, ft_id, 14); + set_sci_style(sci, SCE_PL_SYMBOLTABLE, ft_id, 15); + set_sci_style(sci, SCE_PL_BACKTICKS, ft_id, 16); + set_sci_style(sci, SCE_PL_POD_VERB, ft_id, 17); + set_sci_style(sci, SCE_PL_REGSUBST, ft_id, 18); + set_sci_style(sci, SCE_PL_DATASECTION, ft_id, 19); + set_sci_style(sci, SCE_PL_HERE_DELIM, ft_id, 20); + set_sci_style(sci, SCE_PL_HERE_Q, ft_id, 21); + set_sci_style(sci, SCE_PL_HERE_QQ, ft_id, 22); + set_sci_style(sci, SCE_PL_HERE_QX, ft_id, 23); + set_sci_style(sci, SCE_PL_STRING_Q, ft_id, 24); + set_sci_style(sci, SCE_PL_STRING_QQ, ft_id, 25); + set_sci_style(sci, SCE_PL_STRING_QX, ft_id, 26); + set_sci_style(sci, SCE_PL_STRING_QR, ft_id, 27); + set_sci_style(sci, SCE_PL_STRING_QW, ft_id, 28); + set_sci_style(sci, SCE_PL_VARIABLE_INDEXER, ft_id, 29); + set_sci_style(sci, SCE_PL_PUNCTUATION, ft_id, 30); + set_sci_style(sci, SCE_PL_LONGQUOTE, ft_id, 31); + set_sci_style(sci, SCE_PL_SUB_PROTOTYPE, ft_id, 32); + set_sci_style(sci, SCE_PL_FORMAT_IDENT, ft_id, 33); + set_sci_style(sci, SCE_PL_FORMAT, ft_id, 34); } static void styleset_python_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PYTHON, 16); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[0]); - get_keyfile_hex(config, config_home, "commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x400080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[2]); - get_keyfile_hex(config, config_home, "string", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[3]); - get_keyfile_hex(config, config_home, "character", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[4]); - get_keyfile_hex(config, config_home, "word", 0x600080, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PYTHON].styling[5]); - get_keyfile_hex(config, config_home, "triple", 0x008020, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[6]); - get_keyfile_hex(config, config_home, "tripledouble", 0x404000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[7]); - get_keyfile_hex(config, config_home, "classname", 0x003030, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[8]); - get_keyfile_hex(config, config_home, "defname", 0x000080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[9]); - get_keyfile_hex(config, config_home, "operator", 0x300080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[10]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[11]); - get_keyfile_hex(config, config_home, "commentblock", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[12]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[13]); - get_keyfile_hex(config, config_home, "word2", 0xdd00a6, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PYTHON].styling[14]); - get_keyfile_hex(config, config_home, "decorator", 0x808000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[15]); - - style_sets[GEANY_FILETYPES_PYTHON].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_PYTHON, 0, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); - get_keyfile_keywords(config, config_home, "identifiers", GEANY_FILETYPES_PYTHON, 1, ""); - style_sets[GEANY_FILETYPES_PYTHON].keywords[2] = NULL; + new_styleset(ft_id, 16); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "triple", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "tripledouble", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "classname", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "defname", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "commentblock", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "decorator", &style_sets[ft_id].styling[15]); + + style_sets[ft_id].keywords = g_new(gchar*, 3); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "identifiers", ft_id, 1); + style_sets[ft_id].keywords[2] = NULL; } -static void styleset_python(ScintillaObject *sci) +static void styleset_python(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PYTHON; - apply_filetype_properties(sci, SCLEX_PYTHON, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_PYTHON].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_PYTHON].keywords[1]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PYTHON, 0); - set_sci_style(sci, SCE_P_DEFAULT, GEANY_FILETYPES_PYTHON, 0); - set_sci_style(sci, SCE_P_COMMENTLINE, GEANY_FILETYPES_PYTHON, 1); - set_sci_style(sci, SCE_P_NUMBER, GEANY_FILETYPES_PYTHON, 2); - set_sci_style(sci, SCE_P_STRING, GEANY_FILETYPES_PYTHON, 3); - set_sci_style(sci, SCE_P_CHARACTER, GEANY_FILETYPES_PYTHON, 4); - set_sci_style(sci, SCE_P_WORD, GEANY_FILETYPES_PYTHON, 5); - set_sci_style(sci, SCE_P_TRIPLE, GEANY_FILETYPES_PYTHON, 6); - set_sci_style(sci, SCE_P_TRIPLEDOUBLE, GEANY_FILETYPES_PYTHON, 7); - set_sci_style(sci, SCE_P_CLASSNAME, GEANY_FILETYPES_PYTHON, 8); - set_sci_style(sci, SCE_P_DEFNAME, GEANY_FILETYPES_PYTHON, 9); - set_sci_style(sci, SCE_P_OPERATOR, GEANY_FILETYPES_PYTHON, 10); - set_sci_style(sci, SCE_P_IDENTIFIER, GEANY_FILETYPES_PYTHON, 11); - set_sci_style(sci, SCE_P_COMMENTBLOCK, GEANY_FILETYPES_PYTHON, 12); - set_sci_style(sci, SCE_P_STRINGEOL, GEANY_FILETYPES_PYTHON, 13); - set_sci_style(sci, SCE_P_WORD2, GEANY_FILETYPES_PYTHON, 14); - set_sci_style(sci, SCE_P_DECORATOR, GEANY_FILETYPES_PYTHON, 15); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.comment.python", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.quotes.python", (sptr_t) "1"); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_P_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_P_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_P_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_P_STRING, ft_id, 3); + set_sci_style(sci, SCE_P_CHARACTER, ft_id, 4); + set_sci_style(sci, SCE_P_WORD, ft_id, 5); + set_sci_style(sci, SCE_P_TRIPLE, ft_id, 6); + set_sci_style(sci, SCE_P_TRIPLEDOUBLE, ft_id, 7); + set_sci_style(sci, SCE_P_CLASSNAME, ft_id, 8); + set_sci_style(sci, SCE_P_DEFNAME, ft_id, 9); + set_sci_style(sci, SCE_P_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_P_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_P_COMMENTBLOCK, ft_id, 12); + set_sci_style(sci, SCE_P_STRINGEOL, ft_id, 13); + set_sci_style(sci, SCE_P_WORD2, ft_id, 14); + set_sci_style(sci, SCE_P_DECORATOR, ft_id, 15); } static void styleset_cmake_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CMAKE, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[1]); - get_keyfile_hex(config, config_home, "stringdq", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[2]); - get_keyfile_hex(config, config_home, "stringlq", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[3]); - get_keyfile_hex(config, config_home, "stringrq", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[4]); - get_keyfile_hex(config, config_home, "command", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[5]); - get_keyfile_hex(config, config_home, "parameters", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[6]); - get_keyfile_hex(config, config_home, "variable", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[7]); - get_keyfile_hex(config, config_home, "userdefined", 0x0000d0, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CMAKE].styling[8]); - get_keyfile_hex(config, config_home, "whiledef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CMAKE].styling[9]); - get_keyfile_hex(config, config_home, "foreachdef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CMAKE].styling[10]); - get_keyfile_hex(config, config_home, "ifdefinedef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CMAKE].styling[11]); - get_keyfile_hex(config, config_home, "macrodef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CMAKE].styling[12]); - get_keyfile_hex(config, config_home, "stringvar", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[13]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[14]); - - style_sets[GEANY_FILETYPES_CMAKE].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "commands", GEANY_FILETYPES_CMAKE, 0, ""); - get_keyfile_keywords(config, config_home, "parameters", GEANY_FILETYPES_CMAKE, 1, ""); - get_keyfile_keywords(config, config_home, "userdefined", GEANY_FILETYPES_CMAKE, 2, ""); - style_sets[GEANY_FILETYPES_CMAKE].keywords[3] = NULL; + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "stringdq", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "stringlq", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "stringrq", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "parameters", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "variable", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "userdefined", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "whiledef", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "foreachdef", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "ifdefinedef", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "macrodef", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringvar", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "commands", ft_id, 0); + get_keyfile_keywords(config, config_home, "parameters", ft_id, 1); + get_keyfile_keywords(config, config_home, "userdefined", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_cmake(ScintillaObject *sci) +static void styleset_cmake(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CMAKE; - apply_filetype_properties(sci, SCLEX_CMAKE, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CMAKE].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_CMAKE].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_CMAKE].keywords[2]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CMAKE, 0); - set_sci_style(sci, SCE_CMAKE_DEFAULT, GEANY_FILETYPES_CMAKE, 0); - set_sci_style(sci, SCE_CMAKE_COMMENT, GEANY_FILETYPES_CMAKE, 1); - set_sci_style(sci, SCE_CMAKE_STRINGDQ, GEANY_FILETYPES_CMAKE, 2); - set_sci_style(sci, SCE_CMAKE_STRINGLQ, GEANY_FILETYPES_CMAKE, 3); - set_sci_style(sci, SCE_CMAKE_STRINGRQ, GEANY_FILETYPES_CMAKE, 4); - set_sci_style(sci, SCE_CMAKE_COMMANDS, GEANY_FILETYPES_CMAKE, 5); - set_sci_style(sci, SCE_CMAKE_PARAMETERS, GEANY_FILETYPES_CMAKE, 6); - set_sci_style(sci, SCE_CMAKE_VARIABLE, GEANY_FILETYPES_CMAKE, 7); - set_sci_style(sci, SCE_CMAKE_USERDEFINED, GEANY_FILETYPES_CMAKE, 8); - set_sci_style(sci, SCE_CMAKE_WHILEDEF, GEANY_FILETYPES_CMAKE, 9); - set_sci_style(sci, SCE_CMAKE_FOREACHDEF, GEANY_FILETYPES_CMAKE, 10); - set_sci_style(sci, SCE_CMAKE_IFDEFINEDEF, GEANY_FILETYPES_CMAKE, 11); - set_sci_style(sci, SCE_CMAKE_MACRODEF, GEANY_FILETYPES_CMAKE, 12); - set_sci_style(sci, SCE_CMAKE_STRINGVAR, GEANY_FILETYPES_CMAKE, 13); - set_sci_style(sci, SCE_CMAKE_NUMBER, GEANY_FILETYPES_CMAKE, 14); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CMAKE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CMAKE_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_CMAKE_STRINGDQ, ft_id, 2); + set_sci_style(sci, SCE_CMAKE_STRINGLQ, ft_id, 3); + set_sci_style(sci, SCE_CMAKE_STRINGRQ, ft_id, 4); + set_sci_style(sci, SCE_CMAKE_COMMANDS, ft_id, 5); + set_sci_style(sci, SCE_CMAKE_PARAMETERS, ft_id, 6); + set_sci_style(sci, SCE_CMAKE_VARIABLE, ft_id, 7); + set_sci_style(sci, SCE_CMAKE_USERDEFINED, ft_id, 8); + set_sci_style(sci, SCE_CMAKE_WHILEDEF, ft_id, 9); + set_sci_style(sci, SCE_CMAKE_FOREACHDEF, ft_id, 10); + set_sci_style(sci, SCE_CMAKE_IFDEFINEDEF, ft_id, 11); + set_sci_style(sci, SCE_CMAKE_MACRODEF, ft_id, 12); + set_sci_style(sci, SCE_CMAKE_STRINGVAR, ft_id, 13); + set_sci_style(sci, SCE_CMAKE_NUMBER, ft_id, 14); } static void styleset_r_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_R, 12); + new_styleset(ft_id, 12); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[1]); - get_keyfile_hex(config, config_home, "kword", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[2]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[3]); - get_keyfile_hex(config, config_home, "basekword", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[4]); - get_keyfile_hex(config, config_home, "otherkword", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[5]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[6]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[7]); - get_keyfile_hex(config, config_home, "string2", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[8]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[9]); - get_keyfile_hex(config, config_home, "infix", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[10]); - get_keyfile_hex(config, config_home, "infixeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_R].styling[11]); - - style_sets[GEANY_FILETYPES_R].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_R, 0, "abs array data.frame diag for function if matrix NCOL NROW print read.table require return solve source sqrt sum while"); - get_keyfile_keywords(config, config_home, "package", GEANY_FILETYPES_R, 1, NULL); - get_keyfile_keywords(config, config_home, "package_other", GEANY_FILETYPES_R, 2, NULL); - style_sets[GEANY_FILETYPES_R].keywords[3] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "kword", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "basekword", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "otherkword", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "string2", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "infix", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "infixeol", &style_sets[ft_id].styling[11]); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "package", ft_id, 1); + get_keyfile_keywords(config, config_home, "package_other", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_r(ScintillaObject *sci) +static void styleset_r(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_R; - apply_filetype_properties(sci, SCLEX_R, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_R].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_R].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_R].keywords[2]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_R, 0); - set_sci_style(sci, SCE_R_DEFAULT, GEANY_FILETYPES_R, 0); - set_sci_style(sci, SCE_R_COMMENT, GEANY_FILETYPES_R, 1); - set_sci_style(sci, SCE_R_KWORD, GEANY_FILETYPES_R, 2); - set_sci_style(sci, SCE_R_OPERATOR, GEANY_FILETYPES_R, 3); - set_sci_style(sci, SCE_R_BASEKWORD, GEANY_FILETYPES_R, 4); - set_sci_style(sci, SCE_R_OTHERKWORD, GEANY_FILETYPES_R, 5); - set_sci_style(sci, SCE_R_NUMBER, GEANY_FILETYPES_R, 6); - set_sci_style(sci, SCE_R_STRING, GEANY_FILETYPES_R, 7); - set_sci_style(sci, SCE_R_STRING2, GEANY_FILETYPES_R, 8); - set_sci_style(sci, SCE_R_IDENTIFIER, GEANY_FILETYPES_R, 9); - set_sci_style(sci, SCE_R_INFIX, GEANY_FILETYPES_R, 10); - set_sci_style(sci, SCE_R_INFIXEOL, GEANY_FILETYPES_R, 11); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_R_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_R_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_R_KWORD, ft_id, 2); + set_sci_style(sci, SCE_R_OPERATOR, ft_id, 3); + set_sci_style(sci, SCE_R_BASEKWORD, ft_id, 4); + set_sci_style(sci, SCE_R_OTHERKWORD, ft_id, 5); + set_sci_style(sci, SCE_R_NUMBER, ft_id, 6); + set_sci_style(sci, SCE_R_STRING, ft_id, 7); + set_sci_style(sci, SCE_R_STRING2, ft_id, 8); + set_sci_style(sci, SCE_R_IDENTIFIER, ft_id, 9); + set_sci_style(sci, SCE_R_INFIX, ft_id, 10); + set_sci_style(sci, SCE_R_INFIXEOL, ft_id, 11); } static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_RUBY, 35); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[0]); - get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_RUBY].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x400080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[2]); - get_keyfile_hex(config, config_home, "string", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[3]); - get_keyfile_hex(config, config_home, "character", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[4]); - get_keyfile_hex(config, config_home, "word", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[5]); - get_keyfile_hex(config, config_home, "global", 0x111199, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[6]); - get_keyfile_hex(config, config_home, "symbol", 0x008020, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[7]); - get_keyfile_hex(config, config_home, "classname", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[8]); - get_keyfile_hex(config, config_home, "defname", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[9]); - get_keyfile_hex(config, config_home, "operator", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[10]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[11]); - get_keyfile_hex(config, config_home, "modulename", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[12]); - get_keyfile_hex(config, config_home, "backticks", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[13]); - get_keyfile_hex(config, config_home, "instancevar", 0x000000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[14]); - get_keyfile_hex(config, config_home, "classvar", 0x000000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[15]); - get_keyfile_hex(config, config_home, "datasection", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[16]); - get_keyfile_hex(config, config_home, "heredelim", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[17]); - get_keyfile_hex(config, config_home, "worddemoted", 0x111199, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[18]); - get_keyfile_hex(config, config_home, "stdin", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[19]); - get_keyfile_hex(config, config_home, "stdout", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[20]); - get_keyfile_hex(config, config_home, "stderr", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[21]); - get_keyfile_hex(config, config_home, "datasection", 0x600000, 0xfff0d8, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[22]); - get_keyfile_hex(config, config_home, "regex", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[23]); - get_keyfile_hex(config, config_home, "here_q", 0x7f007f, 0xddd0dd, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[24]); - get_keyfile_hex(config, config_home, "here_qq", 0x7f007f, 0xddd0dd, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[25]); - get_keyfile_hex(config, config_home, "here_qx", 0x7f007f, 0xddd0dd, TRUE, &style_sets[GEANY_FILETYPES_RUBY].styling[26]); - get_keyfile_hex(config, config_home, "string_q", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[27]); - get_keyfile_hex(config, config_home, "string_qq", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[28]); - get_keyfile_hex(config, config_home, "string_qx", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[29]); - get_keyfile_hex(config, config_home, "string_qr", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[30]); - get_keyfile_hex(config, config_home, "string_qw", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[31]); - get_keyfile_hex(config, config_home, "upper_bound", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[32]); - get_keyfile_hex(config, config_home, "error", 0xe500cc, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[33]); - get_keyfile_hex(config, config_home, "pod", 0x035650, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[34]); - - style_sets[GEANY_FILETYPES_RUBY].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_RUBY, 0, "load define_method attr_accessor attr_writer attr_reader include __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil require retry true while alias class elsif if not return undef yield"); - style_sets[GEANY_FILETYPES_RUBY].keywords[1] = NULL; + new_styleset(ft_id, 35); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "global", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "symbol", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "classname", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "defname", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "modulename", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "backticks", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "instancevar", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "classvar", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "heredelim", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "worddemoted", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "stdin", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "stdout", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "stderr", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "datasection", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "regex", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "here_qq", &style_sets[ft_id].styling[25]); + get_keyfile_style(config, config_home, "here_qx", &style_sets[ft_id].styling[26]); + get_keyfile_style(config, config_home, "string_q", &style_sets[ft_id].styling[27]); + get_keyfile_style(config, config_home, "string_qq", &style_sets[ft_id].styling[28]); + get_keyfile_style(config, config_home, "string_qx", &style_sets[ft_id].styling[29]); + get_keyfile_style(config, config_home, "string_qr", &style_sets[ft_id].styling[30]); + get_keyfile_style(config, config_home, "string_qw", &style_sets[ft_id].styling[31]); + get_keyfile_style(config, config_home, "upper_bound", &style_sets[ft_id].styling[32]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[33]); + get_keyfile_style(config, config_home, "pod", &style_sets[ft_id].styling[34]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_ruby(ScintillaObject *sci) +static void styleset_ruby(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_RUBY; - apply_filetype_properties(sci, SCLEX_RUBY, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_RUBY].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_RUBY, 0); - set_sci_style(sci, SCE_RB_DEFAULT, GEANY_FILETYPES_RUBY, 0); - set_sci_style(sci, SCE_RB_COMMENTLINE, GEANY_FILETYPES_RUBY, 1); - set_sci_style(sci, SCE_RB_NUMBER, GEANY_FILETYPES_RUBY, 2); - set_sci_style(sci, SCE_RB_STRING, GEANY_FILETYPES_RUBY, 3); - set_sci_style(sci, SCE_RB_CHARACTER, GEANY_FILETYPES_RUBY, 4); - set_sci_style(sci, SCE_RB_WORD, GEANY_FILETYPES_RUBY, 5); - set_sci_style(sci, SCE_RB_GLOBAL, GEANY_FILETYPES_RUBY, 6); - set_sci_style(sci, SCE_RB_SYMBOL, GEANY_FILETYPES_RUBY, 7); - set_sci_style(sci, SCE_RB_CLASSNAME, GEANY_FILETYPES_RUBY, 8); - set_sci_style(sci, SCE_RB_DEFNAME, GEANY_FILETYPES_RUBY, 9); - set_sci_style(sci, SCE_RB_OPERATOR, GEANY_FILETYPES_RUBY, 10); - set_sci_style(sci, SCE_RB_IDENTIFIER, GEANY_FILETYPES_RUBY, 11); - set_sci_style(sci, SCE_RB_MODULE_NAME, GEANY_FILETYPES_RUBY, 12); - set_sci_style(sci, SCE_RB_BACKTICKS, GEANY_FILETYPES_RUBY, 13); - set_sci_style(sci, SCE_RB_INSTANCE_VAR, GEANY_FILETYPES_RUBY, 14); - set_sci_style(sci, SCE_RB_CLASS_VAR, GEANY_FILETYPES_RUBY, 15); - set_sci_style(sci, SCE_RB_DATASECTION, GEANY_FILETYPES_RUBY, 16); - set_sci_style(sci, SCE_RB_HERE_DELIM, GEANY_FILETYPES_RUBY, 17); - set_sci_style(sci, SCE_RB_WORD_DEMOTED, GEANY_FILETYPES_RUBY, 18); - set_sci_style(sci, SCE_RB_STDIN, GEANY_FILETYPES_RUBY, 19); - set_sci_style(sci, SCE_RB_STDOUT, GEANY_FILETYPES_RUBY, 20); - set_sci_style(sci, SCE_RB_STDERR, GEANY_FILETYPES_RUBY, 21); - set_sci_style(sci, SCE_RB_DATASECTION, GEANY_FILETYPES_RUBY, 22); - set_sci_style(sci, SCE_RB_REGEX, GEANY_FILETYPES_RUBY, 23); - set_sci_style(sci, SCE_RB_HERE_Q, GEANY_FILETYPES_RUBY, 24); - set_sci_style(sci, SCE_RB_HERE_QQ, GEANY_FILETYPES_RUBY, 25); - set_sci_style(sci, SCE_RB_HERE_QX, GEANY_FILETYPES_RUBY, 26); - set_sci_style(sci, SCE_RB_STRING_Q, GEANY_FILETYPES_RUBY, 27); - set_sci_style(sci, SCE_RB_STRING_QQ, GEANY_FILETYPES_RUBY, 28); - set_sci_style(sci, SCE_RB_STRING_QX, GEANY_FILETYPES_RUBY, 29); - set_sci_style(sci, SCE_RB_STRING_QR, GEANY_FILETYPES_RUBY, 30); - set_sci_style(sci, SCE_RB_STRING_QW, GEANY_FILETYPES_RUBY, 31); - set_sci_style(sci, SCE_RB_UPPER_BOUND, GEANY_FILETYPES_RUBY, 32); - set_sci_style(sci, SCE_RB_ERROR, GEANY_FILETYPES_RUBY, 33); - set_sci_style(sci, SCE_RB_POD, GEANY_FILETYPES_RUBY, 34); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_RB_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_RB_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_RB_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_RB_STRING, ft_id, 3); + set_sci_style(sci, SCE_RB_CHARACTER, ft_id, 4); + set_sci_style(sci, SCE_RB_WORD, ft_id, 5); + set_sci_style(sci, SCE_RB_GLOBAL, ft_id, 6); + set_sci_style(sci, SCE_RB_SYMBOL, ft_id, 7); + set_sci_style(sci, SCE_RB_CLASSNAME, ft_id, 8); + set_sci_style(sci, SCE_RB_DEFNAME, ft_id, 9); + set_sci_style(sci, SCE_RB_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_RB_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_RB_MODULE_NAME, ft_id, 12); + set_sci_style(sci, SCE_RB_BACKTICKS, ft_id, 13); + set_sci_style(sci, SCE_RB_INSTANCE_VAR, ft_id, 14); + set_sci_style(sci, SCE_RB_CLASS_VAR, ft_id, 15); + set_sci_style(sci, SCE_RB_DATASECTION, ft_id, 16); + set_sci_style(sci, SCE_RB_HERE_DELIM, ft_id, 17); + set_sci_style(sci, SCE_RB_WORD_DEMOTED, ft_id, 18); + set_sci_style(sci, SCE_RB_STDIN, ft_id, 19); + set_sci_style(sci, SCE_RB_STDOUT, ft_id, 20); + set_sci_style(sci, SCE_RB_STDERR, ft_id, 21); + set_sci_style(sci, SCE_RB_DATASECTION, ft_id, 22); + set_sci_style(sci, SCE_RB_REGEX, ft_id, 23); + set_sci_style(sci, SCE_RB_HERE_Q, ft_id, 24); + set_sci_style(sci, SCE_RB_HERE_QQ, ft_id, 25); + set_sci_style(sci, SCE_RB_HERE_QX, ft_id, 26); + set_sci_style(sci, SCE_RB_STRING_Q, ft_id, 27); + set_sci_style(sci, SCE_RB_STRING_QQ, ft_id, 28); + set_sci_style(sci, SCE_RB_STRING_QX, ft_id, 29); + set_sci_style(sci, SCE_RB_STRING_QR, ft_id, 30); + set_sci_style(sci, SCE_RB_STRING_QW, ft_id, 31); + set_sci_style(sci, SCE_RB_UPPER_BOUND, ft_id, 32); + set_sci_style(sci, SCE_RB_ERROR, ft_id, 33); + set_sci_style(sci, SCE_RB_POD, ft_id, 34); } static void styleset_sh_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_SH, 14); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[0]); - get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_SH].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[2]); - get_keyfile_hex(config, config_home, "word", 0x119911, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_SH].styling[3]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[4]); - get_keyfile_hex(config, config_home, "character", 0x404000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[5]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[6]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[7]); - get_keyfile_hex(config, config_home, "backticks", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[8]); - get_keyfile_hex(config, config_home, "param", 0x9f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[9]); - get_keyfile_hex(config, config_home, "scalar", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[10]); - get_keyfile_hex(config, config_home, "error", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[11]); - get_keyfile_hex(config, config_home, "here_delim", 0x000000, 0xddd0dd, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[12]); - get_keyfile_hex(config, config_home, "here_q", 0x7f007f, 0xddd0dd, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[13]); - - style_sets[GEANY_FILETYPES_SH].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then until while"); - style_sets[GEANY_FILETYPES_SH].keywords[1] = NULL; + new_styleset(ft_id, 14); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "backticks", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "param", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "scalar", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "here_delim", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "here_q", &style_sets[ft_id].styling[13]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_sh(ScintillaObject *sci) +static void styleset_sh(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_SH; - apply_filetype_properties(sci, SCLEX_BASH, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_SH].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_SH, 0); - set_sci_style(sci, SCE_SH_DEFAULT, GEANY_FILETYPES_SH, 0); - set_sci_style(sci, SCE_SH_COMMENTLINE, GEANY_FILETYPES_SH, 1); - set_sci_style(sci, SCE_SH_NUMBER, GEANY_FILETYPES_SH, 2); - set_sci_style(sci, SCE_SH_WORD, GEANY_FILETYPES_SH, 3); - set_sci_style(sci, SCE_SH_STRING, GEANY_FILETYPES_SH, 4); - set_sci_style(sci, SCE_SH_CHARACTER, GEANY_FILETYPES_SH, 5); - set_sci_style(sci, SCE_SH_OPERATOR, GEANY_FILETYPES_SH, 6); - set_sci_style(sci, SCE_SH_IDENTIFIER, GEANY_FILETYPES_SH, 7); - set_sci_style(sci, SCE_SH_BACKTICKS, GEANY_FILETYPES_SH, 8); - set_sci_style(sci, SCE_SH_PARAM, GEANY_FILETYPES_SH, 9); - set_sci_style(sci, SCE_SH_SCALAR, GEANY_FILETYPES_SH, 10); - set_sci_style(sci, SCE_SH_ERROR, GEANY_FILETYPES_SH, 11); - set_sci_style(sci, SCE_SH_HERE_DELIM, GEANY_FILETYPES_SH, 12); - set_sci_style(sci, SCE_SH_HERE_Q, GEANY_FILETYPES_SH, 13); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_SH_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_SH_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_SH_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_SH_WORD, ft_id, 3); + set_sci_style(sci, SCE_SH_STRING, ft_id, 4); + set_sci_style(sci, SCE_SH_CHARACTER, ft_id, 5); + set_sci_style(sci, SCE_SH_OPERATOR, ft_id, 6); + set_sci_style(sci, SCE_SH_IDENTIFIER, ft_id, 7); + set_sci_style(sci, SCE_SH_BACKTICKS, ft_id, 8); + set_sci_style(sci, SCE_SH_PARAM, ft_id, 9); + set_sci_style(sci, SCE_SH_SCALAR, ft_id, 10); + set_sci_style(sci, SCE_SH_ERROR, ft_id, 11); + set_sci_style(sci, SCE_SH_HERE_DELIM, ft_id, 12); + set_sci_style(sci, SCE_SH_HERE_Q, ft_id, 13); } -static void styleset_xml(ScintillaObject *sci) +static void styleset_xml(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_XML; - apply_filetype_properties(sci, SCLEX_XML, ft_id); /* use the same colouring for HTML; XML and so on */ @@ -2022,1469 +1805,1332 @@ static void styleset_docbook_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_DOCBOOK, 29); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[0]); - get_keyfile_hex(config, config_home, "tag", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[1]); - get_keyfile_hex(config, config_home, "tagunknown", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[2]); - get_keyfile_hex(config, config_home, "attribute", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[3]); - get_keyfile_hex(config, config_home, "attributeunknown", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[4]); - get_keyfile_hex(config, config_home, "number", 0x800080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[5]); - get_keyfile_hex(config, config_home, "doublestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[6]); - get_keyfile_hex(config, config_home, "singlestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[7]); - get_keyfile_hex(config, config_home, "other", 0x800080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[8]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[9]); - get_keyfile_hex(config, config_home, "entity", 0x800080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[10]); - get_keyfile_hex(config, config_home, "tagend", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[11]); - get_keyfile_hex(config, config_home, "xmlstart", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[12]); - get_keyfile_hex(config, config_home, "xmlend", 0x000099, 0xf0f0f0, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[13]); - get_keyfile_hex(config, config_home, "cdata", 0x660099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[14]); - get_keyfile_hex(config, config_home, "question", 0x0000ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[15]); - get_keyfile_hex(config, config_home, "value", 0x660099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[16]); - get_keyfile_hex(config, config_home, "xccomment", 0x660099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[17]); - get_keyfile_hex(config, config_home, "sgml_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[18]); - get_keyfile_hex(config, config_home, "sgml_comment", 0x303030, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[19]); - get_keyfile_hex(config, config_home, "sgml_special", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[20]); - get_keyfile_hex(config, config_home, "sgml_command", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[21]); - get_keyfile_hex(config, config_home, "sgml_doublestring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[22]); - get_keyfile_hex(config, config_home, "sgml_simplestring", 0x404000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[23]); - get_keyfile_hex(config, config_home, "sgml_1st_param", 0x404080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[24]); - get_keyfile_hex(config, config_home, "sgml_entity", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[25]); - get_keyfile_hex(config, config_home, "sgml_block_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[26]); - get_keyfile_hex(config, config_home, "sgml_1st_param_comment", 0x406090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[27]); - get_keyfile_hex(config, config_home, "sgml_error", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[28]); - - style_sets[GEANY_FILETYPES_DOCBOOK].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "elements", GEANY_FILETYPES_DOCBOOK, 0, - "abbrev abstract accel ackno acronym action address affiliation alt anchor \ - answer appendix appendixinfo application area areaset areaspec arg article \ - articleinfo artpagenums attribution audiodata audioobject author authorblurb \ - authorgroup authorinitials beginpage bibliocoverage bibliodiv biblioentry \ - bibliography bibliographyinfo biblioid bibliomisc bibliomixed bibliomset \ - bibliorelation biblioset bibliosource blockinfo blockquote book bookinfo \ - bridgehead callout calloutlist caption caution chapter chapterinfo citation \ - citebiblioid citerefentry citetitle city classname classsynopsis classsynopsisinfo \ - cmdsynopsis co collab collabname colophon nameend namest colname colspec command computeroutput \ - confdates confgroup confnum confsponsor conftitle constant constraint \ - constraintdef constructorsynopsis contractnum contractsponsor contrib \ - copyright coref corpauthor corpname country database date dedication \ - destructorsynopsis edition editor email emphasis entry entrytbl envar \ - epigraph equation errorcode errorname errortext errortype example \ - exceptionname fax fieldsynopsis figure filename fileref firstname firstterm \ - footnote footnoteref foreignphrase formalpara frame funcdef funcparams \ - funcprototype funcsynopsis funcsynopsisinfo function glossary glossaryinfo \ - glossdef glossdiv glossentry glosslist glosssee glossseealso glossterm \ - graphic graphicco group guibutton guiicon guilabel guimenu guimenuitem \ - guisubmenu hardware highlights holder honorific htm imagedata imageobject \ - imageobjectco important index indexdiv indexentry indexinfo indexterm \ - informalequation informalexample informalfigure informaltable initializer \ - inlineequation inlinegraphic inlinemediaobject interface interfacename \ - invpartnumber isbn issn issuenum itemizedlist itermset jobtitle keycap \ - keycode keycombo keysym keyword keywordset label legalnotice lhs lineage \ - lineannotation link listitem iteral literallayout lot lotentry manvolnum \ - markup medialabel mediaobject mediaobjectco member menuchoice methodname \ - methodparam methodsynopsis mm modespec modifier ousebutton msg msgaud \ - msgentry msgexplan msginfo msglevel msgmain msgorig msgrel msgset msgsub \ - msgtext nonterminal note objectinfo olink ooclass ooexception oointerface \ - option optional orderedlist orgdiv orgname otheraddr othercredit othername \ - pagenums para paramdef parameter part partinfo partintro personblurb \ - personname phone phrase pob postcode preface prefaceinfo primary primaryie \ - printhistory procedure production productionrecap productionset productname \ - productnumber programlisting programlistingco prompt property pubdate publisher \ - publishername pubsnumber qandadiv qandaentry qandaset question quote refclass \ - refdescriptor refentry refentryinfo refentrytitle reference referenceinfo \ - refmeta refmiscinfo refname refnamediv refpurpose refsect1 refsect1info refsect2 \ - refsect2info refsect3 refsect3info refsection refsectioninfo refsynopsisdiv \ - refsynopsisdivinfo releaseinfo remark replaceable returnvalue revdescription \ - revhistory revision revnumber revremark rhs row sbr screen screenco screeninfo \ - screenshot secondary secondaryie sect1 sect1info sect2 sect2info sect3 sect3info \ - sect4 sect4info sect5 sect5info section sectioninfo see seealso seealsoie \ - seeie seg seglistitem segmentedlist segtitle seriesvolnums set setindex \ - setindexinfo setinfo sgmltag shortaffil shortcut sidebar sidebarinfo simpara \ - simplelist simplemsgentry simplesect spanspec state step street structfield \ - structname subject subjectset subjectterm subscript substeps subtitle \ - superscript surname sv symbol synopfragment synopfragmentref synopsis \ - systemitem table tbody term tertiary tertiaryie textdata textobject tfoot \ - tgroup thead tip title titleabbrev toc tocback tocchap tocentry tocfront \ - toclevel1 toclevel2 toclevel3 toclevel4 toclevel5 tocpart token trademark \ - type ulink userinput varargs variablelist varlistentry varname videodata \ - videoobject void volumenum warning wordasword xref year cols colnum align spanname\ - arch condition conformance id lang os remap role revision revisionflag security \ - userlevel url vendor xreflabel status label endterm linkend space width"); - get_keyfile_keywords(config, config_home, "dtd", GEANY_FILETYPES_DOCBOOK, 1, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); - style_sets[GEANY_FILETYPES_DOCBOOK].keywords[2] = NULL; + new_styleset(ft_id, 29); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "tagunknown", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "attribute", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "attributeunknown", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "doublestring", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "singlestring", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "other", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "entity", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "tagend", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "xmlstart", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "xmlend", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "cdata", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "question", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "value", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "xccomment", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "sgml_default", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "sgml_comment", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "sgml_special", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "sgml_command", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "sgml_doublestring", &style_sets[ft_id].styling[22]); + get_keyfile_style(config, config_home, "sgml_simplestring", &style_sets[ft_id].styling[23]); + get_keyfile_style(config, config_home, "sgml_1st_param", &style_sets[ft_id].styling[24]); + get_keyfile_style(config, config_home, "sgml_entity", &style_sets[ft_id].styling[25]); + get_keyfile_style(config, config_home, "sgml_block_default", &style_sets[ft_id].styling[26]); + get_keyfile_style(config, config_home, "sgml_1st_param_comment", &style_sets[ft_id].styling[27]); + get_keyfile_style(config, config_home, "sgml_error", &style_sets[ft_id].styling[28]); + + style_sets[ft_id].keywords = g_new(gchar*, 3); + get_keyfile_keywords(config, config_home, "elements", ft_id, 0); + get_keyfile_keywords(config, config_home, "dtd", ft_id, 1); + style_sets[ft_id].keywords[2] = NULL; } -static void styleset_docbook(ScintillaObject *sci) +static void styleset_docbook(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_DOCBOOK; - apply_filetype_properties(sci, SCLEX_XML, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_DOCBOOK].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_DOCBOOK].keywords[1]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 5, style_sets[ft_id].keywords[1]); /* Unknown tags and attributes are highlighed in red. * If a tag is actually OK, it should be added in lower case to the htmlKeyWords string. */ - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_DOCBOOK, 0); - set_sci_style(sci, SCE_H_DEFAULT, GEANY_FILETYPES_DOCBOOK, 0); - set_sci_style(sci, SCE_H_TAG, GEANY_FILETYPES_DOCBOOK, 1); - set_sci_style(sci, SCE_H_TAGUNKNOWN, GEANY_FILETYPES_DOCBOOK, 2); - set_sci_style(sci, SCE_H_ATTRIBUTE, GEANY_FILETYPES_DOCBOOK, 3); - set_sci_style(sci, SCE_H_ATTRIBUTEUNKNOWN, GEANY_FILETYPES_DOCBOOK, 4); - set_sci_style(sci, SCE_H_NUMBER, GEANY_FILETYPES_DOCBOOK, 5); - set_sci_style(sci, SCE_H_DOUBLESTRING, GEANY_FILETYPES_DOCBOOK, 6); - set_sci_style(sci, SCE_H_SINGLESTRING, GEANY_FILETYPES_DOCBOOK, 7); - set_sci_style(sci, SCE_H_OTHER, GEANY_FILETYPES_DOCBOOK, 8); - set_sci_style(sci, SCE_H_COMMENT, GEANY_FILETYPES_DOCBOOK, 9); - set_sci_style(sci, SCE_H_ENTITY, GEANY_FILETYPES_DOCBOOK, 10); - set_sci_style(sci, SCE_H_TAGEND, GEANY_FILETYPES_DOCBOOK, 11); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_H_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_H_TAG, ft_id, 1); + set_sci_style(sci, SCE_H_TAGUNKNOWN, ft_id, 2); + set_sci_style(sci, SCE_H_ATTRIBUTE, ft_id, 3); + set_sci_style(sci, SCE_H_ATTRIBUTEUNKNOWN, ft_id, 4); + set_sci_style(sci, SCE_H_NUMBER, ft_id, 5); + set_sci_style(sci, SCE_H_DOUBLESTRING, ft_id, 6); + set_sci_style(sci, SCE_H_SINGLESTRING, ft_id, 7); + set_sci_style(sci, SCE_H_OTHER, ft_id, 8); + set_sci_style(sci, SCE_H_COMMENT, ft_id, 9); + set_sci_style(sci, SCE_H_ENTITY, ft_id, 10); + set_sci_style(sci, SCE_H_TAGEND, ft_id, 11); SSM(sci, SCI_STYLESETEOLFILLED, SCE_H_XMLSTART, 1); - set_sci_style(sci, SCE_H_XMLSTART, GEANY_FILETYPES_DOCBOOK, 12); - set_sci_style(sci, SCE_H_XMLEND, GEANY_FILETYPES_DOCBOOK, 13); - set_sci_style(sci, SCE_H_CDATA, GEANY_FILETYPES_DOCBOOK, 14); - set_sci_style(sci, SCE_H_QUESTION, GEANY_FILETYPES_DOCBOOK, 15); - set_sci_style(sci, SCE_H_VALUE, GEANY_FILETYPES_DOCBOOK, 16); - set_sci_style(sci, SCE_H_XCCOMMENT, GEANY_FILETYPES_DOCBOOK, 17); - set_sci_style(sci, SCE_H_SGML_DEFAULT, GEANY_FILETYPES_DOCBOOK, 18); - set_sci_style(sci, SCE_H_DEFAULT, GEANY_FILETYPES_DOCBOOK, 19); - set_sci_style(sci, SCE_H_SGML_SPECIAL, GEANY_FILETYPES_DOCBOOK, 20); - set_sci_style(sci, SCE_H_SGML_COMMAND, GEANY_FILETYPES_DOCBOOK, 21); - set_sci_style(sci, SCE_H_SGML_DOUBLESTRING, GEANY_FILETYPES_DOCBOOK, 22); - set_sci_style(sci, SCE_H_SGML_SIMPLESTRING, GEANY_FILETYPES_DOCBOOK, 23); - set_sci_style(sci, SCE_H_SGML_1ST_PARAM, GEANY_FILETYPES_DOCBOOK, 24); - set_sci_style(sci, SCE_H_SGML_ENTITY, GEANY_FILETYPES_DOCBOOK, 25); - set_sci_style(sci, SCE_H_SGML_BLOCK_DEFAULT, GEANY_FILETYPES_DOCBOOK, 26); - set_sci_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, GEANY_FILETYPES_DOCBOOK, 27); - set_sci_style(sci, SCE_H_SGML_ERROR, GEANY_FILETYPES_DOCBOOK, 28); - - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.html", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.html.preprocessor", (sptr_t) "1"); + set_sci_style(sci, SCE_H_XMLSTART, ft_id, 12); + set_sci_style(sci, SCE_H_XMLEND, ft_id, 13); + set_sci_style(sci, SCE_H_CDATA, ft_id, 14); + set_sci_style(sci, SCE_H_QUESTION, ft_id, 15); + set_sci_style(sci, SCE_H_VALUE, ft_id, 16); + set_sci_style(sci, SCE_H_XCCOMMENT, ft_id, 17); + set_sci_style(sci, SCE_H_SGML_DEFAULT, ft_id, 18); + set_sci_style(sci, SCE_H_DEFAULT, ft_id, 19); + set_sci_style(sci, SCE_H_SGML_SPECIAL, ft_id, 20); + set_sci_style(sci, SCE_H_SGML_COMMAND, ft_id, 21); + set_sci_style(sci, SCE_H_SGML_DOUBLESTRING, ft_id, 22); + set_sci_style(sci, SCE_H_SGML_SIMPLESTRING, ft_id, 23); + set_sci_style(sci, SCE_H_SGML_1ST_PARAM, ft_id, 24); + set_sci_style(sci, SCE_H_SGML_ENTITY, ft_id, 25); + set_sci_style(sci, SCE_H_SGML_BLOCK_DEFAULT, ft_id, 26); + set_sci_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, ft_id, 27); + set_sci_style(sci, SCE_H_SGML_ERROR, ft_id, 28); } -static void styleset_none(ScintillaObject *sci) +static void styleset_default(ScintillaObject *sci, gint ft_id) { SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0); /* we need to set STYLE_DEFAULT before we call SCI_STYLECLEARALL in styleset_common() */ set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_NONE, GCS_DEFAULT); - styleset_common(sci); - - SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) common_style_set.wordchars); - SSM(sci, SCI_SETWHITESPACECHARS, 0, (sptr_t) whitespace_chars); + styleset_common(sci, ft_id); } static void styleset_css_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CSS, 22); - get_keyfile_hex(config, config_home, "default", 0x003399, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[1]); - get_keyfile_hex(config, config_home, "tag", 0x2166a4, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[2]); - get_keyfile_hex(config, config_home, "class", 0x007f00, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[3]); - get_keyfile_hex(config, config_home, "pseudoclass", 0x660010, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[4]); - get_keyfile_hex(config, config_home, "unknown_pseudoclass", 0xff0099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[5]); - get_keyfile_hex(config, config_home, "unknown_identifier", 0xff0099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[6]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[7]); - get_keyfile_hex(config, config_home, "identifier", 0x000099, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[8]); - get_keyfile_hex(config, config_home, "doublestring", 0x330066, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[9]); - get_keyfile_hex(config, config_home, "singlestring", 0x330066, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[10]); - get_keyfile_hex(config, config_home, "attribute", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[11]); - get_keyfile_hex(config, config_home, "value", 0x303030, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[12]); - get_keyfile_hex(config, config_home, "id", 0xff9000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[13]); - get_keyfile_hex(config, config_home, "identifier2", 0x6b6bff, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[14]); - get_keyfile_hex(config, config_home, "important", 0x990000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[15]); - get_keyfile_hex(config, config_home, "directive", 0x006bff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[16]); - get_keyfile_hex(config, config_home, "identifier3", 0x00c8ff, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[17]); - get_keyfile_hex(config, config_home, "pseudoelement", 0x666610, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[18]); - get_keyfile_hex(config, config_home, "extended_identifier", 0x9090a0, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[19]); - get_keyfile_hex(config, config_home, "extended_pseudoclass", 0x907080, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[20]); - get_keyfile_hex(config, config_home, "extended_pseudoelement", 0x909080, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[21]); - - style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 9); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_CSS, 0, ""); - get_keyfile_keywords(config, config_home, "pseudoclasses", GEANY_FILETYPES_CSS, 1, ""); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_CSS, 2, ""); - get_keyfile_keywords(config, config_home, "css3_properties", GEANY_FILETYPES_CSS, 3, ""); - get_keyfile_keywords(config, config_home, "pseudo_elements", GEANY_FILETYPES_CSS, 4, ""); - get_keyfile_keywords(config, config_home, "browser_css_properties", GEANY_FILETYPES_CSS, 5, ""); - get_keyfile_keywords(config, config_home, "browser_pseudo_classes", GEANY_FILETYPES_CSS, 6, ""); - get_keyfile_keywords(config, config_home, "browser_pseudo_elements", GEANY_FILETYPES_CSS, 7, ""); - style_sets[GEANY_FILETYPES_CSS].keywords[8] = NULL; + new_styleset(ft_id, 23); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "tag", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "class", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "pseudoclass", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "unknown_pseudoclass", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "unknown_identifier", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "doublestring", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "singlestring", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "attribute", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "value", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "id", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "identifier2", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "important", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "directive", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "identifier3", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "pseudoelement", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "extended_identifier", &style_sets[ft_id].styling[19]); + get_keyfile_style(config, config_home, "extended_pseudoclass", &style_sets[ft_id].styling[20]); + get_keyfile_style(config, config_home, "extended_pseudoelement", &style_sets[ft_id].styling[21]); + get_keyfile_style(config, config_home, "media", &style_sets[ft_id].styling[22]); + + style_sets[ft_id].keywords = g_new(gchar*, 9); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "pseudoclasses", ft_id, 1); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 2); + get_keyfile_keywords(config, config_home, "css3_properties", ft_id, 3); + get_keyfile_keywords(config, config_home, "pseudo_elements", ft_id, 4); + get_keyfile_keywords(config, config_home, "browser_css_properties", ft_id, 5); + get_keyfile_keywords(config, config_home, "browser_pseudo_classes", ft_id, 6); + get_keyfile_keywords(config, config_home, "browser_pseudo_elements", ft_id, 7); + style_sets[ft_id].keywords[8] = NULL; } -static void styleset_css(ScintillaObject *sci) +static void styleset_css(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CSS; guint i; apply_filetype_properties(sci, SCLEX_CSS, ft_id); for (i = 0; i < 8; i++) { - SSM(sci, SCI_SETKEYWORDS, i, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[i]); + sci_set_keywords(sci, i, style_sets[ft_id].keywords[i]); } - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CSS, 0); - set_sci_style(sci, SCE_CSS_DEFAULT, GEANY_FILETYPES_CSS, 0); - set_sci_style(sci, SCE_CSS_COMMENT, GEANY_FILETYPES_CSS, 1); - set_sci_style(sci, SCE_CSS_TAG, GEANY_FILETYPES_CSS, 2); - set_sci_style(sci, SCE_CSS_CLASS, GEANY_FILETYPES_CSS, 3); - set_sci_style(sci, SCE_CSS_PSEUDOCLASS, GEANY_FILETYPES_CSS, 4); - set_sci_style(sci, SCE_CSS_UNKNOWN_PSEUDOCLASS, GEANY_FILETYPES_CSS, 5); - set_sci_style(sci, SCE_CSS_UNKNOWN_IDENTIFIER, GEANY_FILETYPES_CSS, 6); - set_sci_style(sci, SCE_CSS_OPERATOR, GEANY_FILETYPES_CSS, 7); - set_sci_style(sci, SCE_CSS_IDENTIFIER, GEANY_FILETYPES_CSS, 8); - set_sci_style(sci, SCE_CSS_DOUBLESTRING, GEANY_FILETYPES_CSS, 9); - set_sci_style(sci, SCE_CSS_SINGLESTRING, GEANY_FILETYPES_CSS, 10); - set_sci_style(sci, SCE_CSS_ATTRIBUTE, GEANY_FILETYPES_CSS, 11); - set_sci_style(sci, SCE_CSS_VALUE, GEANY_FILETYPES_CSS, 12); - set_sci_style(sci, SCE_CSS_ID, GEANY_FILETYPES_CSS, 13); - set_sci_style(sci, SCE_CSS_IDENTIFIER2, GEANY_FILETYPES_CSS, 14); - set_sci_style(sci, SCE_CSS_IMPORTANT, GEANY_FILETYPES_CSS, 15); - set_sci_style(sci, SCE_CSS_DIRECTIVE, GEANY_FILETYPES_CSS, 16); - set_sci_style(sci, SCE_CSS_IDENTIFIER3, GEANY_FILETYPES_CSS, 17); - set_sci_style(sci, SCE_CSS_PSEUDOELEMENT, GEANY_FILETYPES_CSS, 18); - set_sci_style(sci, SCE_CSS_EXTENDED_IDENTIFIER, GEANY_FILETYPES_CSS, 19); - set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOCLASS, GEANY_FILETYPES_CSS, 20); - set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOELEMENT, GEANY_FILETYPES_CSS, 21); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CSS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CSS_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_CSS_TAG, ft_id, 2); + set_sci_style(sci, SCE_CSS_CLASS, ft_id, 3); + set_sci_style(sci, SCE_CSS_PSEUDOCLASS, ft_id, 4); + set_sci_style(sci, SCE_CSS_UNKNOWN_PSEUDOCLASS, ft_id, 5); + set_sci_style(sci, SCE_CSS_UNKNOWN_IDENTIFIER, ft_id, 6); + set_sci_style(sci, SCE_CSS_OPERATOR, ft_id, 7); + set_sci_style(sci, SCE_CSS_IDENTIFIER, ft_id, 8); + set_sci_style(sci, SCE_CSS_DOUBLESTRING, ft_id, 9); + set_sci_style(sci, SCE_CSS_SINGLESTRING, ft_id, 10); + set_sci_style(sci, SCE_CSS_ATTRIBUTE, ft_id, 11); + set_sci_style(sci, SCE_CSS_VALUE, ft_id, 12); + set_sci_style(sci, SCE_CSS_ID, ft_id, 13); + set_sci_style(sci, SCE_CSS_IDENTIFIER2, ft_id, 14); + set_sci_style(sci, SCE_CSS_IMPORTANT, ft_id, 15); + set_sci_style(sci, SCE_CSS_DIRECTIVE, ft_id, 16); + set_sci_style(sci, SCE_CSS_IDENTIFIER3, ft_id, 17); + set_sci_style(sci, SCE_CSS_PSEUDOELEMENT, ft_id, 18); + set_sci_style(sci, SCE_CSS_EXTENDED_IDENTIFIER, ft_id, 19); + set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOCLASS, ft_id, 20); + set_sci_style(sci, SCE_CSS_EXTENDED_PSEUDOELEMENT, ft_id, 21); + set_sci_style(sci, SCE_CSS_MEDIA, ft_id, 22); } static void styleset_nsis_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_NSIS, 19); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[1]); - get_keyfile_hex(config, config_home, "stringdq", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[2]); - get_keyfile_hex(config, config_home, "stringlq", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[3]); - get_keyfile_hex(config, config_home, "stringrq", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[4]); - get_keyfile_hex(config, config_home, "function", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[5]); - get_keyfile_hex(config, config_home, "variable", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[6]); - get_keyfile_hex(config, config_home, "label", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[7]); - get_keyfile_hex(config, config_home, "userdefined", 0x0000d0, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[8]); - get_keyfile_hex(config, config_home, "sectiondef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[9]); - get_keyfile_hex(config, config_home, "subsectiondef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[10]); - get_keyfile_hex(config, config_home, "ifdefinedef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[11]); - get_keyfile_hex(config, config_home, "macrodef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[12]); - get_keyfile_hex(config, config_home, "stringvar", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[13]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[14]); - get_keyfile_hex(config, config_home, "sectiongroup", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[15]); - get_keyfile_hex(config, config_home, "pageex", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[16]); - get_keyfile_hex(config, config_home, "functiondef", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_NSIS].styling[17]); - get_keyfile_hex(config, config_home, "commentbox", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[18]); - - style_sets[GEANY_FILETYPES_NSIS].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "functions", GEANY_FILETYPES_NSIS, 0, ""); - get_keyfile_keywords(config, config_home, "variables", GEANY_FILETYPES_NSIS, 1, ""); - get_keyfile_keywords(config, config_home, "lables", GEANY_FILETYPES_NSIS, 2, ""); - get_keyfile_keywords(config, config_home, "userdefined", GEANY_FILETYPES_NSIS, 3, ""); - style_sets[GEANY_FILETYPES_NSIS].keywords[4] = NULL; + new_styleset(ft_id, 19); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "stringdq", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "stringlq", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "stringrq", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "function", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "variable", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "userdefined", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "sectiondef", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "subsectiondef", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "ifdefinedef", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "macrodef", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringvar", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "sectiongroup", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "pageex", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "functiondef", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "commentbox", &style_sets[ft_id].styling[18]); + + style_sets[ft_id].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "functions", ft_id, 0); + get_keyfile_keywords(config, config_home, "variables", ft_id, 1); + get_keyfile_keywords(config, config_home, "lables", ft_id, 2); + get_keyfile_keywords(config, config_home, "userdefined", ft_id, 3); + style_sets[ft_id].keywords[4] = NULL; } -static void styleset_nsis(ScintillaObject *sci) +static void styleset_nsis(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_NSIS; - apply_filetype_properties(sci, SCLEX_NSIS, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_NSIS].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_NSIS].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_NSIS].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_NSIS].keywords[3]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_NSIS, 0); - set_sci_style(sci, SCE_NSIS_DEFAULT, GEANY_FILETYPES_NSIS, 0); - set_sci_style(sci, SCE_NSIS_COMMENT, GEANY_FILETYPES_NSIS, 1); - set_sci_style(sci, SCE_NSIS_STRINGDQ, GEANY_FILETYPES_NSIS, 2); - set_sci_style(sci, SCE_NSIS_STRINGLQ, GEANY_FILETYPES_NSIS, 3); - set_sci_style(sci, SCE_NSIS_STRINGRQ, GEANY_FILETYPES_NSIS, 4); - set_sci_style(sci, SCE_NSIS_FUNCTION, GEANY_FILETYPES_NSIS, 5); - set_sci_style(sci, SCE_NSIS_VARIABLE, GEANY_FILETYPES_NSIS, 6); - set_sci_style(sci, SCE_NSIS_LABEL, GEANY_FILETYPES_NSIS, 7); - set_sci_style(sci, SCE_NSIS_USERDEFINED, GEANY_FILETYPES_NSIS, 8); - set_sci_style(sci, SCE_NSIS_SECTIONDEF, GEANY_FILETYPES_NSIS, 9); - set_sci_style(sci, SCE_NSIS_SUBSECTIONDEF, GEANY_FILETYPES_NSIS, 10); - set_sci_style(sci, SCE_NSIS_IFDEFINEDEF, GEANY_FILETYPES_NSIS, 11); - set_sci_style(sci, SCE_NSIS_MACRODEF, GEANY_FILETYPES_NSIS, 12); - set_sci_style(sci, SCE_NSIS_STRINGVAR, GEANY_FILETYPES_NSIS, 13); - set_sci_style(sci, SCE_NSIS_NUMBER, GEANY_FILETYPES_NSIS, 14); - set_sci_style(sci, SCE_NSIS_SECTIONGROUP, GEANY_FILETYPES_NSIS, 15); - set_sci_style(sci, SCE_NSIS_PAGEEX, GEANY_FILETYPES_NSIS, 16); - set_sci_style(sci, SCE_NSIS_FUNCTIONDEF, GEANY_FILETYPES_NSIS, 17); - set_sci_style(sci, SCE_NSIS_COMMENTBOX, GEANY_FILETYPES_NSIS, 18); - - SSM(sci, SCI_SETPROPERTY, (uptr_t) "nsis.uservars", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (uptr_t) "nsis.ignorecase", (sptr_t) "1"); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_NSIS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_NSIS_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_NSIS_STRINGDQ, ft_id, 2); + set_sci_style(sci, SCE_NSIS_STRINGLQ, ft_id, 3); + set_sci_style(sci, SCE_NSIS_STRINGRQ, ft_id, 4); + set_sci_style(sci, SCE_NSIS_FUNCTION, ft_id, 5); + set_sci_style(sci, SCE_NSIS_VARIABLE, ft_id, 6); + set_sci_style(sci, SCE_NSIS_LABEL, ft_id, 7); + set_sci_style(sci, SCE_NSIS_USERDEFINED, ft_id, 8); + set_sci_style(sci, SCE_NSIS_SECTIONDEF, ft_id, 9); + set_sci_style(sci, SCE_NSIS_SUBSECTIONDEF, ft_id, 10); + set_sci_style(sci, SCE_NSIS_IFDEFINEDEF, ft_id, 11); + set_sci_style(sci, SCE_NSIS_MACRODEF, ft_id, 12); + set_sci_style(sci, SCE_NSIS_STRINGVAR, ft_id, 13); + set_sci_style(sci, SCE_NSIS_NUMBER, ft_id, 14); + set_sci_style(sci, SCE_NSIS_SECTIONGROUP, ft_id, 15); + set_sci_style(sci, SCE_NSIS_PAGEEX, ft_id, 16); + set_sci_style(sci, SCE_NSIS_FUNCTIONDEF, ft_id, 17); + set_sci_style(sci, SCE_NSIS_COMMENTBOX, ft_id, 18); } static void styleset_po_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PO, 9); - get_keyfile_hex(config, config_home, "default", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[1]); - get_keyfile_hex(config, config_home, "msgid", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PO].styling[2]); - get_keyfile_hex(config, config_home, "msgid_text", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[3]); - get_keyfile_hex(config, config_home, "msgstr", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PO].styling[4]); - get_keyfile_hex(config, config_home, "msgstr_text", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[5]); - get_keyfile_hex(config, config_home, "msgctxt", 0x007f00, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PO].styling[6]); - get_keyfile_hex(config, config_home, "msgctxt_text", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[7]); - get_keyfile_hex(config, config_home, "fuzzy", 0xffa500, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PO].styling[8]); + new_styleset(ft_id, 9); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "msgid", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "msgid_text", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "msgstr", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "msgstr_text", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "msgctxt", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "msgctxt_text", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "fuzzy", &style_sets[ft_id].styling[8]); - style_sets[GEANY_FILETYPES_PO].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_po(ScintillaObject *sci) +static void styleset_po(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_PO; - apply_filetype_properties(sci, SCLEX_PO, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PO, 0); - set_sci_style(sci, SCE_PO_DEFAULT, GEANY_FILETYPES_PO, 0); - set_sci_style(sci, SCE_PO_COMMENT, GEANY_FILETYPES_PO, 1); - set_sci_style(sci, SCE_PO_MSGID, GEANY_FILETYPES_PO, 2); - set_sci_style(sci, SCE_PO_MSGID_TEXT, GEANY_FILETYPES_PO, 3); - set_sci_style(sci, SCE_PO_MSGSTR, GEANY_FILETYPES_PO, 4); - set_sci_style(sci, SCE_PO_MSGSTR_TEXT, GEANY_FILETYPES_PO, 5); - set_sci_style(sci, SCE_PO_MSGCTXT, GEANY_FILETYPES_PO, 6); - set_sci_style(sci, SCE_PO_MSGCTXT_TEXT, GEANY_FILETYPES_PO, 7); - set_sci_style(sci, SCE_PO_FUZZY, GEANY_FILETYPES_PO, 8); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PO_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PO_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_PO_MSGID, ft_id, 2); + set_sci_style(sci, SCE_PO_MSGID_TEXT, ft_id, 3); + set_sci_style(sci, SCE_PO_MSGSTR, ft_id, 4); + set_sci_style(sci, SCE_PO_MSGSTR_TEXT, ft_id, 5); + set_sci_style(sci, SCE_PO_MSGCTXT, ft_id, 6); + set_sci_style(sci, SCE_PO_MSGCTXT_TEXT, ft_id, 7); + set_sci_style(sci, SCE_PO_FUZZY, ft_id, 8); } static void styleset_conf_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CONF, 6); - get_keyfile_hex(config, config_home, "default", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[1]); - get_keyfile_hex(config, config_home, "section", 0x000090, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CONF].styling[2]); - get_keyfile_hex(config, config_home, "key", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[3]); - get_keyfile_hex(config, config_home, "assignment", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[4]); - get_keyfile_hex(config, config_home, "defval", 0x00007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[5]); + new_styleset(ft_id, 6); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "section", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "key", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "assignment", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "defval", &style_sets[ft_id].styling[5]); - style_sets[GEANY_FILETYPES_CONF].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_conf(ScintillaObject *sci) +static void styleset_conf(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CONF; - apply_filetype_properties(sci, SCLEX_PROPERTIES, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CONF, 0); - set_sci_style(sci, SCE_PROPS_DEFAULT, GEANY_FILETYPES_CONF, 0); - set_sci_style(sci, SCE_PROPS_COMMENT, GEANY_FILETYPES_CONF, 1); - set_sci_style(sci, SCE_PROPS_SECTION, GEANY_FILETYPES_CONF, 2); - set_sci_style(sci, SCE_PROPS_KEY, GEANY_FILETYPES_CONF, 3); - set_sci_style(sci, SCE_PROPS_ASSIGNMENT, GEANY_FILETYPES_CONF, 4); - set_sci_style(sci, SCE_PROPS_DEFVAL, GEANY_FILETYPES_CONF, 5); - - SSM(sci, SCI_SETPROPERTY, (uptr_t) "lexer.props.allow.initial.spaces", (sptr_t) "0"); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PROPS_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_PROPS_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_PROPS_SECTION, ft_id, 2); + set_sci_style(sci, SCE_PROPS_KEY, ft_id, 3); + set_sci_style(sci, SCE_PROPS_ASSIGNMENT, ft_id, 4); + set_sci_style(sci, SCE_PROPS_DEFVAL, ft_id, 5); } static void styleset_asm_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_ASM, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[2]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[3]); - get_keyfile_hex(config, config_home, "operator", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[4]); - get_keyfile_hex(config, config_home, "identifier", 0x880000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[5]); - get_keyfile_hex(config, config_home, "cpuinstruction", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_ASM].styling[6]); - get_keyfile_hex(config, config_home, "mathinstruction", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_ASM].styling[7]); - get_keyfile_hex(config, config_home, "register", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[8]); - get_keyfile_hex(config, config_home, "directive", 0x3d670f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_ASM].styling[9]); - get_keyfile_hex(config, config_home, "directiveoperand", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[10]); - get_keyfile_hex(config, config_home, "commentblock", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[11]); - get_keyfile_hex(config, config_home, "character", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[12]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[13]); - get_keyfile_hex(config, config_home, "extinstruction", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[14]); - - style_sets[GEANY_FILETYPES_ASM].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "instructions", GEANY_FILETYPES_ASM, 0, "HLT LAD SPI ADD SUB MUL DIV JMP JEZ JGZ JLZ SWAP JSR RET PUSHAC POPAC ADDST SUBST MULST DIVST LSA LDS PUSH POP CLI LDI INK LIA DEK LDX"); - get_keyfile_keywords(config, config_home, "registers", GEANY_FILETYPES_ASM, 1, ""); - get_keyfile_keywords(config, config_home, "directives", GEANY_FILETYPES_ASM, 2, "ORG LIST NOLIST PAGE EQUIVALENT WORD TEXT"); - style_sets[GEANY_FILETYPES_ASM].keywords[3] = NULL; + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "cpuinstruction", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "mathinstruction", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "register", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "directive", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "directiveoperand", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "commentblock", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "extinstruction", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "instructions", ft_id, 0); + get_keyfile_keywords(config, config_home, "registers", ft_id, 1); + get_keyfile_keywords(config, config_home, "directives", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_asm(ScintillaObject *sci) +static void styleset_asm(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_ASM; - apply_filetype_properties(sci, SCLEX_ASM, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_ASM].keywords[0]); - /*SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_ASM].keywords[0]);*/ - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_ASM].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_ASM].keywords[2]); - /*SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_ASM].keywords[0]);*/ - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_ASM, 0); - set_sci_style(sci, SCE_ASM_DEFAULT, GEANY_FILETYPES_ASM, 0); - set_sci_style(sci, SCE_ASM_COMMENT, GEANY_FILETYPES_ASM, 1); - set_sci_style(sci, SCE_ASM_NUMBER, GEANY_FILETYPES_ASM, 2); - set_sci_style(sci, SCE_ASM_STRING, GEANY_FILETYPES_ASM, 3); - set_sci_style(sci, SCE_ASM_OPERATOR, GEANY_FILETYPES_ASM, 4); - set_sci_style(sci, SCE_ASM_IDENTIFIER, GEANY_FILETYPES_ASM, 5); - set_sci_style(sci, SCE_ASM_CPUINSTRUCTION, GEANY_FILETYPES_ASM, 6); - set_sci_style(sci, SCE_ASM_MATHINSTRUCTION, GEANY_FILETYPES_ASM, 7); - set_sci_style(sci, SCE_ASM_REGISTER, GEANY_FILETYPES_ASM, 8); - set_sci_style(sci, SCE_ASM_DIRECTIVE, GEANY_FILETYPES_ASM, 9); - set_sci_style(sci, SCE_ASM_DIRECTIVEOPERAND, GEANY_FILETYPES_ASM, 10); - set_sci_style(sci, SCE_ASM_COMMENTBLOCK, GEANY_FILETYPES_ASM, 11); - set_sci_style(sci, SCE_ASM_CHARACTER, GEANY_FILETYPES_ASM, 12); - set_sci_style(sci, SCE_ASM_STRINGEOL, GEANY_FILETYPES_ASM, 13); - set_sci_style(sci, SCE_ASM_EXTINSTRUCTION, GEANY_FILETYPES_ASM, 14); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + /*sci_set_keywords(sci, 1, style_sets[ft_id].keywords[0]);*/ + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[2]); + /*sci_set_keywords(sci, 5, style_sets[ft_id].keywords[0]);*/ + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_ASM_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_ASM_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_ASM_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_ASM_STRING, ft_id, 3); + set_sci_style(sci, SCE_ASM_OPERATOR, ft_id, 4); + set_sci_style(sci, SCE_ASM_IDENTIFIER, ft_id, 5); + set_sci_style(sci, SCE_ASM_CPUINSTRUCTION, ft_id, 6); + set_sci_style(sci, SCE_ASM_MATHINSTRUCTION, ft_id, 7); + set_sci_style(sci, SCE_ASM_REGISTER, ft_id, 8); + set_sci_style(sci, SCE_ASM_DIRECTIVE, ft_id, 9); + set_sci_style(sci, SCE_ASM_DIRECTIVEOPERAND, ft_id, 10); + set_sci_style(sci, SCE_ASM_COMMENTBLOCK, ft_id, 11); + set_sci_style(sci, SCE_ASM_CHARACTER, ft_id, 12); + set_sci_style(sci, SCE_ASM_STRINGEOL, ft_id, 13); + set_sci_style(sci, SCE_ASM_EXTINSTRUCTION, ft_id, 14); } static void styleset_f77_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_F77, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[2]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[3]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[4]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[5]); - get_keyfile_hex(config, config_home, "string2", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_F77].styling[6]); - get_keyfile_hex(config, config_home, "word", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_F77].styling[7]); - get_keyfile_hex(config, config_home, "word2", 0x000099, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_F77].styling[8]); - get_keyfile_hex(config, config_home, "word3", 0x3d670f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_F77].styling[9]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[10]); - get_keyfile_hex(config, config_home, "operator2", 0x301010, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_F77].styling[11]); - get_keyfile_hex(config, config_home, "continuation", 0x000000, 0xf0e080, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[12]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[13]); - get_keyfile_hex(config, config_home, "label", 0xa861a8, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_F77].styling[14]); - - style_sets[GEANY_FILETYPES_F77].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_F77, 0, ""); - get_keyfile_keywords(config, config_home, "intrinsic_functions", GEANY_FILETYPES_F77, 1, ""); - get_keyfile_keywords(config, config_home, "user_functions", GEANY_FILETYPES_F77, 2, ""); - style_sets[GEANY_FILETYPES_F77].keywords[3] = NULL; + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "string2", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "word3", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "operator2", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "continuation", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "intrinsic_functions", ft_id, 1); + get_keyfile_keywords(config, config_home, "user_functions", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_f77(ScintillaObject *sci) +static void styleset_f77(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_F77; - apply_filetype_properties(sci, SCLEX_F77, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_F77].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_F77].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_F77].keywords[2]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_F77, 0); - set_sci_style(sci, SCE_F_DEFAULT, GEANY_FILETYPES_F77, 0); - set_sci_style(sci, SCE_F_COMMENT, GEANY_FILETYPES_F77, 1); - set_sci_style(sci, SCE_F_NUMBER, GEANY_FILETYPES_F77, 2); - set_sci_style(sci, SCE_F_STRING1, GEANY_FILETYPES_F77, 3); - set_sci_style(sci, SCE_F_OPERATOR, GEANY_FILETYPES_F77, 4); - set_sci_style(sci, SCE_F_IDENTIFIER, GEANY_FILETYPES_F77, 5); - set_sci_style(sci, SCE_F_STRING2, GEANY_FILETYPES_F77, 6); - set_sci_style(sci, SCE_F_WORD, GEANY_FILETYPES_F77, 7); - set_sci_style(sci, SCE_F_WORD2, GEANY_FILETYPES_F77, 8); - set_sci_style(sci, SCE_F_WORD3, GEANY_FILETYPES_F77, 9); - set_sci_style(sci, SCE_F_PREPROCESSOR, GEANY_FILETYPES_F77, 10); - set_sci_style(sci, SCE_F_OPERATOR2, GEANY_FILETYPES_F77, 11); - set_sci_style(sci, SCE_F_CONTINUATION, GEANY_FILETYPES_F77, 12); - set_sci_style(sci, SCE_F_STRINGEOL, GEANY_FILETYPES_F77, 13); - set_sci_style(sci, SCE_F_LABEL, GEANY_FILETYPES_F77, 14); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_F_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_F_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_F_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_F_STRING1, ft_id, 3); + set_sci_style(sci, SCE_F_OPERATOR, ft_id, 4); + set_sci_style(sci, SCE_F_IDENTIFIER, ft_id, 5); + set_sci_style(sci, SCE_F_STRING2, ft_id, 6); + set_sci_style(sci, SCE_F_WORD, ft_id, 7); + set_sci_style(sci, SCE_F_WORD2, ft_id, 8); + set_sci_style(sci, SCE_F_WORD3, ft_id, 9); + set_sci_style(sci, SCE_F_PREPROCESSOR, ft_id, 10); + set_sci_style(sci, SCE_F_OPERATOR2, ft_id, 11); + set_sci_style(sci, SCE_F_CONTINUATION, ft_id, 12); + set_sci_style(sci, SCE_F_STRINGEOL, ft_id, 13); + set_sci_style(sci, SCE_F_LABEL, ft_id, 14); } static void styleset_fortran_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_FORTRAN, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[2]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[3]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[4]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[5]); - get_keyfile_hex(config, config_home, "string2", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[6]); - get_keyfile_hex(config, config_home, "word", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[7]); - get_keyfile_hex(config, config_home, "word2", 0x000099, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[8]); - get_keyfile_hex(config, config_home, "word3", 0x3d670f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[9]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[10]); - get_keyfile_hex(config, config_home, "operator2", 0x301010, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[11]); - get_keyfile_hex(config, config_home, "continuation", 0x000000, 0xf0e080, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[12]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[13]); - get_keyfile_hex(config, config_home, "label", 0xa861a8, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[14]); - - style_sets[GEANY_FILETYPES_FORTRAN].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_FORTRAN, 0, ""); - get_keyfile_keywords(config, config_home, "intrinsic_functions", GEANY_FILETYPES_FORTRAN, 1, ""); - get_keyfile_keywords(config, config_home, "user_functions", GEANY_FILETYPES_FORTRAN, 2, ""); - style_sets[GEANY_FILETYPES_FORTRAN].keywords[3] = NULL; + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "string2", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "word3", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "operator2", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "continuation", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "intrinsic_functions", ft_id, 1); + get_keyfile_keywords(config, config_home, "user_functions", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_fortran(ScintillaObject *sci) +static void styleset_fortran(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_FORTRAN; - apply_filetype_properties(sci, SCLEX_FORTRAN, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_FORTRAN].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_FORTRAN].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_FORTRAN].keywords[2]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_FORTRAN, 0); - set_sci_style(sci, SCE_F_DEFAULT, GEANY_FILETYPES_FORTRAN, 0); - set_sci_style(sci, SCE_F_COMMENT, GEANY_FILETYPES_FORTRAN, 1); - set_sci_style(sci, SCE_F_NUMBER, GEANY_FILETYPES_FORTRAN, 2); - set_sci_style(sci, SCE_F_STRING1, GEANY_FILETYPES_FORTRAN, 3); - set_sci_style(sci, SCE_F_OPERATOR, GEANY_FILETYPES_FORTRAN, 4); - set_sci_style(sci, SCE_F_IDENTIFIER, GEANY_FILETYPES_FORTRAN, 5); - set_sci_style(sci, SCE_F_STRING2, GEANY_FILETYPES_FORTRAN, 6); - set_sci_style(sci, SCE_F_WORD, GEANY_FILETYPES_FORTRAN, 7); - set_sci_style(sci, SCE_F_WORD2, GEANY_FILETYPES_FORTRAN, 8); - set_sci_style(sci, SCE_F_WORD3, GEANY_FILETYPES_FORTRAN, 9); - set_sci_style(sci, SCE_F_PREPROCESSOR, GEANY_FILETYPES_FORTRAN, 10); - set_sci_style(sci, SCE_F_OPERATOR2, GEANY_FILETYPES_FORTRAN, 11); - set_sci_style(sci, SCE_F_CONTINUATION, GEANY_FILETYPES_FORTRAN, 12); - set_sci_style(sci, SCE_F_STRINGEOL, GEANY_FILETYPES_FORTRAN, 13); - set_sci_style(sci, SCE_F_LABEL, GEANY_FILETYPES_FORTRAN, 14); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_F_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_F_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_F_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_F_STRING1, ft_id, 3); + set_sci_style(sci, SCE_F_OPERATOR, ft_id, 4); + set_sci_style(sci, SCE_F_IDENTIFIER, ft_id, 5); + set_sci_style(sci, SCE_F_STRING2, ft_id, 6); + set_sci_style(sci, SCE_F_WORD, ft_id, 7); + set_sci_style(sci, SCE_F_WORD2, ft_id, 8); + set_sci_style(sci, SCE_F_WORD3, ft_id, 9); + set_sci_style(sci, SCE_F_PREPROCESSOR, ft_id, 10); + set_sci_style(sci, SCE_F_OPERATOR2, ft_id, 11); + set_sci_style(sci, SCE_F_CONTINUATION, ft_id, 12); + set_sci_style(sci, SCE_F_STRINGEOL, ft_id, 13); + set_sci_style(sci, SCE_F_LABEL, ft_id, 14); } static void styleset_sql_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_SQL, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[1]); - get_keyfile_hex(config, config_home, "commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[2]); - get_keyfile_hex(config, config_home, "commentdoc", 0x3f5fbf, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[3]); - get_keyfile_hex(config, config_home, "number", 0x7f7f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[4]); - get_keyfile_hex(config, config_home, "word", 0x001a7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_SQL].styling[5]); - get_keyfile_hex(config, config_home, "word2", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_SQL].styling[6]); - get_keyfile_hex(config, config_home, "string", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[7]); - get_keyfile_hex(config, config_home, "character", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[8]); - get_keyfile_hex(config, config_home, "operator", 0x000000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_SQL].styling[9]); - get_keyfile_hex(config, config_home, "identifier", 0x111199, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[10]); - get_keyfile_hex(config, config_home, "sqlplus", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[11]); - get_keyfile_hex(config, config_home, "sqlplus_prompt", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[12]); - get_keyfile_hex(config, config_home, "sqlplus_comment", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[13]); - get_keyfile_hex(config, config_home, "quotedidentifier", 0x111199, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[14]); - - style_sets[GEANY_FILETYPES_SQL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_SQL, 0, - "absolute action add admin after aggregate \ - alias all allocate alter and any are array as asc \ - assertion at authorization before begin bfile bigint binary bit blob bool boolean both breadth by \ - call cascade cascaded case cast catalog char character check class clob close cluster collate \ - collation column commit completion connect connection constraint constraints \ - constructor continue corresponding create cross cube current \ - current_date current_path current_role current_time current_timestamp \ - current_user cursor cycle data date day deallocate dec decimal declare default \ - deferrable deferred delete depth deref desc describe descriptor destroy destructor \ - deterministic diagnostics dictionary dimension disconnect diskgroup distinct domain double drop dynamic \ - each else end end-exec equals escape every except exception exec execute exists explain external \ - false fetch first fixed flashback float for foreign found from free full function general get global \ - go goto grant group grouping having host hour identity if ignore immediate in index indextype indicator \ - initialize initially inner inout input insert int integer intersect interval \ - into is isolation iterate join key language large last lateral leading left less level like \ - limit local localtime localtimestamp locator long map match materialized mediumblob mediumint mediumtext \ - merge middleint minus minute modifies modify module month names national natural nchar nclob new next no noaudit \ - none not null numeric nvarchar2 object of off old on only open operation option or order ordinality out outer \ - output package pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary \ - prior privileges procedure profile public purge read reads real recursive ref references referencing regexp regexp_like \ - relative rename restrict result return returning returns revoke right role rollback rollup routine row rows \ - savepoint schema scroll scope search second section select sequence session session_user set sets size \ - smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static \ - structure synonym system_user table tablespace temporary terminate than then time timestamp \ - timezone_hour timezone_minute tinyint to trailing transaction translation treat trigger true truncate \ - type under union unique unknown unnest update usage user using value values varchar varchar2 variable varying \ - view when whenever where with without work write year zone"); - style_sets[GEANY_FILETYPES_SQL].keywords[1] = NULL; + new_styleset(ft_id, 15); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "commentdoc", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "sqlplus", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "sqlplus_prompt", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "sqlplus_comment", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "quotedidentifier", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_sql(ScintillaObject *sci) +static void styleset_sql(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_SQL; - apply_filetype_properties(sci, SCLEX_SQL, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_SQL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_SQL, 0); - set_sci_style(sci, SCE_SQL_DEFAULT, GEANY_FILETYPES_SQL, 0); - set_sci_style(sci, SCE_SQL_COMMENT, GEANY_FILETYPES_SQL, 1); - set_sci_style(sci, SCE_SQL_COMMENTLINE, GEANY_FILETYPES_SQL, 2); - set_sci_style(sci, SCE_SQL_COMMENTDOC, GEANY_FILETYPES_SQL, 3); - set_sci_style(sci, SCE_SQL_NUMBER, GEANY_FILETYPES_SQL, 4); - set_sci_style(sci, SCE_SQL_WORD, GEANY_FILETYPES_SQL, 5); - set_sci_style(sci, SCE_SQL_WORD2, GEANY_FILETYPES_SQL, 6); - set_sci_style(sci, SCE_SQL_STRING, GEANY_FILETYPES_SQL, 7); - set_sci_style(sci, SCE_SQL_CHARACTER, GEANY_FILETYPES_SQL, 8); - set_sci_style(sci, SCE_SQL_OPERATOR, GEANY_FILETYPES_SQL, 9); - set_sci_style(sci, SCE_SQL_IDENTIFIER, GEANY_FILETYPES_SQL, 10); - set_sci_style(sci, SCE_SQL_SQLPLUS, GEANY_FILETYPES_SQL, 11); - set_sci_style(sci, SCE_SQL_SQLPLUS_PROMPT, GEANY_FILETYPES_SQL, 12); - set_sci_style(sci, SCE_SQL_SQLPLUS_COMMENT, GEANY_FILETYPES_SQL, 13); - set_sci_style(sci, SCE_SQL_QUOTEDIDENTIFIER, GEANY_FILETYPES_SQL, 14); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_SQL_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_SQL_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_SQL_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_SQL_COMMENTDOC, ft_id, 3); + set_sci_style(sci, SCE_SQL_NUMBER, ft_id, 4); + set_sci_style(sci, SCE_SQL_WORD, ft_id, 5); + set_sci_style(sci, SCE_SQL_WORD2, ft_id, 6); + set_sci_style(sci, SCE_SQL_STRING, ft_id, 7); + set_sci_style(sci, SCE_SQL_CHARACTER, ft_id, 8); + set_sci_style(sci, SCE_SQL_OPERATOR, ft_id, 9); + set_sci_style(sci, SCE_SQL_IDENTIFIER, ft_id, 10); + set_sci_style(sci, SCE_SQL_SQLPLUS, ft_id, 11); + set_sci_style(sci, SCE_SQL_SQLPLUS_PROMPT, ft_id, 12); + set_sci_style(sci, SCE_SQL_SQLPLUS_COMMENT, ft_id, 13); + set_sci_style(sci, SCE_SQL_QUOTEDIDENTIFIER, ft_id, 14); } static void styleset_markdown_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_MARKDOWN, 17); + new_styleset(ft_id, 17); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[0]); - get_keyfile_hex(config, config_home, "strong", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[1]); - get_keyfile_hex(config, config_home, "emphasis", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[2]); - get_keyfile_hex(config, config_home, "header1", 0x0000bb, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[3]); - get_keyfile_hex(config, config_home, "header2", 0x0000bb, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[4]); - get_keyfile_hex(config, config_home, "header3", 0x0000bb, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[5]); - get_keyfile_hex(config, config_home, "header4", 0x0000bb, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[6]); - get_keyfile_hex(config, config_home, "header5", 0x0000bb, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[7]); - get_keyfile_hex(config, config_home, "header6", 0x0000bb, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[8]); - get_keyfile_hex(config, config_home, "ulist_item", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[9]); - get_keyfile_hex(config, config_home, "olist_item", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[10]); - get_keyfile_hex(config, config_home, "blockquote", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[11]); - get_keyfile_hex(config, config_home, "strikeout", 0xaa00ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[12]); - get_keyfile_hex(config, config_home, "hrule", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[13]); - get_keyfile_hex(config, config_home, "link", 0x0000ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[14]); - get_keyfile_hex(config, config_home, "code", 0x009f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[15]); - get_keyfile_hex(config, config_home, "codebk", 0x005f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[16]); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "strong", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "emphasis", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "header1", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "header2", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "header3", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "header4", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "header5", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "header6", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "ulist_item", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "olist_item", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "blockquote", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "strikeout", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "hrule", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "link", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "code", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "codebk", &style_sets[ft_id].styling[16]); - style_sets[GEANY_FILETYPES_MARKDOWN].keywords = NULL; + style_sets[ft_id].keywords = NULL; } -static void styleset_markdown(ScintillaObject *sci) -{ - const filetype_id ft_id = GEANY_FILETYPES_MARKDOWN; +static void styleset_markdown(ScintillaObject *sci, gint ft_id) +{ apply_filetype_properties(sci, SCLEX_MARKDOWN, ft_id); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_MARKDOWN, 0); - set_sci_style(sci, SCE_MARKDOWN_DEFAULT, GEANY_FILETYPES_MARKDOWN, 0); - set_sci_style(sci, SCE_MARKDOWN_LINE_BEGIN, GEANY_FILETYPES_MARKDOWN, 0); - set_sci_style(sci, SCE_MARKDOWN_PRECHAR, GEANY_FILETYPES_MARKDOWN, 0); - set_sci_style(sci, SCE_MARKDOWN_STRONG1, GEANY_FILETYPES_MARKDOWN, 1); - set_sci_style(sci, SCE_MARKDOWN_STRONG2, GEANY_FILETYPES_MARKDOWN, 1); - set_sci_style(sci, SCE_MARKDOWN_EM1, GEANY_FILETYPES_MARKDOWN, 2); - set_sci_style(sci, SCE_MARKDOWN_EM2, GEANY_FILETYPES_MARKDOWN, 2); - set_sci_style(sci, SCE_MARKDOWN_HEADER1, GEANY_FILETYPES_MARKDOWN, 3); - set_sci_style(sci, SCE_MARKDOWN_HEADER2, GEANY_FILETYPES_MARKDOWN, 4); - set_sci_style(sci, SCE_MARKDOWN_HEADER3, GEANY_FILETYPES_MARKDOWN, 5); - set_sci_style(sci, SCE_MARKDOWN_HEADER4, GEANY_FILETYPES_MARKDOWN, 6); - set_sci_style(sci, SCE_MARKDOWN_HEADER5, GEANY_FILETYPES_MARKDOWN, 7); - set_sci_style(sci, SCE_MARKDOWN_HEADER6, GEANY_FILETYPES_MARKDOWN, 8); - set_sci_style(sci, SCE_MARKDOWN_ULIST_ITEM, GEANY_FILETYPES_MARKDOWN, 9); - set_sci_style(sci, SCE_MARKDOWN_OLIST_ITEM, GEANY_FILETYPES_MARKDOWN, 10); - set_sci_style(sci, SCE_MARKDOWN_BLOCKQUOTE, GEANY_FILETYPES_MARKDOWN, 11); - set_sci_style(sci, SCE_MARKDOWN_STRIKEOUT, GEANY_FILETYPES_MARKDOWN, 12); - set_sci_style(sci, SCE_MARKDOWN_HRULE, GEANY_FILETYPES_MARKDOWN, 13); - set_sci_style(sci, SCE_MARKDOWN_LINK, GEANY_FILETYPES_MARKDOWN, 14); - set_sci_style(sci, SCE_MARKDOWN_CODE, GEANY_FILETYPES_MARKDOWN, 15); - set_sci_style(sci, SCE_MARKDOWN_CODE2, GEANY_FILETYPES_MARKDOWN, 15); - set_sci_style(sci, SCE_MARKDOWN_CODEBK, GEANY_FILETYPES_MARKDOWN, 16); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MARKDOWN_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MARKDOWN_LINE_BEGIN, ft_id, 0); + set_sci_style(sci, SCE_MARKDOWN_PRECHAR, ft_id, 0); + set_sci_style(sci, SCE_MARKDOWN_STRONG1, ft_id, 1); + set_sci_style(sci, SCE_MARKDOWN_STRONG2, ft_id, 1); + set_sci_style(sci, SCE_MARKDOWN_EM1, ft_id, 2); + set_sci_style(sci, SCE_MARKDOWN_EM2, ft_id, 2); + set_sci_style(sci, SCE_MARKDOWN_HEADER1, ft_id, 3); + set_sci_style(sci, SCE_MARKDOWN_HEADER2, ft_id, 4); + set_sci_style(sci, SCE_MARKDOWN_HEADER3, ft_id, 5); + set_sci_style(sci, SCE_MARKDOWN_HEADER4, ft_id, 6); + set_sci_style(sci, SCE_MARKDOWN_HEADER5, ft_id, 7); + set_sci_style(sci, SCE_MARKDOWN_HEADER6, ft_id, 8); + set_sci_style(sci, SCE_MARKDOWN_ULIST_ITEM, ft_id, 9); + set_sci_style(sci, SCE_MARKDOWN_OLIST_ITEM, ft_id, 10); + set_sci_style(sci, SCE_MARKDOWN_BLOCKQUOTE, ft_id, 11); + set_sci_style(sci, SCE_MARKDOWN_STRIKEOUT, ft_id, 12); + set_sci_style(sci, SCE_MARKDOWN_HRULE, ft_id, 13); + set_sci_style(sci, SCE_MARKDOWN_LINK, ft_id, 14); + set_sci_style(sci, SCE_MARKDOWN_CODE, ft_id, 15); + set_sci_style(sci, SCE_MARKDOWN_CODE2, ft_id, 15); + set_sci_style(sci, SCE_MARKDOWN_CODEBK, ft_id, 16); } + static void styleset_haskell_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_HASKELL, 17); + new_styleset(ft_id, 17); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[0]); - get_keyfile_hex(config, config_home, "commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[1]); - get_keyfile_hex(config, config_home, "commentblock", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[2]); - get_keyfile_hex(config, config_home, "commentblock2", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[3]); - get_keyfile_hex(config, config_home, "commentblock3", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[4]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[5]); - get_keyfile_hex(config, config_home, "keyword", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_HASKELL].styling[6]); - get_keyfile_hex(config, config_home, "import", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[7]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[8]); - get_keyfile_hex(config, config_home, "character", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[9]); - get_keyfile_hex(config, config_home, "class", 0x0000d0, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[10]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[11]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[12]); - get_keyfile_hex(config, config_home, "instance", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[13]); - get_keyfile_hex(config, config_home, "capital", 0x635b00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[14]); - get_keyfile_hex(config, config_home, "module", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[15]); - get_keyfile_hex(config, config_home, "data", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[16]); - - style_sets[GEANY_FILETYPES_HASKELL].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_HASKELL, 0, - "as case class data deriving do else if import in infixl infixr instance let module of primitive qualified then type where"); - style_sets[GEANY_FILETYPES_HASKELL].keywords[1] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentblock", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "commentblock2", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "commentblock3", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "import", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "class", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "instance", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "capital", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "module", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "data", &style_sets[ft_id].styling[16]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_haskell(ScintillaObject *sci) +static void styleset_haskell(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_HASKELL; - apply_filetype_properties(sci, SCLEX_HASKELL, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_HASKELL].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_HASKELL, 0); - set_sci_style(sci, SCE_HA_DEFAULT, GEANY_FILETYPES_HASKELL, 0); - set_sci_style(sci, SCE_HA_COMMENTLINE, GEANY_FILETYPES_HASKELL, 1); - set_sci_style(sci, SCE_HA_COMMENTBLOCK, GEANY_FILETYPES_HASKELL, 2); - set_sci_style(sci, SCE_HA_COMMENTBLOCK2, GEANY_FILETYPES_HASKELL, 3); - set_sci_style(sci, SCE_HA_COMMENTBLOCK3, GEANY_FILETYPES_HASKELL, 4); - set_sci_style(sci, SCE_HA_NUMBER, GEANY_FILETYPES_HASKELL, 5); - set_sci_style(sci, SCE_HA_KEYWORD, GEANY_FILETYPES_HASKELL, 6); - set_sci_style(sci, SCE_HA_IMPORT, GEANY_FILETYPES_HASKELL, 7); - set_sci_style(sci, SCE_HA_STRING, GEANY_FILETYPES_HASKELL, 8); - set_sci_style(sci, SCE_HA_CHARACTER, GEANY_FILETYPES_HASKELL, 9); - set_sci_style(sci, SCE_HA_CLASS, GEANY_FILETYPES_HASKELL, 10); - set_sci_style(sci, SCE_HA_OPERATOR, GEANY_FILETYPES_HASKELL, 11); - set_sci_style(sci, SCE_HA_IDENTIFIER, GEANY_FILETYPES_HASKELL, 12); - set_sci_style(sci, SCE_HA_INSTANCE, GEANY_FILETYPES_HASKELL, 13); - set_sci_style(sci, SCE_HA_CAPITAL, GEANY_FILETYPES_HASKELL, 14); - set_sci_style(sci, SCE_HA_MODULE, GEANY_FILETYPES_HASKELL, 15); - set_sci_style(sci, SCE_HA_DATA, GEANY_FILETYPES_HASKELL, 16); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_HA_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_HA_COMMENTLINE, ft_id, 1); + set_sci_style(sci, SCE_HA_COMMENTBLOCK, ft_id, 2); + set_sci_style(sci, SCE_HA_COMMENTBLOCK2, ft_id, 3); + set_sci_style(sci, SCE_HA_COMMENTBLOCK3, ft_id, 4); + set_sci_style(sci, SCE_HA_NUMBER, ft_id, 5); + set_sci_style(sci, SCE_HA_KEYWORD, ft_id, 6); + set_sci_style(sci, SCE_HA_IMPORT, ft_id, 7); + set_sci_style(sci, SCE_HA_STRING, ft_id, 8); + set_sci_style(sci, SCE_HA_CHARACTER, ft_id, 9); + set_sci_style(sci, SCE_HA_CLASS, ft_id, 10); + set_sci_style(sci, SCE_HA_OPERATOR, ft_id, 11); + set_sci_style(sci, SCE_HA_IDENTIFIER, ft_id, 12); + set_sci_style(sci, SCE_HA_INSTANCE, ft_id, 13); + set_sci_style(sci, SCE_HA_CAPITAL, ft_id, 14); + set_sci_style(sci, SCE_HA_MODULE, ft_id, 15); + set_sci_style(sci, SCE_HA_DATA, ft_id, 16); } static void styleset_caml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CAML, 14); + new_styleset(ft_id, 14); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[1]); - get_keyfile_hex(config, config_home, "comment1", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[2]); - get_keyfile_hex(config, config_home, "comment2", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[3]); - get_keyfile_hex(config, config_home, "comment3", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[4]); - get_keyfile_hex(config, config_home, "number", 0x7f7f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[5]); - get_keyfile_hex(config, config_home, "keyword", 0x001a7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CAML].styling[6]); - get_keyfile_hex(config, config_home, "keyword2", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CAML].styling[7]); - get_keyfile_hex(config, config_home, "string", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[8]); - get_keyfile_hex(config, config_home, "char", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[9]); - get_keyfile_hex(config, config_home, "operator", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[10]); - get_keyfile_hex(config, config_home, "identifier", 0x111199, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[11]); - get_keyfile_hex(config, config_home, "tagname", 0x000000, 0xffe0ff, TRUE, &style_sets[GEANY_FILETYPES_CAML].styling[12]); - get_keyfile_hex(config, config_home, "linenum", 0x000000, 0xc0c0c0, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[13]); - - style_sets[GEANY_FILETYPES_CAML].keywords = g_new(gchar*, 3); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_CAML, 0, - "and as assert asr begin class constraint do \ - done downto else end exception external false for fun function functor if in include inherit \ - initializer land lazy let lor lsl lsr lxor match method mod module mutable new object of open \ - or private rec sig struct then to true try type val virtual when while with"); - get_keyfile_keywords(config, config_home, "keywords_optional", GEANY_FILETYPES_CAML, 1, "option Some None ignore ref"); - style_sets[GEANY_FILETYPES_CAML].keywords[2] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "comment1", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "comment2", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "comment3", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "keyword2", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "char", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "tagname", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "linenum", &style_sets[ft_id].styling[13]); + + style_sets[ft_id].keywords = g_new(gchar*, 3); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + get_keyfile_keywords(config, config_home, "keywords_optional", ft_id, 1); + style_sets[ft_id].keywords[2] = NULL; } -static void styleset_caml(ScintillaObject *sci) +static void styleset_caml(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_CAML; - apply_filetype_properties(sci, SCLEX_CAML, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CAML].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_CAML].keywords[1]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CAML, 0); - set_sci_style(sci, SCE_CAML_DEFAULT, GEANY_FILETYPES_CAML, 0); - set_sci_style(sci, SCE_CAML_COMMENT, GEANY_FILETYPES_CAML, 1); - set_sci_style(sci, SCE_CAML_COMMENT1, GEANY_FILETYPES_CAML, 2); - set_sci_style(sci, SCE_CAML_COMMENT2, GEANY_FILETYPES_CAML, 3); - set_sci_style(sci, SCE_CAML_COMMENT3, GEANY_FILETYPES_CAML, 4); - set_sci_style(sci, SCE_CAML_NUMBER, GEANY_FILETYPES_CAML, 5); - set_sci_style(sci, SCE_CAML_KEYWORD, GEANY_FILETYPES_CAML, 6); - set_sci_style(sci, SCE_CAML_KEYWORD2, GEANY_FILETYPES_CAML, 7); - set_sci_style(sci, SCE_CAML_STRING, GEANY_FILETYPES_CAML, 8); - set_sci_style(sci, SCE_CAML_CHAR, GEANY_FILETYPES_CAML, 9); - set_sci_style(sci, SCE_CAML_OPERATOR, GEANY_FILETYPES_CAML, 10); - set_sci_style(sci, SCE_CAML_IDENTIFIER, GEANY_FILETYPES_CAML, 11); - set_sci_style(sci, SCE_CAML_TAGNAME, GEANY_FILETYPES_CAML, 12); - set_sci_style(sci, SCE_CAML_LINENUM, GEANY_FILETYPES_CAML, 13); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CAML_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_CAML_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_CAML_COMMENT1, ft_id, 2); + set_sci_style(sci, SCE_CAML_COMMENT2, ft_id, 3); + set_sci_style(sci, SCE_CAML_COMMENT3, ft_id, 4); + set_sci_style(sci, SCE_CAML_NUMBER, ft_id, 5); + set_sci_style(sci, SCE_CAML_KEYWORD, ft_id, 6); + set_sci_style(sci, SCE_CAML_KEYWORD2, ft_id, 7); + set_sci_style(sci, SCE_CAML_STRING, ft_id, 8); + set_sci_style(sci, SCE_CAML_CHAR, ft_id, 9); + set_sci_style(sci, SCE_CAML_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_CAML_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_CAML_TAGNAME, ft_id, 12); + set_sci_style(sci, SCE_CAML_LINENUM, ft_id, 13); } static void styleset_tcl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_TCL, 16); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[0]); - get_keyfile_named_style(config, config_home, "comment", "comment", &style_sets[GEANY_FILETYPES_TCL].styling[1]); - get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_TCL].styling[2]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[3]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[4]); - get_keyfile_hex(config, config_home, "identifier", 0xa20000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[5]); - get_keyfile_hex(config, config_home, "wordinquote", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[6]); - get_keyfile_hex(config, config_home, "inquote", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[7]); - get_keyfile_hex(config, config_home, "substitution", 0x111199, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[8]); - get_keyfile_hex(config, config_home, "modifier", 0x7f007f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[9]); - get_keyfile_hex(config, config_home, "expand", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[10]); - get_keyfile_hex(config, config_home, "wordtcl", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_TCL].styling[11]); - get_keyfile_hex(config, config_home, "wordtk", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_TCL].styling[12]); - get_keyfile_hex(config, config_home, "worditcl", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_TCL].styling[13]); - get_keyfile_hex(config, config_home, "wordtkcmds", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_TCL].styling[14]); - get_keyfile_hex(config, config_home, "wordexpand", 0x7f0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_TCL].styling[15]); - - style_sets[GEANY_FILETYPES_TCL].keywords = g_new(gchar*, 6); - get_keyfile_keywords(config, config_home, "tcl", GEANY_FILETYPES_TCL, 0, ""); - get_keyfile_keywords(config, config_home, "tk", GEANY_FILETYPES_TCL, 1, ""); - get_keyfile_keywords(config, config_home, "itcl", GEANY_FILETYPES_TCL, 2, ""); - get_keyfile_keywords(config, config_home, "tkcommands", GEANY_FILETYPES_TCL, 3, ""); - get_keyfile_keywords(config, config_home, "expand", GEANY_FILETYPES_TCL, 4, ""); - style_sets[GEANY_FILETYPES_TCL].keywords[5] = NULL; + new_styleset(ft_id, 16); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "wordinquote", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "inquote", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "substitution", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "modifier", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "expand", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "wordtcl", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "wordtk", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "worditcl", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "wordtkcmds", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "wordexpand", &style_sets[ft_id].styling[15]); + + style_sets[ft_id].keywords = g_new(gchar*, 6); + get_keyfile_keywords(config, config_home, "tcl", ft_id, 0); + get_keyfile_keywords(config, config_home, "tk", ft_id, 1); + get_keyfile_keywords(config, config_home, "itcl", ft_id, 2); + get_keyfile_keywords(config, config_home, "tkcommands", ft_id, 3); + get_keyfile_keywords(config, config_home, "expand", ft_id, 4); + style_sets[ft_id].keywords[5] = NULL; } -static void styleset_tcl(ScintillaObject *sci) +static void styleset_tcl(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_TCL; - apply_filetype_properties(sci, SCLEX_TCL, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_TCL].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_TCL].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_TCL].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_TCL].keywords[3]); - SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_TCL].keywords[4]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_TCL, 0); - set_sci_style(sci, SCE_TCL_DEFAULT, GEANY_FILETYPES_TCL, 0); - set_sci_style(sci, SCE_TCL_COMMENT, GEANY_FILETYPES_TCL, 1); - set_sci_style(sci, SCE_TCL_COMMENTLINE, GEANY_FILETYPES_TCL, 2); - set_sci_style(sci, SCE_TCL_NUMBER, GEANY_FILETYPES_TCL, 3); - set_sci_style(sci, SCE_TCL_OPERATOR, GEANY_FILETYPES_TCL, 4); - set_sci_style(sci, SCE_TCL_IDENTIFIER, GEANY_FILETYPES_TCL, 5); - set_sci_style(sci, SCE_TCL_WORD_IN_QUOTE, GEANY_FILETYPES_TCL, 6); - set_sci_style(sci, SCE_TCL_IN_QUOTE, GEANY_FILETYPES_TCL, 7); - set_sci_style(sci, SCE_TCL_SUBSTITUTION, GEANY_FILETYPES_TCL, 8); - set_sci_style(sci, SCE_TCL_MODIFIER, GEANY_FILETYPES_TCL, 9); - set_sci_style(sci, SCE_TCL_EXPAND, GEANY_FILETYPES_TCL, 10); - set_sci_style(sci, SCE_TCL_WORD, GEANY_FILETYPES_TCL, 11); - set_sci_style(sci, SCE_TCL_WORD2, GEANY_FILETYPES_TCL, 12); - set_sci_style(sci, SCE_TCL_WORD3, GEANY_FILETYPES_TCL, 13); - set_sci_style(sci, SCE_TCL_WORD4, GEANY_FILETYPES_TCL, 14); - set_sci_style(sci, SCE_TCL_WORD5, GEANY_FILETYPES_TCL, 15); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[4]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_TCL_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_TCL_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_TCL_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_TCL_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_TCL_OPERATOR, ft_id, 4); + set_sci_style(sci, SCE_TCL_IDENTIFIER, ft_id, 5); + set_sci_style(sci, SCE_TCL_WORD_IN_QUOTE, ft_id, 6); + set_sci_style(sci, SCE_TCL_IN_QUOTE, ft_id, 7); + set_sci_style(sci, SCE_TCL_SUBSTITUTION, ft_id, 8); + set_sci_style(sci, SCE_TCL_MODIFIER, ft_id, 9); + set_sci_style(sci, SCE_TCL_EXPAND, ft_id, 10); + set_sci_style(sci, SCE_TCL_WORD, ft_id, 11); + set_sci_style(sci, SCE_TCL_WORD2, ft_id, 12); + set_sci_style(sci, SCE_TCL_WORD3, ft_id, 13); + set_sci_style(sci, SCE_TCL_WORD4, ft_id, 14); + set_sci_style(sci, SCE_TCL_WORD5, ft_id, 15); } static void styleset_matlab_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_MATLAB, 9); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[1]); - get_keyfile_hex(config, config_home, "command", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_MATLAB].styling[2]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[3]); - get_keyfile_hex(config, config_home, "keyword", 0x001a7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_MATLAB].styling[4]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[5]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[6]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[7]); - get_keyfile_hex(config, config_home, "doublequotedstring", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[8]); - - style_sets[GEANY_FILETYPES_MATLAB].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_MATLAB, 0, "break case catch continue else elseif end for function global if otherwise persistent return switch try while"); - style_sets[GEANY_FILETYPES_MATLAB].keywords[1] = NULL; + new_styleset(ft_id, 9); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "command", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "doublequotedstring", &style_sets[ft_id].styling[8]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_matlab(ScintillaObject *sci) +static void styleset_matlab(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_MATLAB; - - styleset_common(sci); - apply_filetype_properties(sci, SCLEX_MATLAB, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_MATLAB].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_MATLAB, 0); - set_sci_style(sci, SCE_MATLAB_DEFAULT, GEANY_FILETYPES_MATLAB, 0); - set_sci_style(sci, SCE_MATLAB_COMMENT, GEANY_FILETYPES_MATLAB, 1); - set_sci_style(sci, SCE_MATLAB_COMMAND, GEANY_FILETYPES_MATLAB, 2); - set_sci_style(sci, SCE_MATLAB_NUMBER, GEANY_FILETYPES_MATLAB, 3); - set_sci_style(sci, SCE_MATLAB_KEYWORD, GEANY_FILETYPES_MATLAB, 4); - set_sci_style(sci, SCE_MATLAB_STRING, GEANY_FILETYPES_MATLAB, 5); - set_sci_style(sci, SCE_MATLAB_OPERATOR, GEANY_FILETYPES_MATLAB, 6); - set_sci_style(sci, SCE_MATLAB_IDENTIFIER, GEANY_FILETYPES_MATLAB, 7); - set_sci_style(sci, SCE_MATLAB_DOUBLEQUOTESTRING, GEANY_FILETYPES_MATLAB, 8); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MATLAB_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_MATLAB_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_MATLAB_COMMAND, ft_id, 2); + set_sci_style(sci, SCE_MATLAB_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_MATLAB_KEYWORD, ft_id, 4); + set_sci_style(sci, SCE_MATLAB_STRING, ft_id, 5); + set_sci_style(sci, SCE_MATLAB_OPERATOR, ft_id, 6); + set_sci_style(sci, SCE_MATLAB_IDENTIFIER, ft_id, 7); + set_sci_style(sci, SCE_MATLAB_DOUBLEQUOTESTRING, ft_id, 8); } static void styleset_d_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_D, 18); + new_styleset(ft_id, 18); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[1]); - get_keyfile_hex(config, config_home, "commentline", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[2]); - get_keyfile_hex(config, config_home, "commentdoc", 0x3f5fbf, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[3]); - get_keyfile_hex(config, config_home, "commentdocnested", 0x3f5fbf, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[4]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[5]); - get_keyfile_hex(config, config_home, "word", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_D].styling[6]); - get_keyfile_hex(config, config_home, "word2", 0x991111, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_D].styling[7]); - get_keyfile_hex(config, config_home, "word3", 0x991111, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_D].styling[8]); - get_keyfile_hex(config, config_home, "typedef", 0x0000d0, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_D].styling[9]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[10]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_D].styling[11]); - get_keyfile_hex(config, config_home, "character", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[12]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[13]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[14]); - get_keyfile_hex(config, config_home, "commentlinedoc", 0x3f5fbf, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_D].styling[15]); - get_keyfile_hex(config, config_home, "commentdockeyword", 0x3f5fbf, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_D].styling[16]); - get_keyfile_hex(config, config_home, "commentdockeyworderror", 0x3f5fbf, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[17]); - - style_sets[GEANY_FILETYPES_D].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_D, 0, - "__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto \ - body bool break byte case cast catch cdouble cent cfloat char class const continue creal \ - dchar debug default delegate delete deprecated do double else enum export extern false \ - final finally float for foreach function goto idouble if ifloat import in inout int \ - interface invariant ireal is long mixin module new null out override package pragma \ - private protected public real return scope short static struct super switch \ - synchronized template this throw true try typedef typeof ubyte ucent uint ulong union \ - unittest ushort version void volatile wchar while with"); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_D, 1, - ""); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_D, 2, - "Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns \ - See_Also Standards Throws Version"); - get_keyfile_keywords(config, config_home, "types", GEANY_FILETYPES_D, 3, - ""); - style_sets[GEANY_FILETYPES_D].keywords[4] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "commentdoc", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "commentdocnested", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "word3", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "typedef", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "commentlinedoc", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "commentdockeyword", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "commentdockeyworderror", &style_sets[ft_id].styling[17]); + + style_sets[ft_id].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + get_keyfile_keywords(config, config_home, "types", ft_id, 3); + style_sets[ft_id].keywords[4] = NULL; } -static void styleset_d(ScintillaObject *sci) +static void styleset_d(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_D; - apply_filetype_properties(sci, SCLEX_D, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_D].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_D].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_D].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_D].keywords[3]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_D, 0); - set_sci_style(sci, SCE_D_DEFAULT, GEANY_FILETYPES_D, 0); - set_sci_style(sci, SCE_D_COMMENT, GEANY_FILETYPES_D, 1); - set_sci_style(sci, SCE_D_COMMENTLINE, GEANY_FILETYPES_D, 2); - set_sci_style(sci, SCE_D_COMMENTDOC, GEANY_FILETYPES_D, 3); - set_sci_style(sci, SCE_D_COMMENTNESTED, GEANY_FILETYPES_D, 4); - set_sci_style(sci, SCE_D_NUMBER, GEANY_FILETYPES_D, 5); - set_sci_style(sci, SCE_D_WORD, GEANY_FILETYPES_D, 6); - set_sci_style(sci, SCE_D_WORD2, GEANY_FILETYPES_D, 7); - set_sci_style(sci, SCE_D_WORD3, GEANY_FILETYPES_D, 8); - set_sci_style(sci, SCE_D_TYPEDEF, GEANY_FILETYPES_D, 9); - set_sci_style(sci, SCE_D_STRING, GEANY_FILETYPES_D, 10); /* also for other strings below */ - set_sci_style(sci, SCE_D_STRINGEOL, GEANY_FILETYPES_D, 11); - set_sci_style(sci, SCE_D_CHARACTER, GEANY_FILETYPES_D, 12); - set_sci_style(sci, SCE_D_OPERATOR, GEANY_FILETYPES_D, 13); - set_sci_style(sci, SCE_D_IDENTIFIER, GEANY_FILETYPES_D, 14); - set_sci_style(sci, SCE_D_COMMENTLINEDOC, GEANY_FILETYPES_D, 15); - set_sci_style(sci, SCE_D_COMMENTDOCKEYWORD, GEANY_FILETYPES_D, 16); - set_sci_style(sci, SCE_D_COMMENTDOCKEYWORDERROR, GEANY_FILETYPES_D, 17); - - /* copy existing styles */ - set_sci_style(sci, SCE_D_STRINGB, GEANY_FILETYPES_D, 10); /* `string` */ - set_sci_style(sci, SCE_D_STRINGR, GEANY_FILETYPES_D, 10); /* r"string" */ + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + /* SCI_SETKEYWORDS = 1 - secondary + global tags file types, see below */ + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + /* SCI_SETKEYWORDS = 3 is for current session types - see editor_lexer_get_type_keyword_idx() */ + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[3]); + + /* assign global types, merge them with user defined keywords and set them */ + merge_type_keywords(sci, ft_id, 1); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_D_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_D_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_D_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_D_COMMENTDOC, ft_id, 3); + set_sci_style(sci, SCE_D_COMMENTNESTED, ft_id, 4); + set_sci_style(sci, SCE_D_NUMBER, ft_id, 5); + set_sci_style(sci, SCE_D_WORD, ft_id, 6); + set_sci_style(sci, SCE_D_WORD2, ft_id, 7); + set_sci_style(sci, SCE_D_WORD3, ft_id, 8); + set_sci_style(sci, SCE_D_TYPEDEF, ft_id, 9); + set_sci_style(sci, SCE_D_WORD5, ft_id, 9); + set_sci_style(sci, SCE_D_STRING, ft_id, 10); + set_sci_style(sci, SCE_D_STRINGB, ft_id, 10); + set_sci_style(sci, SCE_D_STRINGR, ft_id, 10); + set_sci_style(sci, SCE_D_STRINGEOL, ft_id, 11); + set_sci_style(sci, SCE_D_CHARACTER, ft_id, 12); + set_sci_style(sci, SCE_D_OPERATOR, ft_id, 13); + set_sci_style(sci, SCE_D_IDENTIFIER, ft_id, 14); + set_sci_style(sci, SCE_D_COMMENTLINEDOC, ft_id, 15); + set_sci_style(sci, SCE_D_COMMENTDOCKEYWORD, ft_id, 16); + set_sci_style(sci, SCE_D_COMMENTDOCKEYWORDERROR, ft_id, 17); } static void styleset_ferite_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_FERITE, 20); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_FERITE); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_FERITE].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_FERITE, 0, "false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while"); - get_keyfile_keywords(config, config_home, "types", GEANY_FILETYPES_FERITE, 1, "boolean string number array object void"); - get_keyfile_keywords(config, config_home, "docComment", GEANY_FILETYPES_FERITE, 2, "brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning"); - style_sets[GEANY_FILETYPES_FERITE].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "types", ft_id, 1); + get_keyfile_keywords(config, config_home, "docComment", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_ferite(ScintillaObject *sci) +static void styleset_ferite(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_FERITE; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_FERITE].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_FERITE].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_FERITE].keywords[2]); + styleset_c_like(sci, ft_id); - styleset_c_like(sci, GEANY_FILETYPES_FERITE); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); } static void styleset_vhdl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_VHDL, 15); + new_styleset(ft_id, 15); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[1]); - get_keyfile_hex(config, config_home, "comment_line_bang", 0x3f5fbf, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[2]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[3]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[4]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[5]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[6]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[7]); - get_keyfile_hex(config, config_home, "keyword", 0x001a7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_VHDL].styling[8]); - get_keyfile_hex(config, config_home, "stdoperator", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[9]); - get_keyfile_hex(config, config_home, "attribute", 0x804020, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[10]); - get_keyfile_hex(config, config_home, "stdfunction", 0x808020, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_VHDL].styling[11]); - get_keyfile_hex(config, config_home, "stdpackage", 0x208020, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[12]); - get_keyfile_hex(config, config_home, "stdtype", 0x208080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[13]); - get_keyfile_hex(config, config_home, "userword", 0x804020, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_VHDL].styling[14]); - - style_sets[GEANY_FILETYPES_VHDL].keywords = g_new(gchar*, 8); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_VHDL, 0, - "access after alias all architecture array assert attribute begin block \ - body buffer bus case component configuration constant disconnect downto else elsif \ - end entity exit file for function generate generic group guarded if impure in inertial \ - inout is label library linkage literal loop map new next null of on open others out \ - package port postponed procedure process pure range record register reject report \ - return select severity shared signal subtype then to transport type unaffected units \ - until use variable wait when while with"); - get_keyfile_keywords(config, config_home, "operators", GEANY_FILETYPES_VHDL, 1, - "abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor"); - get_keyfile_keywords(config, config_home, "attributes", GEANY_FILETYPES_VHDL, 2, - "left right low high ascending image value pos val succ pred leftof rightof base range \ - reverse_range length delayed stable quiet transaction event active last_event last_active \ - last_value driving driving_value simple_name path_name instance_name"); - get_keyfile_keywords(config, config_home, "std_functions", GEANY_FILETYPES_VHDL, 3, - "now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic \ - to_stdlogicvector to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge \ - is_x shift_left shift_right rotate_left rotate_right resize to_integer to_unsigned \ - to_signed std_match to_01"); - get_keyfile_keywords(config, config_home, "std_packages", GEANY_FILETYPES_VHDL, 4, - "std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc \ - std_logic_signed std_logic_textio std_logic_unsigned numeric_bit numeric_std \ - math_complex math_real vital_primitives vital_timing"); - get_keyfile_keywords(config, config_home, "std_types", GEANY_FILETYPES_VHDL, 5, - "boolean bit character severity_level integer real time delay_length natural positive \ - string bit_vector file_open_kind file_open_status line text side width std_ulogic \ - std_ulogic_vector std_logic std_logic_vector X01 X01Z UX01 UX01Z unsigned signed"); - get_keyfile_keywords(config, config_home, "userwords", GEANY_FILETYPES_VHDL, 6, ""); - style_sets[GEANY_FILETYPES_VHDL].keywords[7] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "comment_line_bang", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "stdoperator", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "attribute", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "stdfunction", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "stdpackage", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "stdtype", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "userword", &style_sets[ft_id].styling[14]); + + style_sets[ft_id].keywords = g_new(gchar*, 8); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + get_keyfile_keywords(config, config_home, "operators", ft_id, 1); + get_keyfile_keywords(config, config_home, "attributes", ft_id, 2); + get_keyfile_keywords(config, config_home, "std_functions", ft_id, 3); + get_keyfile_keywords(config, config_home, "std_packages", ft_id, 4); + get_keyfile_keywords(config, config_home, "std_types", ft_id, 5); + get_keyfile_keywords(config, config_home, "userwords", ft_id, 6); + style_sets[ft_id].keywords[7] = NULL; } -static void styleset_vhdl(ScintillaObject *sci) +static void styleset_vhdl(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_VHDL; - apply_filetype_properties(sci, SCLEX_VHDL, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[3]); - SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[4]); - SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[5]); - SSM(sci, SCI_SETKEYWORDS, 6, (sptr_t) style_sets[GEANY_FILETYPES_VHDL].keywords[6]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_VHDL, 0); - set_sci_style(sci, SCE_VHDL_DEFAULT, GEANY_FILETYPES_VHDL, 0); - set_sci_style(sci, SCE_VHDL_COMMENT, GEANY_FILETYPES_VHDL, 1); - set_sci_style(sci, SCE_VHDL_COMMENTLINEBANG, GEANY_FILETYPES_VHDL, 2); - set_sci_style(sci, SCE_VHDL_NUMBER, GEANY_FILETYPES_VHDL, 3); - set_sci_style(sci, SCE_VHDL_STRING, GEANY_FILETYPES_VHDL, 4); - set_sci_style(sci, SCE_VHDL_OPERATOR, GEANY_FILETYPES_VHDL, 5); - set_sci_style(sci, SCE_VHDL_IDENTIFIER, GEANY_FILETYPES_VHDL, 6); - set_sci_style(sci, SCE_VHDL_STRINGEOL, GEANY_FILETYPES_VHDL, 7); - set_sci_style(sci, SCE_VHDL_KEYWORD, GEANY_FILETYPES_VHDL, 8); - set_sci_style(sci, SCE_VHDL_STDOPERATOR, GEANY_FILETYPES_VHDL, 9); - set_sci_style(sci, SCE_VHDL_ATTRIBUTE, GEANY_FILETYPES_VHDL, 10); - set_sci_style(sci, SCE_VHDL_STDFUNCTION, GEANY_FILETYPES_VHDL, 11); - set_sci_style(sci, SCE_VHDL_STDPACKAGE, GEANY_FILETYPES_VHDL, 12); - set_sci_style(sci, SCE_VHDL_STDTYPE, GEANY_FILETYPES_VHDL, 13); - set_sci_style(sci, SCE_VHDL_USERWORD, GEANY_FILETYPES_VHDL, 14); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[4]); + sci_set_keywords(sci, 5, style_sets[ft_id].keywords[5]); + sci_set_keywords(sci, 6, style_sets[ft_id].keywords[6]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_VHDL_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_VHDL_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_VHDL_COMMENTLINEBANG, ft_id, 2); + set_sci_style(sci, SCE_VHDL_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_VHDL_STRING, ft_id, 4); + set_sci_style(sci, SCE_VHDL_OPERATOR, ft_id, 5); + set_sci_style(sci, SCE_VHDL_IDENTIFIER, ft_id, 6); + set_sci_style(sci, SCE_VHDL_STRINGEOL, ft_id, 7); + set_sci_style(sci, SCE_VHDL_KEYWORD, ft_id, 8); + set_sci_style(sci, SCE_VHDL_STDOPERATOR, ft_id, 9); + set_sci_style(sci, SCE_VHDL_ATTRIBUTE, ft_id, 10); + set_sci_style(sci, SCE_VHDL_STDFUNCTION, ft_id, 11); + set_sci_style(sci, SCE_VHDL_STDPACKAGE, ft_id, 12); + set_sci_style(sci, SCE_VHDL_STDTYPE, ft_id, 13); + set_sci_style(sci, SCE_VHDL_USERWORD, ft_id, 14); +} + + +static void styleset_verilog_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_styleset(ft_id, 14); + + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "comment_line", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "comment_line_bang", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "word3", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "userword", &style_sets[ft_id].styling[13]); + + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "word", ft_id, 0); + get_keyfile_keywords(config, config_home, "word2", ft_id, 1); + get_keyfile_keywords(config, config_home, "word3", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; +} + + +static void styleset_verilog(ScintillaObject *sci, gint ft_id) +{ + apply_filetype_properties(sci, SCLEX_VERILOG, ft_id); + + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_V_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_V_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_V_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_V_COMMENTLINEBANG, ft_id, 3); + set_sci_style(sci, SCE_V_NUMBER, ft_id, 4); + set_sci_style(sci, SCE_V_WORD, ft_id,5); + set_sci_style(sci, SCE_V_STRING, ft_id, 6); + set_sci_style(sci, SCE_V_WORD2, ft_id, 7); + set_sci_style(sci, SCE_V_WORD3, ft_id, 8); + set_sci_style(sci, SCE_V_PREPROCESSOR, ft_id, 9); + set_sci_style(sci, SCE_V_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_V_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_V_STRINGEOL, ft_id, 12); + set_sci_style(sci, SCE_V_USER, ft_id, 13); } static void styleset_yaml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_YAML, 10); - - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[1]); - get_keyfile_hex(config, config_home, "identifier", 0x000088, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_YAML].styling[2]); - get_keyfile_hex(config, config_home, "keyword", 0x991111, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_YAML].styling[3]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[4]); - get_keyfile_hex(config, config_home, "reference", 0x008888, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[5]); - get_keyfile_hex(config, config_home, "document", 0x000088, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[6]); - get_keyfile_hex(config, config_home, "text", 0x333366, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[7]); - get_keyfile_hex(config, config_home, "error", 0xff0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_YAML].styling[8]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[9]); + new_styleset(ft_id, 10); - style_sets[GEANY_FILETYPES_YAML].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_YAML, 0, "true false yes no"); - style_sets[GEANY_FILETYPES_YAML].keywords[1] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "keyword", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "reference", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "document", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "text", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[9]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_yaml(ScintillaObject *sci) +static void styleset_yaml(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_YAML; - apply_filetype_properties(sci, SCLEX_YAML, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_YAML].keywords[0]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_YAML, 0); - set_sci_style(sci, SCE_YAML_DEFAULT, GEANY_FILETYPES_YAML, 0); - set_sci_style(sci, SCE_YAML_COMMENT, GEANY_FILETYPES_YAML, 1); - set_sci_style(sci, SCE_YAML_IDENTIFIER, GEANY_FILETYPES_YAML, 2); - set_sci_style(sci, SCE_YAML_KEYWORD, GEANY_FILETYPES_YAML, 3); - set_sci_style(sci, SCE_YAML_NUMBER, GEANY_FILETYPES_YAML, 4); - set_sci_style(sci, SCE_YAML_REFERENCE, GEANY_FILETYPES_YAML, 5); - set_sci_style(sci, SCE_YAML_DOCUMENT, GEANY_FILETYPES_YAML, 6); - set_sci_style(sci, SCE_YAML_TEXT, GEANY_FILETYPES_YAML, 7); - set_sci_style(sci, SCE_YAML_ERROR, GEANY_FILETYPES_YAML, 8); - set_sci_style(sci, SCE_YAML_OPERATOR, GEANY_FILETYPES_YAML, 9); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_YAML_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_YAML_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_YAML_IDENTIFIER, ft_id, 2); + set_sci_style(sci, SCE_YAML_KEYWORD, ft_id, 3); + set_sci_style(sci, SCE_YAML_NUMBER, ft_id, 4); + set_sci_style(sci, SCE_YAML_REFERENCE, ft_id, 5); + set_sci_style(sci, SCE_YAML_DOCUMENT, ft_id, 6); + set_sci_style(sci, SCE_YAML_TEXT, ft_id, 7); + set_sci_style(sci, SCE_YAML_ERROR, ft_id, 8); + set_sci_style(sci, SCE_YAML_OPERATOR, ft_id, 9); } static void styleset_js_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_JS, 20); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_JS); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_JS].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_JS, 0, "\ - abs abstract acos anchor asin atan atan2 big bold boolean break byte \ - case catch ceil char charAt charCodeAt class concat const continue cos \ - Date debugger default delete do double else enum escape eval exp export \ - extends false final finally fixed float floor fontcolor fontsize for \ - fromCharCode function goto if implements import in indexOf Infinity \ - instanceof int interface isFinite isNaN italics join lastIndexOf length \ - link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY \ - new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private \ - protected public push random return reverse round shift short sin slice small \ - sort splice split sqrt static strike string String sub substr substring sup \ - super switch synchronized tan this throw throws toLowerCase toString \ - toUpperCase transient true try typeof undefined unescape unshift valueOf \ - var void volatile while with"); - style_sets[GEANY_FILETYPES_JS].keywords[1] = NULL; + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; } -static void styleset_js(ScintillaObject *sci) +static void styleset_js(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_JS; - - apply_filetype_properties(sci, SCLEX_CPP, ft_id); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_JS].keywords[0]); + styleset_c_like(sci, ft_id); - styleset_c_like(sci, GEANY_FILETYPES_JS); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); } static void styleset_lua_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_LUA, 20); + new_styleset(ft_id, 20); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[1]); - get_keyfile_hex(config, config_home, "commentline", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[2]); - get_keyfile_hex(config, config_home, "commentdoc", 0x3f5fbf, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_LUA].styling[3]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[4]); - get_keyfile_hex(config, config_home, "word", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_LUA].styling[5]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[6]); - get_keyfile_hex(config, config_home, "character", 0x008000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[7]); - get_keyfile_hex(config, config_home, "literalstring", 0x008020, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[8]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[9]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[10]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[11]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[12]); - get_keyfile_hex(config, config_home, "function_basic", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[13]); - get_keyfile_hex(config, config_home, "function_other", 0x690000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[14]); - get_keyfile_hex(config, config_home, "coroutines", 0x66005c, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[15]); - get_keyfile_hex(config, config_home, "word5", 0x7979ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[16]); - get_keyfile_hex(config, config_home, "word6", 0xad00ff, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[17]); - get_keyfile_hex(config, config_home, "word7", 0x03D000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[18]); - get_keyfile_hex(config, config_home, "word8", 0xff7600, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[19]); - - style_sets[GEANY_FILETYPES_LUA].keywords = g_new(gchar*, 9); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_LUA, 0, - "and break do else elseif end false for function if \ - in local nil not or repeat return then true until while"); - get_keyfile_keywords(config, config_home, "function_basic", GEANY_FILETYPES_LUA, 1, - "_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring \ - print rawget rawset require tonumber tostring type unpack \ - _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT \ - _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype \ - sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall \ - rawequal setfenv setmetatable xpcall string table math coroutine io os debug \ - load module select"); - get_keyfile_keywords(config, config_home, "function_other", GEANY_FILETYPES_LUA, 2, - "abs acos asin atan atan2 ceil cos deg exp \ - floor format frexp gsub ldexp log log10 max min mod rad random randomseed \ - sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan \ - string.byte string.char string.dump string.find string.len \ - string.lower string.rep string.sub string.upper string.format string.gfind string.gsub \ - table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn \ - math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp \ - math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod \ - math.pi math.pow math.rad math.random math.randomseed math.sin math.sqrt math.tan \ - string.gmatch string.match string.reverse table.maxn \ - math.cosh math.fmod math.modf math.sinh math.tanh math.huge"); - get_keyfile_keywords(config, config_home, "coroutines", GEANY_FILETYPES_LUA, 3, - "openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname \ - read write clock date difftime execute exit getenv setlocale time coroutine.create \ - coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush \ - io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin \ - io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv \ - os.remove os.rename os.setlocale os.time os.tmpname coroutine.running package.cpath \ - package.loaded package.loadlib package.path package.preload package.seeall io.popen"); - get_keyfile_keywords(config, config_home, "user1", GEANY_FILETYPES_LUA, 4, ""); - get_keyfile_keywords(config, config_home, "user2", GEANY_FILETYPES_LUA, 5, ""); - get_keyfile_keywords(config, config_home, "user3", GEANY_FILETYPES_LUA, 6, ""); - get_keyfile_keywords(config, config_home, "user4", GEANY_FILETYPES_LUA, 7, ""); - style_sets[GEANY_FILETYPES_LUA].keywords[8] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "commentdoc", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "literalstring", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "function_basic", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "function_other", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "coroutines", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "word5", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "word6", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "word7", &style_sets[ft_id].styling[18]); + get_keyfile_style(config, config_home, "word8", &style_sets[ft_id].styling[19]); + + style_sets[ft_id].keywords = g_new(gchar*, 9); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + get_keyfile_keywords(config, config_home, "function_basic", ft_id, 1); + get_keyfile_keywords(config, config_home, "function_other", ft_id, 2); + get_keyfile_keywords(config, config_home, "coroutines", ft_id, 3); + get_keyfile_keywords(config, config_home, "user1", ft_id, 4); + get_keyfile_keywords(config, config_home, "user2", ft_id, 5); + get_keyfile_keywords(config, config_home, "user3", ft_id, 6); + get_keyfile_keywords(config, config_home, "user4", ft_id, 7); + style_sets[ft_id].keywords[8] = NULL; } -static void styleset_lua(ScintillaObject *sci) +static void styleset_lua(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_LUA; - apply_filetype_properties(sci, SCLEX_LUA, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[3]); - SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[4]); - SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[5]); - SSM(sci, SCI_SETKEYWORDS, 6, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[6]); - SSM(sci, SCI_SETKEYWORDS, 7, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[7]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_LUA, 0); - set_sci_style(sci, SCE_LUA_DEFAULT, GEANY_FILETYPES_LUA, 0); - set_sci_style(sci, SCE_LUA_COMMENT, GEANY_FILETYPES_LUA, 1); - set_sci_style(sci, SCE_LUA_COMMENTLINE, GEANY_FILETYPES_LUA, 2); - set_sci_style(sci, SCE_LUA_COMMENTDOC, GEANY_FILETYPES_LUA, 3); - set_sci_style(sci, SCE_LUA_NUMBER, GEANY_FILETYPES_LUA, 4); - set_sci_style(sci, SCE_LUA_WORD, GEANY_FILETYPES_LUA, 5); - set_sci_style(sci, SCE_LUA_STRING, GEANY_FILETYPES_LUA, 6); - set_sci_style(sci, SCE_LUA_CHARACTER, GEANY_FILETYPES_LUA, 7); - set_sci_style(sci, SCE_LUA_LITERALSTRING, GEANY_FILETYPES_LUA, 8); - set_sci_style(sci, SCE_LUA_PREPROCESSOR, GEANY_FILETYPES_LUA, 9); - set_sci_style(sci, SCE_LUA_OPERATOR, GEANY_FILETYPES_LUA, 10); - set_sci_style(sci, SCE_LUA_IDENTIFIER, GEANY_FILETYPES_LUA, 11); - set_sci_style(sci, SCE_LUA_STRINGEOL, GEANY_FILETYPES_LUA, 12); - set_sci_style(sci, SCE_LUA_WORD2, GEANY_FILETYPES_LUA, 13); - set_sci_style(sci, SCE_LUA_WORD3, GEANY_FILETYPES_LUA, 14); - set_sci_style(sci, SCE_LUA_WORD4, GEANY_FILETYPES_LUA, 15); - set_sci_style(sci, SCE_LUA_WORD5, GEANY_FILETYPES_LUA, 16); - set_sci_style(sci, SCE_LUA_WORD6, GEANY_FILETYPES_LUA, 17); - set_sci_style(sci, SCE_LUA_WORD7, GEANY_FILETYPES_LUA, 18); - set_sci_style(sci, SCE_LUA_WORD8, GEANY_FILETYPES_LUA, 19); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); + sci_set_keywords(sci, 4, style_sets[ft_id].keywords[4]); + sci_set_keywords(sci, 5, style_sets[ft_id].keywords[5]); + sci_set_keywords(sci, 6, style_sets[ft_id].keywords[6]); + sci_set_keywords(sci, 7, style_sets[ft_id].keywords[7]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_LUA_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_LUA_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_LUA_COMMENTLINE, ft_id, 2); + set_sci_style(sci, SCE_LUA_COMMENTDOC, ft_id, 3); + set_sci_style(sci, SCE_LUA_NUMBER, ft_id, 4); + set_sci_style(sci, SCE_LUA_WORD, ft_id, 5); + set_sci_style(sci, SCE_LUA_STRING, ft_id, 6); + set_sci_style(sci, SCE_LUA_CHARACTER, ft_id, 7); + set_sci_style(sci, SCE_LUA_LITERALSTRING, ft_id, 8); + set_sci_style(sci, SCE_LUA_PREPROCESSOR, ft_id, 9); + set_sci_style(sci, SCE_LUA_OPERATOR, ft_id, 10); + set_sci_style(sci, SCE_LUA_IDENTIFIER, ft_id, 11); + set_sci_style(sci, SCE_LUA_STRINGEOL, ft_id, 12); + set_sci_style(sci, SCE_LUA_WORD2, ft_id, 13); + set_sci_style(sci, SCE_LUA_WORD3, ft_id, 14); + set_sci_style(sci, SCE_LUA_WORD4, ft_id, 15); + set_sci_style(sci, SCE_LUA_WORD5, ft_id, 16); + set_sci_style(sci, SCE_LUA_WORD6, ft_id, 17); + set_sci_style(sci, SCE_LUA_WORD7, ft_id, 18); + set_sci_style(sci, SCE_LUA_WORD8, ft_id, 19); } static void styleset_basic_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_BASIC, 19); + new_styleset(ft_id, 19); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[0]); - get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[1]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[2]); - get_keyfile_hex(config, config_home, "word", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_BASIC].styling[3]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[4]); - get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[5]); - get_keyfile_hex(config, config_home, "operator", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[6]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[7]); - get_keyfile_hex(config, config_home, "date", 0x1a6500, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[8]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[9]); - get_keyfile_hex(config, config_home, "word2", 0x007f7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_BASIC].styling[10]); - get_keyfile_hex(config, config_home, "word3", 0x991111, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[11]); - get_keyfile_hex(config, config_home, "word4", 0x0000d0, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[12]); - get_keyfile_hex(config, config_home, "constant", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[13]); - get_keyfile_hex(config, config_home, "asm", 0x105090, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[14]); - get_keyfile_hex(config, config_home, "label", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[15]); - get_keyfile_hex(config, config_home, "error", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[16]); - get_keyfile_hex(config, config_home, "hexnumber", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[17]); - get_keyfile_hex(config, config_home, "binnumber", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[18]); - - style_sets[GEANY_FILETYPES_BASIC].keywords = g_new(gchar*, 5); - get_keyfile_keywords(config, config_home, "keywords", GEANY_FILETYPES_BASIC, 0, - "as asm bit bitreset bitset byte case cint close cls color const \ - continue cshort csign csng cubyte cuint culngint custom data \ - dim do double else elseif end enum environ eof err error exec exit exp \ - export extern field fix for function get gosub goto hex hibyte hiword if iif imp \ - input instr int integer is kill left len let lobyte loc local locate lof log long \ - longint loop loword lset mklongint mks mkshort mod next not on once open or out \ - pointer pos preserve preset private public put read redim rem reset restore return \ - sizeof sleep space static step stop str string sub then time timer to type ubound \ - ubyte ucase uinteger ulongint union unsigned until ushort using val val64 valint \ - wait while with xor"); - get_keyfile_keywords(config, config_home, "preprocessor", GEANY_FILETYPES_BASIC, 1, - "#define defined #dynamic #else #endif #endmacro #error #if #ifdef #ifndef #inclib #include \ - #libpath #line #macro #print #undef"); - get_keyfile_keywords(config, config_home, "user1", GEANY_FILETYPES_BASIC, 2, ""); - get_keyfile_keywords(config, config_home, "user2", GEANY_FILETYPES_BASIC, 3, ""); - style_sets[GEANY_FILETYPES_BASIC].keywords[4] = NULL; + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "comment", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "preprocessor", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "operator", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "date", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "word2", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "word3", &style_sets[ft_id].styling[11]); + get_keyfile_style(config, config_home, "word4", &style_sets[ft_id].styling[12]); + get_keyfile_style(config, config_home, "constant", &style_sets[ft_id].styling[13]); + get_keyfile_style(config, config_home, "asm", &style_sets[ft_id].styling[14]); + get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[15]); + get_keyfile_style(config, config_home, "error", &style_sets[ft_id].styling[16]); + get_keyfile_style(config, config_home, "hexnumber", &style_sets[ft_id].styling[17]); + get_keyfile_style(config, config_home, "binnumber", &style_sets[ft_id].styling[18]); + + style_sets[ft_id].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "keywords", ft_id, 0); + get_keyfile_keywords(config, config_home, "preprocessor", ft_id, 1); + get_keyfile_keywords(config, config_home, "user1", ft_id, 2); + get_keyfile_keywords(config, config_home, "user2", ft_id, 3); + style_sets[ft_id].keywords[4] = NULL; } -static void styleset_basic(ScintillaObject *sci) +static void styleset_basic(ScintillaObject *sci, gint ft_id) { - const filetype_id ft_id = GEANY_FILETYPES_BASIC; - apply_filetype_properties(sci, SCLEX_FREEBASIC, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[3]); - - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_BASIC, 0); - set_sci_style(sci, SCE_B_DEFAULT, GEANY_FILETYPES_BASIC, 0); - set_sci_style(sci, SCE_B_COMMENT, GEANY_FILETYPES_BASIC, 1); - set_sci_style(sci, SCE_B_NUMBER, GEANY_FILETYPES_BASIC, 2); - set_sci_style(sci, SCE_B_KEYWORD, GEANY_FILETYPES_BASIC, 3); - set_sci_style(sci, SCE_B_STRING, GEANY_FILETYPES_BASIC, 4); - set_sci_style(sci, SCE_B_PREPROCESSOR, GEANY_FILETYPES_BASIC, 5); - set_sci_style(sci, SCE_B_OPERATOR, GEANY_FILETYPES_BASIC, 6); - set_sci_style(sci, SCE_B_IDENTIFIER, GEANY_FILETYPES_BASIC, 7); - set_sci_style(sci, SCE_B_DATE, GEANY_FILETYPES_BASIC, 8); - set_sci_style(sci, SCE_B_STRINGEOL, GEANY_FILETYPES_BASIC, 9); - set_sci_style(sci, SCE_B_KEYWORD2, GEANY_FILETYPES_BASIC, 10); - set_sci_style(sci, SCE_B_KEYWORD3, GEANY_FILETYPES_BASIC, 11); - set_sci_style(sci, SCE_B_KEYWORD4, GEANY_FILETYPES_BASIC, 12); - set_sci_style(sci, SCE_B_CONSTANT, GEANY_FILETYPES_BASIC, 13); - set_sci_style(sci, SCE_B_ASM, GEANY_FILETYPES_BASIC, 14); /* (still?) unused by the lexer */ - set_sci_style(sci, SCE_B_LABEL, GEANY_FILETYPES_BASIC, 15); - set_sci_style(sci, SCE_B_ERROR, GEANY_FILETYPES_BASIC, 16); - set_sci_style(sci, SCE_B_HEXNUMBER, GEANY_FILETYPES_BASIC, 17); - set_sci_style(sci, SCE_B_BINNUMBER, GEANY_FILETYPES_BASIC, 18); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 2, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[3]); + + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_B_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_B_COMMENT, ft_id, 1); + set_sci_style(sci, SCE_B_NUMBER, ft_id, 2); + set_sci_style(sci, SCE_B_KEYWORD, ft_id, 3); + set_sci_style(sci, SCE_B_STRING, ft_id, 4); + set_sci_style(sci, SCE_B_PREPROCESSOR, ft_id, 5); + set_sci_style(sci, SCE_B_OPERATOR, ft_id, 6); + set_sci_style(sci, SCE_B_IDENTIFIER, ft_id, 7); + set_sci_style(sci, SCE_B_DATE, ft_id, 8); + set_sci_style(sci, SCE_B_STRINGEOL, ft_id, 9); + set_sci_style(sci, SCE_B_KEYWORD2, ft_id, 10); + set_sci_style(sci, SCE_B_KEYWORD3, ft_id, 11); + set_sci_style(sci, SCE_B_KEYWORD4, ft_id, 12); + set_sci_style(sci, SCE_B_CONSTANT, ft_id, 13); + set_sci_style(sci, SCE_B_ASM, ft_id, 14); /* (still?) unused by the lexer */ + set_sci_style(sci, SCE_B_LABEL, ft_id, 15); + set_sci_style(sci, SCE_B_ERROR, ft_id, 16); + set_sci_style(sci, SCE_B_HEXNUMBER, ft_id, 17); + set_sci_style(sci, SCE_B_BINNUMBER, ft_id, 18); } static void styleset_actionscript_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_AS, 20); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_AS); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_AS].keywords = g_new(gchar *, 4); - - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_AS, 0, ""); - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_AS, 1, ""); - get_keyfile_keywords(config, config_home, "classes", GEANY_FILETYPES_AS, 2, ""); - style_sets[GEANY_FILETYPES_AS].keywords[3] = NULL; + style_sets[ft_id].keywords = g_new(gchar *, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "classes", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; } -static void styleset_actionscript(ScintillaObject *sci) +static void styleset_actionscript(ScintillaObject *sci, gint ft_id) { - apply_filetype_properties(sci, SCLEX_CPP, GEANY_FILETYPES_AS); - - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_AS].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_AS].keywords[2]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_AS].keywords[1]); + styleset_c_like(sci, ft_id); - styleset_c_like(sci, GEANY_FILETYPES_AS); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[2]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[1]); } static void styleset_haxe_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_HAXE, 20); - styleset_c_like_init(config, config_home, GEANY_FILETYPES_HAXE); + styleset_c_like_init(config, config_home, ft_id); - style_sets[GEANY_FILETYPES_HAXE].keywords = g_new(gchar*, 4); - - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_HAXE, 0, "\ - abstract break case catch class \ - continue default do else enum external extends \ - finally float for function goto if implements import in \ - interface new package protected public \ - return static super switch this throw throws \ - try type var while"); + style_sets[ft_id].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + get_keyfile_keywords(config, config_home, "secondary", ft_id, 1); + get_keyfile_keywords(config, config_home, "classes", ft_id, 2); + style_sets[ft_id].keywords[3] = NULL; +} - get_keyfile_keywords(config, config_home, "secondary", GEANY_FILETYPES_HAXE, 1, "\ - Bool Enum Float Int Null Void Dynamic String"); - get_keyfile_keywords(config, config_home, "classes", GEANY_FILETYPES_HAXE, 2, "\ - Array ArrayAccess Class Date DateTools \ - EReg Enum Hash IntHash IntIter \ - Iterable Iterator Lambda List Math Protected \ - Reflect Std StringBuf StringTools Type \ - UInt ValueType Void Xml XmlType"); +static void styleset_haxe(ScintillaObject *sci, gint ft_id) +{ + styleset_c_like(sci, ft_id); - style_sets[GEANY_FILETYPES_HAXE].keywords[3] = NULL; + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); + sci_set_keywords(sci, 1, style_sets[ft_id].keywords[1]); + sci_set_keywords(sci, 3, style_sets[ft_id].keywords[2]); } -static void styleset_haxe(ScintillaObject *sci) +static void styleset_ada_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - const filetype_id ft_id = GEANY_FILETYPES_HAXE; + new_styleset(ft_id, 12); - apply_filetype_properties(sci, SCLEX_CPP, ft_id); + get_keyfile_style(config, config_home, "default", &style_sets[ft_id].styling[0]); + get_keyfile_style(config, config_home, "word", &style_sets[ft_id].styling[1]); + get_keyfile_style(config, config_home, "identifier", &style_sets[ft_id].styling[2]); + get_keyfile_style(config, config_home, "number", &style_sets[ft_id].styling[3]); + get_keyfile_style(config, config_home, "delimiter", &style_sets[ft_id].styling[4]); + get_keyfile_style(config, config_home, "character", &style_sets[ft_id].styling[5]); + get_keyfile_style(config, config_home, "charactereol", &style_sets[ft_id].styling[6]); + get_keyfile_style(config, config_home, "string", &style_sets[ft_id].styling[7]); + get_keyfile_style(config, config_home, "stringeol", &style_sets[ft_id].styling[8]); + get_keyfile_style(config, config_home, "label", &style_sets[ft_id].styling[9]); + get_keyfile_style(config, config_home, "commentline", &style_sets[ft_id].styling[10]); + get_keyfile_style(config, config_home, "illegal", &style_sets[ft_id].styling[11]); + + style_sets[ft_id].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "primary", ft_id, 0); + style_sets[ft_id].keywords[1] = NULL; +} + + +static void styleset_ada(ScintillaObject *sci, gint ft_id) +{ + apply_filetype_properties(sci, SCLEX_ADA, ft_id); - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_HAXE].keywords[0]); - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_HAXE].keywords[1]); - SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_HAXE].keywords[2]); + sci_set_keywords(sci, 0, style_sets[ft_id].keywords[0]); - styleset_c_like(sci, GEANY_FILETYPES_HAXE); + set_sci_style(sci, STYLE_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_ADA_DEFAULT, ft_id, 0); + set_sci_style(sci, SCE_ADA_WORD, ft_id, 1); + set_sci_style(sci, SCE_ADA_IDENTIFIER, ft_id, 2); + set_sci_style(sci, SCE_ADA_NUMBER, ft_id, 3); + set_sci_style(sci, SCE_ADA_DELIMITER, ft_id, 4); + set_sci_style(sci, SCE_ADA_CHARACTER, ft_id, 5); + set_sci_style(sci, SCE_ADA_CHARACTEREOL, ft_id, 6); + set_sci_style(sci, SCE_ADA_STRING, ft_id, 7); + set_sci_style(sci, SCE_ADA_STRINGEOL, ft_id, 8); + set_sci_style(sci, SCE_ADA_LABEL, ft_id, 9); + set_sci_style(sci, SCE_ADA_COMMENTLINE, ft_id, 10); + set_sci_style(sci, SCE_ADA_ILLEGAL, ft_id, 11); } -static void styleset_ada_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +static void get_key_values(GKeyFile *config, const gchar *group, gchar **keys, gchar **values) { - new_style_array(GEANY_FILETYPES_ADA, 12); + while (*keys) + { + gchar *str = g_key_file_get_string(config, group, *keys, NULL); + + if (str) + setptr(*values, str); - get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[0]); - get_keyfile_hex(config, config_home, "word", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_ADA].styling[1]); - get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[2]); - get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[3]); - get_keyfile_hex(config, config_home, "delimiter", 0x301010, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[4]); - get_keyfile_hex(config, config_home, "character", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[5]); - get_keyfile_hex(config, config_home, "charactereol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[6]); - get_keyfile_hex(config, config_home, "string", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[7]); - get_keyfile_hex(config, config_home, "stringeol", 0x000000, 0xe0c0e0, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[8]); - get_keyfile_hex(config, config_home, "label", 0xaaaaaa, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[9]); - get_keyfile_hex(config, config_home, "commentline", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[10]); - get_keyfile_hex(config, config_home, "illegal", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[11]); - - style_sets[GEANY_FILETYPES_ADA].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "primary", GEANY_FILETYPES_ADA, 0, "abort abs abstract accept access aliased all and array at begin body case constant declare delay delta digits do else elsif end entry exception exit for function generic goto if in interface is limited loop mod new not null of or others out overriding package pragma private procedure protected raise range record rem renames requeue return reverse select separate subtype synchronized tagged task terminate then type until use when while with xor"); - style_sets[GEANY_FILETYPES_ADA].keywords[1] = NULL; + keys++; + values++; + } } -static void styleset_ada(ScintillaObject *sci) +#define foreach_strv(strptr, strv) \ + for (strptr = strv; *strptr; strptr++) + +static void read_properties(GeanyFiletype *ft, GKeyFile *config, GKeyFile *configh) { - const filetype_id ft_id = GEANY_FILETYPES_ADA; + gchar group[] = "lexer_properties"; + gchar **keys = g_key_file_get_keys(config, group, NULL, NULL); + gchar **keysh = g_key_file_get_keys(configh, group, NULL, NULL); - apply_filetype_properties(sci, SCLEX_ADA, ft_id); + /* move/merge keysh into keys */ + if (!keys) + keys = keysh; + else if (keysh) + { + gchar **strv = g_new0(gchar*, g_strv_length(keys) + g_strv_length(keysh) + 1); + gchar **read, **write = strv; + + /* may have same key in each, but home will override so it's OK */ + foreach_strv(read, keys) + *write++ = *read; + foreach_strv(read, keysh) + *write++ = *read; + g_free(keys); + g_free(keysh); + keys = strv; + } - SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_ADA].keywords[0]); + if (keys) + { + gchar **values = g_new0(gchar*, g_strv_length(keys) + 1); + + style_sets[ft->id].property_keys = keys; + style_sets[ft->id].property_values = values; - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_ADA, 0); - set_sci_style(sci, SCE_ADA_DEFAULT, GEANY_FILETYPES_ADA, 0); - set_sci_style(sci, SCE_ADA_WORD, GEANY_FILETYPES_ADA, 1); - set_sci_style(sci, SCE_ADA_IDENTIFIER, GEANY_FILETYPES_ADA, 2); - set_sci_style(sci, SCE_ADA_NUMBER, GEANY_FILETYPES_ADA, 3); - set_sci_style(sci, SCE_ADA_DELIMITER, GEANY_FILETYPES_ADA, 4); - set_sci_style(sci, SCE_ADA_CHARACTER, GEANY_FILETYPES_ADA, 5); - set_sci_style(sci, SCE_ADA_CHARACTEREOL, GEANY_FILETYPES_ADA, 6); - set_sci_style(sci, SCE_ADA_STRING, GEANY_FILETYPES_ADA, 7); - set_sci_style(sci, SCE_ADA_STRINGEOL, GEANY_FILETYPES_ADA, 8); - set_sci_style(sci, SCE_ADA_LABEL, GEANY_FILETYPES_ADA, 9); - set_sci_style(sci, SCE_ADA_COMMENTLINE, GEANY_FILETYPES_ADA, 10); - set_sci_style(sci, SCE_ADA_ILLEGAL, GEANY_FILETYPES_ADA, 11); + get_key_values(config, group, keys, values); + get_key_values(configh, group, keys, values); + } +} + + +static gint get_lexer_filetype(GeanyFiletype *ft) +{ + ft = NVL(ft->lexer_filetype, ft); + return ft->id; } @@ -3497,16 +3143,28 @@ /* Called by filetypes_load_config(). */ void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh) { - /* Clear old information if necessary - e.g. reloading config */ - styleset_free(filetype_idx); + GeanyFiletype *ft = filetypes[filetype_idx]; + gint lexer_id = get_lexer_filetype(ft); + + if (!style_sets) + style_sets = g_new0(StyleSet, filetypes_array->len); + + /* Clear old information if necessary - e.g. when reloading config */ + free_styleset(filetype_idx); + + read_properties(ft, config, configh); + /* None filetype handled specially */ + if (filetype_idx == GEANY_FILETYPES_NONE) + { + styleset_common_init(GEANY_FILETYPES_NONE, config, configh); + return; + } /* All stylesets depend on filetypes.common */ - if (filetype_idx != GEANY_FILETYPES_NONE) - filetypes_load_config(GEANY_FILETYPES_NONE, FALSE); + filetypes_load_config(GEANY_FILETYPES_NONE, FALSE); - switch (filetype_idx) + switch (lexer_id) { - init_styleset_case(GEANY_FILETYPES_NONE, styleset_common_init); init_styleset_case(GEANY_FILETYPES_ADA, styleset_ada_init); init_styleset_case(GEANY_FILETYPES_ASM, styleset_asm_init); init_styleset_case(GEANY_FILETYPES_BASIC, styleset_basic_init); @@ -3514,8 +3172,6 @@ init_styleset_case(GEANY_FILETYPES_CAML, styleset_caml_init); init_styleset_case(GEANY_FILETYPES_CMAKE, styleset_cmake_init); init_styleset_case(GEANY_FILETYPES_CONF, styleset_conf_init); - init_styleset_case(GEANY_FILETYPES_CPP, styleset_cpp_init); - init_styleset_case(GEANY_FILETYPES_CS, styleset_cs_init); init_styleset_case(GEANY_FILETYPES_CSS, styleset_css_init); init_styleset_case(GEANY_FILETYPES_D, styleset_d_init); init_styleset_case(GEANY_FILETYPES_DIFF, styleset_diff_init); @@ -3523,7 +3179,6 @@ init_styleset_case(GEANY_FILETYPES_FERITE, styleset_ferite_init); init_styleset_case(GEANY_FILETYPES_F77, styleset_f77_init); init_styleset_case(GEANY_FILETYPES_FORTRAN, styleset_fortran_init); - init_styleset_case(GEANY_FILETYPES_GLSL, styleset_glsl_init); init_styleset_case(GEANY_FILETYPES_HASKELL, styleset_haskell_init); init_styleset_case(GEANY_FILETYPES_HAXE, styleset_haxe_init); init_styleset_case(GEANY_FILETYPES_AS, styleset_actionscript_init); @@ -3546,32 +3201,37 @@ init_styleset_case(GEANY_FILETYPES_SH, styleset_sh_init); init_styleset_case(GEANY_FILETYPES_SQL, styleset_sql_init); init_styleset_case(GEANY_FILETYPES_TCL, styleset_tcl_init); - init_styleset_case(GEANY_FILETYPES_VALA, styleset_vala_init); init_styleset_case(GEANY_FILETYPES_VHDL, styleset_vhdl_init); + init_styleset_case(GEANY_FILETYPES_VERILOG, styleset_verilog_init); init_styleset_case(GEANY_FILETYPES_XML, styleset_markup_init); init_styleset_case(GEANY_FILETYPES_YAML, styleset_yaml_init); + default: + if (ft->lexer_filetype) + geany_debug("Filetype %s has a recursive lexer_filetype %s set!", + ft->name, ft->lexer_filetype->name); } + /* should be done in filetypes.c really: */ - if (filetype_idx != GEANY_FILETYPES_NONE) - get_keyfile_wordchars(config, configh, &style_sets[filetype_idx].wordchars); + get_keyfile_wordchars(config, configh, &style_sets[filetype_idx].wordchars); } /* lang_name is the name used for the styleset_foo function, e.g. foo. */ #define styleset_case(ft_id, styleset_func) \ case (ft_id): \ - styleset_func (sci); \ + styleset_func(sci, ft->id); \ break -void highlighting_set_styles(ScintillaObject *sci, gint filetype_idx) +/** Sets up highlighting and other visual settings. + * @param sci Scintilla widget. + * @param ft Filetype settings to use. */ +void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) { - filetypes_load_config(filetype_idx, FALSE); /* load filetypes.ext */ + gint lexer_id = get_lexer_filetype(ft); - /* load tags files (some lexers highlight global typenames) */ - if (filetype_idx != GEANY_FILETYPES_NONE) - symbols_global_tags_loaded(filetype_idx); + filetypes_load_config(ft->id, FALSE); /* load filetypes.ext */ - switch (filetype_idx) + switch (lexer_id) { styleset_case(GEANY_FILETYPES_ADA, styleset_ada); styleset_case(GEANY_FILETYPES_ASM, styleset_asm); @@ -3580,8 +3240,6 @@ styleset_case(GEANY_FILETYPES_CAML, styleset_caml); styleset_case(GEANY_FILETYPES_CMAKE, styleset_cmake); styleset_case(GEANY_FILETYPES_CONF, styleset_conf); - styleset_case(GEANY_FILETYPES_CPP, styleset_cpp); - styleset_case(GEANY_FILETYPES_CS, styleset_cs); styleset_case(GEANY_FILETYPES_CSS, styleset_css); styleset_case(GEANY_FILETYPES_D, styleset_d); styleset_case(GEANY_FILETYPES_DIFF, styleset_diff); @@ -3589,7 +3247,6 @@ styleset_case(GEANY_FILETYPES_FERITE, styleset_ferite); styleset_case(GEANY_FILETYPES_F77, styleset_f77); styleset_case(GEANY_FILETYPES_FORTRAN, styleset_fortran); - styleset_case(GEANY_FILETYPES_GLSL, styleset_glsl); styleset_case(GEANY_FILETYPES_HASKELL, styleset_haskell); styleset_case(GEANY_FILETYPES_HAXE, styleset_haxe); styleset_case(GEANY_FILETYPES_AS, styleset_actionscript); @@ -3612,27 +3269,41 @@ styleset_case(GEANY_FILETYPES_SH, styleset_sh); styleset_case(GEANY_FILETYPES_SQL, styleset_sql); styleset_case(GEANY_FILETYPES_TCL, styleset_tcl); - styleset_case(GEANY_FILETYPES_VALA, styleset_vala); styleset_case(GEANY_FILETYPES_VHDL, styleset_vhdl); + styleset_case(GEANY_FILETYPES_VERILOG, styleset_verilog); styleset_case(GEANY_FILETYPES_XML, styleset_xml); styleset_case(GEANY_FILETYPES_YAML, styleset_yaml); + case GEANY_FILETYPES_NONE: default: - styleset_case(GEANY_FILETYPES_NONE, styleset_none); + styleset_default(sci, ft->id); + } + /* [lexer_properties] settings */ + if (style_sets[ft->id].property_keys) + { + gchar **prop = style_sets[ft->id].property_keys; + gchar **val = style_sets[ft->id].property_values; + + while (*prop) + { + sci_set_property(sci, *prop, *val); + prop++; + val++; + } } } -/** Retrieve a style @a style_id for the filetype @a ft_id. +/** Retrieves a style @a style_id for the filetype @a ft_id. * If the style was not already initialised * (e.g. by by opening a file of this type), it will be initialised. The returned pointer is * owned by Geany and must not be freed. * @param ft_id Filetype ID, e.g. @c GEANY_FILETYPES_DIFF. * @param style_id A Scintilla lexer style, e.g. @c SCE_DIFF_ADDED. See scintilla/include/SciLexer.h. * @return A pointer to the style struct. - * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with ScintillaFuncs::send_message(). */ + * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with scintilla_send_message(). */ const GeanyLexerStyle *highlighting_get_style(gint ft_id, gint style_id) { - if (ft_id < 0 || ft_id > GEANY_MAX_BUILT_IN_FILETYPES) + if (ft_id < 0 || ft_id >= (gint)filetypes_array->len) return NULL; /* ensure filetype loaded */ @@ -3642,3 +3313,109 @@ * with array indices) */ return get_style(ft_id, style_id); } + + +static void +on_color_scheme_clicked(GtkMenuItem *menuitem, gpointer user_data) +{ + gchar *fname; + gchar *path; + + /* check if default item */ + if (user_data) + { + setptr(editor_prefs.color_scheme, NULL); + filetypes_reload(); + return; + } + fname = ui_menu_item_get_text(menuitem); + setptr(fname, utils_get_locale_from_utf8(fname)); + + /* fname is just the basename from the menu item, so prepend the custom files path */ + path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL); + if (!g_file_test(path, G_FILE_TEST_EXISTS)) + { + /* try the system path */ + g_free(path); + path = g_build_path(G_DIR_SEPARATOR_S, app->datadir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL); + } + if (g_file_test(path, G_FILE_TEST_EXISTS)) + { + setptr(editor_prefs.color_scheme, fname); + fname = NULL; + filetypes_reload(); + } + else + { + setptr(fname, utils_get_utf8_from_locale(fname)); + ui_set_statusbar(TRUE, _("Could not find file '%s'."), fname); + } + g_free(path); + g_free(fname); +} + + +static void add_color_scheme_item(const gchar *fname, GtkWidget *menu) +{ + GtkWidget *tmp_button; + gchar *label; + + g_return_if_fail(fname); + g_return_if_fail(menu); + + label = utils_get_utf8_from_locale(fname); + + tmp_button = gtk_menu_item_new_with_label(label); + gtk_widget_show(tmp_button); + gtk_container_add(GTK_CONTAINER(menu), tmp_button); + g_signal_connect(tmp_button, "activate", G_CALLBACK(on_color_scheme_clicked), NULL); + + g_free(label); +} + + +static gboolean add_color_scheme_items(GtkWidget *menu) +{ + GSList *list = utils_get_config_files(GEANY_COLORSCHEMES_SUBDIR); + GSList *node; + + foreach_slist(node, list) + { + gchar *fname = node->data; + + if (g_str_has_suffix(fname, ".conf")) + add_color_scheme_item(fname, menu); + g_free(fname); + } + g_slist_free(list); + return list != NULL; +} + + +static void create_color_scheme_menu(void) +{ + GtkWidget *item, *menu, *root; + + menu = ui_lookup_widget(main_widgets.window, "menu_view_editor1_menu"); + item = ui_image_menu_item_new(GTK_STOCK_SELECT_COLOR, _("_Color Schemes")); + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item); + root = item; + + menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu); + + item = gtk_menu_item_new_with_mnemonic(_("_Default")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_color_scheme_clicked), GINT_TO_POINTER(TRUE)); + + /* for now we don't show the color scheme menu unless there are files */ + if (add_color_scheme_items(menu)) + gtk_widget_show_all(root); +} + + +void highlighting_init(void) +{ + create_color_scheme_menu(); +} + diff -Nru geany-0.18/src/highlighting.h geany-0.19/src/highlighting.h --- geany-0.18/src/highlighting.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/highlighting.h 2010-01-25 15:53:54.000000000 +0000 @@ -1,8 +1,8 @@ /* * highlighting.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: highlighting.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: highlighting.h 4552 2010-01-25 15:53:54Z ntrel $ */ @@ -30,7 +30,7 @@ /** Fields representing the different attributes of a Scintilla lexer style. - * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with ScintillaFuncs::send_message(). */ + * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with scintilla_send_message(). */ typedef struct GeanyLexerStyle { gint foreground; /**< Foreground text colour, in @c 0xBBGGRR format. */ @@ -41,9 +41,11 @@ GeanyLexerStyle; +void highlighting_init(void); + void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh); -void highlighting_set_styles(ScintillaObject *sci, gint filetype_idx); +void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft); const GeanyLexerStyle *highlighting_get_style(gint ft_id, gint style_id); diff -Nru geany-0.18/src/images.c geany-0.19/src/images.c --- geany-0.18/src/images.c 2009-06-05 15:00:08.000000000 +0100 +++ geany-0.19/src/images.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * images.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 diff -Nru geany-0.18/src/interface.c geany-0.19/src/interface.c --- geany-0.18/src/interface.c 2009-07-14 12:25:07.000000000 +0100 +++ geany-0.19/src/interface.c 2010-05-16 19:22:24.000000000 +0100 @@ -38,9 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image2854; - GtkWidget *menu_new_with_template1_menu; - GtkWidget *invisible2; + GtkWidget *image3165; GtkWidget *separator12; GtkWidget *menu_open1; GtkWidget *menu_open_selected_file1; @@ -49,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image2855; + GtkWidget *image3166; GtkWidget *menu_reload1; - GtkWidget *image2856; + GtkWidget *image3167; GtkWidget *menu_reload_as1; - GtkWidget *image2857; + GtkWidget *image3168; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -64,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image2858; + GtkWidget *image3169; GtkWidget *menu_close_all1; - GtkWidget *image2859; + GtkWidget *image3170; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -83,25 +81,44 @@ GtkWidget *separator25; GtkWidget *menu_format1; GtkWidget *menu_format1_menu; + GtkWidget *reflow_lines_block1; GtkWidget *menu_toggle_case2; + GtkWidget *transpose_current_line1; GtkWidget *separator28; GtkWidget *menu_comment_line1; GtkWidget *menu_uncomment_line1; GtkWidget *menu_toggle_line_commentation1; - GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image2860; + GtkWidget *image3171; GtkWidget *menu_decrease_indent1; - GtkWidget *image2861; + GtkWidget *image3172; + GtkWidget *smart_line_indent1; GtkWidget *separator37; - GtkWidget *send_selection_to_vte1; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; + GtkWidget *commands2; + GtkWidget *commands2_menu; + GtkWidget *cut_current_line_s_1; + GtkWidget *image3173; + GtkWidget *copy_current_line_s_1; + GtkWidget *image3174; + GtkWidget *delete_current_line_s_1; + GtkWidget *duplicate_line_or_selection1; + GtkWidget *separator49; + GtkWidget *select_current_line_s_1; + GtkWidget *select_current_paragraph1; + GtkWidget *separator50; + GtkWidget *insert_alternative_white_space1; + GtkWidget *separator51; + GtkWidget *go_to_next_marker1; + GtkWidget *go_to_previous_marker1; + GtkWidget *separator52; + GtkWidget *send_selection_to_vte1; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image2862; + GtkWidget *image3175; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -110,16 +127,18 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image2863; + GtkWidget *image3176; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image2864; + GtkWidget *image3177; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image2865; + GtkWidget *image3178; + GtkWidget *plugin_preferences1; + GtkWidget *image3179; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -127,7 +146,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image2866; + GtkWidget *image3180; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -136,11 +155,11 @@ GtkWidget *previous_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image2867; + GtkWidget *image3181; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image2868; + GtkWidget *image3182; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -198,27 +217,30 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image2869; + GtkWidget *image3183; GtkWidget *project_open1; - GtkWidget *image2870; + GtkWidget *image3184; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image2871; + GtkWidget *image3185; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; + GtkWidget *menu_reload_configuration1; + GtkWidget *image3186; + GtkWidget *configuration_files1; + GtkWidget *image3187; + GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image2872; + GtkWidget *image3188; GtkWidget *menu_count_words1; GtkWidget *load_tags1; - GtkWidget *menu_reload_configuration1; - GtkWidget *image2873; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image2874; + GtkWidget *image3189; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -252,9 +274,6 @@ GtkWidget *hbox1; GtkWidget *statusbar; GtkAccelGroup *accel_group; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); accel_group = gtk_accel_group_new (); @@ -288,16 +307,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image2854 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2854); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2854); - - menu_new_with_template1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); - - invisible2 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (menu_new_with_template1_menu), invisible2); - gtk_tooltips_set_tip (tooltips, invisible2, _("dummy tooltip, don't translate this."), NULL); + image3165 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3165); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3165); separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -333,25 +345,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); - image2855 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2855); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2855); + image3166 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3166); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3166); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image2856 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2856); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2856); + image3167 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3167); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3167); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image2857 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2857); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2857); + image3168 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3168); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3168); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -394,17 +406,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1); - image2858 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2858); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2858); + image3169 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3169); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3169); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); - image2859 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2859); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2859); + image3170 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3170); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3170); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -472,10 +484,18 @@ menu_format1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_format1), menu_format1_menu); + reflow_lines_block1 = gtk_menu_item_new_with_mnemonic (_("_Reflow Lines/Block")); + gtk_widget_show (reflow_lines_block1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), reflow_lines_block1); + menu_toggle_case2 = gtk_menu_item_new_with_mnemonic (_("T_oggle Case of Selection")); gtk_widget_show (menu_toggle_case2); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_toggle_case2); + transpose_current_line1 = gtk_menu_item_new_with_mnemonic (_("_Transpose Current Line")); + gtk_widget_show (transpose_current_line1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), transpose_current_line1); + separator28 = gtk_separator_menu_item_new (); gtk_widget_show (separator28); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator28); @@ -493,10 +513,6 @@ gtk_widget_show (menu_toggle_line_commentation1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_toggle_line_commentation1); - menu_duplicate_line1 = gtk_menu_item_new_with_mnemonic (_("Du_plicate Line or Selection")); - gtk_widget_show (menu_duplicate_line1); - gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_duplicate_line1); - separator29 = gtk_separator_menu_item_new (); gtk_widget_show (separator29); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator29); @@ -506,27 +522,27 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image2860 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2860); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2860); + image3171 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3171); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3171); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image2861 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2861); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2861); + image3172 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3172); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3172); + + smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent")); + gtk_widget_show (smart_line_indent1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), smart_line_indent1); separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator37); gtk_widget_set_sensitive (separator37, FALSE); - send_selection_to_vte1 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to Terminal")); - gtk_widget_show (send_selection_to_vte1); - gtk_container_add (GTK_CONTAINER (menu_format1_menu), send_selection_to_vte1); - send_selection_to2 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to")); gtk_widget_show (send_selection_to2); gtk_container_add (GTK_CONTAINER (menu_format1_menu), send_selection_to2); @@ -537,6 +553,81 @@ invisible13 = gtk_menu_item_new_with_mnemonic (_("invisible")); gtk_container_add (GTK_CONTAINER (send_selection_to2_menu), invisible13); + commands2 = gtk_menu_item_new_with_mnemonic (_("_Commands")); + gtk_widget_show (commands2); + gtk_container_add (GTK_CONTAINER (edit1_menu), commands2); + + commands2_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands2_menu); + + cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Cut Current Line(s)")); + gtk_widget_show (cut_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1); + + image3173 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3173); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3173); + + copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Copy Current Line(s)")); + gtk_widget_show (copy_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1); + + image3174 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3174); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3174); + + delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)")); + gtk_widget_show (delete_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), delete_current_line_s_1); + + duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("_Duplicate Line or Selection")); + gtk_widget_show (duplicate_line_or_selection1); + gtk_container_add (GTK_CONTAINER (commands2_menu), duplicate_line_or_selection1); + + separator49 = gtk_separator_menu_item_new (); + gtk_widget_show (separator49); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator49); + gtk_widget_set_sensitive (separator49, FALSE); + + select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Line(s)")); + gtk_widget_show (select_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_line_s_1); + + select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Paragraph")); + gtk_widget_show (select_current_paragraph1); + gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1); + + separator50 = gtk_separator_menu_item_new (); + gtk_widget_show (separator50); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator50); + gtk_widget_set_sensitive (separator50, FALSE); + + insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("_Insert Alternative White Space")); + gtk_widget_show (insert_alternative_white_space1); + gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1); + + separator51 = gtk_separator_menu_item_new (); + gtk_widget_show (separator51); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator51); + gtk_widget_set_sensitive (separator51, FALSE); + + go_to_next_marker1 = gtk_menu_item_new_with_mnemonic (_("_Go to Next Marker")); + gtk_widget_show (go_to_next_marker1); + gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_next_marker1); + + go_to_previous_marker1 = gtk_menu_item_new_with_mnemonic (_("_Go to Previous Marker")); + gtk_widget_show (go_to_previous_marker1); + gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_previous_marker1); + + separator52 = gtk_separator_menu_item_new (); + gtk_widget_show (separator52); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator52); + gtk_widget_set_sensitive (separator52, FALSE); + + send_selection_to_vte1 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to Terminal")); + gtk_widget_show (send_selection_to_vte1); + gtk_container_add (GTK_CONTAINER (commands2_menu), send_selection_to_vte1); + separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); gtk_container_add (GTK_CONTAINER (edit1_menu), separator18); @@ -546,9 +637,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image2862 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2862); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2862); + image3175 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3175); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3175); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -581,9 +672,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image2863 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2863); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2863); + image3176 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3176); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3176); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -595,9 +686,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image2864 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2864); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2864); + image3177 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3177); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3177); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -614,9 +705,17 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); - image2865 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2865); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image2865); + image3178 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3178); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3178); + + plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences")); + gtk_widget_show (plugin_preferences1); + gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1); + + image3179 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3179); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3179); search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); @@ -645,9 +744,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image2866 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2866); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2866); + image3180 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3180); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3180); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -684,9 +783,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image2867 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2867); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2867); + image3181 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3181); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3181); menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -699,9 +798,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); - image2868 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2868); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2868); + image3182 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3182); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3182); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -940,17 +1039,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image2869 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2869); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2869); + image3183 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3183); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3183); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image2870 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2870); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2870); + image3184 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3184); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3184); recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -960,9 +1059,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image2871 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2871); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2871); + image3185 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3185); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3185); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -984,13 +1083,34 @@ tools1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (tools1), tools1_menu); + menu_reload_configuration1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload Configuration")); + gtk_widget_show (menu_reload_configuration1); + gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); + + image3186 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3186); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3186); + + configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files")); + gtk_widget_show (configuration_files1); + gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1); + + image3187 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3187); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3187); + + separator47 = gtk_separator_menu_item_new (); + gtk_widget_show (separator47); + gtk_container_add (GTK_CONTAINER (tools1_menu), separator47); + gtk_widget_set_sensitive (separator47, FALSE); + menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("_Color Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); - image2872 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2872); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2872); + image3188 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3188); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3188); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1000,14 +1120,6 @@ gtk_widget_show (load_tags1); gtk_container_add (GTK_CONTAINER (tools1_menu), load_tags1); - menu_reload_configuration1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload Configuration")); - gtk_widget_show (menu_reload_configuration1); - gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); - - image2873 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2873); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2873); - menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (menu_help1); gtk_container_add (GTK_CONTAINER (menubar1), menu_help1); @@ -1019,9 +1131,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image2874 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2874); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2874); + image3189 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3189); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3189); website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1243,9 +1355,15 @@ g_signal_connect ((gpointer) menu_select_all1, "activate", G_CALLBACK (on_menu_select_all1_activate), NULL); + g_signal_connect ((gpointer) reflow_lines_block1, "activate", + G_CALLBACK (on_reflow_lines_block1_activate), + NULL); g_signal_connect ((gpointer) menu_toggle_case2, "activate", G_CALLBACK (on_toggle_case1_activate), NULL); + g_signal_connect ((gpointer) transpose_current_line1, "activate", + G_CALLBACK (on_transpose_current_line1_activate), + NULL); g_signal_connect ((gpointer) menu_comment_line1, "activate", G_CALLBACK (on_menu_comment_line1_activate), NULL); @@ -1255,15 +1373,42 @@ g_signal_connect ((gpointer) menu_toggle_line_commentation1, "activate", G_CALLBACK (on_menu_toggle_line_commentation1_activate), NULL); - g_signal_connect ((gpointer) menu_duplicate_line1, "activate", - G_CALLBACK (on_menu_duplicate_line1_activate), - NULL); g_signal_connect ((gpointer) menu_increase_indent1, "activate", G_CALLBACK (on_menu_increase_indent1_activate), NULL); g_signal_connect ((gpointer) menu_decrease_indent1, "activate", G_CALLBACK (on_menu_decrease_indent1_activate), NULL); + g_signal_connect ((gpointer) smart_line_indent1, "activate", + G_CALLBACK (on_smart_line_indent1_activate), + NULL); + g_signal_connect ((gpointer) cut_current_line_s_1, "activate", + G_CALLBACK (on_cut_current_line_s_1_activate), + NULL); + g_signal_connect ((gpointer) copy_current_line_s_1, "activate", + G_CALLBACK (on_copy_current_line_s_1_activate), + NULL); + g_signal_connect ((gpointer) delete_current_line_s_1, "activate", + G_CALLBACK (on_delete_current_line_s_1_activate), + NULL); + g_signal_connect ((gpointer) duplicate_line_or_selection1, "activate", + G_CALLBACK (on_duplicate_line_or_selection1_activate), + NULL); + g_signal_connect ((gpointer) select_current_line_s_1, "activate", + G_CALLBACK (on_select_current_line_s_1_activate), + NULL); + g_signal_connect ((gpointer) select_current_paragraph1, "activate", + G_CALLBACK (on_select_current_paragraph1_activate), + NULL); + g_signal_connect ((gpointer) insert_alternative_white_space1, "activate", + G_CALLBACK (on_insert_alternative_white_space1_activate), + NULL); + g_signal_connect ((gpointer) go_to_next_marker1, "activate", + G_CALLBACK (on_go_to_next_marker1_activate), + NULL); + g_signal_connect ((gpointer) go_to_previous_marker1, "activate", + G_CALLBACK (on_go_to_previous_marker1_activate), + NULL); g_signal_connect ((gpointer) send_selection_to_vte1, "activate", G_CALLBACK (on_send_selection_to_vte1_activate), NULL); @@ -1288,6 +1433,9 @@ g_signal_connect ((gpointer) preferences1, "activate", G_CALLBACK (on_preferences1_activate), NULL); + g_signal_connect ((gpointer) plugin_preferences1, "activate", + G_CALLBACK (on_plugin_preferences1_activate), + NULL); g_signal_connect ((gpointer) search1, "activate", G_CALLBACK (on_search1_activate), NULL); @@ -1432,6 +1580,9 @@ g_signal_connect ((gpointer) project_properties1, "activate", G_CALLBACK (on_project_properties1_activate), NULL); + g_signal_connect ((gpointer) menu_reload_configuration1, "activate", + G_CALLBACK (on_menu_reload_configuration1_activate), + NULL); g_signal_connect ((gpointer) menu_choose_color1, "activate", G_CALLBACK (on_show_color_chooser1_activate), NULL); @@ -1441,9 +1592,6 @@ g_signal_connect ((gpointer) load_tags1, "activate", G_CALLBACK (on_load_tags1_activate), NULL); - g_signal_connect ((gpointer) menu_reload_configuration1, "activate", - G_CALLBACK (on_menu_reload_configuration1_activate), - NULL); g_signal_connect ((gpointer) help1, "activate", G_CALLBACK (on_help1_activate), NULL); @@ -1485,9 +1633,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image2854, "image2854"); - GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); - GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); + GLADE_HOOKUP_OBJECT (window1, image3165, "image3165"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1"); GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1"); @@ -1496,11 +1642,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image2855, "image2855"); + GLADE_HOOKUP_OBJECT (window1, image3166, "image3166"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image2856, "image2856"); + GLADE_HOOKUP_OBJECT (window1, image3167, "image3167"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image2857, "image2857"); + GLADE_HOOKUP_OBJECT (window1, image3168, "image3168"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1511,9 +1657,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image2858, "image2858"); + GLADE_HOOKUP_OBJECT (window1, image3169, "image3169"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image2859, "image2859"); + GLADE_HOOKUP_OBJECT (window1, image3170, "image3170"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1530,25 +1676,44 @@ GLADE_HOOKUP_OBJECT (window1, separator25, "separator25"); GLADE_HOOKUP_OBJECT (window1, menu_format1, "menu_format1"); GLADE_HOOKUP_OBJECT (window1, menu_format1_menu, "menu_format1_menu"); + GLADE_HOOKUP_OBJECT (window1, reflow_lines_block1, "reflow_lines_block1"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_case2, "menu_toggle_case2"); + GLADE_HOOKUP_OBJECT (window1, transpose_current_line1, "transpose_current_line1"); GLADE_HOOKUP_OBJECT (window1, separator28, "separator28"); GLADE_HOOKUP_OBJECT (window1, menu_comment_line1, "menu_comment_line1"); GLADE_HOOKUP_OBJECT (window1, menu_uncomment_line1, "menu_uncomment_line1"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); - GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2860, "image2860"); + GLADE_HOOKUP_OBJECT (window1, image3171, "image3171"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2861, "image2861"); + GLADE_HOOKUP_OBJECT (window1, image3172, "image3172"); + GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); - GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); + GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); + GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu"); + GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1"); + GLADE_HOOKUP_OBJECT (window1, image3173, "image3173"); + GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); + GLADE_HOOKUP_OBJECT (window1, image3174, "image3174"); + GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1"); + GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1"); + GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); + GLADE_HOOKUP_OBJECT (window1, select_current_line_s_1, "select_current_line_s_1"); + GLADE_HOOKUP_OBJECT (window1, select_current_paragraph1, "select_current_paragraph1"); + GLADE_HOOKUP_OBJECT (window1, separator50, "separator50"); + GLADE_HOOKUP_OBJECT (window1, insert_alternative_white_space1, "insert_alternative_white_space1"); + GLADE_HOOKUP_OBJECT (window1, separator51, "separator51"); + GLADE_HOOKUP_OBJECT (window1, go_to_next_marker1, "go_to_next_marker1"); + GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); + GLADE_HOOKUP_OBJECT (window1, separator52, "separator52"); + GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image2862, "image2862"); + GLADE_HOOKUP_OBJECT (window1, image3175, "image3175"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1557,16 +1722,18 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image2863, "image2863"); + GLADE_HOOKUP_OBJECT (window1, image3176, "image3176"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image2864, "image2864"); + GLADE_HOOKUP_OBJECT (window1, image3177, "image3177"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); - GLADE_HOOKUP_OBJECT (window1, image2865, "image2865"); + GLADE_HOOKUP_OBJECT (window1, image3178, "image3178"); + GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1"); + GLADE_HOOKUP_OBJECT (window1, image3179, "image3179"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1574,7 +1741,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image2866, "image2866"); + GLADE_HOOKUP_OBJECT (window1, image3180, "image3180"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1583,11 +1750,11 @@ GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image2867, "image2867"); + GLADE_HOOKUP_OBJECT (window1, image3181, "image3181"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image2868, "image2868"); + GLADE_HOOKUP_OBJECT (window1, image3182, "image3182"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1643,27 +1810,30 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image2869, "image2869"); + GLADE_HOOKUP_OBJECT (window1, image3183, "image3183"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image2870, "image2870"); + GLADE_HOOKUP_OBJECT (window1, image3184, "image3184"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image2871, "image2871"); + GLADE_HOOKUP_OBJECT (window1, image3185, "image3185"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); + GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); + GLADE_HOOKUP_OBJECT (window1, image3186, "image3186"); + GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); + GLADE_HOOKUP_OBJECT (window1, image3187, "image3187"); + GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image2872, "image2872"); + GLADE_HOOKUP_OBJECT (window1, image3188, "image3188"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); - GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image2873, "image2873"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image2874, "image2874"); + GLADE_HOOKUP_OBJECT (window1, image3189, "image3189"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); @@ -1696,7 +1866,6 @@ GLADE_HOOKUP_OBJECT (window1, notebook_info_label_scribble, "notebook_info_label_scribble"); GLADE_HOOKUP_OBJECT (window1, hbox1, "hbox1"); GLADE_HOOKUP_OBJECT (window1, statusbar, "statusbar"); - GLADE_HOOKUP_OBJECT_NO_REF (window1, tooltips, "tooltips"); gtk_window_add_accel_group (GTK_WINDOW (window1), accel_group); @@ -1707,99 +1876,35 @@ create_toolbar_popup_menu1 (void) { GtkWidget *toolbar_popup_menu1; - GSList *images_and_text2_group = NULL; - GtkWidget *images_and_text2; - GtkWidget *images_only2; - GtkWidget *text_only2; - GtkWidget *separator1; - GSList *large_icons1_group = NULL; - GtkWidget *large_icons1; - GtkWidget *small_icons1; - GtkWidget *very_small_icons1; - GtkWidget *separator20; GtkWidget *customize_toolbar1; - GtkWidget *image2878; + GtkWidget *image3192; + GtkWidget *separator53; GtkWidget *hide_toolbar1; - GtkWidget *image2879; + GtkWidget *image3193; toolbar_popup_menu1 = gtk_menu_new (); - images_and_text2 = gtk_radio_menu_item_new_with_mnemonic (images_and_text2_group, _("Images _and Text")); - images_and_text2_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (images_and_text2)); - gtk_widget_show (images_and_text2); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), images_and_text2); - - images_only2 = gtk_radio_menu_item_new_with_mnemonic (images_and_text2_group, _("_Images Only")); - images_and_text2_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (images_only2)); - gtk_widget_show (images_only2); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), images_only2); - - text_only2 = gtk_radio_menu_item_new_with_mnemonic (images_and_text2_group, _("_Text Only")); - images_and_text2_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (text_only2)); - gtk_widget_show (text_only2); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), text_only2); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (text_only2), TRUE); - - separator1 = gtk_separator_menu_item_new (); - gtk_widget_show (separator1); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), separator1); - gtk_widget_set_sensitive (separator1, FALSE); - - large_icons1 = gtk_radio_menu_item_new_with_mnemonic (large_icons1_group, _("_Large Icons")); - large_icons1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (large_icons1)); - gtk_widget_show (large_icons1); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), large_icons1); - - small_icons1 = gtk_radio_menu_item_new_with_mnemonic (large_icons1_group, _("_Small Icons")); - large_icons1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (small_icons1)); - gtk_widget_show (small_icons1); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), small_icons1); - - very_small_icons1 = gtk_radio_menu_item_new_with_mnemonic (large_icons1_group, _("_Very Small Icons")); - large_icons1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (very_small_icons1)); - gtk_widget_show (very_small_icons1); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), very_small_icons1); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (very_small_icons1), TRUE); - - separator20 = gtk_separator_menu_item_new (); - gtk_widget_show (separator20); - gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), separator20); - gtk_widget_set_sensitive (separator20, FALSE); - - customize_toolbar1 = gtk_image_menu_item_new_with_mnemonic (_("_Customize Toolbar")); + customize_toolbar1 = gtk_image_menu_item_new_with_mnemonic (_("_Toolbar Preferences")); gtk_widget_show (customize_toolbar1); gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), customize_toolbar1); - image2878 = gtk_image_new_from_stock ("gtk-properties", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2878); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (customize_toolbar1), image2878); + image3192 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3192); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (customize_toolbar1), image3192); + + separator53 = gtk_separator_menu_item_new (); + gtk_widget_show (separator53); + gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), separator53); + gtk_widget_set_sensitive (separator53, FALSE); hide_toolbar1 = gtk_image_menu_item_new_with_mnemonic (_("_Hide Toolbar")); gtk_widget_show (hide_toolbar1); gtk_container_add (GTK_CONTAINER (toolbar_popup_menu1), hide_toolbar1); - image2879 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2879); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_toolbar1), image2879); + image3193 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3193); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_toolbar1), image3193); - g_signal_connect ((gpointer) images_and_text2, "activate", - G_CALLBACK (on_images_and_text2_activate), - NULL); - g_signal_connect ((gpointer) images_only2, "activate", - G_CALLBACK (on_images_only2_activate), - NULL); - g_signal_connect ((gpointer) text_only2, "activate", - G_CALLBACK (on_text_only2_activate), - NULL); - g_signal_connect ((gpointer) large_icons1, "activate", - G_CALLBACK (on_toolbar_large_icons1_activate), - NULL); - g_signal_connect ((gpointer) small_icons1, "activate", - G_CALLBACK (on_toolbar_small_icons1_activate), - NULL); - g_signal_connect ((gpointer) very_small_icons1, "activate", - G_CALLBACK (on_very_small_icons1_activate), - NULL); g_signal_connect ((gpointer) customize_toolbar1, "activate", G_CALLBACK (on_customize_toolbar1_activate), NULL); @@ -1809,18 +1914,11 @@ /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (toolbar_popup_menu1, toolbar_popup_menu1, "toolbar_popup_menu1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, images_and_text2, "images_and_text2"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, images_only2, "images_only2"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, text_only2, "text_only2"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, separator1, "separator1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, large_icons1, "large_icons1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, small_icons1, "small_icons1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, very_small_icons1, "very_small_icons1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, separator20, "separator20"); GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, customize_toolbar1, "customize_toolbar1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, image2878, "image2878"); + GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, image3192, "image3192"); + GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, separator53, "separator53"); GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, hide_toolbar1, "hide_toolbar1"); - GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, image2879, "image2879"); + GLADE_HOOKUP_OBJECT (toolbar_popup_menu1, image3193, "image3193"); return toolbar_popup_menu1; } @@ -1842,26 +1940,10 @@ GtkWidget *menu_open_selected_file2; GtkWidget *separator36; GtkWidget *menu_format2; - GtkWidget *menu_format2_menu; - GtkWidget *toggle_case1; - GtkWidget *separator30; - GtkWidget *menu_comment_line2; - GtkWidget *menu_uncomment_line2; - GtkWidget *menu_toggle_line_commentation2; - GtkWidget *menu_duplicate_line2; - GtkWidget *separator31; - GtkWidget *menu_increase_indent2; - GtkWidget *image2823; - GtkWidget *menu_decrease_indent2; - GtkWidget *image2824; - GtkWidget *separator38; - GtkWidget *send_selection_to_vte2; - GtkWidget *send_selection_to1; - GtkWidget *send_selection_to1_menu; - GtkWidget *invisible12; + GtkWidget *commands1; GtkWidget *separator17; GtkWidget *comments; - GtkWidget *image2825; + GtkWidget *image3043; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -1870,24 +1952,24 @@ GtkWidget *insert_gpl_notice1; GtkWidget *insert_bsd_license_notice1; GtkWidget *insert_date2; - GtkWidget *image2826; + GtkWidget *image3044; GtkWidget *insert_date2_menu; GtkWidget *invisible10; GtkWidget *insert_include1; - GtkWidget *image2827; + GtkWidget *image3045; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image2828; + GtkWidget *image3046; GtkWidget *find_document_usage1; - GtkWidget *image2829; + GtkWidget *image3047; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *context_action1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image2830; + GtkWidget *image3048; GtkAccelGroup *accel_group; accel_group = gtk_accel_group_new (); @@ -1950,73 +2032,9 @@ gtk_widget_show (menu_format2); gtk_container_add (GTK_CONTAINER (edit_menu1), menu_format2); - menu_format2_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_format2), menu_format2_menu); - - toggle_case1 = gtk_menu_item_new_with_mnemonic (_("T_oggle Case of Selection")); - gtk_widget_show (toggle_case1); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), toggle_case1); - - separator30 = gtk_separator_menu_item_new (); - gtk_widget_show (separator30); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), separator30); - gtk_widget_set_sensitive (separator30, FALSE); - - menu_comment_line2 = gtk_menu_item_new_with_mnemonic (_("_Comment Line(s)")); - gtk_widget_show (menu_comment_line2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_comment_line2); - - menu_uncomment_line2 = gtk_menu_item_new_with_mnemonic (_("U_ncomment Line(s)")); - gtk_widget_show (menu_uncomment_line2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_uncomment_line2); - - menu_toggle_line_commentation2 = gtk_menu_item_new_with_mnemonic (_("_Toggle Line Commentation")); - gtk_widget_show (menu_toggle_line_commentation2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_toggle_line_commentation2); - - menu_duplicate_line2 = gtk_menu_item_new_with_mnemonic (_("Du_plicate Line or Selection")); - gtk_widget_show (menu_duplicate_line2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_duplicate_line2); - - separator31 = gtk_separator_menu_item_new (); - gtk_widget_show (separator31); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), separator31); - gtk_widget_set_sensitive (separator31, FALSE); - - menu_increase_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Increase Indent")); - gtk_widget_show (menu_increase_indent2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - - image2823 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2823); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2823); - - menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); - gtk_widget_show (menu_decrease_indent2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - - image2824 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2824); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2824); - - separator38 = gtk_separator_menu_item_new (); - gtk_widget_show (separator38); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), separator38); - gtk_widget_set_sensitive (separator38, FALSE); - - send_selection_to_vte2 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to Terminal")); - gtk_widget_show (send_selection_to_vte2); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), send_selection_to_vte2); - - send_selection_to1 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to")); - gtk_widget_show (send_selection_to1); - gtk_container_add (GTK_CONTAINER (menu_format2_menu), send_selection_to1); - - send_selection_to1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (send_selection_to1), send_selection_to1_menu); - - invisible12 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (send_selection_to1_menu), invisible12); + commands1 = gtk_menu_item_new_with_mnemonic (_("_Commands")); + gtk_widget_show (commands1); + gtk_container_add (GTK_CONTAINER (edit_menu1), commands1); separator17 = gtk_separator_menu_item_new (); gtk_widget_show (separator17); @@ -2027,9 +2045,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image2825 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2825); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2825); + image3043 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3043); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3043); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -2062,9 +2080,9 @@ gtk_widget_show (insert_date2); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); - image2826 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2826); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2826); + image3044 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3044); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3044); insert_date2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); @@ -2076,9 +2094,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image2827 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2827); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2827); + image3045 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3045); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3045); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -2095,17 +2113,17 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image2828 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2828); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2828); + image3046 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3046); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3046); find_document_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Document Usage")); gtk_widget_show (find_document_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_document_usage1); - image2829 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2829); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image2829); + image3047 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3047); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image3047); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); gtk_widget_show (goto_tag_definition1); @@ -2128,9 +2146,9 @@ gtk_widget_show (go_to_line); gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); - image2830 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2830); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2830); + image3048 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3048); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image3048); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2156,30 +2174,6 @@ g_signal_connect ((gpointer) menu_open_selected_file2, "activate", G_CALLBACK (on_menu_open_selected_file1_activate), NULL); - g_signal_connect ((gpointer) toggle_case1, "activate", - G_CALLBACK (on_toggle_case1_activate), - NULL); - g_signal_connect ((gpointer) menu_comment_line2, "activate", - G_CALLBACK (on_menu_comment_line1_activate), - NULL); - g_signal_connect ((gpointer) menu_uncomment_line2, "activate", - G_CALLBACK (on_menu_uncomment_line1_activate), - NULL); - g_signal_connect ((gpointer) menu_toggle_line_commentation2, "activate", - G_CALLBACK (on_menu_toggle_line_commentation1_activate), - NULL); - g_signal_connect ((gpointer) menu_duplicate_line2, "activate", - G_CALLBACK (on_menu_duplicate_line1_activate), - NULL); - g_signal_connect ((gpointer) menu_increase_indent2, "activate", - G_CALLBACK (on_menu_increase_indent1_activate), - NULL); - g_signal_connect ((gpointer) menu_decrease_indent2, "activate", - G_CALLBACK (on_menu_decrease_indent1_activate), - NULL); - g_signal_connect ((gpointer) send_selection_to_vte2, "activate", - G_CALLBACK (on_send_selection_to_vte1_activate), - NULL); g_signal_connect ((gpointer) add_changelog_entry2, "activate", G_CALLBACK (on_comments_changelog_activate), NULL); @@ -2232,26 +2226,10 @@ GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator36, "separator36"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2_menu, "menu_format2_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, toggle_case1, "toggle_case1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator30, "separator30"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_comment_line2, "menu_comment_line2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_uncomment_line2, "menu_uncomment_line2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_toggle_line_commentation2, "menu_toggle_line_commentation2"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2823, "image2823"); - GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2824, "image2824"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator38, "separator38"); - GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to_vte2, "send_selection_to_vte2"); - GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1, "send_selection_to1"); - GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1_menu, "send_selection_to1_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, invisible12, "invisible12"); + GLADE_HOOKUP_OBJECT (edit_menu1, commands1, "commands1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2825, "image2825"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3043, "image3043"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); @@ -2260,24 +2238,24 @@ GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2826, "image2826"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3044, "image3044"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2827, "image2827"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3045, "image3045"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2828, "image2828"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3046, "image3046"); GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2829, "image2829"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3047, "image3047"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2830, "image2830"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3048, "image3048"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); @@ -2330,6 +2308,7 @@ GtkWidget *check_switch_pages; GtkWidget *check_suppress_status_msgs; GtkWidget *check_auto_focus; + GtkWidget *check_native_windows_dialogs; GtkWidget *label199; GtkWidget *frame36; GtkWidget *alignment39; @@ -2350,8 +2329,17 @@ GtkWidget *frame7; GtkWidget *alignment9; GtkWidget *vbox11; + GtkWidget *frame39; + GtkWidget *alignment46; + GtkWidget *vbox46; GtkWidget *check_list_symbol; GtkWidget *check_list_openfiles; + GtkWidget *check_sidebar_visible; + GtkWidget *hbox17; + GtkWidget *label237; + GtkWidget *radio_sidebar_left; + GSList *radio_sidebar_left_group = NULL; + GtkWidget *radio_sidebar_right; GtkWidget *label146; GtkWidget *frame4; GtkWidget *alignment5; @@ -2368,11 +2356,13 @@ GtkWidget *vbox26; GtkWidget *check_show_notebook_tabs; GtkWidget *check_show_tab_cross; - GtkWidget *hbox7; + GtkWidget *table21; GtkWidget *label150; + GtkWidget *hbox7; GtkWidget *radio_tab_left; GSList *radio_tab_left_group = NULL; GtkWidget *radio_tab_right; + GtkWidget *check_tab_beside; GtkWidget *check_double_click_hides_widgets; GtkWidget *label197; GtkWidget *frame9; @@ -2395,29 +2385,35 @@ GtkWidget *frame28; GtkWidget *alignment31; GtkWidget *vbox42; + GtkWidget *hbox18; + GtkWidget *vbox52; GtkWidget *check_toolbar_show; GtkWidget *check_toolbar_in_menu; - GtkWidget *label196; - GtkWidget *frame13; - GtkWidget *alignment16; - GtkWidget *table9; - GtkWidget *label169; - GtkWidget *label170; - GtkWidget *radio_toolbar_imagetext; - GSList *radio_toolbar_imagetext_group = NULL; - GtkWidget *radio_toolbar_small; - GSList *radio_toolbar_small_group = NULL; - GtkWidget *radio_toolbar_large; - GtkWidget *radio_toolbar_text; - GtkWidget *radio_toolbar_image; - GtkWidget *radio_toolbar_verysmall; - GtkWidget *label167; - GtkWidget *hbox15; + GtkWidget *vbox53; GtkWidget *button_customize_toolbar; GtkWidget *alignment45; GtkWidget *hbox16; GtkWidget *image2877; GtkWidget *label236; + GtkWidget *frame_toolbar_style; + GtkWidget *alignment50; + GtkWidget *table19; + GtkWidget *radio_toolbar_style_default; + GSList *radio_toolbar_style_default_group = NULL; + GtkWidget *radio_toolbar_imagetext; + GtkWidget *radio_toolbar_image; + GtkWidget *radio_toolbar_text; + GtkWidget *label244; + GtkWidget *frame_toolbar_icon; + GtkWidget *alignment51; + GtkWidget *table20; + GtkWidget *radio_toolbar_icon_default; + GSList *radio_toolbar_icon_default_group = NULL; + GtkWidget *radio_toolbar_small; + GtkWidget *radio_toolbar_verysmall; + GtkWidget *radio_toolbar_large; + GtkWidget *label245; + GtkWidget *label246; GtkWidget *label164; GtkWidget *notebook4; GtkWidget *vbox5; @@ -2456,11 +2452,6 @@ GSList *radio_indent_spaces_group = NULL; GtkWidget *radio_indent_tabs; GtkWidget *radio_indent_both; - GtkWidget *alignment41; - GtkWidget *hbox13; - GtkWidget *label221; - GtkObject *spin_tab_width_adj; - GtkWidget *spin_tab_width; GtkWidget *check_detect_indent; GtkWidget *check_tab_key_indents; GtkWidget *label195; @@ -2521,8 +2512,16 @@ GtkWidget *radio_long_line_line; GSList *radio_long_line_line_group = NULL; GtkWidget *radio_long_line_background; - GtkWidget *radio_long_line_disabled; - GtkWidget *label155; + GtkWidget *check_long_line; + GtkWidget *label242; + GtkWidget *frame40; + GtkWidget *alignment47; + GtkWidget *vbox48; + GtkWidget *radio_virtualspace_disabled; + GSList *radio_virtualspace_disabled_group = NULL; + GtkWidget *radio_virtualspace_selection; + GtkWidget *radio_virtualspace_always; + GtkWidget *label238; GtkWidget *label213; GtkWidget *label95; GtkWidget *vbox18; @@ -2537,14 +2536,16 @@ GtkWidget *label109; GtkWidget *frame37; GtkWidget *alignment40; - GtkWidget *table5; + GtkWidget *vbox43; + GtkWidget *vbox44; + GtkWidget *label153; GtkWidget *eventbox1; GtkWidget *combo_new_encoding; - GtkWidget *label153; + GtkWidget *check_open_encoding; + GtkWidget *vbox45; GtkWidget *label_open_encoding; GtkWidget *eventbox3; GtkWidget *combo_open_encoding; - GtkWidget *check_open_encoding; GtkWidget *label219; GtkWidget *frame2; GtkWidget *alignment3; @@ -2571,14 +2572,10 @@ GtkWidget *vbox2; GtkWidget *vbox33; GtkWidget *table1; - GtkWidget *label11; GtkWidget *label97; GtkWidget *label117; - GtkWidget *entry_com_make; GtkWidget *entry_com_term; GtkWidget *entry_browser; - GtkWidget *button_make; - GtkWidget *image285; GtkWidget *button_term; GtkWidget *image286; GtkWidget *button_browser; @@ -2597,6 +2594,7 @@ GtkWidget *image1919; GtkWidget *label193; GtkWidget *label96; + GtkWidget *vbox49; GtkWidget *frame21; GtkWidget *alignment24; GtkWidget *vbox9; @@ -2630,6 +2628,8 @@ GtkWidget *button2; GtkWidget *label181; GtkWidget *label151; + GtkWidget *frame41; + GtkWidget *alignment49; GtkWidget *vbox27; GtkWidget *frame32; GtkWidget *alignment35; @@ -2654,11 +2654,13 @@ GtkWidget *label203; GtkWidget *entry_print_dateformat; GtkWidget *radio_print_gtk; + GtkWidget *label243; GtkWidget *label201; GtkWidget *dialog_action_area3; GtkWidget *button3; GtkWidget *button4; GtkWidget *button5; + GtkWidget *button_help; GtkTooltips *tooltips; tooltips = gtk_tooltips_new (); @@ -2749,7 +2751,7 @@ frame25 = gtk_frame_new (NULL); gtk_widget_show (frame25); - gtk_box_pack_start (GTK_BOX (vbox20), frame25, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox20), frame25, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame25), GTK_SHADOW_NONE); alignment28 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2847,9 +2849,10 @@ gtk_widget_show (label233); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook5), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook5), 0), label233); - vbox41 = gtk_vbox_new (FALSE, 0); + vbox41 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox41); gtk_container_add (GTK_CONTAINER (notebook5), vbox41); + gtk_container_set_border_width (GTK_CONTAINER (vbox41), 5); frame19 = gtk_frame_new (NULL); gtk_widget_show (frame19); @@ -2885,6 +2888,11 @@ gtk_box_pack_start (GTK_BOX (vbox21), check_auto_focus, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_auto_focus, _("Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE."), NULL); + check_native_windows_dialogs = gtk_check_button_new_with_mnemonic (_("Use Windows File Open/Save dialogs")); + gtk_widget_show (check_native_windows_dialogs); + gtk_box_pack_start (GTK_BOX (vbox21), check_native_windows_dialogs, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_native_windows_dialogs, _("Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs"), NULL); + label199 = gtk_label_new (_("Miscellaneous")); gtk_widget_show (label199); gtk_frame_set_label_widget (GTK_FRAME (frame19), label199); @@ -2893,7 +2901,6 @@ frame36 = gtk_frame_new (NULL); gtk_widget_show (frame36); gtk_box_pack_start (GTK_BOX (vbox41), frame36, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame36), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame36), GTK_SHADOW_NONE); alignment39 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2926,7 +2933,7 @@ frame35 = gtk_frame_new (NULL); gtk_widget_show (frame35); - gtk_box_pack_start (GTK_BOX (vbox41), frame35, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox41), frame35, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame35), GTK_SHADOW_NONE); alignment38 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2980,16 +2987,55 @@ gtk_widget_show (vbox11); gtk_container_add (GTK_CONTAINER (alignment9), vbox11); + frame39 = gtk_frame_new (NULL); + gtk_widget_show (frame39); + gtk_box_pack_start (GTK_BOX (vbox11), frame39, FALSE, FALSE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame39), GTK_SHADOW_NONE); + + alignment46 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment46); + gtk_container_add (GTK_CONTAINER (frame39), alignment46); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment46), 0, 0, 12, 0); + + vbox46 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox46); + gtk_container_add (GTK_CONTAINER (alignment46), vbox46); + check_list_symbol = gtk_check_button_new_with_mnemonic (_("Show symbol list")); gtk_widget_show (check_list_symbol); - gtk_box_pack_start (GTK_BOX (vbox11), check_list_symbol, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox46), check_list_symbol, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_list_symbol, _("Toggle the symbol list on and off"), NULL); check_list_openfiles = gtk_check_button_new_with_mnemonic (_("Show documents list")); gtk_widget_show (check_list_openfiles); - gtk_box_pack_start (GTK_BOX (vbox11), check_list_openfiles, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox46), check_list_openfiles, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_list_openfiles, _("Toggle the documents list on and off"), NULL); + check_sidebar_visible = gtk_check_button_new_with_mnemonic (_("Show sidebar")); + gtk_widget_show (check_sidebar_visible); + gtk_frame_set_label_widget (GTK_FRAME (frame39), check_sidebar_visible); + + hbox17 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox17); + gtk_box_pack_start (GTK_BOX (vbox11), hbox17, FALSE, FALSE, 0); + + label237 = gtk_label_new (_("Position:")); + gtk_widget_show (label237); + gtk_box_pack_start (GTK_BOX (hbox17), label237, FALSE, FALSE, 0); + + radio_sidebar_left = gtk_radio_button_new_with_mnemonic (NULL, _("Left")); + gtk_widget_show (radio_sidebar_left); + gtk_box_pack_start (GTK_BOX (hbox17), radio_sidebar_left, FALSE, FALSE, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_sidebar_left), radio_sidebar_left_group); + radio_sidebar_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_sidebar_left)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_sidebar_left), TRUE); + + radio_sidebar_right = gtk_radio_button_new_with_mnemonic (NULL, _("Right")); + gtk_widget_show (radio_sidebar_right); + gtk_box_pack_start (GTK_BOX (hbox17), radio_sidebar_right, FALSE, FALSE, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_sidebar_right), radio_sidebar_left_group); + radio_sidebar_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_sidebar_right)); + label146 = gtk_label_new (_("Sidebar")); gtk_widget_show (label146); gtk_frame_set_label_widget (GTK_FRAME (frame7), label146); @@ -3083,15 +3129,23 @@ gtk_box_pack_start (GTK_BOX (vbox26), check_show_tab_cross, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_show_tab_cross, _("Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)"), NULL); - hbox7 = gtk_hbox_new (FALSE, 12); - gtk_widget_show (hbox7); - gtk_box_pack_start (GTK_BOX (vbox26), hbox7, FALSE, TRUE, 0); + table21 = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table21); + gtk_box_pack_start (GTK_BOX (vbox26), table21, FALSE, TRUE, 0); label150 = gtk_label_new (_("Placement of new file tabs:")); gtk_widget_show (label150); - gtk_box_pack_start (GTK_BOX (hbox7), label150, FALSE, FALSE, 0); + gtk_table_attach (GTK_TABLE (table21), label150, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label150), 0, 0.5); + hbox7 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox7); + gtk_table_attach (GTK_TABLE (table21), hbox7, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + radio_tab_left = gtk_radio_button_new_with_mnemonic (NULL, _("Left")); gtk_widget_show (radio_tab_left); gtk_box_pack_start (GTK_BOX (hbox7), radio_tab_left, FALSE, FALSE, 0); @@ -3107,6 +3161,13 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_right), radio_tab_left_group); radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_right)); + check_tab_beside = gtk_check_button_new_with_mnemonic (_("Next to current")); + gtk_widget_show (check_tab_beside); + gtk_table_attach (GTK_TABLE (table21), check_tab_beside, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, check_tab_beside, _("Whether to place file tabs next to the current tab rather than at the edges of the notebook"), NULL); + check_double_click_hides_widgets = gtk_check_button_new_with_mnemonic (_("Double-clicking hides all additional widgets")); gtk_widget_show (check_double_click_hides_widgets); gtk_box_pack_start (GTK_BOX (vbox26), check_double_click_hides_widgets, FALSE, FALSE, 0); @@ -3235,130 +3296,161 @@ gtk_container_add (GTK_CONTAINER (frame28), alignment31); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment31), 0, 0, 12, 0); - vbox42 = gtk_vbox_new (FALSE, 0); + vbox42 = gtk_vbox_new (FALSE, 5); gtk_widget_show (vbox42); gtk_container_add (GTK_CONTAINER (alignment31), vbox42); + hbox18 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox18); + gtk_box_pack_start (GTK_BOX (vbox42), hbox18, FALSE, FALSE, 0); + + vbox52 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox52); + gtk_box_pack_start (GTK_BOX (hbox18), vbox52, TRUE, TRUE, 0); + check_toolbar_show = gtk_check_button_new_with_mnemonic (_("Show T_oolbar")); gtk_widget_show (check_toolbar_show); - gtk_box_pack_start (GTK_BOX (vbox42), check_toolbar_show, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox52), check_toolbar_show, FALSE, FALSE, 0); check_toolbar_in_menu = gtk_check_button_new_with_mnemonic (_("_Append Toolbar to the Menu")); gtk_widget_show (check_toolbar_in_menu); - gtk_box_pack_start (GTK_BOX (vbox42), check_toolbar_in_menu, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox52), check_toolbar_in_menu, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_toolbar_in_menu, _("Pack the toolbar to the main menu to save vertical space"), NULL); - label196 = gtk_label_new (_("Toolbar")); - gtk_widget_show (label196); - gtk_frame_set_label_widget (GTK_FRAME (frame28), label196); - gtk_label_set_use_markup (GTK_LABEL (label196), TRUE); + vbox53 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox53); + gtk_box_pack_start (GTK_BOX (hbox18), vbox53, FALSE, FALSE, 0); - frame13 = gtk_frame_new (NULL); - gtk_widget_show (frame13); - gtk_box_pack_start (GTK_BOX (vbox15), frame13, FALSE, FALSE, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame13), GTK_SHADOW_NONE); + button_customize_toolbar = gtk_button_new (); + gtk_widget_show (button_customize_toolbar); + gtk_box_pack_start (GTK_BOX (vbox53), button_customize_toolbar, FALSE, FALSE, 0); + + alignment45 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment45); + gtk_container_add (GTK_CONTAINER (button_customize_toolbar), alignment45); - alignment16 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment16); - gtk_container_add (GTK_CONTAINER (frame13), alignment16); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment16), 0, 0, 12, 0); + hbox16 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox16); + gtk_container_add (GTK_CONTAINER (alignment45), hbox16); - table9 = gtk_table_new (2, 4, FALSE); - gtk_widget_show (table9); - gtk_container_add (GTK_CONTAINER (alignment16), table9); - gtk_table_set_row_spacings (GTK_TABLE (table9), 3); - gtk_table_set_col_spacings (GTK_TABLE (table9), 12); + image2877 = gtk_image_new_from_stock ("gtk-properties", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image2877); + gtk_box_pack_start (GTK_BOX (hbox16), image2877, FALSE, FALSE, 0); - label169 = gtk_label_new (_("Icon style:")); - gtk_widget_show (label169); - gtk_table_attach (GTK_TABLE (table9), label169, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label169), 0, 0.5); + label236 = gtk_label_new_with_mnemonic (_("Customize Toolbar")); + gtk_widget_show (label236); + gtk_box_pack_start (GTK_BOX (hbox16), label236, FALSE, FALSE, 0); - label170 = gtk_label_new (_("Icon size:")); - gtk_widget_show (label170); - gtk_table_attach (GTK_TABLE (table9), label170, 0, 1, 1, 2, + frame_toolbar_style = gtk_frame_new (NULL); + gtk_widget_show (frame_toolbar_style); + gtk_box_pack_start (GTK_BOX (vbox42), frame_toolbar_style, TRUE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame_toolbar_style), GTK_SHADOW_NONE); + + alignment50 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment50); + gtk_container_add (GTK_CONTAINER (frame_toolbar_style), alignment50); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment50), 0, 0, 12, 0); + + table19 = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table19); + gtk_container_add (GTK_CONTAINER (alignment50), table19); + gtk_table_set_row_spacings (GTK_TABLE (table19), 3); + gtk_table_set_col_spacings (GTK_TABLE (table19), 20); + + radio_toolbar_style_default = gtk_radio_button_new_with_mnemonic (NULL, _("System _Default")); + gtk_widget_show (radio_toolbar_style_default); + gtk_table_attach (GTK_TABLE (table19), radio_toolbar_style_default, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label170), 0, 0.5); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_style_default), radio_toolbar_style_default_group); + radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_style_default)); radio_toolbar_imagetext = gtk_radio_button_new_with_mnemonic (NULL, _("Images _and Text")); gtk_widget_show (radio_toolbar_imagetext); - gtk_table_attach (GTK_TABLE (table9), radio_toolbar_imagetext, 1, 2, 0, 1, + gtk_table_attach (GTK_TABLE (table19), radio_toolbar_imagetext, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext), radio_toolbar_imagetext_group); - radio_toolbar_imagetext_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext), radio_toolbar_style_default_group); + radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext)); - radio_toolbar_small = gtk_radio_button_new_with_mnemonic (NULL, _("_Small Icons")); - gtk_widget_show (radio_toolbar_small); - gtk_table_attach (GTK_TABLE (table9), radio_toolbar_small, 2, 3, 1, 2, + radio_toolbar_image = gtk_radio_button_new_with_mnemonic (NULL, _("_Images Only")); + gtk_widget_show (radio_toolbar_image); + gtk_table_attach (GTK_TABLE (table19), radio_toolbar_image, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_small), radio_toolbar_small_group); - radio_toolbar_small_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_small)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_image), radio_toolbar_style_default_group); + radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_image)); - radio_toolbar_large = gtk_radio_button_new_with_mnemonic (NULL, _("_Large Icons")); - gtk_widget_show (radio_toolbar_large); - gtk_table_attach (GTK_TABLE (table9), radio_toolbar_large, 1, 2, 1, 2, + radio_toolbar_text = gtk_radio_button_new_with_mnemonic (NULL, _("_Text Only")); + gtk_widget_show (radio_toolbar_text); + gtk_table_attach (GTK_TABLE (table19), radio_toolbar_text, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_large), radio_toolbar_small_group); - radio_toolbar_small_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_large)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_text), radio_toolbar_style_default_group); + radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_text)); - radio_toolbar_text = gtk_radio_button_new_with_mnemonic (NULL, _("_Text Only")); - gtk_widget_show (radio_toolbar_text); - gtk_table_attach (GTK_TABLE (table9), radio_toolbar_text, 3, 4, 0, 1, + label244 = gtk_label_new (_("Icon Style")); + gtk_widget_show (label244); + gtk_frame_set_label_widget (GTK_FRAME (frame_toolbar_style), label244); + gtk_label_set_use_markup (GTK_LABEL (label244), TRUE); + + frame_toolbar_icon = gtk_frame_new (NULL); + gtk_widget_show (frame_toolbar_icon); + gtk_box_pack_start (GTK_BOX (vbox42), frame_toolbar_icon, TRUE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame_toolbar_icon), GTK_SHADOW_NONE); + + alignment51 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment51); + gtk_container_add (GTK_CONTAINER (frame_toolbar_icon), alignment51); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment51), 0, 0, 12, 0); + + table20 = gtk_table_new (2, 2, TRUE); + gtk_widget_show (table20); + gtk_container_add (GTK_CONTAINER (alignment51), table20); + gtk_table_set_row_spacings (GTK_TABLE (table20), 3); + gtk_table_set_col_spacings (GTK_TABLE (table20), 20); + + radio_toolbar_icon_default = gtk_radio_button_new_with_mnemonic (NULL, _("S_ystem Default")); + gtk_widget_show (radio_toolbar_icon_default); + gtk_table_attach (GTK_TABLE (table20), radio_toolbar_icon_default, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_text), radio_toolbar_imagetext_group); - radio_toolbar_imagetext_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_text)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_icon_default), radio_toolbar_icon_default_group); + radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_icon_default)); - radio_toolbar_image = gtk_radio_button_new_with_mnemonic (NULL, _("_Images Only")); - gtk_widget_show (radio_toolbar_image); - gtk_table_attach (GTK_TABLE (table9), radio_toolbar_image, 2, 3, 0, 1, + radio_toolbar_small = gtk_radio_button_new_with_mnemonic (NULL, _("_Small Icons")); + gtk_widget_show (radio_toolbar_small); + gtk_table_attach (GTK_TABLE (table20), radio_toolbar_small, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_image), radio_toolbar_imagetext_group); - radio_toolbar_imagetext_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_image)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_small), radio_toolbar_icon_default_group); + radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_small)); radio_toolbar_verysmall = gtk_radio_button_new_with_mnemonic (NULL, _("_Very Small Icons")); gtk_widget_show (radio_toolbar_verysmall); - gtk_table_attach (GTK_TABLE (table9), radio_toolbar_verysmall, 3, 4, 1, 2, + gtk_table_attach (GTK_TABLE (table20), radio_toolbar_verysmall, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_verysmall), radio_toolbar_small_group); - radio_toolbar_small_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_verysmall)); - - label167 = gtk_label_new (_("Appearance")); - gtk_widget_show (label167); - gtk_frame_set_label_widget (GTK_FRAME (frame13), label167); - gtk_label_set_use_markup (GTK_LABEL (label167), TRUE); - - hbox15 = gtk_hbox_new (TRUE, 0); - gtk_widget_show (hbox15); - gtk_box_pack_start (GTK_BOX (vbox15), hbox15, FALSE, FALSE, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_verysmall), radio_toolbar_icon_default_group); + radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_verysmall)); - button_customize_toolbar = gtk_button_new (); - gtk_widget_show (button_customize_toolbar); - gtk_box_pack_start (GTK_BOX (hbox15), button_customize_toolbar, FALSE, FALSE, 0); - - alignment45 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment45); - gtk_container_add (GTK_CONTAINER (button_customize_toolbar), alignment45); + radio_toolbar_large = gtk_radio_button_new_with_mnemonic (NULL, _("_Large Icons")); + gtk_widget_show (radio_toolbar_large); + gtk_table_attach (GTK_TABLE (table20), radio_toolbar_large, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_large), radio_toolbar_icon_default_group); + radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_large)); - hbox16 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox16); - gtk_container_add (GTK_CONTAINER (alignment45), hbox16); + label245 = gtk_label_new (_("Icon Size")); + gtk_widget_show (label245); + gtk_frame_set_label_widget (GTK_FRAME (frame_toolbar_icon), label245); + gtk_label_set_use_markup (GTK_LABEL (label245), TRUE); - image2877 = gtk_image_new_from_stock ("gtk-properties", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image2877); - gtk_box_pack_start (GTK_BOX (hbox16), image2877, FALSE, FALSE, 0); - - label236 = gtk_label_new_with_mnemonic (_("Customize Toolbar")); - gtk_widget_show (label236); - gtk_box_pack_start (GTK_BOX (hbox16), label236, FALSE, FALSE, 0); + label246 = gtk_label_new (_("Toolbar")); + gtk_widget_show (label246); + gtk_frame_set_label_widget (GTK_FRAME (frame28), label246); + gtk_label_set_use_markup (GTK_LABEL (label246), TRUE); label164 = gtk_label_new (_("Toolbar")); gtk_widget_show (label164); @@ -3458,9 +3550,10 @@ gtk_widget_show (label211); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 0), label211); - vbox40 = gtk_vbox_new (FALSE, 6); + vbox40 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox40); gtk_container_add (GTK_CONTAINER (notebook4), vbox40); + gtk_container_set_border_width (GTK_CONTAINER (vbox40), 5); label_project_indent_warning = gtk_vbox_new (FALSE, 0); gtk_widget_show (label_project_indent_warning); @@ -3468,7 +3561,7 @@ frame27 = gtk_frame_new (NULL); gtk_widget_show (frame27); - gtk_box_pack_start (GTK_BOX (vbox40), frame27, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox40), frame27, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame27), GTK_SHADOW_NONE); alignment30 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3480,7 +3573,7 @@ gtk_widget_show (vbox25); gtk_container_add (GTK_CONTAINER (alignment30), vbox25); - table13 = gtk_table_new (7, 2, FALSE); + table13 = gtk_table_new (6, 2, FALSE); gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table13), 3); @@ -3488,14 +3581,14 @@ label183 = gtk_label_new (_("Auto-indent mode:")); gtk_widget_show (label183); - gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 6, 7, + gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label183), 0, 0.5); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); - gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 6, 7, + gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None")); @@ -3555,33 +3648,9 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_spaces_group); radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); - alignment41 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment41); - gtk_table_attach (GTK_TABLE (table13), alignment41, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment41), 0, 0, 24, 0); - - hbox13 = gtk_hbox_new (FALSE, 12); - gtk_widget_show (hbox13); - gtk_container_add (GTK_CONTAINER (alignment41), hbox13); - - label221 = gtk_label_new (_("Hard tab width:")); - gtk_widget_show (label221); - gtk_box_pack_start (GTK_BOX (hbox13), label221, FALSE, FALSE, 0); - - spin_tab_width_adj = gtk_adjustment_new (8, 1, 99, 1, 10, 0); - spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0); - gtk_widget_show (spin_tab_width); - gtk_box_pack_start (GTK_BOX (hbox13), spin_tab_width, TRUE, TRUE, 0); - gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width of a tab when Tabs & Spaces is set for a document"), NULL); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE); - gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE); - check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file")); gtk_widget_show (check_detect_indent); - gtk_table_attach (GTK_TABLE (table13), check_detect_indent, 1, 2, 5, 6, + gtk_table_attach (GTK_TABLE (table13), check_detect_indent, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); @@ -3600,14 +3669,14 @@ gtk_widget_show (label232); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 1), label232); - vbox39 = gtk_vbox_new (FALSE, 1); + vbox39 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox39); gtk_container_add (GTK_CONTAINER (notebook4), vbox39); + gtk_container_set_border_width (GTK_CONTAINER (vbox39), 5); frame18 = gtk_frame_new (NULL); gtk_widget_show (frame18); gtk_box_pack_start (GTK_BOX (vbox39), frame18, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame18), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame18), GTK_SHADOW_NONE); alignment21 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3709,7 +3778,6 @@ frame38 = gtk_frame_new (NULL); gtk_widget_show (frame38); gtk_box_pack_start (GTK_BOX (vbox39), frame38, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame38), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame38), GTK_SHADOW_NONE); alignment42 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3787,7 +3855,7 @@ check_highlighting_invert = gtk_check_button_new_with_mnemonic (_("Invert syntax highlighting colors")); gtk_widget_show (check_highlighting_invert); gtk_box_pack_start (GTK_BOX (vbox12), check_highlighting_invert, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_highlighting_invert, _("Use white text on a black background and invert all colors, this option requires a restart of Geany"), NULL); + gtk_tooltips_set_tip (tooltips, check_highlighting_invert, _("Invert all colors, by default using white text on a black background"), NULL); check_indent = gtk_check_button_new_with_mnemonic (_("Show indentation guides")); gtk_widget_show (check_indent); @@ -3826,7 +3894,7 @@ frame8 = gtk_frame_new (NULL); gtk_widget_show (frame8); - gtk_box_pack_start (GTK_BOX (vbox24), frame8, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox24), frame8, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame8), GTK_SHADOW_NONE); alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3834,36 +3902,36 @@ gtk_container_add (GTK_CONTAINER (frame8), alignment11); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 0, 0, 12, 0); - table7 = gtk_table_new (3, 2, FALSE); + table7 = gtk_table_new (4, 2, FALSE); gtk_widget_show (table7); gtk_container_add (GTK_CONTAINER (alignment11), table7); gtk_table_set_row_spacings (GTK_TABLE (table7), 3); gtk_table_set_col_spacings (GTK_TABLE (table7), 24); - label133 = gtk_label_new (_("Long line marker:")); + label133 = gtk_label_new (_("Column:")); gtk_widget_show (label133); - gtk_table_attach (GTK_TABLE (table7), label133, 0, 1, 1, 2, + gtk_table_attach (GTK_TABLE (table7), label133, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label133), 0, 0.5); - label134 = gtk_label_new (_("Long line marker color:")); + label134 = gtk_label_new (_("Color:")); gtk_widget_show (label134); - gtk_table_attach (GTK_TABLE (table7), label134, 0, 1, 2, 3, + gtk_table_attach (GTK_TABLE (table7), label134, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label134), 0, 0.5); label156 = gtk_label_new (_("Type:")); gtk_widget_show (label156); - gtk_table_attach (GTK_TABLE (table7), label156, 0, 1, 0, 1, + gtk_table_attach (GTK_TABLE (table7), label156, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label156), 0, 0.5); long_line_color = gtk_color_button_new (); gtk_widget_show (long_line_color); - gtk_table_attach (GTK_TABLE (table7), long_line_color, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table7), long_line_color, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, long_line_color, _("Sets the color of the long line marker"), NULL); @@ -3872,7 +3940,7 @@ spin_long_line_adj = gtk_adjustment_new (72, 0, 1000, 1, 10, 0); spin_long_line = gtk_spin_button_new (GTK_ADJUSTMENT (spin_long_line_adj), 1, 0); gtk_widget_show (spin_long_line); - gtk_table_attach (GTK_TABLE (table7), spin_long_line, 1, 2, 1, 2, + gtk_table_attach (GTK_TABLE (table7), spin_long_line, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, spin_long_line, _("The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear."), NULL); @@ -3881,7 +3949,7 @@ hbox5 = gtk_hbox_new (FALSE, 12); gtk_widget_show (hbox5); - gtk_table_attach (GTK_TABLE (table7), hbox5, 1, 2, 0, 1, + gtk_table_attach (GTK_TABLE (table7), hbox5, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -3899,16 +3967,56 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_background), radio_long_line_line_group); radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_background)); - radio_long_line_disabled = gtk_radio_button_new_with_mnemonic (NULL, _("Disabled")); - gtk_widget_show (radio_long_line_disabled); - gtk_box_pack_start (GTK_BOX (hbox5), radio_long_line_disabled, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_disabled), radio_long_line_line_group); - radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_disabled)); - - label155 = gtk_label_new (_("Long line marker")); - gtk_widget_show (label155); - gtk_frame_set_label_widget (GTK_FRAME (frame8), label155); - gtk_label_set_use_markup (GTK_LABEL (label155), TRUE); + check_long_line = gtk_check_button_new_with_mnemonic (_("Enabled")); + gtk_widget_show (check_long_line); + gtk_table_attach (GTK_TABLE (table7), check_long_line, 0, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + label242 = gtk_label_new (_("Long line marker")); + gtk_widget_show (label242); + gtk_frame_set_label_widget (GTK_FRAME (frame8), label242); + gtk_label_set_use_markup (GTK_LABEL (label242), TRUE); + + frame40 = gtk_frame_new (NULL); + gtk_widget_show (frame40); + gtk_box_pack_start (GTK_BOX (vbox24), frame40, FALSE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame40), GTK_SHADOW_NONE); + + alignment47 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment47); + gtk_container_add (GTK_CONTAINER (frame40), alignment47); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment47), 0, 0, 12, 0); + + vbox48 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox48); + gtk_container_add (GTK_CONTAINER (alignment47), vbox48); + + radio_virtualspace_disabled = gtk_radio_button_new_with_mnemonic (NULL, _("Disabled")); + gtk_widget_show (radio_virtualspace_disabled); + gtk_box_pack_start (GTK_BOX (vbox48), radio_virtualspace_disabled, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_virtualspace_disabled, _("Do not show virtual spaces"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_virtualspace_disabled), radio_virtualspace_disabled_group); + radio_virtualspace_disabled_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_virtualspace_disabled)); + + radio_virtualspace_selection = gtk_radio_button_new_with_mnemonic (NULL, _("Only for rectangular selections")); + gtk_widget_show (radio_virtualspace_selection); + gtk_box_pack_start (GTK_BOX (vbox48), radio_virtualspace_selection, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_virtualspace_selection, _("Only show virtual spaces beyond the end of lines when drawing a rectangular selection"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_virtualspace_selection), radio_virtualspace_disabled_group); + radio_virtualspace_disabled_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_virtualspace_selection)); + + radio_virtualspace_always = gtk_radio_button_new_with_mnemonic (NULL, _("Always")); + gtk_widget_show (radio_virtualspace_always); + gtk_box_pack_start (GTK_BOX (vbox48), radio_virtualspace_always, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_virtualspace_always, _("Always show virtual spaces beyond the end of lines"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_virtualspace_always), radio_virtualspace_disabled_group); + radio_virtualspace_disabled_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_virtualspace_always)); + + label238 = gtk_label_new (_("Virtual spaces")); + gtk_widget_show (label238); + gtk_frame_set_label_widget (GTK_FRAME (frame40), label238); + gtk_label_set_use_markup (GTK_LABEL (label238), TRUE); label213 = gtk_label_new (_("Display")); gtk_widget_show (label213); @@ -3980,55 +4088,51 @@ gtk_container_add (GTK_CONTAINER (frame37), alignment40); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment40), 0, 0, 12, 0); - table5 = gtk_table_new (3, 2, FALSE); - gtk_widget_show (table5); - gtk_container_add (GTK_CONTAINER (alignment40), table5); - gtk_table_set_row_spacings (GTK_TABLE (table5), 3); - gtk_table_set_col_spacings (GTK_TABLE (table5), 24); + vbox43 = gtk_vbox_new (FALSE, 6); + gtk_widget_show (vbox43); + gtk_container_add (GTK_CONTAINER (alignment40), vbox43); + + vbox44 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox44); + gtk_box_pack_start (GTK_BOX (vbox43), vbox44, TRUE, TRUE, 0); + + label153 = gtk_label_new (_("Default encoding (new files):")); + gtk_widget_show (label153); + gtk_box_pack_start (GTK_BOX (vbox44), label153, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5); eventbox1 = gtk_event_box_new (); gtk_widget_show (eventbox1); - gtk_table_attach (GTK_TABLE (table5), eventbox1, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_box_pack_start (GTK_BOX (vbox44), eventbox1, TRUE, TRUE, 0); gtk_tooltips_set_tip (tooltips, eventbox1, _("Sets the default encoding for newly created files"), NULL); combo_new_encoding = gtk_combo_box_new_text (); gtk_widget_show (combo_new_encoding); gtk_container_add (GTK_CONTAINER (eventbox1), combo_new_encoding); - label153 = gtk_label_new (_("Default encoding (new files):")); - gtk_widget_show (label153); - gtk_table_attach (GTK_TABLE (table5), label153, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5); + check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening non-Unicode files")); + gtk_widget_show (check_open_encoding); + gtk_box_pack_start (GTK_BOX (vbox43), check_open_encoding, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)"), NULL); - label_open_encoding = gtk_label_new (_("Default encoding (existing files):")); + vbox45 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox45); + gtk_box_pack_start (GTK_BOX (vbox43), vbox45, TRUE, TRUE, 0); + + label_open_encoding = gtk_label_new (_("Default encoding (existing non-Unicode files):")); gtk_widget_show (label_open_encoding); - gtk_table_attach (GTK_TABLE (table5), label_open_encoding, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + gtk_box_pack_start (GTK_BOX (vbox45), label_open_encoding, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (label_open_encoding), 0, 0.5); eventbox3 = gtk_event_box_new (); gtk_widget_show (eventbox3); - gtk_table_attach (GTK_TABLE (table5), eventbox3, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_tooltips_set_tip (tooltips, eventbox3, _("Sets the default encoding for opening existing files"), NULL); + gtk_box_pack_start (GTK_BOX (vbox45), eventbox3, TRUE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, eventbox3, _("Sets the default encoding for opening existing non-Unicode files"), NULL); combo_open_encoding = gtk_combo_box_new_text (); gtk_widget_show (combo_open_encoding); gtk_container_add (GTK_CONTAINER (eventbox3), combo_open_encoding); - check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening files")); - gtk_widget_show (check_open_encoding); - gtk_table_attach (GTK_TABLE (table5), check_open_encoding, 0, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed)"), NULL); - label219 = gtk_label_new (_("Encodings")); gtk_widget_show (label219); gtk_frame_set_label_widget (GTK_FRAME (frame37), label219); @@ -4161,13 +4265,6 @@ gtk_table_set_row_spacings (GTK_TABLE (table1), 3); gtk_table_set_col_spacings (GTK_TABLE (table1), 6); - label11 = gtk_label_new (_("Make:")); - gtk_widget_show (label11); - gtk_table_attach (GTK_TABLE (table1), label11, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5); - label97 = gtk_label_new (_("Terminal:")); gtk_widget_show (label97); gtk_table_attach (GTK_TABLE (table1), label97, 0, 1, 1, 2, @@ -4182,13 +4279,6 @@ (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label117), 0, 0.5); - entry_com_make = gtk_entry_new (); - gtk_widget_show (entry_com_make); - gtk_table_attach (GTK_TABLE (table1), entry_com_make, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, entry_com_make, _("Path and options for the make tool"), NULL); - entry_com_term = gtk_entry_new (); gtk_widget_show (entry_com_term); gtk_table_attach (GTK_TABLE (table1), entry_com_term, 1, 2, 1, 2, @@ -4203,16 +4293,6 @@ (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, entry_browser, _("Path (and possibly additional arguments) to your favorite browser"), NULL); - button_make = gtk_button_new (); - gtk_widget_show (button_make); - gtk_table_attach (GTK_TABLE (table1), button_make, 2, 3, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - image285 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image285); - gtk_container_add (GTK_CONTAINER (button_make), image285); - button_term = gtk_button_new (); gtk_widget_show (button_term); gtk_table_attach (GTK_TABLE (table1), button_term, 2, 3, 1, 2, @@ -4263,7 +4343,7 @@ frame26 = gtk_frame_new (NULL); gtk_widget_show (frame26); - gtk_box_pack_start (GTK_BOX (vbox23), frame26, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox23), frame26, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame26), GTK_SHADOW_NONE); alignment29 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4310,10 +4390,14 @@ gtk_widget_show (label96); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 5), label96); + vbox49 = gtk_vbox_new (FALSE, 10); + gtk_widget_show (vbox49); + gtk_container_add (GTK_CONTAINER (notebook2), vbox49); + gtk_container_set_border_width (GTK_CONTAINER (vbox49), 5); + frame21 = gtk_frame_new (NULL); gtk_widget_show (frame21); - gtk_container_add (GTK_CONTAINER (notebook2), frame21); - gtk_container_set_border_width (GTK_CONTAINER (frame21), 5); + gtk_box_pack_start (GTK_BOX (vbox49), frame21, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame21), GTK_SHADOW_NONE); alignment24 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4503,9 +4587,20 @@ gtk_widget_show (label151); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 7), label151); - vbox27 = gtk_vbox_new (FALSE, 0); + frame41 = gtk_frame_new (NULL); + gtk_widget_show (frame41); + gtk_container_add (GTK_CONTAINER (notebook2), frame41); + gtk_container_set_border_width (GTK_CONTAINER (frame41), 5); + gtk_frame_set_shadow_type (GTK_FRAME (frame41), GTK_SHADOW_NONE); + + alignment49 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment49); + gtk_container_add (GTK_CONTAINER (frame41), alignment49); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment49), 0, 0, 12, 0); + + vbox27 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox27); - gtk_container_add (GTK_CONTAINER (notebook2), vbox27); + gtk_container_add (GTK_CONTAINER (alignment49), vbox27); gtk_container_set_border_width (GTK_CONTAINER (vbox27), 5); frame32 = gtk_frame_new (NULL); @@ -4614,6 +4709,11 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_print_gtk), radio_print_external_group); radio_print_external_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_print_gtk)); + label243 = gtk_label_new (_("Printing")); + gtk_widget_show (label243); + gtk_frame_set_label_widget (GTK_FRAME (frame41), label243); + gtk_label_set_use_markup (GTK_LABEL (label243), TRUE); + label201 = gtk_label_new (_("Printing")); gtk_widget_show (label201); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 8), label201); @@ -4637,6 +4737,11 @@ gtk_dialog_add_action_widget (GTK_DIALOG (prefs_dialog), button5, GTK_RESPONSE_OK); GTK_WIDGET_SET_FLAGS (button5, GTK_CAN_DEFAULT); + button_help = gtk_button_new_from_stock ("gtk-help"); + gtk_widget_show (button_help); + gtk_dialog_add_action_widget (GTK_DIALOG (prefs_dialog), button_help, GTK_RESPONSE_HELP); + GTK_WIDGET_SET_FLAGS (button_help, GTK_CAN_DEFAULT); + g_signal_connect ((gpointer) button_customize_toolbar, "clicked", G_CALLBACK (on_button_customize_toolbar_clicked), NULL); @@ -4685,6 +4790,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_switch_pages, "check_switch_pages"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_suppress_status_msgs, "check_suppress_status_msgs"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_focus, "check_auto_focus"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_native_windows_dialogs, "check_native_windows_dialogs"); GLADE_HOOKUP_OBJECT (prefs_dialog, label199, "label199"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame36, "frame36"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment39, "alignment39"); @@ -4705,8 +4811,16 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, frame7, "frame7"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment9, "alignment9"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox11, "vbox11"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame39, "frame39"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment46, "alignment46"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox46, "vbox46"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_list_symbol, "check_list_symbol"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_list_openfiles, "check_list_openfiles"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_sidebar_visible, "check_sidebar_visible"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox17, "hbox17"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label237, "label237"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_sidebar_left, "radio_sidebar_left"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_sidebar_right, "radio_sidebar_right"); GLADE_HOOKUP_OBJECT (prefs_dialog, label146, "label146"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame4, "frame4"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment5, "alignment5"); @@ -4723,10 +4837,12 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox26, "vbox26"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_show_notebook_tabs, "check_show_notebook_tabs"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_show_tab_cross, "check_show_tab_cross"); - GLADE_HOOKUP_OBJECT (prefs_dialog, hbox7, "hbox7"); + GLADE_HOOKUP_OBJECT (prefs_dialog, table21, "table21"); GLADE_HOOKUP_OBJECT (prefs_dialog, label150, "label150"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox7, "hbox7"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_tab_left, "radio_tab_left"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_tab_right, "radio_tab_right"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_tab_beside, "check_tab_beside"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_double_click_hides_widgets, "check_double_click_hides_widgets"); GLADE_HOOKUP_OBJECT (prefs_dialog, label197, "label197"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame9, "frame9"); @@ -4749,27 +4865,33 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, frame28, "frame28"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment31, "alignment31"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox42, "vbox42"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox18, "hbox18"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox52, "vbox52"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_show, "check_toolbar_show"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_in_menu, "check_toolbar_in_menu"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label196, "label196"); - GLADE_HOOKUP_OBJECT (prefs_dialog, frame13, "frame13"); - GLADE_HOOKUP_OBJECT (prefs_dialog, alignment16, "alignment16"); - GLADE_HOOKUP_OBJECT (prefs_dialog, table9, "table9"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label169, "label169"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label170, "label170"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_imagetext, "radio_toolbar_imagetext"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_small, "radio_toolbar_small"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_large, "radio_toolbar_large"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_text, "radio_toolbar_text"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_image, "radio_toolbar_image"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_verysmall, "radio_toolbar_verysmall"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label167, "label167"); - GLADE_HOOKUP_OBJECT (prefs_dialog, hbox15, "hbox15"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox53, "vbox53"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_customize_toolbar, "button_customize_toolbar"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment45, "alignment45"); GLADE_HOOKUP_OBJECT (prefs_dialog, hbox16, "hbox16"); GLADE_HOOKUP_OBJECT (prefs_dialog, image2877, "image2877"); GLADE_HOOKUP_OBJECT (prefs_dialog, label236, "label236"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame_toolbar_style, "frame_toolbar_style"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment50, "alignment50"); + GLADE_HOOKUP_OBJECT (prefs_dialog, table19, "table19"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_style_default, "radio_toolbar_style_default"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_imagetext, "radio_toolbar_imagetext"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_image, "radio_toolbar_image"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_text, "radio_toolbar_text"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label244, "label244"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame_toolbar_icon, "frame_toolbar_icon"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment51, "alignment51"); + GLADE_HOOKUP_OBJECT (prefs_dialog, table20, "table20"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_icon_default, "radio_toolbar_icon_default"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_small, "radio_toolbar_small"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_verysmall, "radio_toolbar_verysmall"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_toolbar_large, "radio_toolbar_large"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label245, "label245"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label246, "label246"); GLADE_HOOKUP_OBJECT (prefs_dialog, label164, "label164"); GLADE_HOOKUP_OBJECT (prefs_dialog, notebook4, "notebook4"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox5, "vbox5"); @@ -4805,10 +4927,6 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_spaces, "radio_indent_spaces"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_tabs, "radio_indent_tabs"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_both, "radio_indent_both"); - GLADE_HOOKUP_OBJECT (prefs_dialog, alignment41, "alignment41"); - GLADE_HOOKUP_OBJECT (prefs_dialog, hbox13, "hbox13"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label221, "label221"); - GLADE_HOOKUP_OBJECT (prefs_dialog, spin_tab_width, "spin_tab_width"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent, "check_detect_indent"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_tab_key_indents, "check_tab_key_indents"); GLADE_HOOKUP_OBJECT (prefs_dialog, label195, "label195"); @@ -4864,8 +4982,15 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, hbox5, "hbox5"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_long_line_line, "radio_long_line_line"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_long_line_background, "radio_long_line_background"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_long_line_disabled, "radio_long_line_disabled"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label155, "label155"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_long_line, "check_long_line"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label242, "label242"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame40, "frame40"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment47, "alignment47"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox48, "vbox48"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_virtualspace_disabled, "radio_virtualspace_disabled"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_virtualspace_selection, "radio_virtualspace_selection"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_virtualspace_always, "radio_virtualspace_always"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label238, "label238"); GLADE_HOOKUP_OBJECT (prefs_dialog, label213, "label213"); GLADE_HOOKUP_OBJECT (prefs_dialog, label95, "label95"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox18, "vbox18"); @@ -4880,14 +5005,16 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame37, "frame37"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment40, "alignment40"); - GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox43, "vbox43"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox44, "vbox44"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153"); GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_new_encoding, "combo_new_encoding"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox45, "vbox45"); GLADE_HOOKUP_OBJECT (prefs_dialog, label_open_encoding, "label_open_encoding"); GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox3, "eventbox3"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_open_encoding, "combo_open_encoding"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding"); GLADE_HOOKUP_OBJECT (prefs_dialog, label219, "label219"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame2, "frame2"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment3, "alignment3"); @@ -4912,14 +5039,10 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox33, "vbox33"); GLADE_HOOKUP_OBJECT (prefs_dialog, table1, "table1"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label11, "label11"); GLADE_HOOKUP_OBJECT (prefs_dialog, label97, "label97"); GLADE_HOOKUP_OBJECT (prefs_dialog, label117, "label117"); - GLADE_HOOKUP_OBJECT (prefs_dialog, entry_com_make, "entry_com_make"); GLADE_HOOKUP_OBJECT (prefs_dialog, entry_com_term, "entry_com_term"); GLADE_HOOKUP_OBJECT (prefs_dialog, entry_browser, "entry_browser"); - GLADE_HOOKUP_OBJECT (prefs_dialog, button_make, "button_make"); - GLADE_HOOKUP_OBJECT (prefs_dialog, image285, "image285"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_term, "button_term"); GLADE_HOOKUP_OBJECT (prefs_dialog, image286, "image286"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_browser, "button_browser"); @@ -4938,6 +5061,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, image1919, "image1919"); GLADE_HOOKUP_OBJECT (prefs_dialog, label193, "label193"); GLADE_HOOKUP_OBJECT (prefs_dialog, label96, "label96"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox49, "vbox49"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame21, "frame21"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment24, "alignment24"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox9, "vbox9"); @@ -4971,6 +5095,8 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, button2, "button2"); GLADE_HOOKUP_OBJECT (prefs_dialog, label181, "label181"); GLADE_HOOKUP_OBJECT (prefs_dialog, label151, "label151"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame41, "frame41"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment49, "alignment49"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox27, "vbox27"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame32, "frame32"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment35, "alignment35"); @@ -4994,11 +5120,13 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, label203, "label203"); GLADE_HOOKUP_OBJECT (prefs_dialog, entry_print_dateformat, "entry_print_dateformat"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_print_gtk, "radio_print_gtk"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label243, "label243"); GLADE_HOOKUP_OBJECT (prefs_dialog, label201, "label201"); GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, dialog_action_area3, "dialog_action_area3"); GLADE_HOOKUP_OBJECT (prefs_dialog, button3, "button3"); GLADE_HOOKUP_OBJECT (prefs_dialog, button4, "button4"); GLADE_HOOKUP_OBJECT (prefs_dialog, button5, "button5"); + GLADE_HOOKUP_OBJECT (prefs_dialog, button_help, "button_help"); GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, tooltips, "tooltips"); gtk_widget_grab_default (button5); @@ -5022,13 +5150,22 @@ GSList *radio_indent_spaces_group = NULL; GtkWidget *radio_indent_tabs; GtkWidget *radio_indent_both; - GtkWidget *alignment44; - GtkWidget *hbox14; - GtkWidget *label231; - GtkObject *spin_tab_width_adj; - GtkWidget *spin_tab_width; GtkWidget *check_detect_indent; GtkWidget *label227; + GtkWidget *vbox47; + GtkWidget *frame40; + GtkWidget *alignment48; + GtkWidget *table18; + GtkWidget *label241; + GtkWidget *label240; + GtkWidget *radio_long_line_disabled; + GSList *radio_long_line_disabled_group = NULL; + GtkWidget *radio_long_line_custom; + GtkWidget *radio_long_line_default; + GtkObject *spin_long_line_adj; + GtkWidget *spin_long_line; + GtkWidget *label239; + GtkWidget *label238; GtkWidget *dialog_action_area4; GtkWidget *cancelbutton1; GtkWidget *okbutton1; @@ -5047,7 +5184,7 @@ gtk_widget_show (project_notebook); gtk_box_pack_start (GTK_BOX (dialog_vbox4), project_notebook, TRUE, TRUE, 0); - table17 = gtk_table_new (7, 2, FALSE); + table17 = gtk_table_new (6, 2, FALSE); gtk_widget_show (table17); gtk_container_add (GTK_CONTAINER (project_notebook), table17); gtk_container_set_border_width (GTK_CONTAINER (table17), 6); @@ -5056,14 +5193,14 @@ label228 = gtk_label_new (_("Auto-indent mode:")); gtk_widget_show (label228); - gtk_table_attach (GTK_TABLE (table17), label228, 0, 1, 6, 7, + gtk_table_attach (GTK_TABLE (table17), label228, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label228), 0, 0.5); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); - gtk_table_attach (GTK_TABLE (table17), combo_auto_indent_mode, 1, 2, 6, 7, + gtk_table_attach (GTK_TABLE (table17), combo_auto_indent_mode, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None")); @@ -5123,33 +5260,9 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_spaces_group); radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); - alignment44 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment44); - gtk_table_attach (GTK_TABLE (table17), alignment44, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment44), 0, 0, 24, 0); - - hbox14 = gtk_hbox_new (FALSE, 12); - gtk_widget_show (hbox14); - gtk_container_add (GTK_CONTAINER (alignment44), hbox14); - - label231 = gtk_label_new (_("Hard tab width:")); - gtk_widget_show (label231); - gtk_box_pack_start (GTK_BOX (hbox14), label231, FALSE, FALSE, 0); - - spin_tab_width_adj = gtk_adjustment_new (8, 1, 99, 1, 10, 0); - spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0); - gtk_widget_show (spin_tab_width); - gtk_box_pack_start (GTK_BOX (hbox14), spin_tab_width, TRUE, TRUE, 0); - gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width of a tab when Tabs & Spaces is set for a document"), NULL); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE); - gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE); - check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file")); gtk_widget_show (check_detect_indent); - gtk_table_attach (GTK_TABLE (table17), check_detect_indent, 1, 2, 5, 6, + gtk_table_attach (GTK_TABLE (table17), check_detect_indent, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); @@ -5158,6 +5271,83 @@ gtk_widget_show (label227); gtk_notebook_set_tab_label (GTK_NOTEBOOK (project_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (project_notebook), 0), label227); + vbox47 = gtk_vbox_new (FALSE, 10); + gtk_widget_show (vbox47); + gtk_container_add (GTK_CONTAINER (project_notebook), vbox47); + gtk_container_set_border_width (GTK_CONTAINER (vbox47), 5); + + frame40 = gtk_frame_new (NULL); + gtk_widget_show (frame40); + gtk_box_pack_start (GTK_BOX (vbox47), frame40, FALSE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame40), GTK_SHADOW_NONE); + + alignment48 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment48); + gtk_container_add (GTK_CONTAINER (frame40), alignment48); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment48), 0, 0, 12, 0); + + table18 = gtk_table_new (4, 2, FALSE); + gtk_widget_show (table18); + gtk_container_add (GTK_CONTAINER (alignment48), table18); + gtk_table_set_row_spacings (GTK_TABLE (table18), 3); + gtk_table_set_col_spacings (GTK_TABLE (table18), 12); + + label241 = gtk_label_new (_("Display:")); + gtk_widget_show (label241); + gtk_table_attach (GTK_TABLE (table18), label241, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label241), 0, 0.5); + + label240 = gtk_label_new (_("Column:")); + gtk_widget_show (label240); + gtk_table_attach (GTK_TABLE (table18), label240, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label240), 0, 0.5); + + radio_long_line_disabled = gtk_radio_button_new_with_mnemonic (NULL, _("Disabled")); + gtk_widget_show (radio_long_line_disabled); + gtk_table_attach (GTK_TABLE (table18), radio_long_line_disabled, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_disabled), radio_long_line_disabled_group); + radio_long_line_disabled_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_disabled)); + + radio_long_line_custom = gtk_radio_button_new_with_mnemonic (NULL, _("Custom")); + gtk_widget_show (radio_long_line_custom); + gtk_table_attach (GTK_TABLE (table18), radio_long_line_custom, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_custom), radio_long_line_disabled_group); + radio_long_line_disabled_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_custom)); + + radio_long_line_default = gtk_radio_button_new_with_mnemonic (NULL, _("Use global settings")); + gtk_widget_show (radio_long_line_default); + gtk_table_attach (GTK_TABLE (table18), radio_long_line_default, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_default), radio_long_line_disabled_group); + radio_long_line_disabled_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_default)); + + spin_long_line_adj = gtk_adjustment_new (72, 0, 1000, 1, 10, 0); + spin_long_line = gtk_spin_button_new (GTK_ADJUSTMENT (spin_long_line_adj), 1, 0); + gtk_widget_show (spin_long_line); + gtk_table_attach (GTK_TABLE (table18), spin_long_line, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_long_line), TRUE); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_long_line), TRUE); + + label239 = gtk_label_new (_("Long line marker")); + gtk_widget_show (label239); + gtk_frame_set_label_widget (GTK_FRAME (frame40), label239); + gtk_label_set_use_markup (GTK_LABEL (label239), TRUE); + + label238 = gtk_label_new (_("Editor")); + gtk_widget_show (label238); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (project_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (project_notebook), 1), label238); + dialog_action_area4 = GTK_DIALOG (project_dialog)->action_area; gtk_widget_show (dialog_action_area4); gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area4), GTK_BUTTONBOX_END); @@ -5185,12 +5375,20 @@ GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_spaces, "radio_indent_spaces"); GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_tabs, "radio_indent_tabs"); GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_both, "radio_indent_both"); - GLADE_HOOKUP_OBJECT (project_dialog, alignment44, "alignment44"); - GLADE_HOOKUP_OBJECT (project_dialog, hbox14, "hbox14"); - GLADE_HOOKUP_OBJECT (project_dialog, label231, "label231"); - GLADE_HOOKUP_OBJECT (project_dialog, spin_tab_width, "spin_tab_width"); GLADE_HOOKUP_OBJECT (project_dialog, check_detect_indent, "check_detect_indent"); GLADE_HOOKUP_OBJECT (project_dialog, label227, "label227"); + GLADE_HOOKUP_OBJECT (project_dialog, vbox47, "vbox47"); + GLADE_HOOKUP_OBJECT (project_dialog, frame40, "frame40"); + GLADE_HOOKUP_OBJECT (project_dialog, alignment48, "alignment48"); + GLADE_HOOKUP_OBJECT (project_dialog, table18, "table18"); + GLADE_HOOKUP_OBJECT (project_dialog, label241, "label241"); + GLADE_HOOKUP_OBJECT (project_dialog, label240, "label240"); + GLADE_HOOKUP_OBJECT (project_dialog, radio_long_line_disabled, "radio_long_line_disabled"); + GLADE_HOOKUP_OBJECT (project_dialog, radio_long_line_custom, "radio_long_line_custom"); + GLADE_HOOKUP_OBJECT (project_dialog, radio_long_line_default, "radio_long_line_default"); + GLADE_HOOKUP_OBJECT (project_dialog, spin_long_line, "spin_long_line"); + GLADE_HOOKUP_OBJECT (project_dialog, label239, "label239"); + GLADE_HOOKUP_OBJECT (project_dialog, label238, "label238"); GLADE_HOOKUP_OBJECT_NO_REF (project_dialog, dialog_action_area4, "dialog_action_area4"); GLADE_HOOKUP_OBJECT (project_dialog, cancelbutton1, "cancelbutton1"); GLADE_HOOKUP_OBJECT (project_dialog, okbutton1, "okbutton1"); diff -Nru geany-0.18/src/keybindings.c geany-0.19/src/keybindings.c --- geany-0.18/src/keybindings.c 2009-08-09 12:17:00.000000000 +0100 +++ geany-0.19/src/keybindings.c 2010-05-08 14:32:23.000000000 +0100 @@ -1,8 +1,8 @@ /* * keybindings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,16 +18,23 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: keybindings.c 4062 2009-08-09 11:17:00Z eht16 $ + * $Id: keybindings.c 4885 2010-05-08 13:32:23Z eht16 $ */ -/* +/** + * @file keybindings.h * Configurable keyboard shortcuts. - */ + * - keybindings_send_command() mimics a built-in keybinding. + * - @ref GeanyKeyGroupID lists groups of built-in keybindings. + * @see plugin_set_key_group(). + **/ -#include #include "geany.h" + +#include +#include + #include "keybindings.h" #include "support.h" #include "utils.h" @@ -46,7 +53,7 @@ #include "symbols.h" #include "vte.h" #include "toolbar.h" -#include "treeviews.h" +#include "sidebar.h" #include "geanywraplabel.h" #include "main.h" #include "search.h" @@ -57,8 +64,6 @@ /* keyfile group name for non-plugin KB groups */ const gchar keybindings_keyfile_group_name[] = "Bindings"; -static gboolean ignore_keybinding = FALSE; - static GtkAccelGroup *kb_accel_group = NULL; static const gboolean swap_alt_tab_order = FALSE; @@ -77,20 +82,21 @@ static gboolean check_current_word(GeanyDocument *doc); static gboolean read_current_word(GeanyDocument *doc); +static gchar *get_current_word_or_sel(GeanyDocument *doc); -static void cb_func_file_action(guint key_id); -static void cb_func_project_action(guint key_id); -static void cb_func_editor_action(guint key_id); -static void cb_func_select_action(guint key_id); -static void cb_func_format_action(guint key_id); -static void cb_func_insert_action(guint key_id); -static void cb_func_search_action(guint key_id); -static void cb_func_goto_action(guint key_id); -static void cb_func_switch_action(guint key_id); -static void cb_func_clipboard(guint key_id); -static void cb_func_build_action(guint key_id); -static void cb_func_document_action(guint key_id); -static void cb_func_view_action(guint key_id); +static gboolean cb_func_file_action(guint key_id); +static gboolean cb_func_project_action(guint key_id); +static gboolean cb_func_editor_action(guint key_id); +static gboolean cb_func_select_action(guint key_id); +static gboolean cb_func_format_action(guint key_id); +static gboolean cb_func_insert_action(guint key_id); +static gboolean cb_func_search_action(guint key_id); +static gboolean cb_func_goto_action(guint key_id); +static gboolean cb_func_switch_action(guint key_id); +static gboolean cb_func_clipboard_action(guint key_id); +static gboolean cb_func_build_action(guint key_id); +static gboolean cb_func_document_action(guint key_id); +static gboolean cb_func_view_action(guint key_id); /* note: new keybindings should normally use per group callbacks */ static void cb_func_menu_help(guint key_id); @@ -107,42 +113,64 @@ static void cb_func_move_tab(guint key_id); static void add_popup_menu_accels(void); -static void apply_kb_accel(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_data); -/* This is used to set default keybindings on startup but at this point we don't want to - * assign the keybinding to the menu_item (apply_kb_accel) otherwise it can't be overridden - * by user keybindings anymore */ -/** Simple convenience function to fill a GeanyKeyBinding struct item. +/** Looks up a keybinding item. * @param group Group. * @param key_id Keybinding index for the group. - * @param callback Function to call when activated. + * @return The keybinding. + * @since 0.19. */ +GeanyKeyBinding *keybindings_get_item(GeanyKeyGroup *group, gsize key_id) +{ + g_assert(key_id < group->count); + + return &group->keys[key_id]; +} + + +/* This is used to set default keybindings on startup. + * Menu accels are set in apply_kb_accel(). */ +/** Fills a GeanyKeyBinding struct item. + * @param group Group. + * @param key_id Keybinding index for the group. + * @param callback Function to call when activated, or @c NULL to use the group callback. + * Usually it's better to use the group callback instead - see plugin_set_key_group(). * @param key (Lower case) default key, e.g. @c GDK_j, but usually 0 for unset. * @param mod Default modifier, e.g. @c GDK_CONTROL_MASK, but usually 0 for unset. - * @param name Not duplicated - use a static string. - * @param label Currently not duplicated - use a static or heap-allocated (e.g. translated) string. - * @param menu_item Optional widget to set an accelerator for, or @c NULL. */ -void keybindings_set_item(GeanyKeyGroup *group, gsize key_id, + * @param kf_name Key name for the configuration file, such as @c "menu_new". + * @param label Label used in the preferences dialog keybindings tab. May contain + * underscores - these won't be displayed. + * @param menu_item Optional widget to set an accelerator for, or @c NULL. + * @return The keybinding - normally this is ignored. */ +GeanyKeyBinding *keybindings_set_item(GeanyKeyGroup *group, gsize key_id, GeanyKeyCallback callback, guint key, GdkModifierType mod, - gchar *name, gchar *label, GtkWidget *menu_item) + const gchar *kf_name, const gchar *label, GtkWidget *menu_item) { - GeanyKeyBinding *kb; - - g_assert(key_id < group->count); + GeanyKeyBinding *kb = keybindings_get_item(group, key_id); - kb = &group->keys[key_id]; - - kb->name = name; - kb->label = label; + if (group->plugin) + { + /* some plugins e.g. GeanyLua need these fields duplicated */ + setptr(kb->name, g_strdup(kf_name)); + setptr(kb->label, g_strdup(label)); + } + else + { + /* we don't touch them unless group->plugin is set, cast is safe */ + kb->name = (gchar *)kf_name; + kb->label = (gchar *)label; + } kb->key = key; kb->mods = mod; kb->callback = callback; kb->menu_item = menu_item; + return kb; } static GeanyKeyGroup *add_kb_group(GeanyKeyGroup *group, - const gchar *name, const gchar *label, gsize count, GeanyKeyBinding *keys) + const gchar *name, const gchar *label, gsize count, GeanyKeyBinding *keys, + GeanyKeyGroupCallback callback) { g_ptr_array_add(keybinding_groups, group); @@ -150,6 +178,7 @@ group->label = label; group->count = count; group->keys = keys; + group->callback = callback; return group; } @@ -165,10 +194,10 @@ /* Expansion for group_id = FILE: * add_kb_group(&groups[GEANY_KEY_GROUP_FILE], NULL, _("File menu"), - * GEANY_KEYS_FILE_COUNT, FILE_keys); */ -#define ADD_KB_GROUP(group_id, label) \ + * GEANY_KEYS_FILE_COUNT, FILE_keys, callback); */ +#define ADD_KB_GROUP(group_id, label, callback) \ add_kb_group(&groups[GEANY_KEY_GROUP_ ## group_id], keybindings_keyfile_group_name, label, \ - GEANY_KEYS_ ## group_id ## _COUNT, group_id ## _keys) + GEANY_KEYS_ ## group_id ## _COUNT, group_id ## _keys, callback) /* Init all fields of keys with default values. * The menu_item field is always the main menu item, popup menu accelerators are @@ -195,215 +224,238 @@ DECLARE_KEYS(TOOLS); DECLARE_KEYS(HELP); - group = ADD_KB_GROUP(FILE, _("File")); + group = ADD_KB_GROUP(FILE, _("File"), cb_func_file_action); - keybindings_set_item(group, GEANY_KEYS_FILE_NEW, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_NEW, NULL, GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), NULL); - keybindings_set_item(group, GEANY_KEYS_FILE_OPEN, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_OPEN, NULL, GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), NULL); - keybindings_set_item(group, GEANY_KEYS_FILE_OPENSELECTED, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_OPENSELECTED, NULL, GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected", _("Open selected file"), LW(menu_open_selected_file1)); - keybindings_set_item(group, GEANY_KEYS_FILE_SAVE, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_SAVE, NULL, GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), NULL); - keybindings_set_item(group, GEANY_KEYS_FILE_SAVEAS, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_SAVEAS, NULL, 0, 0, "menu_saveas", _("Save as"), LW(menu_save_as1)); - keybindings_set_item(group, GEANY_KEYS_FILE_SAVEALL, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_SAVEALL, NULL, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_saveall", _("Save all"), LW(menu_save_all1)); - keybindings_set_item(group, GEANY_KEYS_FILE_PRINT, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_PRINT, NULL, GDK_p, GDK_CONTROL_MASK, "menu_print", _("Print"), LW(print1)); - keybindings_set_item(group, GEANY_KEYS_FILE_CLOSE, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_CLOSE, NULL, GDK_w, GDK_CONTROL_MASK, "menu_close", _("Close"), LW(menu_close1)); - keybindings_set_item(group, GEANY_KEYS_FILE_CLOSEALL, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_CLOSEALL, NULL, GDK_w, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_closeall", _("Close all"), LW(menu_close_all1)); - keybindings_set_item(group, GEANY_KEYS_FILE_RELOAD, cb_func_file_action, + keybindings_set_item(group, GEANY_KEYS_FILE_RELOAD, NULL, GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file"), LW(menu_reload1)); + keybindings_set_item(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL, + 0, 0, "file_openlasttab", _("Re-open last closed tab"), NULL); - group = ADD_KB_GROUP(PROJECT, _("Project")); + group = ADD_KB_GROUP(PROJECT, _("Project"), cb_func_project_action); - keybindings_set_item(group, GEANY_KEYS_PROJECT_PROPERTIES, cb_func_project_action, + keybindings_set_item(group, GEANY_KEYS_PROJECT_PROPERTIES, NULL, 0, 0, "project_properties", _("Project properties"), LW(project_properties1)); - group = ADD_KB_GROUP(EDITOR, _("Editor")); + group = ADD_KB_GROUP(EDITOR, _("Editor"), cb_func_editor_action); - keybindings_set_item(group, GEANY_KEYS_EDITOR_UNDO, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_UNDO, NULL, GDK_z, GDK_CONTROL_MASK, "menu_undo", _("Undo"), LW(menu_undo2)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_REDO, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_REDO, NULL, GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo"), LW(menu_redo2)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_DUPLICATELINE, cb_func_editor_action, - GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection"), - LW(menu_duplicate_line1)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINE, cb_func_editor_action, - GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("Delete current line(s)"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINETOEND, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_DUPLICATELINE, NULL, + GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("_Duplicate Line or Selection"), + LW(duplicate_line_or_selection1)); + keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINE, NULL, + GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("_Delete Current Line(s)"), + LW(delete_current_line_s_1)); + keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_deletelinetoend", _("Delete to line end"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, cb_func_editor_action, - GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose current line"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, cb_func_editor_action, + /* transpose may fit better in format group */ + keybindings_set_item(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, + GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("_Transpose Current Line"), + LW(transpose_current_line1)); + keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, NULL, GDK_Up, GDK_MOD1_MASK, "edit_scrolllineup", _("Scroll up the view by one line"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEDOWN, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEDOWN, NULL, GDK_Down, GDK_MOD1_MASK, "edit_scrolllinedown", _("Scroll down the view by one line"), NULL); - /* GEANY_KEYS_EDITOR_COMPLETESNIPPET is handled specially in check_snippet_completion() */ keybindings_set_item(group, GEANY_KEYS_EDITOR_COMPLETESNIPPET, NULL, GDK_Tab, 0, "edit_completesnippet", _("Complete snippet"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR, NULL, 0, 0, "move_snippetnextcursor", _("Move cursor in snippet"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, NULL, 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_CONTEXTACTION, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_CONTEXTACTION, NULL, 0, 0, "popup_contextaction", _("Context Action"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_AUTOCOMPLETE, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_AUTOCOMPLETE, NULL, GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_CALLTIP, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_CALLTIP, NULL, GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_MACROLIST, cb_func_editor_action, + keybindings_set_item(group, GEANY_KEYS_EDITOR_MACROLIST, NULL, GDK_Return, GDK_CONTROL_MASK, "edit_macrolist", _("Show macro list"), NULL); + keybindings_set_item(group, GEANY_KEYS_EDITOR_WORDPARTCOMPLETION, NULL, + GDK_Tab, 0, "edit_wordpartcompletion", _("Word part completion"), NULL); + keybindings_set_item(group, GEANY_KEYS_EDITOR_MOVELINEUP, NULL, + 0, 0, "edit_movelineup", _("Move line(s) up"), NULL); + keybindings_set_item(group, GEANY_KEYS_EDITOR_MOVELINEDOWN, NULL, + 0, 0, "edit_movelinedown", _("Move line(s) down"), NULL); - group = ADD_KB_GROUP(CLIPBOARD, _("Clipboard")); + group = ADD_KB_GROUP(CLIPBOARD, _("Clipboard"), cb_func_clipboard_action); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUT, cb_func_clipboard, + keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPY, cb_func_clipboard, + keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPY, NULL, GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_PASTE, cb_func_clipboard, + keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPYLINE, cb_func_clipboard, - GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("Copy current line(s)"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUTLINE, cb_func_clipboard, - GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("Cut current line(s)"), NULL); + keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, + GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), + LW(copy_current_line_s_1)); + keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUTLINE, NULL, + GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("_Cut Current Line(s)"), + LW(cut_current_line_s_1)); - group = ADD_KB_GROUP(SELECT, _("Select")); + group = ADD_KB_GROUP(SELECT, _("Select"), cb_func_select_action); - keybindings_set_item(group, GEANY_KEYS_SELECT_ALL, cb_func_select_action, + keybindings_set_item(group, GEANY_KEYS_SELECT_ALL, NULL, GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All"), LW(menu_select_all1)); - keybindings_set_item(group, GEANY_KEYS_SELECT_WORD, cb_func_select_action, + keybindings_set_item(group, GEANY_KEYS_SELECT_WORD, NULL, GDK_w, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectword", _("Select current word"), NULL); - keybindings_set_item(group, GEANY_KEYS_SELECT_LINE, cb_func_select_action, - GDK_l, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectline", _("Select current line(s)"), NULL); - keybindings_set_item(group, GEANY_KEYS_SELECT_PARAGRAPH, cb_func_select_action, - GDK_p, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectparagraph", _("Select current paragraph"), NULL); + keybindings_set_item(group, GEANY_KEYS_SELECT_LINE, NULL, + GDK_l, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectline", _("_Select Current Line(s)"), + LW(select_current_line_s_1)); + keybindings_set_item(group, GEANY_KEYS_SELECT_PARAGRAPH, NULL, + GDK_p, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectparagraph", _("_Select Current Paragraph"), + LW(select_current_paragraph1)); + keybindings_set_item(group, GEANY_KEYS_SELECT_WORDPARTLEFT, NULL, + 0, 0, "edit_selectwordpartleft", _("Select to previous word part"), NULL); + keybindings_set_item(group, GEANY_KEYS_SELECT_WORDPARTRIGHT, NULL, + 0, 0, "edit_selectwordpartright", _("Select to next word part"), NULL); - group = ADD_KB_GROUP(FORMAT, _("Format")); + group = ADD_KB_GROUP(FORMAT, _("Format"), cb_func_format_action); - keybindings_set_item(group, GEANY_KEYS_FORMAT_TOGGLECASE, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_TOGGLECASE, NULL, GDK_u, GDK_CONTROL_MASK | GDK_MOD1_MASK, "edit_togglecase", _("Toggle Case of Selection"), LW(menu_toggle_case2)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, NULL, GDK_e, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation"), LW(menu_toggle_line_commentation1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_COMMENTLINE, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_COMMENTLINE, NULL, 0, 0, "edit_commentline", _("Comment line(s)"), LW(menu_comment_line1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_UNCOMMENTLINE, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_UNCOMMENTLINE, NULL, 0, 0, "edit_uncommentline", _("Uncomment line(s)"), LW(menu_uncomment_line1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_INCREASEINDENT, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_INCREASEINDENT, NULL, GDK_i, GDK_CONTROL_MASK, "edit_increaseindent", _("Increase indent"), LW(menu_increase_indent1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENT, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENT, NULL, GDK_u, GDK_CONTROL_MASK, "edit_decreaseindent", _("Decrease indent"), LW(menu_decrease_indent1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, NULL, 0, 0, "edit_increaseindentbyspace", _("Increase indent by one space"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL, 0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_AUTOINDENT, cb_func_format_action, - 0, 0, "edit_autoindent", _("Smart line indent"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD1, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, + 0, 0, "edit_autoindent", _("_Smart Line Indent"), LW(smart_line_indent1)); + keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD2, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, GDK_2, GDK_CONTROL_MASK, "edit_sendtocmd2", _("Send to Custom Command 2"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD3, cb_func_format_action, + keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD3, NULL, GDK_3, GDK_CONTROL_MASK, "edit_sendtocmd3", _("Send to Custom Command 3"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, cb_func_format_action, - 0, 0, "edit_sendtovte", _("Send Selection to Terminal"), LW(send_selection_to_vte1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, cb_func_format_action, - GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("Reflow lines/block"), NULL); + /* may fit better in editor group */ + keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, + 0, 0, "edit_sendtovte", _("_Send Selection to Terminal"), LW(send_selection_to_vte1)); + keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, + GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), + LW(reflow_lines_block1)); - group = ADD_KB_GROUP(INSERT, _("Insert")); + group = ADD_KB_GROUP(INSERT, _("Insert"), cb_func_insert_action); - keybindings_set_item(group, GEANY_KEYS_INSERT_DATE, cb_func_insert_action, + keybindings_set_item(group, GEANY_KEYS_INSERT_DATE, NULL, GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date"), LW(insert_date_custom1)); - keybindings_set_item(group, GEANY_KEYS_INSERT_ALTWHITESPACE, cb_func_insert_action, - 0, 0, "edit_insertwhitespace", _("Insert alternative white space"), NULL); + keybindings_set_item(group, GEANY_KEYS_INSERT_ALTWHITESPACE, NULL, + 0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"), + LW(insert_alternative_white_space1)); - group = ADD_KB_GROUP(SETTINGS, _("Settings")); + group = ADD_KB_GROUP(SETTINGS, _("Settings"), NULL); keybindings_set_item(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), LW(preferences1)); + keybindings_set_item(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, + 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), LW(plugin_preferences1)); - group = ADD_KB_GROUP(SEARCH, _("Search")); + group = ADD_KB_GROUP(SEARCH, _("Search"), cb_func_search_action); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FIND, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FIND, NULL, GDK_f, GDK_CONTROL_MASK, "menu_find", _("Find"), LW(find1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXT, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXT, NULL, GDK_g, GDK_CONTROL_MASK, "menu_findnext", _("Find Next"), LW(find_next1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVIOUS, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVIOUS, NULL, GDK_g, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findprevious", _("Find Previous"), LW(find_previous1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXTSEL, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXTSEL, NULL, 0, 0, "menu_findnextsel", _("Find Next Selection"), LW(find_nextsel1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVSEL, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVSEL, NULL, 0, 0, "menu_findprevsel", _("Find Previous Selection"), LW(find_prevsel1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_REPLACE, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_REPLACE, NULL, GDK_h, GDK_CONTROL_MASK, "menu_replace", _("Replace"), LW(replace1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDINFILES, cb_func_search_action, GDK_f, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDINFILES, NULL, GDK_f, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findinfiles", _("Find in Files"), LW(find_in_files1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_NEXTMESSAGE, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_NEXTMESSAGE, NULL, 0, 0, "menu_nextmessage", _("Next Message"), LW(next_message1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, NULL, 0, 0, "menu_previousmessage", _("Previous Message"), LW(previous_message1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDUSAGE, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDUSAGE, NULL, 0, 0, "popup_findusage", _("Find Usage"), NULL); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, NULL, 0, 0, "popup_finddocumentusage", _("Find Document Usage"), NULL); - keybindings_set_item(group, GEANY_KEYS_SEARCH_MARKALL, cb_func_search_action, + keybindings_set_item(group, GEANY_KEYS_SEARCH_MARKALL, NULL, GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("Mark All"), NULL); - group = ADD_KB_GROUP(GOTO, _("Go to")); + group = ADD_KB_GROUP(GOTO, _("Go to"), cb_func_goto_action); - keybindings_set_item(group, GEANY_KEYS_GOTO_BACK, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_BACK, NULL, 0, 0, "nav_back", _("Navigate back a location"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_FORWARD, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_FORWARD, NULL, 0, 0, "nav_forward", _("Navigate forward a location"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINE, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_LINE, NULL, GDK_l, GDK_CONTROL_MASK, "menu_gotoline", _("Go to Line"), LW(go_to_line1)); - keybindings_set_item(group, GEANY_KEYS_GOTO_MATCHINGBRACE, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_MATCHINGBRACE, NULL, GDK_b, GDK_CONTROL_MASK, "edit_gotomatchingbrace", _("Go to matching brace"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_TOGGLEMARKER, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_TOGGLEMARKER, NULL, GDK_m, GDK_CONTROL_MASK, "edit_togglemarker", _("Toggle marker"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTMARKER, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTMARKER, NULL, GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker", - _("Go to next marker"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, cb_func_goto_action, + _("_Go to Next Marker"), LW(go_to_next_marker1)); + keybindings_set_item(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, NULL, GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker", - _("Go to previous marker"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDEFINITION, cb_func_goto_action, + _("_Go to Previous Marker"), LW(go_to_previous_marker1)); + keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL, 0, 0, "popup_gototagdefinition", _("Go to Tag Definition"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDECLARATION, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDECLARATION, NULL, 0, 0, "popup_gototagdeclaration", _("Go to Tag Declaration"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINESTART, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_LINESTART, NULL, GDK_Home, 0, "edit_gotolinestart", _("Go to Start of Line"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINEEND, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_LINEEND, NULL, GDK_End, 0, "edit_gotolineend", _("Go to End of Line"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINEENDVISUAL, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_LINEENDVISUAL, NULL, GDK_End, GDK_MOD1_MASK, "edit_gotolineendvisual", _("Go to End of Display Line"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_PREVWORDSTART, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_PREVWORDPART, NULL, GDK_slash, GDK_CONTROL_MASK, "edit_prevwordstart", _("Go to Previous Word Part"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTWORDSTART, cb_func_goto_action, + keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTWORDPART, NULL, GDK_backslash, GDK_CONTROL_MASK, "edit_nextwordstart", _("Go to Next Word Part"), NULL); - group = ADD_KB_GROUP(VIEW, _("View")); + group = ADD_KB_GROUP(VIEW, _("View"), cb_func_view_action); - keybindings_set_item(group, GEANY_KEYS_VIEW_TOGGLEALL, cb_func_view_action, + keybindings_set_item(group, GEANY_KEYS_VIEW_TOGGLEALL, NULL, 0, 0, "menu_toggleall", _("Toggle All Additional Widgets"), LW(menu_toggle_all_additional_widgets1)); keybindings_set_item(group, GEANY_KEYS_VIEW_FULLSCREEN, cb_func_menu_fullscreen, @@ -411,29 +463,39 @@ keybindings_set_item(group, GEANY_KEYS_VIEW_MESSAGEWINDOW, cb_func_menu_messagewindow, 0, 0, "menu_messagewindow", _("Toggle Messages Window"), LW(menu_show_messages_window1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_SIDEBAR, cb_func_view_action, + keybindings_set_item(group, GEANY_KEYS_VIEW_SIDEBAR, NULL, 0, 0, "toggle_sidebar", _("Toggle Sidebar"), LW(menu_show_sidebar1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMIN, cb_func_view_action, + keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMIN, NULL, GDK_plus, GDK_CONTROL_MASK, "menu_zoomin", _("Zoom In"), LW(menu_zoom_in1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMOUT, cb_func_view_action, + keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMOUT, NULL, GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out"), LW(menu_zoom_out1)); + keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMRESET, NULL, + GDK_0, GDK_CONTROL_MASK, "normal_size", _("Zoom Reset"), LW(normal_size1)); - group = ADD_KB_GROUP(FOCUS, _("Focus")); + group = ADD_KB_GROUP(FOCUS, _("Focus"), cb_func_switch_action); - keybindings_set_item(group, GEANY_KEYS_FOCUS_EDITOR, cb_func_switch_action, + keybindings_set_item(group, GEANY_KEYS_FOCUS_EDITOR, NULL, GDK_F2, 0, "switch_editor", _("Switch to Editor"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SCRIBBLE, cb_func_switch_action, + keybindings_set_item(group, GEANY_KEYS_FOCUS_SCRIBBLE, NULL, GDK_F6, 0, "switch_scribble", _("Switch to Scribble"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_VTE, cb_func_switch_action, + keybindings_set_item(group, GEANY_KEYS_FOCUS_VTE, NULL, GDK_F4, 0, "switch_vte", _("Switch to VTE"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SEARCHBAR, cb_func_switch_action, + keybindings_set_item(group, GEANY_KEYS_FOCUS_SEARCHBAR, NULL, GDK_F7, 0, "switch_search_bar", _("Switch to Search Bar"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR, cb_func_switch_action, + keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR, NULL, 0, 0, "switch_sidebar", _("Switch to Sidebar"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_COMPILER, cb_func_switch_action, + keybindings_set_item(group, GEANY_KEYS_FOCUS_COMPILER, NULL, 0, 0, "switch_compiler", _("Switch to Compiler"), NULL); + keybindings_set_item(group, GEANY_KEYS_FOCUS_MESSAGES, NULL, + 0, 0, "switch_messages", _("Switch to Messages"), NULL); + keybindings_set_item(group, GEANY_KEYS_FOCUS_MESSAGE_WINDOW, NULL, + 0, 0, "switch_message_window", _("Switch to Message Window"), NULL); + keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR_DOCUMENT_LIST, NULL, + 0, 0, "switch_sidebar_doc_list", _("Switch to Sidebar Document List"), NULL); + keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR_SYMBOL_LIST, NULL, + 0, 0, "switch_sidebar_symbol_list", _("Switch to Sidebar Symbol List"), NULL); - group = ADD_KB_GROUP(NOTEBOOK, _("Notebook tab")); + group = ADD_KB_GROUP(NOTEBOOK, _("Notebook tab"), NULL); keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, cb_func_switch_tableft, GDK_Page_Up, GDK_CONTROL_MASK, "switch_tableft", _("Switch to left document"), NULL); @@ -450,55 +512,57 @@ keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_MOVETABLAST, cb_func_move_tab, 0, 0, "move_tablast", _("Move document last"), NULL); - group = ADD_KB_GROUP(DOCUMENT, _("Document")); + group = ADD_KB_GROUP(DOCUMENT, _("Document"), cb_func_document_action); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEWRAP, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEWRAP, NULL, 0, 0, "menu_linewrap", _("Toggle Line wrapping"), LW(menu_line_wrapping1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEBREAK, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEBREAK, NULL, 0, 0, "menu_linebreak", _("Toggle Line breaking"), LW(line_breaking1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REPLACETABS, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REPLACETABS, NULL, 0, 0, "menu_replacetabs", _("Replace tabs by space"), LW(menu_replace_tabs)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REPLACESPACES, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REPLACESPACES, NULL, 0, 0, "menu_replacespaces", _("Replace spaces by tabs"), LW(menu_replace_spaces)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_TOGGLEFOLD, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_TOGGLEFOLD, NULL, 0, 0, "menu_togglefold", _("Toggle current fold"), NULL); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_FOLDALL, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_FOLDALL, NULL, 0, 0, "menu_foldall", _("Fold all"), LW(menu_fold_all1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_UNFOLDALL, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_UNFOLDALL, NULL, 0, 0, "menu_unfoldall", _("Unfold all"), LW(menu_unfold_all1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_RELOADTAGLIST, cb_func_document_action, + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_RELOADTAGLIST, NULL, GDK_r, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "reloadtaglist", _("Reload symbol list"), NULL); + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS, NULL, + 0, 0, "remove_markers", _("Remove Markers"), LW(remove_markers1)); + keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REMOVE_ERROR_INDICATORS, NULL, + 0, 0, "remove_error_indicators", _("Remove Error Indicators"), LW(menu_remove_indicators1)); - group = ADD_KB_GROUP(BUILD, _("Build")); + group = ADD_KB_GROUP(BUILD, _("Build"), cb_func_build_action); - keybindings_set_item(group, GEANY_KEYS_BUILD_COMPILE, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_COMPILE, NULL, GDK_F8, 0, "build_compile", _("Compile"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_LINK, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_LINK, NULL, GDK_F9, 0, "build_link", _("Build"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_MAKE, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_MAKE, NULL, GDK_F9, GDK_SHIFT_MASK, "build_make", _("Make all"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_MAKEOWNTARGET, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_MAKEOWNTARGET, NULL, GDK_F9, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "build_makeowntarget", _("Make custom target"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_MAKEOBJECT, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_MAKEOBJECT, NULL, 0, 0, "build_makeobject", _("Make object"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_NEXTERROR, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_NEXTERROR, NULL, 0, 0, "build_nexterror", _("Next error"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_PREVIOUSERROR, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_PREVIOUSERROR, NULL, 0, 0, "build_previouserror", _("Previous error"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_RUN, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_RUN, NULL, GDK_F5, 0, "build_run", _("Run"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_RUN2, cb_func_build_action, - 0, 0, "build_run2", _("Run (alternative command)"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_OPTIONS, cb_func_build_action, + keybindings_set_item(group, GEANY_KEYS_BUILD_OPTIONS, NULL, 0, 0, "build_options", _("Build options"), NULL); - group = ADD_KB_GROUP(TOOLS, _("Tools")); + group = ADD_KB_GROUP(TOOLS, _("Tools"), NULL); keybindings_set_item(group, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER, cb_func_menu_opencolorchooser, 0, 0, "menu_opencolorchooser", _("Show Color Chooser"), LW(menu_choose_color1)); - group = ADD_KB_GROUP(HELP, _("Help")); + group = ADD_KB_GROUP(HELP, _("Help"), NULL); keybindings_set_item(group, GEANY_KEYS_HELP_HELP, cb_func_menu_help, GDK_F1, 0, "menu_help", _("Help"), LW(help1)); @@ -568,16 +632,6 @@ } -static void apply_kb_accel(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_data) -{ - if (kb->key != 0 && kb->menu_item) - { - gtk_widget_add_accelerator(kb->menu_item, "activate", kb_accel_group, - kb->key, kb->mods, GTK_ACCEL_VISIBLE); - } -} - - typedef void (*KBItemCallback) (GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_data); static void keybindings_foreach(KBItemCallback cb, gpointer user_data) @@ -632,42 +686,47 @@ } +static void apply_kb_accel(GeanyKeyGroup *group, GeanyKeyBinding *kb, gpointer user_data) +{ + if (kb->key != 0 && kb->menu_item) + { + gtk_widget_add_accelerator(kb->menu_item, "activate", kb_accel_group, + kb->key, kb->mods, GTK_ACCEL_VISIBLE); + } +} + + void keybindings_load_keyfile(void) { load_user_kb(); add_popup_menu_accels(); - /* set menu accels now, after user keybindings have been read and processed - * if we would set it before, user keybindings could not override menu item's default - * keybindings */ + /* set menu accels now, after user keybindings have been read */ keybindings_foreach(apply_kb_accel, NULL); } -static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, - GtkAccelGroup *accel_group, GtkWidget *menuitem) +static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, GtkWidget *menuitem) { GeanyKeyBinding *kb = &group->keys[kb_id]; if (kb->key != 0) - gtk_widget_add_accelerator(menuitem, "activate", accel_group, + gtk_widget_add_accelerator(menuitem, "activate", kb_accel_group, kb->key, kb->mods, GTK_ACCEL_VISIBLE); } #define GEANY_ADD_POPUP_ACCEL(kb_id, wid) \ - add_menu_accel(group, kb_id, accel_group, ui_lookup_widget(main_widgets.editor_menu, G_STRINGIFY(wid))) + add_menu_accel(group, kb_id, ui_lookup_widget(main_widgets.editor_menu, G_STRINGIFY(wid))) /* set the menu item accelerator shortcuts (just for visibility, they are handled anyway) */ static void add_popup_menu_accels(void) { - GtkAccelGroup *accel_group = gtk_accel_group_new(); GeanyKeyGroup *group; group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_EDITOR); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_UNDO, undo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_REDO, redo1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_DUPLICATELINE, menu_duplicate_line2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_CONTEXTACTION, context_action1); group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SELECT); @@ -688,18 +747,8 @@ GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDEFINITION, goto_tag_definition1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDECLARATION, goto_tag_declaration1); - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FORMAT); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_TOGGLECASE, toggle_case1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_COMMENTLINE, menu_comment_line2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_UNCOMMENTLINE, menu_uncomment_line2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, menu_toggle_line_commentation2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_INCREASEINDENT, menu_increase_indent2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_DECREASEINDENT, menu_decrease_indent2); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FORMAT_SENDTOVTE, send_selection_to_vte2); - - /* the build menu items are set if the build menus are created */ - - gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group); + /* Format and Commands share the menu bar submenus */ + /* Build menu items are set if the build menus are created */ } @@ -748,10 +797,15 @@ } +gchar *keybindings_get_label(GeanyKeyBinding *kb) +{ + return utils_str_remove_chars(g_strdup(kb->label), "_"); +} + + static void fill_shortcut_labels_treeview(GtkWidget *tree) { gsize g, i; - gchar *shortcut; GeanyKeyBinding *kb; GeanyKeyGroup *group; GtkListStore *store; @@ -774,13 +828,17 @@ for (i = 0; i < group->count; i++) { + gchar *shortcut, *label; + kb = &group->keys[i]; + label = keybindings_get_label(kb); shortcut = gtk_accelerator_get_label(kb->key, kb->mods); gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, kb->label, 1, shortcut, 2, PANGO_WEIGHT_NORMAL, -1); + gtk_list_store_set(store, &iter, 0, label, 1, shortcut, 2, PANGO_WEIGHT_NORMAL, -1); g_free(shortcut); + g_free(label); } } @@ -794,7 +852,6 @@ GtkWidget *dialog, *tree, *label, *swin, *vbox; GtkCellRenderer *text_renderer; GtkTreeViewColumn *column; - gint height; dialog = gtk_dialog_new_with_buttons(_("Keyboard Shortcuts"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -804,8 +861,7 @@ gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog"); - height = GEANY_WINDOW_MINIMAL_HEIGHT; - gtk_window_set_default_size(GTK_WINDOW(dialog), -1, height); + gtk_window_set_default_size(GTK_WINDOW(dialog), -1, GEANY_DEFAULT_DIALOG_HEIGHT); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); @@ -912,28 +968,20 @@ } -/* We have a special case for GEANY_KEYS_EDIT_COMPLETESNIPPET, because we need to - * return FALSE if no completion occurs, so the tab or space is handled normally. */ -static gboolean check_snippet_completion(GeanyDocument *doc, guint keyval, guint state) +static gboolean check_snippet_completion(GeanyDocument *doc) { - GeanyKeyBinding *kb = keybindings_lookup_item(GEANY_KEY_GROUP_EDITOR, - GEANY_KEYS_EDITOR_COMPLETESNIPPET); + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); g_return_val_if_fail(doc, FALSE); - if (kb->key == keyval && kb->mods == state) + /* keybinding only valid when scintilla widget has focus */ + if (focusw == GTK_WIDGET(doc->editor->sci)) { - GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - - /* keybinding only valid when scintilla widget has focus */ - if (focusw == GTK_WIDGET(doc->editor->sci)) - { - ScintillaObject *sci = doc->editor->sci; - gint pos = sci_get_current_position(sci); + ScintillaObject *sci = doc->editor->sci; + gint pos = sci_get_current_position(sci); - if (editor_prefs.complete_snippets) - return editor_complete_snippet(doc->editor, pos); - } + if (editor_prefs.complete_snippets) + return editor_complete_snippet(doc->editor, pos); } return FALSE; } @@ -972,11 +1020,6 @@ if ((keyval == GDK_Menu && state == 0) || (keyval == GDK_F10 && state == GDK_SHIFT_MASK)) { GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - static GtkWidget *scribble = NULL; - - if (scribble == NULL) - scribble = ui_lookup_widget(main_widgets.window, "textview_scribble"); - if (doc != NULL) { if (focusw == doc->priv->tag_tree) @@ -1002,7 +1045,7 @@ || focusw == msgwindow.tree_status || focusw == msgwindow.tree_compiler || focusw == msgwindow.tree_msg - || focusw == scribble + || focusw == msgwindow.scribble #ifdef HAVE_VTE || (vte_info.have_vte && focusw == vc->vte) #endif @@ -1077,6 +1120,83 @@ #endif +/* Map the keypad keys to their equivalent functions (taken from ScintillaGTK.cxx) */ +static guint key_kp_translate(guint key_in) +{ + switch (key_in) + { + case GDK_KP_Down: + return GDK_Down; + case GDK_KP_Up: + return GDK_Up; + case GDK_KP_Left: + return GDK_Left; + case GDK_KP_Right: + return GDK_Right; + case GDK_KP_Home: + return GDK_Home; + case GDK_KP_End: + return GDK_End; + case GDK_KP_Page_Up: + return GDK_Page_Up; + case GDK_KP_Page_Down: + return GDK_Page_Down; + case GDK_KP_Delete: + return GDK_Delete; + case GDK_KP_Insert: + return GDK_Insert; + default: + return key_in; + } +} + + +/* Stripped down version of the main keypress event handler which can be used + * to process foreign events. Instead of executing the keybinding, a pointer to the + * keybinding structure is returned. + * Additionally, the group_id and binding_id are filled with the appropriate indexes + * if non-NULL. */ +const GeanyKeyBinding *keybindings_check_event(GdkEventKey *ev, gint *group_id, gint *binding_id) +{ + guint state, keyval; + gsize g, i; + GeanyKeyGroup *group; + GeanyKeyBinding *kb; + + if (ev->keyval == 0) + return FALSE; + + keyval = ev->keyval; + state = ev->state & gtk_accelerator_get_default_mod_mask(); + /* hack to get around that CTRL+Shift+r results in GDK_R not GDK_r */ + if ((ev->state & GDK_SHIFT_MASK) || (ev->state & GDK_LOCK_MASK)) + if (keyval >= GDK_A && keyval <= GDK_Z) + keyval += GDK_a - GDK_A; + + if (keyval >= GDK_KP_Space && keyval < GDK_KP_Equal) + keyval = key_kp_translate(keyval); + + for (g = 0; g < keybinding_groups->len; g++) + { + group = g_ptr_array_index(keybinding_groups, g); + + for (i = 0; i < group->count; i++) + { + kb = &group->keys[i]; + if (keyval == kb->key && state == kb->mods) + { + if (group_id != NULL) + *group_id = g; + if (binding_id != NULL) + *binding_id = i; + return kb; + } + } + } + return NULL; +} + + /* central keypress event handler, almost all keypress events go to this function */ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) { @@ -1086,7 +1206,7 @@ GeanyKeyGroup *group; GeanyKeyBinding *kb; - if (G_UNLIKELY(ev->keyval == 0)) + if (ev->keyval == 0) return FALSE; doc = document_get_current(); @@ -1094,13 +1214,15 @@ document_check_disk_status(doc, FALSE); keyval = ev->keyval; - state = ev->state & gtk_accelerator_get_default_mod_mask(); - + state = ev->state & gtk_accelerator_get_default_mod_mask(); /* hack to get around that CTRL+Shift+r results in GDK_R not GDK_r */ if ((ev->state & GDK_SHIFT_MASK) || (ev->state & GDK_LOCK_MASK)) if (keyval >= GDK_A && keyval <= GDK_Z) keyval += GDK_a - GDK_A; + if (keyval >= GDK_KP_Space && keyval < GDK_KP_Equal) + keyval = key_kp_translate(keyval); + /*geany_debug("%d (%d) %d (%d)", keyval, ev->keyval, state, ev->state);*/ /* special cases */ @@ -1108,12 +1230,9 @@ if (vte_info.have_vte && check_vte(state, keyval)) return FALSE; #endif - if (doc && check_snippet_completion(doc, keyval, state)) - return TRUE; if (check_menu_key(doc, keyval, state, ev->time)) return TRUE; - ignore_keybinding = FALSE; for (g = 0; g < keybinding_groups->len; g++) { group = g_ptr_array_index(keybinding_groups, g); @@ -1123,12 +1242,20 @@ kb = &group->keys[i]; if (keyval == kb->key && state == kb->mods) { - if (G_UNLIKELY(kb->callback == NULL)) - return FALSE; /* ignore the keybinding */ - /* call the corresponding callback function for this shortcut */ - kb->callback(i); - return !ignore_keybinding; + if (kb->callback) + { + kb->callback(i); + return TRUE; + } + else if (group->callback) + { + if (group->callback(i)) + return TRUE; + else + continue; /* not handled */ + } + g_warning("No callback for keybinding %s: %s!", group->name, kb->name); } } } @@ -1177,7 +1304,7 @@ } -/** Mimic a (built-in only) keybinding action. +/** Mimics a (built-in only) keybinding action. * Example: @code keybindings_send_command(GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_OPEN); @endcode * @param group_id The index for the key group that contains the @a key_id keybinding. * @param key_id The keybinding command index. */ @@ -1189,7 +1316,17 @@ kb = keybindings_lookup_item(group_id, key_id); if (kb) - kb->callback(key_id); + { + if (kb->callback) + kb->callback(key_id); + else + { + GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, group_id); + + if (group->callback) + group->callback(key_id); + } + } } @@ -1197,7 +1334,7 @@ * own function. */ -static void cb_func_file_action(guint key_id) +static gboolean cb_func_file_action(guint key_id) { switch (key_id) { @@ -1210,6 +1347,14 @@ case GEANY_KEYS_FILE_OPENSELECTED: on_menu_open_selected_file1_activate(NULL, NULL); break; + case GEANY_KEYS_FILE_OPENLASTTAB: + { + gchar *utf8_filename = g_queue_peek_head(ui_prefs.recent_queue); + gchar *locale_filename = utils_get_locale_from_utf8(utf8_filename); + document_open_file(locale_filename, FALSE, NULL, NULL); + g_free(locale_filename); + break; + } case GEANY_KEYS_FILE_SAVE: on_save1_activate(NULL, NULL); break; @@ -1232,10 +1377,11 @@ on_print1_activate(NULL, NULL); break; } + return TRUE; } -static void cb_func_project_action(guint key_id) +static gboolean cb_func_project_action(guint key_id) { switch (key_id) { @@ -1244,26 +1390,42 @@ on_project_properties1_activate(NULL, NULL); break; } + return TRUE; } -static void cb_func_menu_preferences(G_GNUC_UNUSED guint key_id) +static void cb_func_menu_preferences(guint key_id) { - on_preferences1_activate(NULL, NULL); + switch (key_id) + { + case GEANY_KEYS_SETTINGS_PREFERENCES: + on_preferences1_activate(NULL, NULL); + break; + case GEANY_KEYS_SETTINGS_PLUGINPREFERENCES: + on_plugin_preferences1_activate(NULL, NULL); + break; + } } + static void cb_func_menu_help(G_GNUC_UNUSED guint key_id) { on_help1_activate(NULL, NULL); } -static void cb_func_search_action(guint key_id) + +static gboolean cb_func_search_action(guint key_id) { GeanyDocument *doc = document_get_current(); ScintillaObject *sci; + if (key_id == GEANY_KEYS_SEARCH_FINDINFILES) + { + on_find_in_files1_activate(NULL, NULL); /* works without docs too */ + return TRUE; + } if (!doc) - return; + return TRUE; sci = doc->editor->sci; switch (key_id) @@ -1280,8 +1442,6 @@ on_find_nextsel1_activate(NULL, NULL); break; case GEANY_KEYS_SEARCH_REPLACE: on_replace1_activate(NULL, NULL); break; - case GEANY_KEYS_SEARCH_FINDINFILES: - on_find_in_files1_activate(NULL, NULL); break; case GEANY_KEYS_SEARCH_NEXTMESSAGE: on_next_message1_activate(NULL, NULL); break; case GEANY_KEYS_SEARCH_PREVIOUSMESSAGE: @@ -1295,29 +1455,31 @@ on_find_document_usage1_activate(NULL, NULL); break; case GEANY_KEYS_SEARCH_MARKALL: - if (sci_has_selection(sci)) - { - gchar *text = sci_get_selection_contents(sci); + { + gchar *text = get_current_word_or_sel(doc); + if (sci_has_selection(sci)) search_mark_all(doc, text, SCFIND_MATCHCASE); - g_free(text); - } else { - read_current_word(doc); - search_mark_all(doc, editor_info.current_word, SCFIND_MATCHCASE | SCFIND_WHOLEWORD); + /* clears markers if text is null */ + search_mark_all(doc, text, SCFIND_MATCHCASE | SCFIND_WHOLEWORD); } + g_free(text); break; + } } + return TRUE; } + static void cb_func_menu_opencolorchooser(G_GNUC_UNUSED guint key_id) { on_show_color_chooser1_activate(NULL, NULL); } -static void cb_func_view_action(guint key_id) +static gboolean cb_func_view_action(guint key_id) { switch (key_id) { @@ -1333,9 +1495,13 @@ case GEANY_KEYS_VIEW_ZOOMOUT: on_zoom_out1_activate(NULL, NULL); break; + case GEANY_KEYS_VIEW_ZOOMRESET: + on_normal_size1_activate(NULL, NULL); + break; default: break; } + return TRUE; } @@ -1347,6 +1513,7 @@ gtk_check_menu_item_set_active(c, ! gtk_check_menu_item_get_active(c)); } + static void cb_func_menu_messagewindow(G_GNUC_UNUSED guint key_id) { GtkCheckMenuItem *c = GTK_CHECK_MENU_ITEM( @@ -1356,50 +1523,48 @@ } -static void cb_func_build_action(guint key_id) +static gboolean cb_func_build_action(guint key_id) { GtkWidget *item; BuildMenuItems *menu_items; - GeanyDocument *doc = document_get_current(); + if (doc == NULL) - return; + return TRUE; if (!GTK_WIDGET_IS_SENSITIVE(ui_lookup_widget(main_widgets.window, "menu_build1"))) - return; - menu_items = build_get_menu_items(doc->file_type->id); + return TRUE; + menu_items = build_get_menu_items(doc->file_type->id); +/* TODO make it a table??*/ switch (key_id) { case GEANY_KEYS_BUILD_COMPILE: - item = menu_items->item_compile; + item = menu_items->menu_item[GEANY_GBG_FT][GBO_TO_CMD(GEANY_GBO_COMPILE)]; break; case GEANY_KEYS_BUILD_LINK: - item = menu_items->item_link; + item = menu_items->menu_item[GEANY_GBG_FT][GBO_TO_CMD(GEANY_GBO_BUILD)]; break; case GEANY_KEYS_BUILD_MAKE: - item = menu_items->item_make_all; + item = menu_items->menu_item[GEANY_GBG_NON_FT][GBO_TO_CMD(GEANY_GBO_MAKE_ALL)]; break; case GEANY_KEYS_BUILD_MAKEOWNTARGET: - item = menu_items->item_make_custom; + item = menu_items->menu_item[GEANY_GBG_NON_FT][GBO_TO_CMD(GEANY_GBO_CUSTOM)]; break; case GEANY_KEYS_BUILD_MAKEOBJECT: - item = menu_items->item_make_object; + item = menu_items->menu_item[GEANY_GBG_NON_FT][GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)]; break; case GEANY_KEYS_BUILD_NEXTERROR: - item = menu_items->item_next_error; + item = menu_items->menu_item[GBG_FIXED][GBF_NEXT_ERROR]; break; case GEANY_KEYS_BUILD_PREVIOUSERROR: - item = menu_items->item_previous_error; + item = menu_items->menu_item[GBG_FIXED][GBF_PREV_ERROR]; break; case GEANY_KEYS_BUILD_RUN: - item = menu_items->item_exec; - break; - case GEANY_KEYS_BUILD_RUN2: - item = menu_items->item_exec2; + item = menu_items->menu_item[GEANY_GBG_EXEC][GBO_TO_CMD(GEANY_GBO_EXEC)]; break; case GEANY_KEYS_BUILD_OPTIONS: - item = menu_items->item_set_args; + item = menu_items->menu_item[GBG_FIXED][GBF_COMMANDS]; break; default: item = NULL; @@ -1409,6 +1574,7 @@ * they are redrawn. */ if (item && GTK_WIDGET_IS_SENSITIVE(item)) gtk_menu_item_activate(GTK_MENU_ITEM(item)); + return TRUE; } @@ -1439,6 +1605,17 @@ } +static gchar *get_current_word_or_sel(GeanyDocument *doc) +{ + ScintillaObject *sci = doc->editor->sci; + + if (sci_has_selection(sci)) + return sci_get_selection_contents(sci); + + return read_current_word(doc) ? g_strdup(editor_info.current_word) : NULL; +} + + static void focus_sidebar(void) { if (ui_prefs.sidebar_visible) @@ -1452,7 +1629,19 @@ } -static void cb_func_switch_action(guint key_id) +static void focus_msgwindow(void) +{ + if (ui_prefs.msgwindow_visible) + { + gint page_num = gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)); + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(msgwindow.notebook), page_num); + + gtk_widget_grab_focus(gtk_bin_get_child(GTK_BIN(page))); + } +} + + +static gboolean cb_func_switch_action(guint key_id) { switch (key_id) { @@ -1460,7 +1649,13 @@ { GeanyDocument *doc = document_get_current(); if (doc != NULL) - gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + { + GtkWidget *sci = GTK_WIDGET(doc->editor->sci); + if (GTK_WIDGET_HAS_FOCUS(sci)) + ui_update_statusbar(doc, -1); + else + gtk_widget_grab_focus(sci); + } break; } case GEANY_KEYS_FOCUS_SCRIBBLE: @@ -1483,7 +1678,20 @@ case GEANY_KEYS_FOCUS_COMPILER: msgwin_switch_tab(MSG_COMPILER, TRUE); break; + case GEANY_KEYS_FOCUS_MESSAGES: + msgwin_switch_tab(MSG_MESSAGE, TRUE); + break; + case GEANY_KEYS_FOCUS_MESSAGE_WINDOW: + focus_msgwindow(); + break; + case GEANY_KEYS_FOCUS_SIDEBAR_DOCUMENT_LIST: + sidebar_focus_openfiles_tab(); + break; + case GEANY_KEYS_FOCUS_SIDEBAR_SYMBOL_LIST: + sidebar_focus_symbols_tab(); + break; } + return TRUE; } @@ -1697,29 +1905,30 @@ static void goto_matching_brace(GeanyDocument *doc) { gint pos, new_pos; + gint after_brace; if (doc == NULL) return; pos = sci_get_current_position(doc->editor->sci); - if (! utils_isbrace(sci_get_char_at(doc->editor->sci, pos), TRUE)) - pos--; /* set pos to the brace */ + after_brace = pos > 0 && utils_isbrace(sci_get_char_at(doc->editor->sci, pos - 1), TRUE); + pos -= after_brace; /* set pos to the brace */ new_pos = sci_find_matching_brace(doc->editor->sci, pos); if (new_pos != -1) - { /* set the cursor at the brace */ - sci_set_current_position(doc->editor->sci, new_pos, FALSE); + { /* set the cursor at/after the brace */ + sci_set_current_position(doc->editor->sci, new_pos + (!after_brace), FALSE); editor_display_current_line(doc->editor, 0.5F); } } -static void cb_func_clipboard(guint key_id) +static gboolean cb_func_clipboard_action(guint key_id) { GeanyDocument *doc = document_get_current(); if (doc == NULL) - return; + return TRUE; switch (key_id) { @@ -1739,17 +1948,31 @@ sci_send_command(doc->editor->sci, SCI_LINECUT); break; } + return TRUE; +} + + +static void goto_tag(GeanyDocument *doc, gboolean definition) +{ + gchar *text = get_current_word_or_sel(doc); + + if (text) + symbols_goto_tag(text, definition); + else + utils_beep(); + + g_free(text); } /* Common function for goto keybindings, useful even when sci doesn't have focus. */ -static void cb_func_goto_action(guint key_id) +static gboolean cb_func_goto_action(guint key_id) { gint cur_line; GeanyDocument *doc = document_get_current(); if (doc == NULL) - return; + return TRUE; cur_line = sci_get_current_line(doc->editor->sci); @@ -1757,22 +1980,33 @@ { case GEANY_KEYS_GOTO_BACK: navqueue_go_back(); - return; + return TRUE; case GEANY_KEYS_GOTO_FORWARD: navqueue_go_forward(); - return; + return TRUE; case GEANY_KEYS_GOTO_LINE: + { + if (toolbar_prefs.visible) + { + GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry"); + + /* use toolbar item if shown */ + if (wid) + { + gtk_widget_grab_focus(wid); + return TRUE; + } + } on_go_to_line_activate(NULL, NULL); - return; + return TRUE; + } case GEANY_KEYS_GOTO_MATCHINGBRACE: goto_matching_brace(doc); - return; + return TRUE; case GEANY_KEYS_GOTO_TOGGLEMARKER: { - gboolean set = sci_is_marker_set_at_line(doc->editor->sci, cur_line, 1); - - sci_set_marker_at_line(doc->editor->sci, cur_line, ! set, 1); - return; + sci_toggle_marker_at_line(doc->editor->sci, cur_line, 1); + return TRUE; } case GEANY_KEYS_GOTO_NEXTMARKER: { @@ -1783,7 +2017,7 @@ sci_set_current_line(doc->editor->sci, mline); editor_display_current_line(doc->editor, 0.5F); } - return; + return TRUE; } case GEANY_KEYS_GOTO_PREVIOUSMARKER: { @@ -1794,23 +2028,20 @@ sci_set_current_line(doc->editor->sci, mline); editor_display_current_line(doc->editor, 0.5F); } - return; + return TRUE; } case GEANY_KEYS_GOTO_TAGDEFINITION: - if (check_current_word(doc)) - symbols_goto_tag(editor_info.current_word, TRUE); - return; + goto_tag(doc, TRUE); + return TRUE; case GEANY_KEYS_GOTO_TAGDECLARATION: - if (check_current_word(doc)) - symbols_goto_tag(editor_info.current_word, FALSE); - return; + goto_tag(doc, FALSE); + return TRUE; } - /* only check editor-sensitive keybindings when editor has focus */ + /* only check editor-sensitive keybindings when editor has focus so home,end still + * work in other widgets */ if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != GTK_WIDGET(doc->editor->sci)) - { - ignore_keybinding = TRUE; - return; - } + return FALSE; + switch (key_id) { case GEANY_KEYS_GOTO_LINESTART: @@ -1822,13 +2053,14 @@ case GEANY_KEYS_GOTO_LINEENDVISUAL: sci_send_command(doc->editor->sci, SCI_LINEENDDISPLAY); break; - case GEANY_KEYS_GOTO_PREVWORDSTART: + case GEANY_KEYS_GOTO_PREVWORDPART: sci_send_command(doc->editor->sci, SCI_WORDPARTLEFT); break; - case GEANY_KEYS_GOTO_NEXTWORDSTART: + case GEANY_KEYS_GOTO_NEXTWORDPART: sci_send_command(doc->editor->sci, SCI_WORDPARTRIGHT); break; } + return TRUE; } @@ -1853,15 +2085,46 @@ } +static void move_lines(GeanyEditor *editor, gboolean down) +{ + ScintillaObject *sci = editor->sci; + gchar *text; + gint pos, line, len; + + sci_start_undo_action(sci); + editor_select_lines(editor, FALSE); + len = sci_get_selected_text_length(sci); + + pos = sci_get_selection_start(sci); + line = sci_get_line_from_position(sci, pos); + if (down) + line++; + else + line--; + + text = sci_get_selection_contents(sci); + sci_clear(sci); + + pos = sci_get_position_from_line(sci, line); + sci_insert_text(sci, pos, text); + g_free(text); + + sci_set_current_position(sci, pos, TRUE); + sci_set_selection_end(sci, pos + len - 1); + + sci_end_undo_action(sci); +} + + /* common function for editor keybindings, only valid when scintilla has focus. */ -static void cb_func_editor_action(guint key_id) +static gboolean cb_func_editor_action(guint key_id) { GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* edit keybindings only valid when scintilla widget has focus */ if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return; + return FALSE; /* also makes tab work outside editor */ switch (key_id) { @@ -1884,8 +2147,7 @@ duplicate_lines(doc->editor); break; case GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR: - snippet_goto_next_cursor(doc->editor->sci, - sci_get_current_position(doc->editor->sci)); + editor_goto_next_snippet_cursor(doc->editor); break; case GEANY_KEYS_EDITOR_DELETELINE: delete_lines(doc->editor); @@ -1910,6 +2172,10 @@ on_context_action1_activate(GTK_MENU_ITEM(ui_lookup_widget(main_widgets.editor_menu, "context_action1")), NULL); break; + case GEANY_KEYS_EDITOR_COMPLETESNIPPET: + /* allow tab to be overloaded */ + return check_snippet_completion(doc); + case GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION: { GeanyKeyBinding *kb = keybindings_lookup_item(GEANY_KEY_GROUP_EDITOR, @@ -1928,7 +2194,17 @@ } break; } + case GEANY_KEYS_EDITOR_WORDPARTCOMPLETION: + return editor_complete_word_part(doc->editor); + + case GEANY_KEYS_EDITOR_MOVELINEUP: + move_lines(doc->editor, FALSE); + break; + case GEANY_KEYS_EDITOR_MOVELINEDOWN: + move_lines(doc->editor, TRUE); + break; } + return TRUE; } @@ -1953,7 +2229,7 @@ editor_strip_line_trailing_spaces(editor, i); /* remove starting spaces from second and following lines due to the same reason */ - for (i = start+1; i <= end; i++) + for (i = start + 1; i <= end; i++) sci_set_line_indentation(editor->sci, i, 0); /* @@ -1984,13 +2260,16 @@ } -static void split_lines(GeanyEditor *editor) +static void split_lines(GeanyEditor *editor, gint column) { - gint start, indent, linescount, i; + gint start, indent, linescount, i, end; + gchar c; + ScintillaObject *sci = editor->sci; - /* do nothing if long line marker is disabled */ - if (editor_prefs.long_line_type == 2) - return; + /* don't include trailing newlines */ + end = sci_get_selection_end(sci); + while ((c = sci_get_char_at(sci, end - 1)) == '\n' || c == '\r') end--; + sci_set_selection_end(sci, end); start = sci_get_line_from_position(editor->sci, sci_get_selection_start(editor->sci)); @@ -2005,8 +2284,7 @@ /* * If this line is short enough, just return */ - if (editor_prefs.long_line_column > - sci_get_line_end_position(editor->sci, start) - + if (column > sci_get_line_end_position(editor->sci, start) - sci_get_position_from_line(editor->sci, start)) { return; @@ -2036,13 +2314,30 @@ sci_target_from_selection(editor->sci); linescount = sci_get_line_count(editor->sci); sci_lines_split(editor->sci, - (editor_prefs.long_line_column - indent) * - sci_text_width(editor->sci, STYLE_DEFAULT, " ")); + (column - indent) * sci_text_width(editor->sci, STYLE_DEFAULT, " ")); linescount = sci_get_line_count(editor->sci) - linescount; /* Fix indentation. */ for (i = start; i <= start + linescount; i++) sci_set_line_indentation(editor->sci, i, indent); + + /* Remove trailing spaces. */ + if (editor_prefs.newline_strip || file_prefs.strip_trailing_spaces) + { + for (i = start; i <= start + linescount; i++) + editor_strip_line_trailing_spaces(editor, i); + } +} + + +/* if cursor < anchor, swap them */ +static void sci_fix_selection(ScintillaObject *sci) +{ + gint start, end; + + start = sci_get_selection_start(sci); + end = sci_get_selection_end(sci); + sci_set_selection(sci, start, end); } @@ -2050,7 +2345,24 @@ { ScintillaObject *sci = editor->sci; gboolean sel; + gint column = -1; + if (editor->line_breaking) + { + /* use line break column if enabled */ + column = editor_prefs.line_break_column; + } + else if (editor_get_long_line_type() != 2) + { + /* use long line if enabled */ + column = editor_get_long_line_column(); + } + else + { + /* do nothing if no column is defined */ + utils_beep(); + return; + } sci_start_undo_action(sci); sel = sci_has_selection(sci); if (!sel) @@ -2061,25 +2373,31 @@ /* deselect last line break */ pos = sci_get_selection_end(sci); line = sci_get_line_from_position(sci, pos); - pos = sci_get_line_end_position(sci, line - 1); - sci_set_selection_end(sci, pos); + if (line < sci_get_line_count(sci) - 1) + { + /* not last line */ + pos = sci_get_line_end_position(sci, line - 1); + sci_set_selection_end(sci, pos); + } } - split_lines(editor); + sci_fix_selection(sci); + split_lines(editor, column); if (!sel) sci_set_anchor(sci, -1); + sci_end_undo_action(sci); } /* common function for format keybindings, only valid when scintilla has focus. */ -static void cb_func_format_action(guint key_id) +static gboolean cb_func_format_action(guint key_id) { GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybindings only valid when scintilla widget has focus */ if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return; + return TRUE; switch (key_id) { @@ -2129,29 +2447,42 @@ reflow_paragraph(doc->editor); break; } + return TRUE; } /* common function for select keybindings, only valid when scintilla has focus. */ -static void cb_func_select_action(guint key_id) +static gboolean cb_func_select_action(guint key_id) { GeanyDocument *doc; + ScintillaObject *sci; GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - static GtkWidget *scribble_widget = NULL; + GtkWidget *toolbar_search_entry = toolbar_get_widget_child_by_name("SearchEntry"); + GtkWidget *toolbar_goto_entry = toolbar_get_widget_child_by_name("GotoEntry"); /* special case for Select All in the scribble widget */ - if (scribble_widget == NULL) /* lookup the scribble widget only once */ - scribble_widget = ui_lookup_widget(main_widgets.window, "textview_scribble"); - if (key_id == GEANY_KEYS_SELECT_ALL && focusw == scribble_widget) + if (key_id == GEANY_KEYS_SELECT_ALL && focusw == msgwindow.scribble) { - g_signal_emit_by_name(scribble_widget, "select-all", TRUE); - return; + g_signal_emit_by_name(msgwindow.scribble, "select-all", TRUE); + return TRUE; + } + /* special case for Select All in the toolbar search widget */ + else if (key_id == GEANY_KEYS_SELECT_ALL && focusw == toolbar_search_entry) + { + gtk_editable_select_region(GTK_EDITABLE(toolbar_search_entry), 0, -1); + return TRUE; + } + else if (key_id == GEANY_KEYS_SELECT_ALL && focusw == toolbar_goto_entry) + { + gtk_editable_select_region(GTK_EDITABLE(toolbar_goto_entry), 0, -1); + return TRUE; } doc = document_get_current(); /* keybindings only valid when scintilla widget has focus */ if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return; + return TRUE; + sci = doc->editor->sci; switch (key_id) { @@ -2167,15 +2498,23 @@ case GEANY_KEYS_SELECT_PARAGRAPH: editor_select_paragraph(doc->editor); break; + case GEANY_KEYS_SELECT_WORDPARTLEFT: + sci_send_command(sci, SCI_WORDPARTLEFTEXTEND); + break; + case GEANY_KEYS_SELECT_WORDPARTRIGHT: + sci_send_command(sci, SCI_WORDPARTRIGHTEXTEND); + break; } + return TRUE; } -static void cb_func_document_action(guint key_id) +static gboolean cb_func_document_action(guint key_id) { GeanyDocument *doc = document_get_current(); + if (doc == NULL) - return; + return TRUE; switch (key_id) { @@ -2206,22 +2545,29 @@ if (editor_prefs.folding) { gint line = sci_get_current_line(doc->editor->sci); - sci_toggle_fold(doc->editor->sci, line); + editor_toggle_fold(doc->editor, line, 0); break; } + case GEANY_KEYS_DOCUMENT_REMOVE_MARKERS: + on_remove_markers1_activate(NULL, NULL); + break; + case GEANY_KEYS_DOCUMENT_REMOVE_ERROR_INDICATORS: + on_menu_remove_indicators1_activate(NULL, NULL); + break; } + return TRUE; } /* common function for insert keybindings, only valid when scintilla has focus. */ -static void cb_func_insert_action(guint key_id) +static gboolean cb_func_insert_action(guint key_id) { GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybindings only valid when scintilla widget has focus */ if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return; + return TRUE; switch (key_id) { @@ -2233,5 +2579,65 @@ ui_lookup_widget(main_widgets.window, "insert_date_custom1"))); break; } + return TRUE; +} + + +/* update key combination */ +void keybindings_update_combo(GeanyKeyBinding *kb, guint key, GdkModifierType mods) +{ + GtkWidget *widget = kb->menu_item; + + if (widget && kb->key) + gtk_widget_remove_accelerator(widget, kb_accel_group, kb->key, kb->mods); + + kb->key = key; + kb->mods = mods; + + if (widget && kb->key) + gtk_widget_add_accelerator(widget, "activate", kb_accel_group, + kb->key, kb->mods, GTK_ACCEL_VISIBLE); } + +/* used for plugins */ +GeanyKeyGroup *keybindings_set_group(GeanyKeyGroup *group, const gchar *section_name, + const gchar *label, gsize count, GeanyKeyGroupCallback callback) +{ + g_return_val_if_fail(section_name, NULL); + g_return_val_if_fail(count, NULL); + + /* prevent conflict with core bindings */ + g_return_val_if_fail(!g_str_equal(section_name, keybindings_keyfile_group_name), NULL); + + if (!group) + group = g_new0(GeanyKeyGroup, 1); + + if (!group->keys || count > group->count) + { + /* allow resizing existing array of keys */ + group->keys = g_renew(GeanyKeyBinding, group->keys, count); + memset(group->keys + group->count, 0, (count - group->count) * sizeof(GeanyKeyBinding)); + } + group->plugin = TRUE; + add_kb_group(group, section_name, label, count, group->keys, callback); + return group; +} + + +/* used for plugins */ +void keybindings_free_group(GeanyKeyGroup *group) +{ + GeanyKeyBinding *kb; + + g_assert(group->plugin); + + foreach_c_array(kb, group->keys, group->count) + { + g_free(kb->name); + g_free(kb->label); + } + g_free(group->keys); + g_ptr_array_remove_fast(keybinding_groups, group); + g_free(group); +} diff -Nru geany-0.18/src/keybindings.h geany-0.19/src/keybindings.h --- geany-0.18/src/keybindings.h 2009-07-24 16:44:14.000000000 +0100 +++ geany-0.19/src/keybindings.h 2010-04-22 13:25:20.000000000 +0100 @@ -1,8 +1,8 @@ /* * keybindings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,45 +18,55 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: keybindings.h 4025 2009-07-24 15:44:14Z ntrel $ + * $Id: keybindings.h 4851 2010-04-22 12:25:20Z ntrel $ */ -/** - * @file keybindings.h - * Configurable keyboard shortcuts. - **/ - - #ifndef GEANY_KEYBINDINGS_H #define GEANY_KEYBINDINGS_H 1 - -/** Function pointer type used for keybinding callbacks */ +/** Function pointer type used for keybinding callbacks. */ typedef void (*GeanyKeyCallback) (guint key_id); -/** Represents a single keybinding action */ -/* Note: name and label are not const strings so plugins can set them to malloc'd strings - * and free them in cleanup(). */ +/** Represents a single keybinding action. + * Use keybindings_set_item() to set. */ typedef struct GeanyKeyBinding { - guint key; /**< Key value in lower-case, such as @c GDK_a */ - GdkModifierType mods; /**< Modifier keys, such as @c GDK_CONTROL_MASK */ + guint key; /**< Key value in lower-case, such as @c GDK_a or 0 */ + GdkModifierType mods; /**< Modifier keys, such as @c GDK_CONTROL_MASK or 0 */ gchar *name; /**< Key name for the configuration file, such as @c "menu_new" */ - gchar *label; /**< Label used in the preferences dialog keybindings tab */ - GeanyKeyCallback callback; /**< Callback function called when the key combination is pressed */ - GtkWidget *menu_item; /**< Menu item widget for setting the menu accelerator */ -} GeanyKeyBinding; + /** Label used in the preferences dialog keybindings tab. + * May contain underscores - these won't be displayed. */ + gchar *label; + /** Function called when the key combination is pressed, or @c NULL to use the group callback + * (preferred). @see plugin_set_key_group(). */ + GeanyKeyCallback callback; + GtkWidget *menu_item; /**< Optional widget to set an accelerator for, or @c NULL */ +} +GeanyKeyBinding; + +/** Function pointer type used for keybinding group callbacks. + * You should return @c TRUE to indicate handling the callback. (Occasionally, if the keybinding + * cannot apply in the current situation, it is useful to return @c FALSE to allow a later keybinding + * with the same key combination to handle it). */ +typedef gboolean (*GeanyKeyGroupCallback) (guint key_id); /** A collection of keybindings grouped together. */ -typedef struct GeanyKeyGroup -{ - const gchar *name; /**< Group name used in the configuration file, such as @c "html_chars" */ - const gchar *label; /**< Group label used in the preferences dialog keybindings tab */ - gsize count; /**< Count of GeanyKeyBinding structs in @c keys */ - GeanyKeyBinding *keys; /**< Fixed array of GeanyKeyBinding structs */ -} -GeanyKeyGroup; +typedef struct GeanyKeyGroup GeanyKeyGroup; + +/* Plugins should not set these fields. */ +#ifdef GEANY_PRIVATE +struct GeanyKeyGroup +{ + const gchar *name; /* Group name used in the configuration file, such as @c "html_chars" */ + const gchar *label; /* Group label used in the preferences dialog keybindings tab */ + gsize count; /* number of keybindings the group holds */ + GeanyKeyBinding *keys; /* array of GeanyKeyBinding structs */ + gboolean plugin; /* used by plugin */ + GeanyKeyGroupCallback callback; /* use this or individual keybinding callbacks */ +}; +#endif + extern GPtrArray *keybinding_groups; /* array of GeanyKeyGroup pointers */ @@ -69,246 +79,260 @@ * The _COUNT item should not be used by plugins, as it may well change. */ /** Keybinding group IDs */ -enum +enum GeanyKeyGroupID { - GEANY_KEY_GROUP_FILE, - GEANY_KEY_GROUP_PROJECT, - GEANY_KEY_GROUP_EDITOR, - GEANY_KEY_GROUP_CLIPBOARD, - GEANY_KEY_GROUP_SELECT, - GEANY_KEY_GROUP_FORMAT, - GEANY_KEY_GROUP_INSERT, - GEANY_KEY_GROUP_SETTINGS, - GEANY_KEY_GROUP_SEARCH, - GEANY_KEY_GROUP_GOTO, - GEANY_KEY_GROUP_VIEW, - GEANY_KEY_GROUP_FOCUS, - GEANY_KEY_GROUP_NOTEBOOK, - GEANY_KEY_GROUP_DOCUMENT, - GEANY_KEY_GROUP_BUILD, - GEANY_KEY_GROUP_TOOLS, - GEANY_KEY_GROUP_HELP, + GEANY_KEY_GROUP_FILE, /**< Group for @ref GeanyKeysFileID. */ + GEANY_KEY_GROUP_PROJECT, /**< Group for @ref GeanyKeysProjectID. */ + GEANY_KEY_GROUP_EDITOR, /**< Group for @ref GeanyKeysEditorID. */ + GEANY_KEY_GROUP_CLIPBOARD, /**< Group for @ref GeanyKeysClipboardID. */ + GEANY_KEY_GROUP_SELECT, /**< Group for @ref GeanyKeysSelectID. */ + GEANY_KEY_GROUP_FORMAT, /**< Group for @ref GeanyKeysFormatID. */ + GEANY_KEY_GROUP_INSERT, /**< Group for @ref GeanyKeysInsertID. */ + GEANY_KEY_GROUP_SETTINGS, /**< Group for @ref GeanyKeysSettingsID. */ + GEANY_KEY_GROUP_SEARCH, /**< Group for @ref GeanyKeysSearchID. */ + GEANY_KEY_GROUP_GOTO, /**< Group for @ref GeanyKeysGoToID. */ + GEANY_KEY_GROUP_VIEW, /**< Group for @ref GeanyKeysViewID. */ + GEANY_KEY_GROUP_FOCUS, /**< Group for @ref GeanyKeysFocusID. */ + GEANY_KEY_GROUP_NOTEBOOK, /**< Group for @ref GeanyKeysNotebookTabID. */ + GEANY_KEY_GROUP_DOCUMENT, /**< Group for @ref GeanyKeysDocumentID. */ + GEANY_KEY_GROUP_BUILD, /**< Group for @ref GeanyKeysBuildID. */ + GEANY_KEY_GROUP_TOOLS, /**< Group for @ref GeanyKeysToolsID. */ + GEANY_KEY_GROUP_HELP, /**< Group for @ref GeanyKeysHelpID. */ GEANY_KEY_GROUP_COUNT }; /** File group keybinding command IDs */ -enum +enum GeanyKeysFileID { - GEANY_KEYS_FILE_NEW, - GEANY_KEYS_FILE_OPEN, - GEANY_KEYS_FILE_OPENSELECTED, - GEANY_KEYS_FILE_SAVE, - GEANY_KEYS_FILE_SAVEAS, - GEANY_KEYS_FILE_SAVEALL, - GEANY_KEYS_FILE_PRINT, - GEANY_KEYS_FILE_CLOSE, - GEANY_KEYS_FILE_CLOSEALL, - GEANY_KEYS_FILE_RELOAD, + GEANY_KEYS_FILE_NEW, /**< Keybinding. */ + GEANY_KEYS_FILE_OPEN, /**< Keybinding. */ + GEANY_KEYS_FILE_OPENSELECTED, /**< Keybinding. */ + GEANY_KEYS_FILE_SAVE, /**< Keybinding. */ + GEANY_KEYS_FILE_SAVEAS, /**< Keybinding. */ + GEANY_KEYS_FILE_SAVEALL, /**< Keybinding. */ + GEANY_KEYS_FILE_PRINT, /**< Keybinding. */ + GEANY_KEYS_FILE_CLOSE, /**< Keybinding. */ + GEANY_KEYS_FILE_CLOSEALL, /**< Keybinding. */ + GEANY_KEYS_FILE_RELOAD, /**< Keybinding. */ + GEANY_KEYS_FILE_OPENLASTTAB, /**< Keybinding. */ GEANY_KEYS_FILE_COUNT }; /** Project group keybinding command IDs */ -enum +enum GeanyKeysProjectID { - GEANY_KEYS_PROJECT_PROPERTIES, + GEANY_KEYS_PROJECT_PROPERTIES, /**< Keybinding. */ GEANY_KEYS_PROJECT_COUNT }; /** Editor group keybinding command IDs */ -enum +enum GeanyKeysEditorID { - GEANY_KEYS_EDITOR_UNDO, - GEANY_KEYS_EDITOR_REDO, - GEANY_KEYS_EDITOR_DELETELINE, - GEANY_KEYS_EDITOR_DUPLICATELINE, - GEANY_KEYS_EDITOR_TRANSPOSELINE, - GEANY_KEYS_EDITOR_SCROLLTOLINE, - GEANY_KEYS_EDITOR_SCROLLLINEUP, - GEANY_KEYS_EDITOR_SCROLLLINEDOWN, - GEANY_KEYS_EDITOR_COMPLETESNIPPET, - GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, - GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR, - GEANY_KEYS_EDITOR_CONTEXTACTION, - GEANY_KEYS_EDITOR_AUTOCOMPLETE, - GEANY_KEYS_EDITOR_CALLTIP, - GEANY_KEYS_EDITOR_MACROLIST, - GEANY_KEYS_EDITOR_DELETELINETOEND, + GEANY_KEYS_EDITOR_UNDO, /**< Keybinding. */ + GEANY_KEYS_EDITOR_REDO, /**< Keybinding. */ + GEANY_KEYS_EDITOR_DELETELINE, /**< Keybinding. */ + GEANY_KEYS_EDITOR_DUPLICATELINE, /**< Keybinding. */ + GEANY_KEYS_EDITOR_TRANSPOSELINE, /**< Keybinding. */ + GEANY_KEYS_EDITOR_SCROLLTOLINE, /**< Keybinding. */ + GEANY_KEYS_EDITOR_SCROLLLINEUP, /**< Keybinding. */ + GEANY_KEYS_EDITOR_SCROLLLINEDOWN, /**< Keybinding. */ + GEANY_KEYS_EDITOR_COMPLETESNIPPET, /**< Keybinding. */ + GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, /**< Keybinding. */ + GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR, /**< Keybinding. */ + GEANY_KEYS_EDITOR_CONTEXTACTION, /**< Keybinding. */ + GEANY_KEYS_EDITOR_AUTOCOMPLETE, /**< Keybinding. */ + GEANY_KEYS_EDITOR_CALLTIP, /**< Keybinding. */ + GEANY_KEYS_EDITOR_MACROLIST, /**< Keybinding. */ + GEANY_KEYS_EDITOR_DELETELINETOEND, /**< Keybinding. */ + GEANY_KEYS_EDITOR_WORDPARTCOMPLETION, /**< Keybinding. */ + GEANY_KEYS_EDITOR_MOVELINEUP, /**< Keybinding. */ + GEANY_KEYS_EDITOR_MOVELINEDOWN, /**< Keybinding. */ GEANY_KEYS_EDITOR_COUNT }; /** Clipboard group keybinding command IDs */ -enum +enum GeanyKeysClipboardID { - GEANY_KEYS_CLIPBOARD_CUT, - GEANY_KEYS_CLIPBOARD_COPY, - GEANY_KEYS_CLIPBOARD_PASTE, - GEANY_KEYS_CLIPBOARD_CUTLINE, - GEANY_KEYS_CLIPBOARD_COPYLINE, + GEANY_KEYS_CLIPBOARD_CUT, /**< Keybinding. */ + GEANY_KEYS_CLIPBOARD_COPY, /**< Keybinding. */ + GEANY_KEYS_CLIPBOARD_PASTE, /**< Keybinding. */ + GEANY_KEYS_CLIPBOARD_CUTLINE, /**< Keybinding. */ + GEANY_KEYS_CLIPBOARD_COPYLINE, /**< Keybinding. */ GEANY_KEYS_CLIPBOARD_COUNT }; /** Select group keybinding command IDs */ -enum +enum GeanyKeysSelectID { - GEANY_KEYS_SELECT_ALL, - GEANY_KEYS_SELECT_WORD, - GEANY_KEYS_SELECT_LINE, - GEANY_KEYS_SELECT_PARAGRAPH, + GEANY_KEYS_SELECT_ALL, /**< Keybinding. */ + GEANY_KEYS_SELECT_WORD, /**< Keybinding. */ + GEANY_KEYS_SELECT_LINE, /**< Keybinding. */ + GEANY_KEYS_SELECT_PARAGRAPH, /**< Keybinding. */ + GEANY_KEYS_SELECT_WORDPARTLEFT, /**< Keybinding. */ + GEANY_KEYS_SELECT_WORDPARTRIGHT, /**< Keybinding. */ GEANY_KEYS_SELECT_COUNT }; /** Format group keybinding command IDs */ -enum +enum GeanyKeysFormatID { - GEANY_KEYS_FORMAT_TOGGLECASE, - GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, - GEANY_KEYS_FORMAT_COMMENTLINE, - GEANY_KEYS_FORMAT_UNCOMMENTLINE, - GEANY_KEYS_FORMAT_INCREASEINDENT, - GEANY_KEYS_FORMAT_DECREASEINDENT, - GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, - GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, - GEANY_KEYS_FORMAT_AUTOINDENT, - GEANY_KEYS_FORMAT_SENDTOCMD1, - GEANY_KEYS_FORMAT_SENDTOCMD2, - GEANY_KEYS_FORMAT_SENDTOCMD3, - GEANY_KEYS_FORMAT_SENDTOVTE, - GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, + GEANY_KEYS_FORMAT_TOGGLECASE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_COMMENTLINE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_UNCOMMENTLINE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_INCREASEINDENT, /**< Keybinding. */ + GEANY_KEYS_FORMAT_DECREASEINDENT, /**< Keybinding. */ + GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_AUTOINDENT, /**< Keybinding. */ + GEANY_KEYS_FORMAT_SENDTOCMD1, /**< Keybinding. */ + GEANY_KEYS_FORMAT_SENDTOCMD2, /**< Keybinding. */ + GEANY_KEYS_FORMAT_SENDTOCMD3, /**< Keybinding. */ + GEANY_KEYS_FORMAT_SENDTOVTE, /**< Keybinding. */ + GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, /**< Keybinding. */ GEANY_KEYS_FORMAT_COUNT }; /** Insert group keybinding command IDs */ -enum +enum GeanyKeysInsertID { - GEANY_KEYS_INSERT_DATE, - GEANY_KEYS_INSERT_ALTWHITESPACE, + GEANY_KEYS_INSERT_DATE, /**< Keybinding. */ + GEANY_KEYS_INSERT_ALTWHITESPACE, /**< Keybinding. */ GEANY_KEYS_INSERT_COUNT }; /** Settings group keybinding command IDs */ -enum +enum GeanyKeysSettingsID { - GEANY_KEYS_SETTINGS_PREFERENCES, + GEANY_KEYS_SETTINGS_PREFERENCES, /**< Keybinding. */ + GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, /**< Keybinding. */ GEANY_KEYS_SETTINGS_COUNT }; /** Search group keybinding command IDs */ -enum +enum GeanyKeysSearchID { - GEANY_KEYS_SEARCH_FIND, - GEANY_KEYS_SEARCH_FINDNEXT, - GEANY_KEYS_SEARCH_FINDPREVIOUS, - GEANY_KEYS_SEARCH_FINDINFILES, - GEANY_KEYS_SEARCH_REPLACE, - GEANY_KEYS_SEARCH_FINDNEXTSEL, - GEANY_KEYS_SEARCH_FINDPREVSEL, - GEANY_KEYS_SEARCH_NEXTMESSAGE, - GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, - GEANY_KEYS_SEARCH_FINDUSAGE, - GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, - GEANY_KEYS_SEARCH_MARKALL, + GEANY_KEYS_SEARCH_FIND, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDNEXT, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDPREVIOUS, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDINFILES, /**< Keybinding. */ + GEANY_KEYS_SEARCH_REPLACE, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDNEXTSEL, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDPREVSEL, /**< Keybinding. */ + GEANY_KEYS_SEARCH_NEXTMESSAGE, /**< Keybinding. */ + GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDUSAGE, /**< Keybinding. */ + GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, /**< Keybinding. */ + GEANY_KEYS_SEARCH_MARKALL, /**< Keybinding. */ GEANY_KEYS_SEARCH_COUNT }; /** Go To group keybinding command IDs */ -enum +enum GeanyKeysGoToID { - GEANY_KEYS_GOTO_FORWARD, - GEANY_KEYS_GOTO_BACK, - GEANY_KEYS_GOTO_LINE, - GEANY_KEYS_GOTO_LINESTART, - GEANY_KEYS_GOTO_LINEEND, - GEANY_KEYS_GOTO_MATCHINGBRACE, - GEANY_KEYS_GOTO_TOGGLEMARKER, - GEANY_KEYS_GOTO_NEXTMARKER, - GEANY_KEYS_GOTO_PREVIOUSMARKER, - GEANY_KEYS_GOTO_PREVWORDSTART, - GEANY_KEYS_GOTO_NEXTWORDSTART, - GEANY_KEYS_GOTO_TAGDEFINITION, - GEANY_KEYS_GOTO_TAGDECLARATION, - GEANY_KEYS_GOTO_LINEENDVISUAL, + GEANY_KEYS_GOTO_FORWARD, /**< Keybinding. */ + GEANY_KEYS_GOTO_BACK, /**< Keybinding. */ + GEANY_KEYS_GOTO_LINE, /**< Keybinding. */ + GEANY_KEYS_GOTO_LINESTART, /**< Keybinding. */ + GEANY_KEYS_GOTO_LINEEND, /**< Keybinding. */ + GEANY_KEYS_GOTO_MATCHINGBRACE, /**< Keybinding. */ + GEANY_KEYS_GOTO_TOGGLEMARKER, /**< Keybinding. */ + GEANY_KEYS_GOTO_NEXTMARKER, /**< Keybinding. */ + GEANY_KEYS_GOTO_PREVIOUSMARKER, /**< Keybinding. */ + GEANY_KEYS_GOTO_PREVWORDPART, /**< Keybinding. */ + GEANY_KEYS_GOTO_NEXTWORDPART, /**< Keybinding. */ + GEANY_KEYS_GOTO_TAGDEFINITION, /**< Keybinding. */ + GEANY_KEYS_GOTO_TAGDECLARATION, /**< Keybinding. */ + GEANY_KEYS_GOTO_LINEENDVISUAL, /**< Keybinding. */ GEANY_KEYS_GOTO_COUNT }; /** View group keybinding command IDs */ -enum +enum GeanyKeysViewID { - GEANY_KEYS_VIEW_TOGGLEALL, - GEANY_KEYS_VIEW_FULLSCREEN, - GEANY_KEYS_VIEW_MESSAGEWINDOW, - GEANY_KEYS_VIEW_SIDEBAR, - GEANY_KEYS_VIEW_ZOOMIN, - GEANY_KEYS_VIEW_ZOOMOUT, + GEANY_KEYS_VIEW_TOGGLEALL, /**< Keybinding. */ + GEANY_KEYS_VIEW_FULLSCREEN, /**< Keybinding. */ + GEANY_KEYS_VIEW_MESSAGEWINDOW, /**< Keybinding. */ + GEANY_KEYS_VIEW_SIDEBAR, /**< Keybinding. */ + GEANY_KEYS_VIEW_ZOOMIN, /**< Keybinding. */ + GEANY_KEYS_VIEW_ZOOMOUT, /**< Keybinding. */ + GEANY_KEYS_VIEW_ZOOMRESET, /**< Keybinding. */ GEANY_KEYS_VIEW_COUNT }; /** Focus group keybinding command IDs */ -enum +/* TODO when the plugin ABI get increased the next time, rearrange these keybindings */ +enum GeanyKeysFocusID { - GEANY_KEYS_FOCUS_EDITOR, - GEANY_KEYS_FOCUS_SCRIBBLE, - GEANY_KEYS_FOCUS_VTE, - GEANY_KEYS_FOCUS_SEARCHBAR, - GEANY_KEYS_FOCUS_SIDEBAR, - GEANY_KEYS_FOCUS_COMPILER, + GEANY_KEYS_FOCUS_EDITOR, /**< Keybinding. */ + GEANY_KEYS_FOCUS_SCRIBBLE, /**< Keybinding. */ + GEANY_KEYS_FOCUS_VTE, /**< Keybinding. */ + GEANY_KEYS_FOCUS_SEARCHBAR, /**< Keybinding. */ + GEANY_KEYS_FOCUS_SIDEBAR, /**< Keybinding. */ + GEANY_KEYS_FOCUS_COMPILER, /**< Keybinding. */ + GEANY_KEYS_FOCUS_MESSAGES, /**< Keybinding. */ + GEANY_KEYS_FOCUS_MESSAGE_WINDOW, /**< Keybinding. */ + GEANY_KEYS_FOCUS_SIDEBAR_DOCUMENT_LIST, /**< Keybinding. */ + GEANY_KEYS_FOCUS_SIDEBAR_SYMBOL_LIST, /**< Keybinding. */ GEANY_KEYS_FOCUS_COUNT }; /** Notebook Tab group keybinding command IDs */ -enum +enum GeanyKeysNotebookTabID { - GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, - GEANY_KEYS_NOTEBOOK_SWITCHTABRIGHT, - GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED, - GEANY_KEYS_NOTEBOOK_MOVETABLEFT, - GEANY_KEYS_NOTEBOOK_MOVETABRIGHT, - GEANY_KEYS_NOTEBOOK_MOVETABFIRST, - GEANY_KEYS_NOTEBOOK_MOVETABLAST, + GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, /**< Keybinding. */ + GEANY_KEYS_NOTEBOOK_SWITCHTABRIGHT, /**< Keybinding. */ + GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED, /**< Keybinding. */ + GEANY_KEYS_NOTEBOOK_MOVETABLEFT, /**< Keybinding. */ + GEANY_KEYS_NOTEBOOK_MOVETABRIGHT, /**< Keybinding. */ + GEANY_KEYS_NOTEBOOK_MOVETABFIRST, /**< Keybinding. */ + GEANY_KEYS_NOTEBOOK_MOVETABLAST, /**< Keybinding. */ GEANY_KEYS_NOTEBOOK_COUNT }; /** Document group keybinding command IDs */ -enum +enum GeanyKeysDocumentID { - GEANY_KEYS_DOCUMENT_REPLACETABS, - GEANY_KEYS_DOCUMENT_REPLACESPACES, - GEANY_KEYS_DOCUMENT_TOGGLEFOLD, - GEANY_KEYS_DOCUMENT_FOLDALL, - GEANY_KEYS_DOCUMENT_UNFOLDALL, - GEANY_KEYS_DOCUMENT_RELOADTAGLIST, - GEANY_KEYS_DOCUMENT_LINEWRAP, - GEANY_KEYS_DOCUMENT_LINEBREAK, + GEANY_KEYS_DOCUMENT_REPLACETABS, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_REPLACESPACES, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_TOGGLEFOLD, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_FOLDALL, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_UNFOLDALL, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_RELOADTAGLIST, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_LINEWRAP, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_LINEBREAK, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_REMOVE_MARKERS, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_REMOVE_ERROR_INDICATORS, /**< Keybinding. */ GEANY_KEYS_DOCUMENT_COUNT }; /** Build group keybinding command IDs */ -enum +enum GeanyKeysBuildID { - GEANY_KEYS_BUILD_COMPILE, - GEANY_KEYS_BUILD_LINK, - GEANY_KEYS_BUILD_MAKE, - GEANY_KEYS_BUILD_MAKEOWNTARGET, - GEANY_KEYS_BUILD_MAKEOBJECT, - GEANY_KEYS_BUILD_NEXTERROR, - GEANY_KEYS_BUILD_PREVIOUSERROR, - GEANY_KEYS_BUILD_RUN, - GEANY_KEYS_BUILD_RUN2, - GEANY_KEYS_BUILD_OPTIONS, + GEANY_KEYS_BUILD_COMPILE, /**< Keybinding. */ + GEANY_KEYS_BUILD_LINK, /**< Keybinding. */ + GEANY_KEYS_BUILD_MAKE, /**< Keybinding. */ + GEANY_KEYS_BUILD_MAKEOWNTARGET, /**< Keybinding. */ + GEANY_KEYS_BUILD_MAKEOBJECT, /**< Keybinding. */ + GEANY_KEYS_BUILD_NEXTERROR, /**< Keybinding. */ + GEANY_KEYS_BUILD_PREVIOUSERROR, /**< Keybinding. */ + GEANY_KEYS_BUILD_RUN, /**< Keybinding. */ + GEANY_KEYS_BUILD_OPTIONS, /**< Keybinding. */ GEANY_KEYS_BUILD_COUNT }; /** Tools group keybinding command IDs */ -enum +enum GeanyKeysToolsID { - GEANY_KEYS_TOOLS_OPENCOLORCHOOSER, + GEANY_KEYS_TOOLS_OPENCOLORCHOOSER, /**< Keybinding. */ GEANY_KEYS_TOOLS_COUNT }; /** Help group keybinding command IDs */ -enum +enum GeanyKeysHelpID { - GEANY_KEYS_HELP_HELP, + GEANY_KEYS_HELP_HELP, /**< Keybinding. */ GEANY_KEYS_HELP_COUNT }; @@ -319,9 +343,20 @@ void keybindings_free(void); -void keybindings_set_item(GeanyKeyGroup *group, gsize key_id, +GeanyKeyGroup *keybindings_set_group(GeanyKeyGroup *group, const gchar *section_name, + const gchar *label, gsize count, GeanyKeyGroupCallback callback) G_GNUC_WARN_UNUSED_RESULT; + +void keybindings_free_group(GeanyKeyGroup *group); + +GeanyKeyBinding *keybindings_set_item(GeanyKeyGroup *group, gsize key_id, GeanyKeyCallback callback, guint key, GdkModifierType mod, - gchar *name, gchar *label, GtkWidget *menu_item); + const gchar *name, const gchar *label, GtkWidget *menu_item); + +GeanyKeyBinding *keybindings_get_item(GeanyKeyGroup *group, gsize key_id); + +gchar *keybindings_get_label(GeanyKeyBinding *kb); + +void keybindings_update_combo(GeanyKeyBinding *kb, guint key, GdkModifierType mods); void keybindings_send_command(guint group_id, guint key_id); @@ -332,5 +367,7 @@ void keybindings_show_shortcuts(void); +const GeanyKeyBinding *keybindings_check_event(GdkEventKey *ev, gint *group_id, gint *binding_id); + #endif diff -Nru geany-0.18/src/keyfile.c geany-0.19/src/keyfile.c --- geany-0.18/src/keyfile.c 2009-07-20 13:25:24.000000000 +0100 +++ geany-0.19/src/keyfile.c 2010-05-22 20:40:12.000000000 +0100 @@ -1,8 +1,8 @@ /* * keyfile.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: keyfile.c 3997 2009-07-20 12:25:24Z ntrel $ + * $Id: keyfile.c 4946 2010-05-22 19:40:12Z eht16 $ */ /* @@ -98,7 +98,7 @@ /* The group will be free'd on quitting. * @param for_prefs_dialog is whether the group also has Prefs dialog items. */ -void configuration_add_pref_group(struct GeanyPrefGroup *group, gboolean for_prefs_dialog) +void configuration_add_pref_group(struct StashGroup *group, gboolean for_prefs_dialog) { g_ptr_array_add(keyfile_groups, group); @@ -109,7 +109,7 @@ static void init_pref_groups(void) { - GeanyPrefGroup *group; + StashGroup *group; group = stash_group_new(PACKAGE); configuration_add_pref_group(group, TRUE); @@ -122,7 +122,13 @@ stash_group_add_toggle_button(group, &interface_prefs.notebook_double_click_hides_widgets, "notebook_double_click_hides_widgets", FALSE, "check_double_click_hides_widgets"); stash_group_add_integer(group, &interface_prefs.tab_pos_sidebar, "tab_pos_sidebar", GTK_POS_TOP); + stash_group_add_radio_buttons(group, &interface_prefs.sidebar_pos, + "sidebar_pos", GTK_POS_LEFT, + "radio_sidebar_left", GTK_POS_LEFT, + "radio_sidebar_right", GTK_POS_RIGHT, + NULL); + /* editor display */ stash_group_add_toggle_button(group, &interface_prefs.highlighting_invert_all, "highlighting_invert_all", FALSE, "check_highlighting_invert"); @@ -138,8 +144,6 @@ "use_tab_to_indent", TRUE, "check_tab_key_indents"); stash_group_add_spin_button_integer(group, &editor_prefs.indentation->width, "pref_editor_tab_width", 4, "spin_indent_width"); - stash_group_add_spin_button_integer(group, &editor_prefs.indentation->hard_tab_width, - "indent_hard_tab_width", 8, "spin_tab_width"); stash_group_add_combo_box(group, (gint*)(void*)&editor_prefs.indentation->auto_indent_mode, "indent_mode", GEANY_AUTOINDENT_CURRENTCHARS, "combo_auto_indent_mode"); stash_group_add_radio_buttons(group, (gint*)(void*)&editor_prefs.indentation->type, @@ -148,6 +152,12 @@ "radio_indent_tabs", GEANY_INDENT_TYPE_TABS, "radio_indent_both", GEANY_INDENT_TYPE_BOTH, NULL); + stash_group_add_radio_buttons(group, (gint*)(void*)&editor_prefs.show_virtual_space, + "virtualspace", GEANY_VIRTUAL_SPACE_SELECTION, + "radio_virtualspace_disabled", GEANY_VIRTUAL_SPACE_DISABLED, + "radio_virtualspace_selection", GEANY_VIRTUAL_SPACE_SELECTION, + "radio_virtualspace_always", GEANY_VIRTUAL_SPACE_ALWAYS, + NULL); stash_group_add_toggle_button(group, &editor_prefs.autocomplete_doc_words, "autocomplete_doc_words", FALSE, "check_autocomplete_doc_words"); stash_group_add_toggle_button(group, &editor_prefs.completion_drops_rest_of_word, @@ -155,6 +165,8 @@ stash_group_add_spin_button_integer(group, (gint*)&editor_prefs.autocompletion_max_entries, "autocompletion_max_entries", GEANY_MAX_AUTOCOMPLETE_WORDS, "spin_autocompletion_max_entries"); + stash_group_add_string(group, &editor_prefs.color_scheme, + "color_scheme", NULL); /* files */ stash_group_add_spin_button_integer(group, (gint*)&file_prefs.mru_length, @@ -166,6 +178,7 @@ group = stash_group_new(PACKAGE); configuration_add_pref_group(group, FALSE); stash_group_set_write_once(group, TRUE); + stash_group_add_boolean(group, &editor_prefs.show_scrollbars, "show_editor_scrollbars", TRUE); stash_group_add_boolean(group, &editor_prefs.brace_match_ltgt, @@ -176,10 +189,15 @@ "complete_snippets_whilst_editing", FALSE); stash_group_add_boolean(group, &interface_prefs.show_symbol_list_expanders, "show_symbol_list_expanders", TRUE); + stash_group_add_boolean(group, &interface_prefs.compiler_tab_autoscroll, + "compiler_tab_autoscroll", TRUE); stash_group_add_boolean(group, &ui_prefs.allow_always_save, "allow_always_save", FALSE); stash_group_add_boolean(group, &file_prefs.use_safe_file_saving, "use_safe_file_saving", FALSE); + /* for backwards-compatibility */ + stash_group_add_integer(group, &editor_prefs.indentation->hard_tab_width, + "indent_hard_tab_width", 8); } @@ -193,7 +211,7 @@ static void settings_action(GKeyFile *config, SettingAction action) { guint i; - GeanyPrefGroup *group; + StashGroup *group; foreach_ptr_array(group, i, keyfile_groups) { @@ -341,8 +359,14 @@ g_key_file_set_boolean(config, PACKAGE, "show_notebook_tabs", interface_prefs.show_notebook_tabs); g_key_file_set_boolean(config, PACKAGE, "show_tab_cross", file_prefs.show_tab_cross); g_key_file_set_boolean(config, PACKAGE, "tab_order_ltr", file_prefs.tab_order_ltr); + g_key_file_set_boolean(config, PACKAGE, "tab_order_beside", file_prefs.tab_order_beside); g_key_file_set_integer(config, PACKAGE, "tab_pos_editor", interface_prefs.tab_pos_editor); g_key_file_set_integer(config, PACKAGE, "tab_pos_msgwin", interface_prefs.tab_pos_msgwin); + g_key_file_set_boolean(config, PACKAGE, "msgwin_status_visible", interface_prefs.msgwin_status_visible); + g_key_file_set_boolean(config, PACKAGE, "msgwin_compiler_visible", interface_prefs.msgwin_compiler_visible); + g_key_file_set_boolean(config, PACKAGE, "msgwin_messages_visible", interface_prefs.msgwin_messages_visible); + g_key_file_set_boolean(config, PACKAGE, "msgwin_scribble_visible", interface_prefs.msgwin_scribble_visible); + g_key_file_set_boolean(config, PACKAGE, "use_native_windows_dialogs", interface_prefs.use_native_windows_dialogs); /* display */ g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", editor_prefs.show_indent_guide); @@ -350,8 +374,9 @@ g_key_file_set_boolean(config, PACKAGE, "show_line_endings", editor_prefs.show_line_endings); g_key_file_set_boolean(config, PACKAGE, "show_markers_margin", editor_prefs.show_markers_margin); g_key_file_set_boolean(config, PACKAGE, "show_linenumber_margin", editor_prefs.show_linenumber_margin); - g_key_file_set_integer(config, PACKAGE, "long_line_type", editor_prefs.long_line_type); - g_key_file_set_integer(config, PACKAGE, "long_line_column", editor_prefs.long_line_column); + g_key_file_set_boolean(config, PACKAGE, "long_line_enabled", editor_prefs.long_line_global_enabled); + g_key_file_set_integer(config, PACKAGE, "long_line_type", editor_prefs.long_line_global_type); + g_key_file_set_integer(config, PACKAGE, "long_line_column", editor_prefs.long_line_global_column); g_key_file_set_string(config, PACKAGE, "long_line_color", editor_prefs.long_line_color); /* editor */ @@ -387,6 +412,8 @@ /* toolbar */ g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show", toolbar_prefs.visible); g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_append_to_menu", toolbar_prefs.append_to_menu); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_use_gtk_default_style", toolbar_prefs.use_gtk_default_style); + g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_use_gtk_default_icon", toolbar_prefs.use_gtk_default_icon); g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_style", toolbar_prefs.icon_style); g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_size", toolbar_prefs.icon_size); @@ -401,12 +428,14 @@ g_key_file_set_string(config, PACKAGE, "pref_template_datetime", template_prefs.datetime_format); /* tools settings */ - g_key_file_set_string(config, "tools", "make_cmd", tool_prefs.make_cmd ? tool_prefs.make_cmd : ""); g_key_file_set_string(config, "tools", "term_cmd", tool_prefs.term_cmd ? tool_prefs.term_cmd : ""); g_key_file_set_string(config, "tools", "browser_cmd", tool_prefs.browser_cmd ? tool_prefs.browser_cmd : ""); g_key_file_set_string(config, "tools", "grep_cmd", tool_prefs.grep_cmd ? tool_prefs.grep_cmd : ""); g_key_file_set_string(config, PACKAGE, "context_action_cmd", tool_prefs.context_action_cmd); + /* build menu */ + build_save_menu(config, NULL, GEANY_BCS_PREF); + /* printing */ g_key_file_set_string(config, "printing", "print_cmd", printing_prefs.external_print_cmd ? printing_prefs.external_print_cmd : ""); g_key_file_set_boolean(config, "printing", "use_gtk_printing", printing_prefs.use_gtk_printing); @@ -425,6 +454,9 @@ if (!g_key_file_has_key(config, "VTE", "emulation", NULL)) /* hidden */ g_key_file_set_string(config, "VTE", "emulation", vc->emulation); + if (!g_key_file_has_key(config, "VTE", "send_selection_unsafe", NULL)) /* hidden */ + g_key_file_set_boolean(config, "VTE", "send_selection_unsafe", + vc->send_selection_unsafe); g_key_file_set_string(config, "VTE", "font", vc->font); g_key_file_set_boolean(config, "VTE", "scroll_on_key", vc->scroll_on_key); g_key_file_set_boolean(config, "VTE", "scroll_on_out", vc->scroll_on_out); @@ -463,7 +495,7 @@ GtkTextIter start, end, iter; GtkTextMark *mark; - buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ui_lookup_widget(main_widgets.window, "textview_scribble"))); + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(msgwindow.scribble)); gtk_text_buffer_get_bounds(buffer, &start, &end); scribble_text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); g_key_file_set_string(config, PACKAGE, "scribble_text", scribble_text); @@ -481,10 +513,7 @@ gtk_paned_get_position(GTK_PANED(ui_lookup_widget(main_widgets.window, "hpaned1")))); g_key_file_set_integer(config, PACKAGE, "msgwindow_position", gtk_paned_get_position(GTK_PANED(ui_lookup_widget(main_widgets.window, "vpaned1")))); - } - if (prefs.save_winpos) - { gtk_window_get_position(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[0], &ui_prefs.geometry[1]); gtk_window_get_size(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[2], &ui_prefs.geometry[3]); if (gdk_window_get_state(main_widgets.window->window) & GDK_WINDOW_STATE_MAXIMIZED) @@ -595,14 +624,6 @@ } -#define GEANY_GET_SETTING(propertyname, value, default_value) \ - if (g_object_class_find_property( \ - G_OBJECT_GET_CLASS(G_OBJECT(gtk_settings_get_default())), propertyname)) \ - g_object_get(G_OBJECT(gtk_settings_get_default()), propertyname, &value, \ - NULL); \ - else \ - value = default_value; - static void load_dialog_prefs(GKeyFile *config) { gchar *tmp_string, *tmp_string2; @@ -629,16 +650,28 @@ interface_prefs.sidebar_openfiles_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_openfiles_visible", TRUE); interface_prefs.statusbar_visible = utils_get_setting_boolean(config, PACKAGE, "statusbar_visible", TRUE); file_prefs.tab_order_ltr = utils_get_setting_boolean(config, PACKAGE, "tab_order_ltr", TRUE); + file_prefs.tab_order_beside = utils_get_setting_boolean(config, PACKAGE, "tab_order_beside", FALSE); interface_prefs.show_notebook_tabs = utils_get_setting_boolean(config, PACKAGE, "show_notebook_tabs", TRUE); file_prefs.show_tab_cross = utils_get_setting_boolean(config, PACKAGE, "show_tab_cross", TRUE); interface_prefs.editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", GEANY_DEFAULT_FONT_EDITOR); interface_prefs.tagbar_font = utils_get_setting_string(config, PACKAGE, "tagbar_font", GEANY_DEFAULT_FONT_SYMBOL_LIST); interface_prefs.msgwin_font = utils_get_setting_string(config, PACKAGE, "msgwin_font", GEANY_DEFAULT_FONT_MSG_WINDOW); + interface_prefs.msgwin_status_visible = utils_get_setting_boolean(config, PACKAGE, "msgwin_status_visible", TRUE); + interface_prefs.msgwin_compiler_visible = utils_get_setting_boolean(config, PACKAGE, "msgwin_compiler_visible", TRUE); + interface_prefs.msgwin_messages_visible = utils_get_setting_boolean(config, PACKAGE, "msgwin_messages_visible", TRUE); + interface_prefs.msgwin_scribble_visible = utils_get_setting_boolean(config, PACKAGE, "msgwin_scribble_visible", TRUE); + interface_prefs.use_native_windows_dialogs = utils_get_setting_boolean(config, PACKAGE, "use_native_windows_dialogs", FALSE); /* display, editor */ - editor_prefs.long_line_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0); + editor_prefs.long_line_global_enabled = utils_get_setting_boolean(config, PACKAGE, "long_line_enabled", TRUE); + editor_prefs.long_line_global_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0); + if (editor_prefs.long_line_global_type == 2) /* backward compatibility */ + { + editor_prefs.long_line_global_type = 0; + editor_prefs.long_line_global_enabled = FALSE; + } editor_prefs.long_line_color = utils_get_setting_string(config, PACKAGE, "long_line_color", "#C2EBC2"); - editor_prefs.long_line_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); + editor_prefs.long_line_global_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); editor_prefs.symbolcompletion_min_chars = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_min_chars", GEANY_MIN_SYMBOLLIST_CHARS); editor_prefs.symbolcompletion_max_height = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_max_height", GEANY_MAX_SYMBOLLIST_HEIGHT); editor_prefs.line_wrapping = utils_get_setting_boolean(config, PACKAGE, "line_wrapping", FALSE); /* default is off for better performance */ @@ -698,12 +731,13 @@ toolbar_prefs.visible = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show", TRUE); toolbar_prefs.append_to_menu = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_append_to_menu", FALSE); { - GtkIconSize tb_iconsize; - GtkToolbarStyle tb_style; - GEANY_GET_SETTING("gtk-toolbar-style", tb_style, GTK_TOOLBAR_ICONS); - GEANY_GET_SETTING("gtk-toolbar-icon-size", tb_iconsize, GTK_ICON_SIZE_LARGE_TOOLBAR); - toolbar_prefs.icon_style = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_style", tb_style); - toolbar_prefs.icon_size = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_size", tb_iconsize); + toolbar_prefs.use_gtk_default_style = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_use_gtk_default_style", TRUE); + if (! toolbar_prefs.use_gtk_default_style) + toolbar_prefs.icon_style = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_style", GTK_TOOLBAR_ICONS); + + toolbar_prefs.use_gtk_default_icon = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_use_gtk_default_icon", TRUE); + if (! toolbar_prefs.use_gtk_default_icon) + toolbar_prefs.icon_size = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_size", GTK_ICON_SIZE_LARGE_TOOLBAR); } /* VTE */ @@ -712,7 +746,7 @@ if (vte_info.load_vte) { struct passwd *pw = getpwuid(getuid()); - gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh"; + const gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh"; vc = g_new0(VteConfig, 1); vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL); @@ -724,6 +758,8 @@ vte_info.dir = g_strdup("/"); vc->emulation = utils_get_setting_string(config, "VTE", "emulation", "xterm"); + vc->send_selection_unsafe = utils_get_setting_boolean(config, "VTE", + "send_selection_unsafe", FALSE); vc->shell = utils_get_setting_string(config, "VTE", "shell", shell); vc->font = utils_get_setting_string(config, "VTE", "font", "Monospace 10"); vc->scroll_on_key = utils_get_setting_boolean(config, "VTE", "scroll_on_key", TRUE); @@ -764,13 +800,18 @@ template_prefs.datetime_format = utils_get_setting_string(config, PACKAGE, "pref_template_datetime", "%d.%m.%Y %H:%M:%S %Z"); /* tools */ - tool_prefs.make_cmd = utils_get_setting_string(config, "tools", "make_cmd", GEANY_DEFAULT_TOOLS_MAKE); tool_prefs.term_cmd = utils_get_setting_string(config, "tools", "term_cmd", GEANY_DEFAULT_TOOLS_TERMINAL); tool_prefs.browser_cmd = utils_get_setting_string(config, "tools", "browser_cmd", GEANY_DEFAULT_TOOLS_BROWSER); tool_prefs.grep_cmd = utils_get_setting_string(config, "tools", "grep_cmd", GEANY_DEFAULT_TOOLS_GREP); tool_prefs.context_action_cmd = utils_get_setting_string(config, PACKAGE, "context_action_cmd", ""); + /* build menu */ + build_set_group_count(GEANY_GBG_FT, utils_get_setting_integer(config, "build-menu", "number_ft_menu_items", 0)); + build_set_group_count(GEANY_GBG_NON_FT, utils_get_setting_integer(config, "build-menu", "number_non_ft_menu_items", 0)); + build_set_group_count(GEANY_GBG_EXEC, utils_get_setting_integer(config, "build-menu", "number_exec_menu_items", 0)); + build_load_menu(config, GEANY_BCS_PREF, NULL); + /* printing */ tmp_string2 = g_find_program_in_path(GEANY_DEFAULT_TOOLS_PRINTCMD); #ifdef G_OS_WIN32 @@ -1034,8 +1075,7 @@ { /* update the scribble widget, because now it's realized */ GtkTextIter iter; GtkTextBuffer *buffer = - gtk_text_view_get_buffer(GTK_TEXT_VIEW(ui_lookup_widget(main_widgets.window, - "textview_scribble"))); + gtk_text_view_get_buffer(GTK_TEXT_VIEW(msgwindow.scribble)); gtk_text_buffer_set_text(buffer, scribble_text, -1); gtk_text_buffer_get_iter_at_offset(buffer, &iter, scribble_pos); @@ -1058,76 +1098,10 @@ ui_prefs.fullscreen = TRUE; ui_set_fullscreen(); } -} - - -#ifdef GEANY_DEBUG -/* Geany data file generation is only available with a debug build of Geany. */ - -static void generate_filetype_extensions(const gchar *output_dir); - - -/* Generate the config files in "data/" from defaults */ -void configuration_generate_data_files(void) -{ - gchar *cur_dir, *gen_dir; - - cur_dir = g_get_current_dir(); - gen_dir = g_strconcat(cur_dir, G_DIR_SEPARATOR_S, "data", NULL); - g_free(cur_dir); - if (! g_file_test(gen_dir, G_FILE_TEST_IS_DIR)) - { - g_print("%s does not exist!\n", gen_dir); - return; - } - g_print("Generating system files in %s:\n", gen_dir); - /* currently only filetype extensions are auto-generated. */ - generate_filetype_extensions(gen_dir); - g_free(gen_dir); -} - - -/* This will write the default settings for the system filetype_extensions.conf */ -static void generate_filetype_extensions(const gchar *output_dir) -{ - guint i; - gchar *configfile = g_strconcat(output_dir, G_DIR_SEPARATOR_S, "filetype_extensions.conf", NULL); - gchar *data, *basename; - GKeyFile *config; - - config = g_key_file_new(); - g_key_file_set_comment(config, NULL, NULL, - "*** This file generated by: geany --generate-data-files ***", NULL); - /* add filetype keys */ - for (i = 0; i < filetypes_array->len; i++) - { - g_key_file_set_string_list(config, "Extensions", filetypes[i]->name, - (const gchar**) filetypes[i]->pattern, g_strv_length(filetypes[i]->pattern)); - } - /* add comment */ - g_key_file_set_comment(config, "Extensions", NULL, - "Filetype extension configuration file for Geany\n" - "Insert as many items as you want, seperate them with a \";\".\n" - "See Geany's main documentation for details.", NULL); - - /* write the file */ - g_print("%s: ", G_STRFUNC); - data = g_key_file_to_data(config, NULL, NULL); - basename = g_path_get_basename(configfile); - - if (utils_write_file(configfile, data) == 0) - g_print("wrote file %s.\n", basename); - else - g_print("*** ERROR: error writing file %s\n", basename); - g_free(basename); - - g_free(data); - g_key_file_free(config); + msgwin_show_hide_tabs(); } -#endif - void configuration_init(void) { @@ -1140,7 +1114,7 @@ void configuration_finalize(void) { guint i; - GeanyPrefGroup *group; + StashGroup *group; foreach_ptr_array(group, i, keyfile_groups) stash_group_free(group); @@ -1148,4 +1122,3 @@ g_ptr_array_free(keyfile_groups, TRUE); g_ptr_array_free(pref_groups, TRUE); } - diff -Nru geany-0.18/src/keyfile.h geany-0.19/src/keyfile.h --- geany-0.18/src/keyfile.h 2009-04-15 23:46:13.000000000 +0100 +++ geany-0.19/src/keyfile.h 2010-03-18 17:04:17.000000000 +0000 @@ -1,8 +1,8 @@ /* * keyfile.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: keyfile.h 3707 2009-04-15 22:46:13Z eht16 $ + * $Id: keyfile.h 4776 2010-03-18 17:04:17Z ntrel $ */ @@ -33,9 +33,9 @@ void configuration_finalize(void); -struct GeanyPrefGroup; +struct StashGroup; -void configuration_add_pref_group(struct GeanyPrefGroup *group, gboolean for_prefs_dialog); +void configuration_add_pref_group(struct StashGroup *group, gboolean for_prefs_dialog); void configuration_save(void); @@ -55,9 +55,4 @@ * realisation of the main window */ void configuration_apply_settings(void); -#ifdef GEANY_DEBUG -/* Generate the config files in "data/" from defaults */ -void configuration_generate_data_files(void); -#endif - #endif diff -Nru geany-0.18/src/log.c geany-0.19/src/log.c --- geany-0.18/src/log.c 2009-06-20 17:52:30.000000000 +0100 +++ geany-0.19/src/log.c 2010-03-07 10:37:35.000000000 +0000 @@ -1,8 +1,8 @@ /* * log.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven * * 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 @@ -180,14 +180,14 @@ dialog = gtk_dialog_new_with_buttons(_("Debug Messages"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLEAR, DIALOG_RESPONSE_CLEAR, + _("Cl_ear"), DIALOG_RESPONSE_CLEAR, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 300); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); textview = gtk_text_view_new(); dialog_textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); diff -Nru geany-0.18/src/log.h geany-0.19/src/log.h --- geany-0.18/src/log.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/log.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * log.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Enrico Tröger - * Copyright 2008-2009 Nick Treleaven + * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven * * 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 diff -Nru geany-0.18/src/main.c geany-0.19/src/main.c --- geany-0.18/src/main.c 2009-08-12 19:53:35.000000000 +0100 +++ geany-0.19/src/main.c 2010-05-29 19:35:51.000000000 +0100 @@ -1,8 +1,8 @@ /* * main.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: main.c 4074 2009-08-12 18:53:35Z frlan $ + * $Id: main.c 4957 2010-05-29 18:35:51Z eht16 $ */ /** @@ -59,7 +59,7 @@ #include "dialogs.h" #include "templates.h" #include "encodings.h" -#include "treeviews.h" +#include "sidebar.h" #include "notebook.h" #include "keybindings.h" #include "editor.h" @@ -98,7 +98,6 @@ static gboolean want_plugins; /* command-line options */ -static gboolean debug_mode = FALSE; static gboolean verbose_mode = FALSE; static gboolean ignore_global_tags = FALSE; static gboolean no_msgwin = FALSE; @@ -108,7 +107,6 @@ static gboolean no_vte = FALSE; static gchar *lib_vte = NULL; #endif -static gboolean generate_datafiles = FALSE; static gboolean generate_tags = FALSE; static gboolean no_preprocessing = FALSE; static gboolean ft_names = FALSE; @@ -123,13 +121,13 @@ { { "column", 0, 0, G_OPTION_ARG_INT, &cl_options.goto_column, N_("Set initial column number for the first opened file (useful in conjunction with --line)"), NULL }, { "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("Use an alternate configuration directory"), NULL }, - { "debug", 'd', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &debug_mode, N_("Be verbose"), NULL }, { "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("Print internal filetype names"), NULL }, { "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("Generate global tags file (see documentation)"), NULL }, { "no-preprocessing", 'P', 0, G_OPTION_ARG_NONE, &no_preprocessing, N_("Don't preprocess C/C++ files when generating tags"), NULL }, - { "generate-data-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, NULL, NULL }, #ifdef HAVE_SOCKET { "new-instance", 'i', 0, G_OPTION_ARG_NONE, &cl_options.new_instance, N_("Don't open files in a running instance, force opening a new instance"), NULL }, + { "socket-file", 0, 0, G_OPTION_ARG_FILENAME, &cl_options.socket_filename, N_("Use this socket filename for communication with a running Geany instance"), NULL }, + { "list-documents", 0, 0, G_OPTION_ARG_NONE, &cl_options.list_documents, N_("Return a list of open documents in a running Geany instance"), NULL }, #endif { "line", 'l', 0, G_OPTION_ARG_INT, &cl_options.goto_line, N_("Set initial line number for the first opened file"), NULL }, { "no-msgwin", 'm', 0, G_OPTION_ARG_NONE, &no_msgwin, N_("Don't show message window at startup"), NULL }, @@ -162,6 +160,7 @@ } } + /* special things for the initial setup of the checkboxes and related stuff * an action on a setting is only performed if the setting is not equal to the program default * (all the following code is not perfect but it works for the moment) */ @@ -207,14 +206,13 @@ #ifdef HAVE_VTE if (! vte_info.load_vte) - { gtk_widget_hide(ui_lookup_widget(main_widgets.window, "send_selection_to_vte1")); - gtk_widget_hide(ui_lookup_widget(main_widgets.editor_menu, "send_selection_to_vte2")); - } #else gtk_widget_hide(ui_lookup_widget(main_widgets.window, "send_selection_to_vte1")); - gtk_widget_hide(ui_lookup_widget(main_widgets.editor_menu, "send_selection_to_vte2")); #endif + + if (interface_prefs.sidebar_pos != GTK_POS_LEFT) + ui_swap_sidebar_pos(); } @@ -228,8 +226,9 @@ ui_widgets.open_filesel = NULL; ui_widgets.save_filesel = NULL; ui_widgets.prefs_dialog = NULL; - main_status.main_window_realized= FALSE; + main_status.main_window_realized = FALSE; file_prefs.tab_order_ltr = FALSE; + file_prefs.tab_order_beside = FALSE; main_status.quitting = FALSE; ignore_callback = FALSE; app->tm_workspace = tm_get_workspace(); @@ -268,6 +267,12 @@ /* hide Page setup menu item, it isn't supported with non-GTK printing */ gtk_widget_hide(ui_widgets.print_page_setup); #endif + + /* for some reason we need to set the initial size request, + * otherwise the main window gets crazy dimensions */ + gtk_widget_set_size_request(main_widgets.window, 10, 10); + gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), + GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT); } @@ -318,6 +323,10 @@ if (! NZV(filename)) return; + /* allow to open files like "test:0" */ + if (g_file_test(filename, G_FILE_TEST_EXISTS)) + return; + len = strlen(filename); for (i = len - 1; i >= 1; i--) { @@ -385,6 +394,26 @@ /** + * Checks whether the main window has been realized. + * This is an easy indicator whether Geany is right now starting up (main window is not + * yet realized) or whether it has finished the startup process (main window is realized). + * This is because the main window is realized (i.e. actually drawn on the screen) at the + * end of the startup process. + * + * @note Maybe you want to use the @ref geany-startup-complete signal to get notified about + * the completed startup process. + * + * @return @c TRUE if the Geany main window has been realized or @c FALSE otherwise. + * + * @since 0.19 + **/ +gboolean main_is_realized(void) +{ + return main_status.main_window_realized; +} + + +/** * Initialises the gettext translation system. * This is a convenience function to set up gettext for internationalisation support * in external plugins. You should call this function early in @ref plugin_init(). @@ -426,7 +455,6 @@ bindtextdomain(package, l_locale_dir); bind_textdomain_codeset(package, "UTF-8"); - textdomain(package); g_free(l_locale_dir); } @@ -451,7 +479,7 @@ GError *error = NULL; GOptionContext *context; gint i; - CommandLineOptions def_clo = {FALSE, TRUE, -1, -1, FALSE}; + CommandLineOptions def_clo = {FALSE, NULL, TRUE, -1, -1, FALSE, FALSE}; /* first initialise cl_options fields with default values */ cl_options = def_clo; @@ -502,12 +530,6 @@ } app->debug_mode = verbose_mode; - if (debug_mode) - { - app->debug_mode = TRUE; - g_warning( - "Command line option --debug is obsolete and will be removed in the next version."); - } #ifdef G_OS_WIN32 win32_init_debug_code(); @@ -523,21 +545,16 @@ app->configdir = g_build_filename(g_get_user_config_dir(), "geany", NULL); } -#ifdef GEANY_DEBUG - if (generate_datafiles) - { - filetypes_init_types(); - configuration_generate_data_files(); /* currently only filetype_extensions.conf */ - exit(0); - } -#endif if (generate_tags) { gboolean ret; + document_init_doclist(); filetypes_init_types(); filetypes_read_extensions(); /* needed for *.lang.tags filetype matching */ ret = symbols_generate_global_tags(*argc, *argv, ! no_preprocessing); + filetypes_free_types(); + document_finalize(); exit(ret); } @@ -549,7 +566,12 @@ #ifdef HAVE_SOCKET socket_info.ignore_socket = cl_options.new_instance; + if (cl_options.socket_filename) + { + socket_info.file_name = cl_options.socket_filename; + } #endif + #ifdef HAVE_VTE vte_info.lib_vte = lib_vte; #endif @@ -821,6 +843,26 @@ } +void main_load_project_from_command_line(const gchar *locale_filename, gboolean use_session) +{ + gchar *pfile = NULL; + + if (utils_is_uri(locale_filename)) + pfile = utils_get_path_from_uri(locale_filename); + else + pfile = g_strdup(locale_filename); + + if (pfile != NULL) + { + if (use_session) + project_load_file_with_session(pfile); + else + project_load_file(pfile); + } + g_free(pfile); +} + + static void load_startup_files(gint argc, gchar **argv) { gboolean load_project_from_cl = FALSE; @@ -836,15 +878,7 @@ { if (load_project_from_cl) { - gchar *pfile = argv[1]; - if (utils_is_uri(argv[1])) - pfile = utils_get_path_from_uri(argv[1]); - if (pfile != NULL) - { - project_load_file(pfile); - if (pfile != argv[1]) - g_free(pfile); - } + main_load_project_from_command_line(argv[1], FALSE); } else if (cl_options.load_session && !cl_options.new_instance) load_session_project_file(); @@ -867,10 +901,28 @@ } +static gboolean send_startup_complete(gpointer data) +{ + g_signal_emit_by_name(geany_object, "geany-startup-complete"); + return FALSE; +} + + +static const gchar *get_locale(void) +{ + const gchar *locale = "unknown"; +#ifdef HAVE_LOCALE_H + locale = setlocale(LC_CTYPE, NULL); +#endif + return locale; +} + + gint main(gint argc, gchar **argv) { GeanyDocument *doc; gint config_dir_result; + const gchar *locale; log_handlers_init(); @@ -908,10 +960,12 @@ socket_info.lock_socket = -1; socket_info.lock_socket_tag = 0; socket_info.lock_socket = socket_init(argc, argv); + /* Socket exists */ if (socket_info.lock_socket == -2) { - /* Socket exists */ - if (argc > 1) /* filenames were sent to first instance, so quit */ + /* Quit if filenames were sent to first instance or the list of open + * documents has been sent */ + if (argc > 1 || cl_options.list_documents) { gdk_notify_startup_complete(); g_free(app->configdir); @@ -927,18 +981,18 @@ } #endif - geany_debug("Geany %s, GTK+ %u.%u.%u, GLib %u.%u.%u", + locale = get_locale(); + geany_debug("Geany %s, GTK+ %u.%u.%u, GLib %u.%u.%u (%s)", main_get_version_string(), gtk_major_version, gtk_minor_version, gtk_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); + glib_major_version, glib_minor_version, glib_micro_version, + locale); /* create the object so Geany signals can be connected in init() functions */ geany_object = geany_object_new(); /* inits */ main_init(); - gtk_widget_set_size_request(main_widgets.window, GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT); - gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT); encodings_init(); editor_init(); @@ -950,9 +1004,10 @@ #ifdef HAVE_PLUGINS plugins_init(); #endif - treeviews_init(); + sidebar_init(); load_settings(); /* load keyfile */ + highlighting_init(); msgwin_init(); build_init(); ui_create_insert_menu_items(); @@ -979,8 +1034,7 @@ g_signal_connect(main_widgets.window, "delete-event", G_CALLBACK(on_exit_clicked), NULL); g_signal_connect(main_widgets.window, "window-state-event", G_CALLBACK(on_window_state_event), NULL); - g_signal_connect(ui_lookup_widget(main_widgets.window, "textview_scribble"), - "motion-notify-event", G_CALLBACK(on_motion_event), NULL); + g_signal_connect(msgwindow.scribble, "motion-notify-event", G_CALLBACK(on_motion_event), NULL); #ifdef HAVE_VTE vte_init(); @@ -1020,9 +1074,9 @@ doc = document_get_current(); gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); - treeviews_select_openfiles_item(doc); + sidebar_select_openfiles_item(doc); build_menu_update(doc); - treeviews_update_tag_list(doc, FALSE); + sidebar_update_tag_list(doc, FALSE); #ifdef G_OS_WIN32 /* Manually realise the main window to be able to set the position but don't show it. @@ -1043,7 +1097,7 @@ { socket_info.read_ioc = g_io_channel_unix_new(socket_info.lock_socket); socket_info.lock_socket_tag = g_io_add_watch(socket_info.read_ioc, - G_IO_IN|G_IO_PRI|G_IO_ERR, socket_lock_input_cb, main_widgets.window); + G_IO_IN | G_IO_PRI | G_IO_ERR, socket_lock_input_cb, main_widgets.window); } #endif @@ -1058,6 +1112,10 @@ } #endif + /* when we are really done with setting everything up and the main event loop is running, + * tell other components, mainly plugins, that startup is complete */ + g_idle_add_full(G_PRIORITY_LOW, send_startup_complete, NULL, NULL); + gtk_main(); return 0; } @@ -1088,7 +1146,6 @@ navqueue_free(); keybindings_free(); filetypes_save_commands(); - filetypes_free_types(); highlighting_free_styles(); templates_free_templates(); msgwin_finalize(); @@ -1101,8 +1158,9 @@ editor_snippets_free(); encodings_finalize(); toolbar_finalize(); - treeviews_finalize(); + sidebar_finalize(); configuration_finalize(); + filetypes_free_types(); log_finalize(); tm_workspace_free(TM_WORK_OBJECT(app->tm_workspace)); @@ -1117,13 +1175,13 @@ g_free(interface_prefs.msgwin_font); g_free(editor_prefs.long_line_color); g_free(editor_prefs.comment_toggle_mark); + g_free(editor_prefs.color_scheme); g_free(tool_prefs.context_action_cmd); g_free(template_prefs.developer); g_free(template_prefs.company); g_free(template_prefs.mail); g_free(template_prefs.initials); g_free(template_prefs.version); - g_free(tool_prefs.make_cmd); g_free(tool_prefs.term_cmd); g_free(tool_prefs.browser_cmd); g_free(tool_prefs.grep_cmd); @@ -1167,19 +1225,6 @@ } -/* malloc compatibility code */ -#undef malloc -void *malloc(size_t n); - -/* Allocate an N-byte block of memory from the heap. If N is zero, allocate a 1-byte block. */ -void *rpl_malloc(size_t n) -{ - if (n == 0) - n = 1; - return malloc(n); -} - - /** * Reloads most of Geany's configuration files without restarting. Currently the following * files are reloaded: all template files, also new file templates and the 'New (with template)' @@ -1193,8 +1238,6 @@ **/ void main_reload_configuration(void) { - guint i; - /* reload templates */ templates_free_templates(); templates_init(); @@ -1206,17 +1249,7 @@ /* reload filetype extensions */ filetypes_read_extensions(); - /* save possibly changed commands before re-reading them */ - filetypes_save_commands(); - - /* reload filetype configs */ - for (i = 0; i < filetypes_array->len; i++) - { - /* filetypes_load_config() will skip not loaded filetypes */ - filetypes_load_config(i, TRUE); - } - documents_foreach(i) - document_reload_config(documents[i]); + filetypes_reload(); /* C tag names to ignore */ symbols_reload_config_files(); diff -Nru geany-0.18/src/main.h geany-0.19/src/main.h --- geany-0.18/src/main.h 2009-01-09 18:21:12.000000000 +0000 +++ geany-0.19/src/main.h 2010-04-11 22:56:50.000000000 +0100 @@ -1,8 +1,8 @@ /* * main.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: main.h 3454 2009-01-09 18:21:12Z eht16 $ + * $Id: main.h 4820 2010-04-11 21:56:50Z eht16 $ */ @@ -28,10 +28,12 @@ typedef struct { gboolean new_instance; + gchar *socket_filename; gboolean load_session; gint goto_line; gint goto_column; gboolean ignore_global_tags; + gboolean list_documents; } CommandLineOptions; @@ -63,4 +65,8 @@ void main_locale_init(const gchar *locale_dir, const gchar *gettext_package); +gboolean main_is_realized(void); + +void main_load_project_from_command_line(const gchar *locale_filename, gboolean use_session); + #endif diff -Nru geany-0.18/src/Makefile.am geany-0.19/src/Makefile.am --- geany-0.18/src/Makefile.am 2009-08-16 17:42:23.000000000 +0100 +++ geany-0.19/src/Makefile.am 2010-05-25 20:49:49.000000000 +0100 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 4095 2009-08-16 16:42:23Z eht16 $ +# $Id: Makefile.am 4954 2010-05-25 19:49:49Z eht16 $ EXTRA_DIST = images.c gb.c win32.c win32.h plugindata.h \ @@ -36,7 +36,6 @@ prefs.c prefs.h \ printing.c printing.h \ project.c project.h \ - queue.c queue.h \ sciwrappers.c sciwrappers.h \ search.c search.h \ socket.c socket.h \ @@ -46,29 +45,28 @@ templates.c templates.h \ toolbar.c toolbar.h \ tools.c tools.h \ - treeviews.c treeviews.h \ + sidebar.c sidebar.h \ ui_utils.c ui_utils.h \ utils.c utils.h geany_includedir = $(includedir)/geany + +# only install headers that define types or macros, not just functions geany_include_HEADERS = \ - dialogs.h \ document.h \ editor.h \ encodings.h \ filetypes.h \ + geany.h \ highlighting.h \ keybindings.h \ - geany.h \ - main.h \ msgwindow.h \ - plugins.h \ plugindata.h \ prefs.h \ project.h \ - sciwrappers.h \ search.h \ + stash.h \ support.h \ templates.h \ toolbar.h \ @@ -95,7 +93,10 @@ -DGEANY_DOCDIR=\"\" \ -DGEANY_LIBDIR=\"\" \ -DGEANY_LOCALEDIR=\"\" \ - -DGEANY_PREFIX=\"\" + -DGEANY_PREFIX=\"\" \ + -DGEANY_PRIVATE \ + -DGTK \ + -DG_LOG_DOMAIN=\""Geany"\" geany_LDFLAGS = -mwindows -mms-bitfields @@ -118,7 +119,10 @@ -DGEANY_DOCDIR=\""$(docdir)"\" \ -DGEANY_LIBDIR=\""$(libdir)"\" \ -DGEANY_LOCALEDIR=\""$(localedir)"\" \ - -DGEANY_PREFIX=\""$(prefix)"\" + -DGEANY_PREFIX=\""$(prefix)"\" \ + -DGEANY_PRIVATE \ + -DGTK \ + -DG_LOG_DOMAIN=\""Geany"\" clean-local: diff -Nru geany-0.18/src/Makefile.in geany-0.19/src/Makefile.in --- geany-0.18/src/Makefile.in 2009-08-16 18:29:21.000000000 +0100 +++ geany-0.19/src/Makefile.in 2010-06-12 13:14:29.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. @@ -14,13 +15,14 @@ @SET_MAKE@ -# $Id: Makefile.am 4095 2009-08-16 16:42:23Z eht16 $ +# $Id: Makefile.am 4954 2010-05-25 19:49:49Z eht16 $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@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 @@ -40,15 +42,15 @@ DIST_COMMON = $(geany_include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(geany_includedir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am__geany_SOURCES_DIST = about.c about.h build.c build.h callbacks.c \ callbacks.h dialogs.c dialogs.h document.c document.h editor.c \ @@ -61,12 +63,12 @@ geany.h msgwindow.c msgwindow.h navqueue.c navqueue.h \ notebook.c notebook.h pluginprivate.h plugins.c plugins.h \ pluginutils.c pluginutils.h prefix.c prefix.h prefs.c prefs.h \ - printing.c printing.h project.c project.h queue.c queue.h \ - sciwrappers.c sciwrappers.h search.c search.h socket.c \ - socket.h stash.c stash.h support.h symbols.c symbols.h \ - templates.c templates.h toolbar.c toolbar.h tools.c tools.h \ - treeviews.c treeviews.h ui_utils.c ui_utils.h utils.c utils.h \ - vte.c vte.h win32.c win32.h + printing.c printing.h project.c project.h sciwrappers.c \ + sciwrappers.h search.c search.h socket.c socket.h stash.c \ + stash.h support.h symbols.c symbols.h templates.c templates.h \ + toolbar.c toolbar.h tools.c tools.h sidebar.c sidebar.h \ + ui_utils.c ui_utils.h utils.c utils.h vte.c vte.h win32.c \ + win32.h am__objects_1 = about.$(OBJEXT) build.$(OBJEXT) callbacks.$(OBJEXT) \ dialogs.$(OBJEXT) document.$(OBJEXT) editor.$(OBJEXT) \ encodings.$(OBJEXT) filetypes.$(OBJEXT) \ @@ -77,11 +79,10 @@ main.$(OBJEXT) msgwindow.$(OBJEXT) navqueue.$(OBJEXT) \ notebook.$(OBJEXT) plugins.$(OBJEXT) pluginutils.$(OBJEXT) \ prefix.$(OBJEXT) prefs.$(OBJEXT) printing.$(OBJEXT) \ - project.$(OBJEXT) queue.$(OBJEXT) sciwrappers.$(OBJEXT) \ - search.$(OBJEXT) socket.$(OBJEXT) stash.$(OBJEXT) \ - symbols.$(OBJEXT) templates.$(OBJEXT) toolbar.$(OBJEXT) \ - tools.$(OBJEXT) treeviews.$(OBJEXT) ui_utils.$(OBJEXT) \ - utils.$(OBJEXT) + project.$(OBJEXT) sciwrappers.$(OBJEXT) search.$(OBJEXT) \ + socket.$(OBJEXT) stash.$(OBJEXT) symbols.$(OBJEXT) \ + templates.$(OBJEXT) toolbar.$(OBJEXT) tools.$(OBJEXT) \ + sidebar.$(OBJEXT) ui_utils.$(OBJEXT) utils.$(OBJEXT) @MINGW_FALSE@am_geany_OBJECTS = $(am__objects_1) vte.$(OBJEXT) @MINGW_TRUE@am_geany_OBJECTS = $(am__objects_1) win32.$(OBJEXT) geany_OBJECTS = $(am_geany_OBJECTS) @@ -92,30 +93,54 @@ @MINGW_TRUE@geany_DEPENDENCIES = ../scintilla/libscintilla.a \ @MINGW_TRUE@ ../tagmanager/libtagmanager.a \ @MINGW_TRUE@ $(am__DEPENDENCIES_1) geany_private.res -geany_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(geany_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +geany_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(geany_LDFLAGS) $(LDFLAGS) -o $@ 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) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=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_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +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_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_$(V)) +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) +am__v_CXX_0 = @echo " CXX " $@; CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_$(V)) +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CXXLD_0 = @echo " CXXLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(geany_SOURCES) $(nodist_EXTRA_geany_SOURCES) DIST_SOURCES = $(am__geany_SOURCES_DIST) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -123,8 +148,22 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -geany_includeHEADERS_INSTALL = $(INSTALL_HEADER) +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' HEADERS = $(geany_include_HEADERS) ETAGS = etags CTAGS = ctags @@ -132,6 +171,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -209,6 +249,8 @@ 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@ @@ -306,7 +348,6 @@ prefs.c prefs.h \ printing.c printing.h \ project.c project.h \ - queue.c queue.h \ sciwrappers.c sciwrappers.h \ search.c search.h \ socket.c socket.h \ @@ -316,28 +357,27 @@ templates.c templates.h \ toolbar.c toolbar.h \ tools.c tools.h \ - treeviews.c treeviews.h \ + sidebar.c sidebar.h \ ui_utils.c ui_utils.h \ utils.c utils.h geany_includedir = $(includedir)/geany + +# only install headers that define types or macros, not just functions geany_include_HEADERS = \ - dialogs.h \ document.h \ editor.h \ encodings.h \ filetypes.h \ + geany.h \ highlighting.h \ keybindings.h \ - geany.h \ - main.h \ msgwindow.h \ - plugins.h \ plugindata.h \ prefs.h \ project.h \ - sciwrappers.h \ search.h \ + stash.h \ support.h \ templates.h \ toolbar.h \ @@ -364,13 +404,19 @@ @MINGW_FALSE@ -DGEANY_DOCDIR=\""$(docdir)"\" \ @MINGW_FALSE@ -DGEANY_LIBDIR=\""$(libdir)"\" \ @MINGW_FALSE@ -DGEANY_LOCALEDIR=\""$(localedir)"\" \ -@MINGW_FALSE@ -DGEANY_PREFIX=\""$(prefix)"\" +@MINGW_FALSE@ -DGEANY_PREFIX=\""$(prefix)"\" \ +@MINGW_FALSE@ -DGEANY_PRIVATE \ +@MINGW_FALSE@ -DGTK \ +@MINGW_FALSE@ -DG_LOG_DOMAIN=\""Geany"\" @MINGW_TRUE@AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ @MINGW_TRUE@ -DGEANY_DOCDIR=\"\" \ @MINGW_TRUE@ -DGEANY_LIBDIR=\"\" \ @MINGW_TRUE@ -DGEANY_LOCALEDIR=\"\" \ -@MINGW_TRUE@ -DGEANY_PREFIX=\"\" +@MINGW_TRUE@ -DGEANY_PREFIX=\"\" \ +@MINGW_TRUE@ -DGEANY_PRIVATE \ +@MINGW_TRUE@ -DGTK \ +@MINGW_TRUE@ -DG_LOG_DOMAIN=\""Geany"\" @MINGW_TRUE@geany_LDFLAGS = -mwindows -mms-bitfields @MINGW_TRUE@WINDRES = $(host_alias)-windres @@ -387,9 +433,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -407,37 +453,53 @@ 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-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list geany$(EXEEXT): $(geany_OBJECTS) $(geany_DEPENDENCIES) @rm -f geany$(EXEEXT) - $(geany_LINK) $(geany_OBJECTS) $(geany_LDADD) $(LIBS) + $(AM_V_CXXLD)$(geany_LINK) $(geany_OBJECTS) $(geany_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -473,59 +535,64 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printing.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/project.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sciwrappers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbols.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toolbar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeviews.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vte.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< .cxx.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cxx.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cxx.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -538,20 +605,23 @@ install-geany_includeHEADERS: $(geany_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(geany_includedir)" || $(MKDIR_P) "$(DESTDIR)$(geany_includedir)" - @list='$(geany_include_HEADERS)'; for p in $$list; do \ + @list='$(geany_include_HEADERS)'; test -n "$(geany_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(geany_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(geany_includedir)/$$f'"; \ - $(geany_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(geany_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(geany_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(geany_includedir)" || exit $$?; \ done uninstall-geany_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(geany_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(geany_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(geany_includedir)/$$f"; \ - done + @list='$(geany_include_HEADERS)'; test -n "$(geany_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(geany_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(geany_includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -565,7 +635,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -573,29 +643,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -616,13 +691,17 @@ 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -653,6 +732,7 @@ 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" @@ -674,6 +754,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -682,18 +764,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binPROGRAMS 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 @@ -741,6 +833,7 @@ @MINGW_TRUE@ rm -f geany_private.res @MINGW_FALSE@clean-local: + # 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-0.18/src/makefile.win32 geany-0.19/src/makefile.win32 --- geany-0.18/src/makefile.win32 2009-07-28 12:35:33.000000000 +0100 +++ geany-0.19/src/makefile.win32 2010-05-16 18:44:40.000000000 +0100 @@ -1,10 +1,12 @@ # Note: PACKAGE_DATA_DIR and PACKAGE_LOCALE_DIR are no longer used on Windows. DEFINES = -DHAVE_CONFIG_H \ + -DGEANY_PRIVATE \ -DGEANY_DATADIR=\"data\" \ -DGEANY_LOCALEDIR=\"\" \ -DGEANY_LIBDIR=\"\" \ - -DGEANY_PREFIX=\"\" + -DGEANY_PREFIX=\"\" \ + -DGTK .SUFFIXES: .c .o .h .a WINDRES = windres.exe @@ -64,8 +66,8 @@ interface.o keybindings.o keyfile.o \ log.o main.o msgwindow.o navqueue.o notebook.o plugins.o pluginutils.o \ prefs.o printing.o project.o \ - queue.o sciwrappers.o search.o socket.o stash.o \ - symbols.o templates.o toolbar.o tools.o treeviews.o \ + sciwrappers.o search.o socket.o stash.o \ + symbols.o templates.o toolbar.o tools.o sidebar.o \ ui_utils.o utils.o win32.o .c.o: diff -Nru geany-0.18/src/msgwindow.c geany-0.19/src/msgwindow.c --- geany-0.18/src/msgwindow.c 2009-07-21 23:12:13.000000000 +0100 +++ geany-0.19/src/msgwindow.c 2010-05-29 19:36:17.000000000 +0100 @@ -1,8 +1,8 @@ /* * msgwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: msgwindow.c 4010 2009-07-21 22:12:13Z eht16 $ + * $Id: msgwindow.c 4959 2010-05-29 18:36:17Z eht16 $ */ /* @@ -75,12 +75,22 @@ static void on_scribble_populate(GtkTextView *textview, GtkMenu *arg1, gpointer user_data); -void msgwin_init() +void msgwin_show_hide_tabs(void) +{ + ui_widget_show_hide(gtk_widget_get_parent(msgwindow.tree_status), interface_prefs.msgwin_status_visible); + ui_widget_show_hide(gtk_widget_get_parent(msgwindow.tree_compiler), interface_prefs.msgwin_compiler_visible); + ui_widget_show_hide(gtk_widget_get_parent(msgwindow.tree_msg), interface_prefs.msgwin_messages_visible); + ui_widget_show_hide(gtk_widget_get_parent(msgwindow.scribble), interface_prefs.msgwin_scribble_visible); +} + + +void msgwin_init(void) { msgwindow.notebook = ui_lookup_widget(main_widgets.window, "notebook_info"); msgwindow.tree_status = ui_lookup_widget(main_widgets.window, "treeview3"); msgwindow.tree_msg = ui_lookup_widget(main_widgets.window, "treeview4"); msgwindow.tree_compiler = ui_lookup_widget(main_widgets.window, "treeview5"); + msgwindow.scribble = ui_lookup_widget(main_widgets.window, "textview_scribble"); msgwindow.find_in_files_dir = NULL; prepare_status_tree_view(); @@ -90,15 +100,12 @@ msgwindow.popup_msg_menu = create_message_popup_menu(MSG_MESSAGE); msgwindow.popup_compiler_menu = create_message_popup_menu(MSG_COMPILER); - ui_widget_modify_font_from_string( - ui_lookup_widget(main_widgets.window, "textview_scribble"), interface_prefs.msgwin_font); - - g_signal_connect(ui_lookup_widget(main_widgets.window, "textview_scribble"), - "populate-popup", G_CALLBACK(on_scribble_populate), NULL); + ui_widget_modify_font_from_string(msgwindow.scribble, interface_prefs.msgwin_font); + g_signal_connect(msgwindow.scribble, "populate-popup", G_CALLBACK(on_scribble_populate), NULL); } -void msgwin_finalize() +void msgwin_finalize(void) { g_free(msgwindow.find_in_files_dir); } @@ -106,16 +113,21 @@ static gboolean on_msgwin_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Return || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_space) - { - GdkEventButton button_event; - - button_event.button = 1; - button_event.time = event->time; - on_msgwin_button_press_event(NULL, &button_event, data); + if (ui_is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) + { + switch (GPOINTER_TO_INT(data)) + { + case MSG_COMPILER: + { /* single click in the compiler treeview */ + msgwin_goto_compiler_file_line(event->keyval); + break; + } + case MSG_MESSAGE: + { /* single click in the message treeview (results of 'Find usage') */ + msgwin_goto_messages_file_line(event->keyval); + break; + } + } } return FALSE; } @@ -240,13 +252,14 @@ **/ void msgwin_compiler_add(gint msg_color, const gchar *format, ...) { - gchar string[512]; + gchar *string; va_list args; va_start(args, format); - g_vsnprintf(string, 512, format, args); + string = g_strdup_vprintf(format, args); va_end(args); msgwin_compiler_add_string(msg_color, string); + g_free(string); } @@ -255,11 +268,17 @@ GtkTreeIter iter; GtkTreePath *path; const GdkColor *color = get_color(msg_color); + gchar *utf8_msg; + + if (! g_utf8_validate(msg, -1, NULL)) + utf8_msg = utils_get_utf8_from_locale(msg); + else + utf8_msg = (gchar *) msg; gtk_list_store_append(msgwindow.store_compiler, &iter); - gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, msg, -1); + gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, utf8_msg, -1); - if (ui_prefs.msgwindow_visible) + if (ui_prefs.msgwindow_visible && interface_prefs.compiler_tab_autoscroll) { path = gtk_tree_model_get_path( gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_compiler)), &iter); @@ -267,9 +286,12 @@ gtk_tree_path_free(path); } - /* calling build_menu_update for every build message would be overkill */ - gtk_widget_set_sensitive(build_get_menu_items(-1)->item_next_error, TRUE); - gtk_widget_set_sensitive(build_get_menu_items(-1)->item_previous_error, TRUE); + /* calling build_menu_update for every build message would be overkill, TODO really should call it once when all done */ + gtk_widget_set_sensitive(build_get_menu_items(-1)->menu_item[GBG_FIXED][GBF_NEXT_ERROR], TRUE); + gtk_widget_set_sensitive(build_get_menu_items(-1)->menu_item[GBG_FIXED][GBF_PREV_ERROR], TRUE); + + if (utf8_msg != msg) + g_free(utf8_msg); } @@ -302,14 +324,15 @@ **/ void msgwin_msg_add(gint msg_color, gint line, GeanyDocument *doc, const gchar *format, ...) { - gchar string[512]; + gchar *string; va_list args; va_start(args, format); - g_vsnprintf(string, 512, format, args); + string = g_strdup_vprintf(format, args); va_end(args); msgwin_msg_add_string(msg_color, line, doc, string); + g_free(string); } @@ -320,8 +343,10 @@ const GdkColor *color = get_color(msg_color); gchar *tmp; gsize len; + gchar *utf8_msg; - if (! ui_prefs.msgwindow_visible) msgwin_show_hide(TRUE); + if (! ui_prefs.msgwindow_visible) + msgwin_show_hide(TRUE); /* work around a strange problem when adding very long lines(greater than 4000 bytes) * cut the string to a maximum of 1024 bytes and discard the rest */ @@ -332,15 +357,22 @@ else tmp = g_strdup(string); + if (! g_utf8_validate(tmp, -1, NULL)) + utf8_msg = utils_get_utf8_from_locale(tmp); + else + utf8_msg = tmp; + gtk_list_store_append(msgwindow.store_msg, &iter); - gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, doc, 2, color, 3, tmp, -1); + gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, doc, 2, color, 3, utf8_msg, -1); g_free(tmp); + if (utf8_msg != tmp) + g_free(utf8_msg); } /** - * Log a status message *without* setting the status bar. + * Logs a status message *without* setting the status bar. * (Use ui_set_statusbar() to display text on the statusbar) * * @param format @c printf()-style format string. @@ -349,18 +381,19 @@ void msgwin_status_add(const gchar *format, ...) { GtkTreeIter iter; - gchar string[512]; + gchar *string; gchar *statusmsg, *time_str; va_list args; va_start(args, format); - g_vsnprintf(string, 512, format, args); + string = g_strdup_vprintf(format, args); va_end(args); /* add a timestamp to status messages */ time_str = utils_get_current_time_string(); statusmsg = g_strconcat(time_str, ": ", string, NULL); g_free(time_str); + g_free(string); /* add message to Status window */ gtk_list_store_append(msgwindow.store_status, &iter); @@ -496,7 +529,7 @@ static GtkWidget *create_message_popup_menu(gint type) { - GtkWidget *message_popup_menu, *clear, *copy, *image; + GtkWidget *message_popup_menu, *clear, *copy, *copy_all, *image; message_popup_menu = gtk_menu_new(); @@ -506,19 +539,22 @@ g_signal_connect(clear, "activate", G_CALLBACK(on_message_treeview_clear_activate), GINT_TO_POINTER(type)); - copy = gtk_image_menu_item_new_from_stock("gtk-copy", NULL); + copy = gtk_image_menu_item_new_with_mnemonic(_("C_opy")); gtk_widget_show(copy); gtk_container_add(GTK_CONTAINER(message_popup_menu), copy); + image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy), image); g_signal_connect(copy, "activate", G_CALLBACK(on_compiler_treeview_copy_activate), GINT_TO_POINTER(type)); - copy = gtk_image_menu_item_new_with_mnemonic(_("Copy _All")); - gtk_widget_show(copy); - gtk_container_add(GTK_CONTAINER(message_popup_menu), copy); + copy_all = gtk_image_menu_item_new_with_mnemonic(_("Copy _All")); + gtk_widget_show(copy_all); + gtk_container_add(GTK_CONTAINER(message_popup_menu), copy_all); image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU); gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy), image); - g_signal_connect(copy, "activate", + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_all), image); + g_signal_connect(copy_all, "activate", G_CALLBACK(on_compiler_treeview_copy_all_activate), GINT_TO_POINTER(type)); msgwin_menu_add_common_items(GTK_MENU(message_popup_menu)); @@ -575,13 +611,72 @@ } -gboolean msgwin_goto_compiler_file_line() +static gboolean goto_compiler_file_line(const gchar *filename, gint line, guint keyval) +{ + if (!filename || line <= -1) + return FALSE; + + /* If the path doesn't exist, try the current document. + * This happens when we receive build messages in the wrong order - after the + * 'Leaving directory' messages */ + if (!g_file_test(filename, G_FILE_TEST_EXISTS)) + { + gchar *cur_dir = utils_get_current_file_dir_utf8(); + gchar *name; + + if (cur_dir) + { + /* we let the user know we couldn't find the parsed filename from the message window */ + setptr(cur_dir, utils_get_locale_from_utf8(cur_dir)); + name = g_path_get_basename(filename); + setptr(name, g_build_path(G_DIR_SEPARATOR_S, cur_dir, name, NULL)); + g_free(cur_dir); + + if (g_file_test(name, G_FILE_TEST_EXISTS)) + { + ui_set_statusbar(FALSE, _("Could not find file '%s' - trying the current document path."), + filename); + filename = name; + } + else + g_free(name); + } + } + + { + gchar *utf8_filename = utils_get_utf8_from_locale(filename); + GeanyDocument *doc = document_find_by_filename(utf8_filename); + GeanyDocument *old_doc = document_get_current(); + + g_free(utf8_filename); + + if (doc == NULL) /* file not already open */ + doc = document_open_file(filename, FALSE, NULL, NULL); + + if (doc != NULL) + { + gboolean ret; + + if (! doc->changed && editor_prefs.use_indicators) /* if modified, line may be wrong */ + editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1); + + ret = navqueue_goto_line(old_doc, doc, line); + if (ret && ui_is_keyval_enter_or_return(keyval)) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + + return ret; + } + } + return FALSE; +} + + +gboolean msgwin_goto_compiler_file_line(guint keyval) { GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; gchar *string; - gboolean ret = FALSE; GdkColor *color; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_compiler)); @@ -603,41 +698,21 @@ gint line; gchar *filename, *dir; GtkTreePath *path; - /* save the beginning of the string to use when free'ing it after it was stripped */ - gchar *string_start = string; + gboolean ret; path = gtk_tree_model_get_path(model, &iter); find_prev_build_dir(path, model, &dir); gtk_tree_path_free(path); msgwin_parse_compiler_error_line(string, dir, &filename, &line); + g_free(string); + g_free(dir); - if (dir != NULL) - g_free(dir); - - if (filename != NULL && line > -1) - { - gchar *utf8_filename = utils_get_utf8_from_locale(filename); - GeanyDocument *doc = document_find_by_filename(utf8_filename); - GeanyDocument *old_doc = document_get_current(); - - g_free(utf8_filename); - - if (doc == NULL) /* file not already open */ - doc = document_open_file(filename, FALSE, NULL, NULL); - - if (doc != NULL) - { - if (! doc->changed) /* if modified, line may be wrong */ - editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1); - - ret = navqueue_goto_line(old_doc, doc, line); - } - } + ret = goto_compiler_file_line(filename, line, keyval); g_free(filename); - g_free(string_start); + return ret; } } - return ret; + return FALSE; } @@ -909,7 +984,7 @@ } -gboolean msgwin_goto_messages_file_line() +gboolean msgwin_goto_messages_file_line(guint keyval) { GtkTreeIter iter; GtkTreeModel *model; @@ -929,6 +1004,8 @@ if (line >= 0 && DOC_VALID(doc)) { ret = navqueue_goto_line(old_doc, doc, line); + if (ret && ui_is_keyval_enter_or_return(keyval)) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); } else if (line < 0 && string != NULL) { @@ -939,7 +1016,11 @@ /* use document_open_file to find an already open file, or open it in place */ doc = document_open_file(filename, FALSE, NULL, NULL); if (doc != NULL) + { ret = navqueue_goto_line(old_doc, doc, line); + if (ret && ui_is_keyval_enter_or_return(keyval)) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + } } g_free(filename); } @@ -987,12 +1068,12 @@ { case MSG_COMPILER: { /* single click in the compiler treeview */ - msgwin_goto_compiler_file_line(); + msgwin_goto_compiler_file_line(0); break; } case MSG_MESSAGE: { /* single click in the message treeview (results of 'Find usage') */ - msgwin_goto_messages_file_line(); + msgwin_goto_messages_file_line(0); break; } } @@ -1042,7 +1123,7 @@ switch (tabnum) { - case MSG_SCRATCH: widget = ui_lookup_widget(main_widgets.window, "textview_scribble"); break; + case MSG_SCRATCH: widget = msgwindow.scribble; break; case MSG_COMPILER: widget = msgwindow.tree_compiler; break; case MSG_STATUS: widget = msgwindow.tree_status; break; case MSG_MESSAGE: widget = msgwindow.tree_msg; break; @@ -1061,6 +1142,7 @@ gtk_widget_grab_focus(widget); } + /** * Removes all messages from a tab specified by @a tabnum in the messages window. * diff -Nru geany-0.18/src/msgwindow.h geany-0.19/src/msgwindow.h --- geany-0.18/src/msgwindow.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/msgwindow.h 2010-02-28 14:57:06.000000000 +0000 @@ -1,8 +1,8 @@ /* * msgwindow.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: msgwindow.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: msgwindow.h 4713 2010-02-28 14:57:06Z eht16 $ */ /** @@ -64,6 +64,7 @@ GtkWidget *tree_compiler; GtkWidget *tree_status; GtkWidget *tree_msg; + GtkWidget *scribble; GtkWidget *popup_status_menu; GtkWidget *popup_msg_menu; GtkWidget *popup_compiler_menu; @@ -95,14 +96,16 @@ void msgwin_status_add(const gchar *format, ...) G_GNUC_PRINTF (1, 2); +void msgwin_show_hide_tabs(void); + void msgwin_menu_add_common_items(GtkMenu *menu); -gboolean msgwin_goto_compiler_file_line(void); +gboolean msgwin_goto_compiler_file_line(guint keyval); void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line); -gboolean msgwin_goto_messages_file_line(void); +gboolean msgwin_goto_messages_file_line(guint keyval); #endif diff -Nru geany-0.18/src/navqueue.c geany-0.19/src/navqueue.c --- geany-0.18/src/navqueue.c 2009-07-21 23:12:13.000000000 +0100 +++ geany-0.19/src/navqueue.c 2010-03-15 13:01:16.000000000 +0000 @@ -2,8 +2,8 @@ * navqueue.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Dave Moore - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: navqueue.c 4010 2009-07-21 22:12:13Z eht16 $ + * $Id: navqueue.c 4760 2010-03-15 13:01:16Z ntrel $ */ /* @@ -136,7 +136,7 @@ /** - * Add old file position and new file position to the navqueue, then goes to the new position. + * Adds old file position and new file position to the navqueue, then goes to the new position. * * @param old_doc The document of the previous position, if set as invalid (@c NULL) then no old * position is set diff -Nru geany-0.18/src/navqueue.h geany-0.19/src/navqueue.h --- geany-0.18/src/navqueue.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/navqueue.h 2010-01-01 22:55:18.000000000 +0000 @@ -2,8 +2,8 @@ * navqueue.h - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Dave Moore - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: navqueue.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: navqueue.h 4518 2010-01-01 22:55:18Z eht16 $ */ /** diff -Nru geany-0.18/src/notebook.c geany-0.19/src/notebook.c --- geany-0.18/src/notebook.c 2009-05-20 16:01:04.000000000 +0100 +++ geany-0.19/src/notebook.c 2010-05-16 18:45:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * notebook.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: notebook.c 3808 2009-05-20 15:01:04Z ntrel $ + * $Id: notebook.c 4928 2010-05-16 17:45:39Z eht16 $ */ /* @@ -31,10 +31,11 @@ #include "editor.h" #include "documentprivate.h" #include "ui_utils.h" -#include "treeviews.h" +#include "sidebar.h" #include "support.h" #include "callbacks.h" #include "utils.h" +#include "keybindings.h" #define GEANY_DND_NOTEBOOK_TAB_TYPE "geany_dnd_notebook_tab" @@ -192,62 +193,35 @@ } -static GtkMenu *get_tab_bar_popup_menu(void) +static void show_tab_bar_popup_menu(GdkEventButton *event) { + GtkWidget *menu_item; static GtkWidget *menu = NULL; - GtkWidget *menu_item, *menu_item_label; - const GdkColor *color; - GeanyDocument *doc; - guint i, len; - gchar *base_name; - GeanyDocument *current_doc = document_get_current(); - if (G_UNLIKELY(menu == NULL)) + if (menu == NULL) menu = gtk_menu_new(); /* clear the old menu items */ gtk_container_foreach(GTK_CONTAINER(menu), (GtkCallback) gtk_widget_destroy, NULL); - len = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); - for (i = 0; i < len; i++) - { - doc = document_get_from_page(i); - if (! DOC_VALID(doc)) - continue; - - base_name = g_path_get_basename(DOC_FILENAME(doc)); - menu_item = gtk_menu_item_new_with_label(base_name); - gtk_widget_show(menu_item); - gtk_container_add(GTK_CONTAINER(menu), menu_item); - g_signal_connect(menu_item, "activate", G_CALLBACK(tab_bar_menu_activate_cb), doc); - - color = document_get_status_color(doc); - menu_item_label = gtk_bin_get_child(GTK_BIN(menu_item)); - gtk_widget_modify_fg(menu_item_label, GTK_STATE_NORMAL, color); - gtk_widget_modify_fg(menu_item_label, GTK_STATE_ACTIVE, color); + ui_menu_add_document_items(GTK_MENU(menu), document_get_current(), + G_CALLBACK(tab_bar_menu_activate_cb)); - if (doc == current_doc) - { - setptr(base_name, g_strconcat("", base_name, "", NULL)); - gtk_label_set_markup(GTK_LABEL(menu_item_label), base_name); - } - g_free(base_name); - } menu_item = gtk_separator_menu_item_new(); gtk_widget_show(menu_item); gtk_container_add(GTK_CONTAINER(menu), menu_item); - menu_item = gtk_menu_item_new_with_mnemonic(_("Close Ot_her Documents")); + menu_item = ui_image_menu_item_new(GTK_STOCK_CLOSE, _("Close Ot_her Documents")); gtk_widget_show(menu_item); gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_other_documents1_activate), NULL); - menu_item = gtk_menu_item_new_with_mnemonic(_("C_lose All")); + menu_item = ui_image_menu_item_new(GTK_STOCK_CLOSE, _("C_lose All")); gtk_widget_show(menu_item); gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_all1_activate), NULL); - return GTK_MENU(menu); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); } @@ -269,8 +243,7 @@ } else if (event->button == 3) { - gtk_menu_popup(get_tab_bar_popup_menu(), NULL, NULL, - NULL, NULL, event->button, event->time); + show_tab_bar_popup_menu(event); } return FALSE; } @@ -334,7 +307,7 @@ { /* Not necessary to update open files treeview if it's sorted. * Note: if enabled, it's best to move the item instead of recreating all items. */ - /*treeviews_openfiles_update_all();*/ + /*sidebar_openfiles_update_all();*/ } @@ -390,7 +363,7 @@ GtkWidget *page; /* deal with less than 2 pages */ - switch(gtk_notebook_get_n_pages(notebook)) + switch (gtk_notebook_get_n_pages(notebook)) {case 0: return -1; case 1: return 0;} tab_pos = gtk_notebook_get_tab_pos(notebook); /* which edge */ @@ -412,9 +385,9 @@ max_x = tab->allocation.x + tab->allocation.width - GTK_WIDGET(notebook)->allocation.x; max_y = tab->allocation.y + tab->allocation.height - GTK_WIDGET(notebook)->allocation.y; - if (((tab_pos == GTK_POS_TOP) || (tab_pos == GTK_POS_BOTTOM)) && (x<=max_x)) + if (((tab_pos == GTK_POS_TOP) || (tab_pos == GTK_POS_BOTTOM)) && (x <= max_x)) return page_num; - else if (((tab_pos == GTK_POS_LEFT) || (tab_pos == GTK_POS_RIGHT)) && (y<=max_y)) + else if (((tab_pos == GTK_POS_LEFT) || (tab_pos == GTK_POS_RIGHT)) && (y <= max_y)) return page_num; page_num++; @@ -448,6 +421,8 @@ static gboolean notebook_tab_click(GtkWidget *widget, GdkEventButton *event, gpointer data) { + guint state; + /* toggle additional widgets on double click */ if (event->type == GDK_2BUTTON_PRESS) { @@ -463,7 +438,14 @@ GTK_WIDGET(data))); return TRUE; /* stop other handlers like notebook_tab_bar_click_cb() */ } - + /* switch last used tab on ctrl-click */ + state = event->state & gtk_accelerator_get_default_mod_mask(); + if (event->button == 1 && state == GDK_CONTROL_MASK) + { + keybindings_send_command(GEANY_KEY_GROUP_NOTEBOOK, + GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED); + return TRUE; + } return FALSE; } @@ -484,6 +466,7 @@ GtkWidget *hbox, *ebox; gint tabnum; GtkWidget *page; + gint cur_page; g_return_val_if_fail(this != NULL, -1); @@ -531,12 +514,16 @@ document_update_tab_label(this); + if (file_prefs.tab_order_beside) + cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); + else + cur_page = file_prefs.tab_order_ltr ? -2 /* hack: -2 + 1 = -1, last page */ : 0; if (file_prefs.tab_order_ltr) - tabnum = gtk_notebook_append_page_menu(GTK_NOTEBOOK(main_widgets.notebook), page, - ebox, NULL); + tabnum = gtk_notebook_insert_page_menu(GTK_NOTEBOOK(main_widgets.notebook), page, + ebox, NULL, cur_page + 1); else tabnum = gtk_notebook_insert_page_menu(GTK_NOTEBOOK(main_widgets.notebook), page, - ebox, NULL, 0); + ebox, NULL, cur_page); tab_count_changed(); diff -Nru geany-0.18/src/notebook.h geany-0.19/src/notebook.h --- geany-0.18/src/notebook.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/notebook.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * notebook.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: notebook.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: notebook.h 4518 2010-01-01 22:55:18Z eht16 $ */ #ifndef GEANY_NOTEBOOK_H diff -Nru geany-0.18/src/plugindata.h geany-0.19/src/plugindata.h --- geany-0.18/src/plugindata.h 2009-07-29 18:40:20.000000000 +0100 +++ geany-0.19/src/plugindata.h 2010-06-06 19:34:26.000000000 +0100 @@ -1,8 +1,8 @@ /* * plugindata.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: plugindata.h 4041 2009-07-29 17:40:20Z ntrel $ + * $Id: plugindata.h 5005 2010-06-06 18:34:26Z eht16 $ */ /** @@ -50,16 +50,16 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 150, + GEANY_API_VERSION = 189, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ /* This should usually stay the same if fields are only appended, assuming only pointers to * structs and not structs themselves are declared by plugins. */ - GEANY_ABI_VERSION = 63 + GEANY_ABI_VERSION = 66 }; -/** Check the plugin can be loaded by Geany. +/** Checks the plugin can be loaded by Geany. * This performs runtime checks that try to ensure: * - Geany ABI data types are compatible with this plugin. * - Geany sources provide the required API for this plugin. */ @@ -79,13 +79,13 @@ typedef struct PluginInfo { /** The name of the plugin. */ - gchar *name; + const gchar *name; /** The description of the plugin. */ - gchar *description; + const gchar *description; /** The version of the plugin. */ - gchar *version; + const gchar *version; /** The author of the plugin. */ - gchar *author; + const gchar *author; } PluginInfo; @@ -101,11 +101,12 @@ GeanyPlugin; -/** Set the plugin name and some other basic information about a plugin. - * This declares a function, so you can use the _() translation macro for arguments. +/** Sets the plugin name and some other basic information about a plugin. + * + * @note If you want some of the arguments to be translated, see @ref PLUGIN_SET_TRANSLATABLE_INFO() * * Example: - * @code PLUGIN_SET_INFO(_("Cool Feature"), _("Adds cool feature support."), "0.1", "Joe Author") @endcode */ + * @code PLUGIN_SET_INFO("Cool Feature", "Adds cool feature support.", "0.1", "Joe Author") @endcode */ /* plugin_set_info() could be written manually for plugins if we want to add any * extra PluginInfo features (such as an icon), so we don't need to break API * compatibility. Alternatively just add a new macro, PLUGIN_SET_INFO_FULL(). -ntrel */ @@ -118,24 +119,52 @@ info->author = (p_author); \ } +/** Sets the plugin name and some other basic information about a plugin. + * This macro is like @ref PLUGIN_SET_INFO() but allows the passed information to be translated + * by setting up the translation mechanism with @ref main_locale_init(). + * You therefore don't need to call it manually in plugin_init(). + * + * Example: + * @code PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Cool Feature"), _("Adds a cool feature."), "0.1", "John Doe") @endcode + * + * @since 0.19 */ +#define PLUGIN_SET_TRANSLATABLE_INFO(localedir, package, p_name, p_description, p_version, p_author) \ + void plugin_set_info(PluginInfo* info) \ + { \ + main_locale_init(localedir, package); \ + info->name = (p_name); \ + info->description = (p_description); \ + info->version = (p_version); \ + info->author = (p_author); \ + } -/** Declare and initialise a keybinding group. - * @code GeanyKeyGroup plugin_key_group[1]; @endcode - * You must then set the @c plugin_key_group::keys[] entries for the group in plugin_init(). +/** @deprecated - use plugin_set_key_group() instead. + * @see PLUGIN_KEY_GROUP() macro. */ +typedef struct GeanyKeyGroupInfo +{ + const gchar *name; /**< Group name used in the configuration file, such as @c "html_chars" */ + gsize count; /**< The number of keybindings the group will hold */ +} +GeanyKeyGroupInfo; + +/** @deprecated - use plugin_set_key_group() instead. + * Declare and initialise a keybinding group. + * @code GeanyKeyGroup *plugin_key_group; @endcode + * You must then set the @c plugin_key_group::keys[] entries for the group in plugin_init(), + * normally using keybindings_set_item(). * The @c plugin_key_group::label field is set by Geany after @c plugin_init() * is called, to the name of the plugin. * @param group_name A unique group name (without quotes) to be used in the * configuration file, such as @c html_chars. * @param key_count The number of keybindings the group will hold. */ #define PLUGIN_KEY_GROUP(group_name, key_count) \ - static GeanyKeyBinding plugin_keys[key_count]; \ - \ - /* We have to declare plugin_key_group as a single element array. + /* We have to declare this as a single element array. * Declaring as a pointer to a struct doesn't work with g_module_symbol(). */ \ - GeanyKeyGroup plugin_key_group[1] = \ + GeanyKeyGroupInfo plugin_key_group_info[1] = \ { \ - {G_STRINGIFY(group_name), NULL, key_count, plugin_keys} \ - }; + {G_STRINGIFY(group_name), key_count} \ + };\ + GeanyKeyGroup *plugin_key_group = NULL; /** Callback array entry type used with the @ref plugin_callbacks symbol. */ @@ -143,7 +172,7 @@ { /** The name of signal, must be an existing signal. For a list of available signals, * please see the @link signals Signal documentation @endlink. */ - gchar *signal_name; + const gchar *signal_name; /** A callback function which is called when the signal is emitted. */ GCallback callback; /** Set to TRUE to connect your handler with g_signal_connect_after(). */ @@ -225,9 +254,11 @@ struct NavQueueFuncs *p_navqueue; /**< See navqueue.h */ struct EditorFuncs *p_editor; /**< See editor.h */ struct MainFuncs *p_main; /**< See main.h */ - struct PluginFuncs *p_plugin; /**< See plugins.c */ + struct PluginFuncs *p_plugin; /**< See pluginutils.c */ struct ScintillaFuncs *p_scintilla; /**< See ScintillaFuncs */ struct MsgWinFuncs *p_msgwin; /**< See msgwindow.h */ + struct StashFuncs *p_stash; /**< See stash.h */ + struct SymbolsFuncs *p_symbols; /**< See symbols.h */ } GeanyFunctions; @@ -239,28 +270,29 @@ /* See document.h */ typedef struct DocumentFuncs { - struct GeanyDocument* (*new_file) (const gchar *utf8_filename, struct GeanyFiletype *ft, + struct GeanyDocument* (*document_new_file) (const gchar *utf8_filename, struct GeanyFiletype *ft, const gchar *text); - struct GeanyDocument* (*get_current) (void); - struct GeanyDocument* (*get_from_page) (guint page_num); - struct GeanyDocument* (*find_by_filename) (const gchar *utf8_filename); - struct GeanyDocument* (*find_by_real_path) (const gchar *realname); - gboolean (*save_file) (struct GeanyDocument *doc, gboolean force); - struct GeanyDocument* (*open_file) (const gchar *locale_filename, gboolean readonly, + struct GeanyDocument* (*document_get_current) (void); + struct GeanyDocument* (*document_get_from_page) (guint page_num); + struct GeanyDocument* (*document_find_by_filename) (const gchar *utf8_filename); + struct GeanyDocument* (*document_find_by_real_path) (const gchar *realname); + gboolean (*document_save_file) (struct GeanyDocument *doc, gboolean force); + struct GeanyDocument* (*document_open_file) (const gchar *locale_filename, gboolean readonly, struct GeanyFiletype *ft, const gchar *forced_enc); - void (*open_files) (const GSList *filenames, gboolean readonly, + void (*document_open_files) (const GSList *filenames, gboolean readonly, struct GeanyFiletype *ft, const gchar *forced_enc); - gboolean (*remove_page) (guint page_num); - gboolean (*reload_file) (struct GeanyDocument *doc, const gchar *forced_enc); - void (*set_encoding) (struct GeanyDocument *doc, const gchar *new_encoding); - void (*set_text_changed) (struct GeanyDocument *doc, gboolean changed); - void (*set_filetype) (struct GeanyDocument *doc, struct GeanyFiletype *type); - gboolean (*close) (struct GeanyDocument *doc); - struct GeanyDocument* (*index)(gint idx); - gboolean (*save_file_as) (struct GeanyDocument *doc, const gchar *utf8_fname); - void (*rename_file) (struct GeanyDocument *doc, const gchar *new_filename); - const GdkColor* (*get_status_color) (struct GeanyDocument *doc); - gchar* (*get_basename_for_display) (struct GeanyDocument *doc, gint length); + gboolean (*document_remove_page) (guint page_num); + gboolean (*document_reload_file) (struct GeanyDocument *doc, const gchar *forced_enc); + void (*document_set_encoding) (struct GeanyDocument *doc, const gchar *new_encoding); + void (*document_set_text_changed) (struct GeanyDocument *doc, gboolean changed); + void (*document_set_filetype) (struct GeanyDocument *doc, struct GeanyFiletype *type); + gboolean (*document_close) (struct GeanyDocument *doc); + struct GeanyDocument* (*document_index)(gint idx); + gboolean (*document_save_file_as) (struct GeanyDocument *doc, const gchar *utf8_fname); + void (*document_rename_file) (struct GeanyDocument *doc, const gchar *new_filename); + const GdkColor* (*document_get_status_color) (struct GeanyDocument *doc); + gchar* (*document_get_basename_for_display) (struct GeanyDocument *doc, gint length); + gint (*document_get_notebook_page) (struct GeanyDocument *doc); } DocumentFuncs; @@ -271,10 +303,10 @@ typedef struct ScintillaFuncs { /** Send Scintilla a message. */ - long int (*send_message) (struct _ScintillaObject* sci, unsigned int iMessage, + long int (*scintilla_send_message) (struct _ScintillaObject* sci, unsigned int iMessage, long unsigned int wParam, long int lParam); /** Create a new ScintillaObject widget. */ - GtkWidget* (*new)(void); + GtkWidget* (*scintilla_new)(void); } ScintillaFuncs; @@ -283,51 +315,62 @@ * See sciwrappers.h for the list of functions. */ typedef struct SciFuncs { - /** @deprecated Use @ref ScintillaFuncs::send_message() instead. */ - long int (*send_message) (struct _ScintillaObject* sci, unsigned int iMessage, + /** @deprecated Use @c scintilla_send_message() instead. */ + long int (*sci_send_message) (struct _ScintillaObject *sci, unsigned int iMessage, long unsigned int wParam, long int lParam); - void (*send_command) (struct _ScintillaObject* sci, gint cmd); + void (*sci_send_command) (struct _ScintillaObject *sci, gint cmd); - void (*start_undo_action) (struct _ScintillaObject* sci); - void (*end_undo_action) (struct _ScintillaObject* sci); - void (*set_text) (struct _ScintillaObject *sci, const gchar *text); - void (*insert_text) (struct _ScintillaObject *sci, gint pos, const gchar *text); - void (*get_text) (struct _ScintillaObject *sci, gint len, gchar *text); - gint (*get_length) (struct _ScintillaObject *sci); - gint (*get_current_position) (struct _ScintillaObject *sci); - void (*set_current_position) (struct _ScintillaObject* sci, gint position, + void (*sci_start_undo_action) (struct _ScintillaObject *sci); + void (*sci_end_undo_action) (struct _ScintillaObject *sci); + void (*sci_set_text) (struct _ScintillaObject *sci, const gchar *text); + void (*sci_insert_text) (struct _ScintillaObject *sci, gint pos, const gchar *text); + void (*sci_get_text) (struct _ScintillaObject *sci, gint len, gchar *text); + gint (*sci_get_length) (struct _ScintillaObject *sci); + gint (*sci_get_current_position) (struct _ScintillaObject *sci); + void (*sci_set_current_position) (struct _ScintillaObject *sci, gint position, gboolean scroll_to_caret); - gint (*get_col_from_position) (struct _ScintillaObject* sci, gint position); - gint (*get_line_from_position) (struct _ScintillaObject* sci, gint position); - gint (*get_position_from_line) (struct _ScintillaObject* sci, gint line); - void (*replace_sel) (struct _ScintillaObject* sci, const gchar *text); - void (*get_selected_text) (struct _ScintillaObject* sci, gchar *text); - gint (*get_selected_text_length) (struct _ScintillaObject* sci); - gint (*get_selection_start) (struct _ScintillaObject* sci); - gint (*get_selection_end) (struct _ScintillaObject* sci); - gint (*get_selection_mode) (struct _ScintillaObject* sci); - void (*set_selection_mode) (struct _ScintillaObject* sci, gint mode); - void (*set_selection_start) (struct _ScintillaObject* sci, gint position); - void (*set_selection_end) (struct _ScintillaObject* sci, gint position); - void (*get_text_range) (struct _ScintillaObject* sci, gint start, gint end, gchar *text); - gchar* (*get_line) (struct _ScintillaObject* sci, gint line_num); - gint (*get_line_length) (struct _ScintillaObject* sci, gint line); - gint (*get_line_count) (struct _ScintillaObject* sci); - gboolean (*get_line_is_visible) (struct _ScintillaObject* sci, gint line); - void (*ensure_line_is_visible) (struct _ScintillaObject* sci, gint line); - void (*scroll_caret) (struct _ScintillaObject* sci); - gint (*find_matching_brace) (struct _ScintillaObject* sci, gint pos); - gint (*get_style_at) (struct _ScintillaObject *sci, gint position); - gchar (*get_char_at) (struct _ScintillaObject *sci, gint pos); - gint (*get_current_line) (struct _ScintillaObject *sci); - gboolean (*has_selection) (struct _ScintillaObject *sci); - gint (*get_tab_width) (struct _ScintillaObject *sci); - void (*indicator_clear) (struct _ScintillaObject *sci, gint start, gint end); - void (*indicator_set) (struct _ScintillaObject *sci, gint indic); - gchar* (*get_contents) (struct _ScintillaObject *sci, gint len); - gchar* (*get_contents_range) (struct _ScintillaObject *sci, gint start, gint end); - gchar* (*get_selection_contents) (struct _ScintillaObject *sci); - void (*set_font) (struct _ScintillaObject *sci, gint style, const gchar *font, gint size); + gint (*sci_get_col_from_position) (struct _ScintillaObject *sci, gint position); + gint (*sci_get_line_from_position) (struct _ScintillaObject *sci, gint position); + gint (*sci_get_position_from_line) (struct _ScintillaObject *sci, gint line); + void (*sci_replace_sel) (struct _ScintillaObject *sci, const gchar *text); + void (*sci_get_selected_text) (struct _ScintillaObject *sci, gchar *text); + gint (*sci_get_selected_text_length) (struct _ScintillaObject *sci); + gint (*sci_get_selection_start) (struct _ScintillaObject *sci); + gint (*sci_get_selection_end) (struct _ScintillaObject *sci); + gint (*sci_get_selection_mode) (struct _ScintillaObject *sci); + void (*sci_set_selection_mode) (struct _ScintillaObject *sci, gint mode); + void (*sci_set_selection_start) (struct _ScintillaObject *sci, gint position); + void (*sci_set_selection_end) (struct _ScintillaObject *sci, gint position); + void (*sci_get_text_range) (struct _ScintillaObject *sci, gint start, gint end, gchar *text); + gchar* (*sci_get_line) (struct _ScintillaObject *sci, gint line_num); + gint (*sci_get_line_length) (struct _ScintillaObject *sci, gint line); + gint (*sci_get_line_count) (struct _ScintillaObject *sci); + gboolean (*sci_get_line_is_visible) (struct _ScintillaObject *sci, gint line); + void (*sci_ensure_line_is_visible) (struct _ScintillaObject *sci, gint line); + void (*sci_scroll_caret) (struct _ScintillaObject *sci); + gint (*sci_find_matching_brace) (struct _ScintillaObject *sci, gint pos); + gint (*sci_get_style_at) (struct _ScintillaObject *sci, gint position); + gchar (*sci_get_char_at) (struct _ScintillaObject *sci, gint pos); + gint (*sci_get_current_line) (struct _ScintillaObject *sci); + gboolean (*sci_has_selection) (struct _ScintillaObject *sci); + gint (*sci_get_tab_width) (struct _ScintillaObject *sci); + void (*sci_indicator_clear) (struct _ScintillaObject *sci, gint start, gint end); + void (*sci_indicator_set) (struct _ScintillaObject *sci, gint indic); + gchar* (*sci_get_contents) (struct _ScintillaObject *sci, gint len); + gchar* (*sci_get_contents_range) (struct _ScintillaObject *sci, gint start, gint end); + gchar* (*sci_get_selection_contents) (struct _ScintillaObject *sci); + void (*sci_set_font) (struct _ScintillaObject *sci, gint style, const gchar *font, gint size); + gint (*sci_get_line_end_position) (struct _ScintillaObject *sci, gint line); + void (*sci_set_target_start) (struct _ScintillaObject *sci, gint start); + void (*sci_set_target_end) (struct _ScintillaObject *sci, gint end); + gint (*sci_replace_target) (struct _ScintillaObject *sci, const gchar *text, gboolean regex); + void (*sci_set_marker_at_line) (struct _ScintillaObject *sci, gint line_number, gint marker); + void (*sci_delete_marker_at_line) (struct _ScintillaObject *sci, gint line_number, gint marker); + gboolean (*sci_is_marker_set_at_line) (struct _ScintillaObject *sci, gint line, gint marker); + void (*sci_goto_line) (struct _ScintillaObject *sci, gint line, gboolean unfold); + gint (*sci_find_text) (struct _ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf); + void (*sci_set_line_indentation) (struct _ScintillaObject *sci, gint line, gint indent); + gint (*sci_get_line_indentation) (struct _ScintillaObject *sci, gint line); } SciFuncs; @@ -335,7 +378,7 @@ /* See templates.h */ typedef struct TemplateFuncs { - gchar* (*get_template_fileheader) (gint filetype_idx, const gchar *fname); + gchar* (*templates_get_template_fileheader) (gint filetype_idx, const gchar *fname); } TemplateFuncs; @@ -343,34 +386,38 @@ /* See utils.h */ typedef struct UtilsFuncs { - gboolean (*str_equal) (const gchar *a, const gchar *b); - guint (*string_replace_all) (GString *haystack, const gchar *needle, + gboolean (*utils_str_equal) (const gchar *a, const gchar *b); + guint (*utils_string_replace_all) (GString *haystack, const gchar *needle, const gchar *replacement); - GSList* (*get_file_list) (const gchar *path, guint *length, GError **error); - gint (*write_file) (const gchar *filename, const gchar *text); - gchar* (*get_locale_from_utf8) (const gchar *utf8_text); - gchar* (*get_utf8_from_locale) (const gchar *locale_text); - gchar* (*remove_ext_from_filename) (const gchar *filename); - gint (*mkdir) (const gchar *path, gboolean create_parent_dirs); - gboolean (*get_setting_boolean) (GKeyFile *config, const gchar *section, const gchar *key, + GSList* (*utils_get_file_list) (const gchar *path, guint *length, GError **error); + gint (*utils_write_file) (const gchar *filename, const gchar *text); + gchar* (*utils_get_locale_from_utf8) (const gchar *utf8_text); + gchar* (*utils_get_utf8_from_locale) (const gchar *locale_text); + gchar* (*utils_remove_ext_from_filename) (const gchar *filename); + gint (*utils_mkdir) (const gchar *path, gboolean create_parent_dirs); + gboolean (*utils_get_setting_boolean) (GKeyFile *config, const gchar *section, const gchar *key, const gboolean default_value); - gint (*get_setting_integer) (GKeyFile *config, const gchar *section, const gchar *key, + gint (*utils_get_setting_integer) (GKeyFile *config, const gchar *section, const gchar *key, const gint default_value); - gchar* (*get_setting_string) (GKeyFile *config, const gchar *section, const gchar *key, + gchar* (*utils_get_setting_string) (GKeyFile *config, const gchar *section, const gchar *key, const gchar *default_value); - gboolean (*spawn_sync) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, + gboolean (*utils_spawn_sync) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, gchar **std_out, gchar **std_err, gint *exit_status, GError **error); - gboolean (*spawn_async) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, + gboolean (*utils_spawn_async) (const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); - gint (*str_casecmp) (const gchar *s1, const gchar *s2); - gchar* (*get_date_time) (const gchar *format, time_t *time_to_use); - void (*open_browser) (const gchar *uri); - guint (*string_replace_first) (GString *haystack, const gchar *needle, + gint (*utils_str_casecmp) (const gchar *s1, const gchar *s2); + gchar* (*utils_get_date_time) (const gchar *format, time_t *time_to_use); + void (*utils_open_browser) (const gchar *uri); + guint (*utils_string_replace_first) (GString *haystack, const gchar *needle, const gchar *replace); - gchar* (*str_middle_truncate) (const gchar *string, guint truncate_length); - gchar* (*str_remove_chars) (gchar *string, const gchar *chars); + gchar* (*utils_str_middle_truncate) (const gchar *string, guint truncate_length); + gchar* (*utils_str_remove_chars) (gchar *string, const gchar *chars); + GSList* (*utils_get_file_list_full)(const gchar *path, gboolean full_path, gboolean sort, + GError **error); + gchar** (*utils_copy_environment)(const gchar **exclude_vars, const gchar *first_varname, ...); + } UtilsFuncs; @@ -378,9 +425,9 @@ /* See main.h */ typedef struct MainFuncs { - void (*reload_configuration) (void); - void (*locale_init) (const gchar *locale_dir, const gchar *package); - + void (*main_reload_configuration) (void); + void (*main_locale_init) (const gchar *locale_dir, const gchar *package); + gboolean (*main_is_realized) (void); } MainFuncs; @@ -388,22 +435,24 @@ /* See ui_utils.h */ typedef struct UIUtilsFuncs { - GtkWidget* (*dialog_vbox_new) (GtkDialog *dialog); - GtkWidget* (*frame_new_with_alignment) (const gchar *label_text, GtkWidget **alignment); - - /* set_statusbar() also appends to the message window status tab if log is TRUE. */ - void (*set_statusbar) (gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); - - void (*table_add_row) (GtkTable *table, gint row, ...) G_GNUC_NULL_TERMINATED; - GtkWidget* (*path_box_new) (const gchar *title, GtkFileChooserAction action, GtkEntry *entry); - GtkWidget* (*button_new_with_image) (const gchar *stock_id, const gchar *text); - void (*add_document_sensitive) (GtkWidget *widget); - void (*widget_set_tooltip_text) (GtkWidget *widget, const gchar *text); - GtkWidget* (*image_menu_item_new) (const gchar *stock_id, const gchar *label); - GtkWidget* (*lookup_widget) (GtkWidget *widget, const gchar *widget_name); - void (*progress_bar_start) (const gchar *text); - void (*progress_bar_stop) (void); - void (*entry_add_clear_icon) (GtkWidget *entry); + GtkWidget* (*ui_dialog_vbox_new) (GtkDialog *dialog); + GtkWidget* (*ui_frame_new_with_alignment) (const gchar *label_text, GtkWidget **alignment); + void (*ui_set_statusbar) (gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); + void (*ui_table_add_row) (GtkTable *table, gint row, ...) G_GNUC_NULL_TERMINATED; + GtkWidget* (*ui_path_box_new) (const gchar *title, GtkFileChooserAction action, GtkEntry *entry); + GtkWidget* (*ui_button_new_with_image) (const gchar *stock_id, const gchar *text); + void (*ui_add_document_sensitive) (GtkWidget *widget); + void (*ui_widget_set_tooltip_text) (GtkWidget *widget, const gchar *text); + GtkWidget* (*ui_image_menu_item_new) (const gchar *stock_id, const gchar *label); + GtkWidget* (*ui_lookup_widget) (GtkWidget *widget, const gchar *widget_name); + void (*ui_progress_bar_start) (const gchar *text); + void (*ui_progress_bar_stop) (void); + void (*ui_entry_add_clear_icon) (GtkEntry *entry); + void (*ui_menu_add_document_items) (GtkMenu *menu, struct GeanyDocument *active, + GCallback callback); + void (*ui_widget_modify_font_from_string) (GtkWidget *widget, const gchar *str); + gboolean (*ui_is_keyval_enter_or_return) (guint keyval); + gint (*ui_get_gtk_settings_integer) (const gchar *property_name, gint default_value); } UIUtilsFuncs; @@ -411,12 +460,11 @@ /* See dialogs.h */ typedef struct DialogFuncs { - gboolean (*show_question) (const gchar *text, ...) G_GNUC_PRINTF (1, 2); - void (*show_msgbox) (GtkMessageType type, const gchar *text, ...) G_GNUC_PRINTF (2, 3); - gboolean (*show_save_as) (void); - gboolean (*show_input_numeric) (const gchar *title, const gchar *label_text, + gboolean (*dialogs_show_question) (const gchar *text, ...) G_GNUC_PRINTF (1, 2); + void (*dialogs_show_msgbox) (GtkMessageType type, const gchar *text, ...) G_GNUC_PRINTF (2, 3); + gboolean (*dialogs_show_save_as) (void); + gboolean (*dialogs_show_input_numeric) (const gchar *title, const gchar *label_text, gdouble *value, gdouble min, gdouble max, gdouble step); - } DialogFuncs; @@ -424,7 +472,7 @@ /* @deprecated Use ui_lookup_widget() instead. */ typedef struct SupportFuncs { - GtkWidget* (*lookup_widget) (GtkWidget *widget, const gchar *widget_name); + GtkWidget* (*support_lookup_widget) (GtkWidget *widget, const gchar *widget_name); } SupportFuncs; @@ -433,12 +481,12 @@ typedef struct MsgWinFuncs { /* status_add() does not set the status bar - use ui->set_statusbar() instead. */ - void (*status_add) (const gchar *format, ...) G_GNUC_PRINTF (1, 2); - void (*compiler_add) (gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3); - void (*msg_add) (gint msg_color, gint line, struct GeanyDocument *doc, + void (*msgwin_status_add) (const gchar *format, ...) G_GNUC_PRINTF (1, 2); + void (*msgwin_compiler_add) (gint msg_color, const gchar *format, ...) G_GNUC_PRINTF (2, 3); + void (*msgwin_msg_add) (gint msg_color, gint line, struct GeanyDocument *doc, const gchar *format, ...) G_GNUC_PRINTF (4, 5); - void (*clear_tab) (gint tabnum); - void (*switch_tab) (gint tabnum, gboolean show); + void (*msgwin_clear_tab) (gint tabnum); + void (*msgwin_switch_tab) (gint tabnum, gboolean show); } MsgWinFuncs; @@ -446,10 +494,10 @@ /* See encodings.h */ typedef struct EncodingFuncs { - gchar* (*convert_to_utf8) (const gchar *buffer, gsize size, gchar **used_encoding); - gchar* (*convert_to_utf8_from_charset) (const gchar *buffer, gsize size, + gchar* (*encodings_convert_to_utf8) (const gchar *buffer, gsize size, gchar **used_encoding); + gchar* (*encodings_convert_to_utf8_from_charset) (const gchar *buffer, gsize size, const gchar *charset, gboolean fast); - const gchar* (*get_charset_from_index) (gint idx); + const gchar* (*encodings_get_charset_from_index) (gint idx); } EncodingFuncs; @@ -461,10 +509,12 @@ /* See keybindings.h */ typedef struct KeybindingFuncs { - void (*send_command) (guint group_id, guint key_id); - void (*set_item) (struct GeanyKeyGroup *group, gsize key_id, + void (*keybindings_send_command) (guint group_id, guint key_id); + struct GeanyKeyBinding* (*keybindings_set_item) (struct GeanyKeyGroup *group, gsize key_id, _GeanyKeyCallback callback, guint key, GdkModifierType mod, - gchar *name, gchar *label, GtkWidget *menu_item); + const gchar *name, const gchar *label, GtkWidget *menu_item); + struct GeanyKeyBinding* (*keybindings_get_item)(struct GeanyKeyGroup *group, gsize key_id); + } KeybindingFuncs; @@ -472,7 +522,8 @@ /* See highlighting.h */ typedef struct HighlightingFuncs { - const struct GeanyLexerStyle* (*get_style) (gint ft_id, gint style_id); + const struct GeanyLexerStyle* (*highlighting_get_style) (gint ft_id, gint style_id); + void (*highlighting_set_styles) (struct _ScintillaObject *sci, struct GeanyFiletype *ft); } HighlightingFuncs; @@ -480,9 +531,9 @@ /* See filetypes.h */ typedef struct FiletypeFuncs { - GeanyFiletype* (*detect_from_file) (const gchar *utf8_filename); - GeanyFiletype* (*lookup_by_name) (const gchar *name); - GeanyFiletype* (*index)(gint idx); + GeanyFiletype* (*filetypes_detect_from_file) (const gchar *utf8_filename); + GeanyFiletype* (*filetypes_lookup_by_name) (const gchar *name); + GeanyFiletype* (*filetypes_index)(gint idx); /* Remember to convert any filetype_id arguments to GeanyFiletype pointers in any * appended functions */ } @@ -492,7 +543,7 @@ /* See search.h */ typedef struct SearchFuncs { - void (*show_find_in_files_dialog) (const gchar *dir); + void (*search_show_find_in_files_dialog) (const gchar *dir); } SearchFuncs; @@ -500,13 +551,13 @@ /* See tagmanager/include */ typedef struct TagManagerFuncs { - gchar* (*get_real_path) (const gchar *file_name); - TMWorkObject* (*source_file_new) (const char *file_name, gboolean update, const char *name); - gboolean (*workspace_add_object) (TMWorkObject *work_object); - gboolean (*source_file_update) (TMWorkObject *source_file, gboolean force, + gchar* (*tm_get_real_path) (const gchar *file_name); + TMWorkObject* (*tm_source_file_new) (const char *file_name, gboolean update, const char *name); + gboolean (*tm_workspace_add_object) (TMWorkObject *work_object); + gboolean (*tm_source_file_update) (TMWorkObject *source_file, gboolean force, gboolean recurse, gboolean update_parent); - void (*work_object_free) (gpointer work_object); - gboolean (*workspace_remove_object) (TMWorkObject *w, gboolean do_free, gboolean update); + void (*tm_work_object_free) (gpointer work_object); + gboolean (*tm_workspace_remove_object) (TMWorkObject *w, gboolean do_free, gboolean update); } TagManagerFuncs; @@ -514,7 +565,7 @@ /* See navqueue.h */ typedef struct NavQueueFuncs { - gboolean (*goto_line) (struct GeanyDocument *old_doc, struct GeanyDocument *new_doc, + gboolean (*navqueue_goto_line) (struct GeanyDocument *old_doc, struct GeanyDocument *new_doc, gint line); } NavQueueFuncs; @@ -525,43 +576,108 @@ /* See editor.h */ typedef struct EditorFuncs { - const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor); - struct _ScintillaObject* (*create_widget)(struct GeanyEditor *editor); - - void (*indicator_set_on_range) (struct GeanyEditor *editor, gint indic, gint start, gint end); - void (*indicator_set_on_line) (struct GeanyEditor *editor, gint indic, gint line); - void (*indicator_clear) (struct GeanyEditor *editor, gint indic); - - void (*set_indent_type)(struct GeanyEditor *editor, GeanyIndentType type); - gchar* (*get_word_at_pos) (struct GeanyEditor *editor, gint pos, const gchar *wordchars); + const struct GeanyIndentPrefs* (*editor_get_indent_prefs)(struct GeanyEditor *editor); + struct _ScintillaObject* (*editor_create_widget)(struct GeanyEditor *editor); - /* Remember to convert any GeanyDocument or ScintillaObject pointers in any - * appended functions to GeanyEditor pointers. */ + void (*editor_indicator_set_on_range) (struct GeanyEditor *editor, gint indic, gint start, gint end); + void (*editor_indicator_set_on_line) (struct GeanyEditor *editor, gint indic, gint line); + void (*editor_indicator_clear) (struct GeanyEditor *editor, gint indic); + + void (*editor_set_indent_type)(struct GeanyEditor *editor, GeanyIndentType type); + gchar* (*editor_get_word_at_pos) (struct GeanyEditor *editor, gint pos, const gchar *wordchars); + + const gchar* (*editor_get_eol_char_name) (struct GeanyEditor *editor); + gint (*editor_get_eol_char_len) (struct GeanyEditor *editor); + const gchar* (*editor_get_eol_char) (struct GeanyEditor *editor); + + void (*editor_insert_text_block) (struct GeanyEditor *editor, const gchar *text, + gint insert_pos, gint cursor_index, gint newline_indent_size, + gboolean replace_newlines); } EditorFuncs; -/* See plugins.c */ +/* avoid including keybindings.h */ +typedef gboolean (*_GeanyKeyGroupCallback) (guint key_id); + +/* See pluginutils.c */ typedef struct PluginFuncs { - void (*add_toolbar_item)(GeanyPlugin *plugin, GtkToolItem *item); - void (*module_make_resident) (GeanyPlugin *plugin); - void (*signal_connect) (GeanyPlugin *plugin, - GObject *object, gchar *signal_name, gboolean after, + void (*plugin_add_toolbar_item)(GeanyPlugin *plugin, GtkToolItem *item); + void (*plugin_module_make_resident) (GeanyPlugin *plugin); + void (*plugin_signal_connect) (GeanyPlugin *plugin, + GObject *object, const gchar *signal_name, gboolean after, GCallback callback, gpointer user_data); + struct GeanyKeyGroup* (*plugin_set_key_group)(GeanyPlugin *plugin, + const gchar *section_name, gsize count, _GeanyKeyGroupCallback callback); + void (*plugin_show_configure)(GeanyPlugin *plugin); } PluginFuncs; +struct StashGroup; + +/* See stash.h */ +typedef struct StashFuncs +{ + struct StashGroup *(*stash_group_new)(const gchar *name); + void (*stash_group_add_boolean)(struct StashGroup *group, gboolean *setting, + const gchar *key_name, gboolean default_value); + void (*stash_group_add_integer)(struct StashGroup *group, gint *setting, + const gchar *key_name, gint default_value); + void (*stash_group_add_string)(struct StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value); + void (*stash_group_add_string_vector)(struct StashGroup *group, gchar ***setting, + const gchar *key_name, const gchar **default_value); + void (*stash_group_load_from_key_file)(struct StashGroup *group, GKeyFile *keyfile); + void (*stash_group_save_to_key_file)(struct StashGroup *group, GKeyFile *keyfile); + void (*stash_group_free)(struct StashGroup *group); + gboolean (*stash_group_load_from_file)(struct StashGroup *group, const gchar *filename); + gint (*stash_group_save_to_file)(struct StashGroup *group, const gchar *filename, + GKeyFileFlags flags); + void (*stash_group_add_toggle_button)(struct StashGroup *group, gboolean *setting, + const gchar *key_name, gboolean default_value, gpointer widget_id); + void (*stash_group_add_radio_buttons)(struct StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, + gpointer widget_id, gint enum_id, ...) G_GNUC_NULL_TERMINATED; + void (*stash_group_add_spin_button_integer)(struct StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, gpointer widget_id); + void (*stash_group_add_combo_box)(struct StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, gpointer widget_id); + void (*stash_group_add_combo_box_entry)(struct StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value, gpointer widget_id); + void (*stash_group_add_entry)(struct StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value, gpointer widget_id); + void (*stash_group_add_widget_property)(struct StashGroup *group, gpointer setting, + const gchar *key_name, gpointer default_value, gpointer widget_id, + const gchar *property_name, GType type); + void (*stash_group_display)(struct StashGroup *group, GtkWidget *owner); + void (*stash_group_update)(struct StashGroup *group, GtkWidget *owner); +} +StashFuncs; + + +/* See symbols.h */ +typedef struct SymbolsFuncs +{ + const gchar* (*symbols_get_context_separator)(gint ft_id); +} +SymbolsFuncs; + + /* Deprecated aliases */ #ifndef GEANY_DISABLE_DEPRECATED -/** @c NULL-safe way to get the index of @a doc_ptr in the documents array. */ +/** @deprecated - copy into your plugin code if needed. + * @c NULL-safe way to get the index of @a doc_ptr in the documents array. */ #define DOC_IDX(doc_ptr) \ (doc_ptr ? doc_ptr->index : -1) #define DOC_IDX_VALID(doc_idx) \ ((doc_idx) >= 0 && (guint)(doc_idx) < documents_array->len && documents[doc_idx]->is_valid) +#define GEANY_WINDOW_MINIMAL_WIDTH 550 +#define GEANY_WINDOW_MINIMAL_HEIGHT GEANY_DEFAULT_DIALOG_HEIGHT + #endif /* GEANY_DISABLE_DEPRECATED */ #endif diff -Nru geany-0.18/src/pluginprivate.h geany-0.19/src/pluginprivate.h --- geany-0.18/src/pluginprivate.h 2009-07-30 12:56:25.000000000 +0100 +++ geany-0.19/src/pluginprivate.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * pluginprivate.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Nick Treleaven - * Copyright 2009 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven + * Copyright 2009-2010 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 @@ -19,14 +19,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: pluginprivate.h 4047 2009-07-30 11:56:25Z ntrel $ + * $Id: pluginprivate.h 4518 2010-01-01 22:55:18Z eht16 $ */ #ifndef PLUGINPRIVATE_H #define PLUGINPRIVATE_H -#include "ui_utils.h" +#include "plugindata.h" +#include "ui_utils.h" /* GeanyAutoSeparator */ +#include "keybindings.h" /* GeanyKeyGroup */ + typedef struct SignalConnection { @@ -35,13 +38,29 @@ } SignalConnection; + typedef struct GeanyPluginPrivate { + GModule *module; + gchar *filename; /* plugin filename (/path/libname.so) */ + PluginInfo info; /* plugin name, description, etc */ + GeanyPlugin public; /* fields the plugin can read */ + + void (*init) (GeanyData *data); /* Called when the plugin is enabled */ + GtkWidget* (*configure) (GtkDialog *dialog); /* plugins configure dialog, optional */ + void (*configure_single) (GtkWidget *parent); /* plugin configure dialog, optional */ + void (*help) (void); /* Called when the plugin should show some help, optional */ + void (*cleanup) (void); /* Called when the plugin is disabled or when Geany exits */ + + /* extra stuff */ + PluginFields fields; + GeanyKeyGroup *key_group; GeanyAutoSeparator toolbar_separator; - gboolean resident; - GArray *signal_ids; /* SignalConnection's to disconnect when unloading */ + GArray *signal_ids; /* SignalConnection's to disconnect when unloading */ } GeanyPluginPrivate; +typedef GeanyPluginPrivate Plugin; /* shorter alias */ + #endif /* PLUGINPRIVATE_H */ diff -Nru geany-0.18/src/plugins.c geany-0.19/src/plugins.c --- geany-0.18/src/plugins.c 2009-07-30 12:56:25.000000000 +0100 +++ geany-0.19/src/plugins.c 2010-05-30 19:05:18.000000000 +0100 @@ -1,8 +1,8 @@ /* * plugins.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: plugins.c 4047 2009-07-30 11:56:25Z ntrel $ + * $Id: plugins.c 4963 2010-05-30 18:05:18Z eht16 $ */ /* Code to manage, load and unload plugins. */ @@ -57,29 +57,14 @@ #include "main.h" #include "toolbar.h" #include "stash.h" +#include "symbols.h" #include "keyfile.h" #include "win32.h" #include "pluginutils.h" #include "pluginprivate.h" -typedef struct Plugin -{ - GModule *module; - gchar *filename; /* plugin filename (/path/libname.so) */ - PluginInfo info; /* plugin name, description, etc */ - PluginFields fields; - GeanyPlugin public; /* fields the plugin can read */ - GeanyPluginPrivate priv; /* GeanyPlugin type private data, same as (*public.priv) */ - - GeanyKeyGroup *key_group; - - void (*init) (GeanyData *data); /* Called when the plugin is enabled */ - GtkWidget* (*configure) (GtkDialog *dialog); /* plugin configure dialog, optional */ - void (*help) (void); /* Called when the plugin should show some help, optional */ - void (*cleanup) (void); /* Called when the plugin is disabled or when Geany exits */ -} -Plugin; +GList *active_plugin_list = NULL; /* list of only actually loaded plugins, always valid */ static gboolean want_plugins = FALSE; @@ -87,7 +72,6 @@ /* list of all available, loadable plugins, only valid as long as the plugin manager dialog is * opened, afterwards it will be destroyed */ static GList *plugin_list = NULL; -static GList *active_plugin_list = NULL; /* list of only actually loaded plugins, always valid */ static gchar **active_plugins_pref = NULL; /* list of plugin filenames to load at startup */ static GList *failed_plugins_list = NULL; /* plugins the user wants active but can't be used */ @@ -99,7 +83,9 @@ static PluginFuncs plugin_funcs = { &plugin_add_toolbar_item, &plugin_module_make_resident, - &plugin_signal_connect + &plugin_signal_connect, + &plugin_set_key_group, + &plugin_show_configure }; static DocumentFuncs doc_funcs = { @@ -121,7 +107,8 @@ &document_save_file_as, &document_rename_file, &document_get_status_color, - &document_get_basename_for_display + &document_get_basename_for_display, + &document_get_notebook_page }; static EditorFuncs editor_funcs = { @@ -131,7 +118,11 @@ &editor_indicator_set_on_line, &editor_indicator_clear, &editor_set_indent_type, - &editor_get_word_at_pos + &editor_get_word_at_pos, + &editor_get_eol_char_name, + &editor_get_eol_char_len, + &editor_get_eol_char, + &editor_insert_text_block }; static ScintillaFuncs scintilla_funcs = { @@ -183,7 +174,18 @@ &sci_get_contents, &sci_get_contents_range, &sci_get_selection_contents, - &sci_set_font + &sci_set_font, + &sci_get_line_end_position, + &sci_set_target_start, + &sci_set_target_end, + &sci_replace_target, + &sci_set_marker_at_line, + &sci_delete_marker_at_line, + &sci_is_marker_set_at_line, + &sci_goto_line, + &sci_find_text, + &sci_set_line_indentation, + &sci_get_line_indentation }; static TemplateFuncs template_funcs = { @@ -209,7 +211,9 @@ &utils_open_browser, &utils_string_replace_first, &utils_str_middle_truncate, - &utils_str_remove_chars + &utils_str_remove_chars, + &utils_get_file_list_full, + &utils_copy_environment }; static UIUtilsFuncs uiutils_funcs = { @@ -225,7 +229,11 @@ &ui_lookup_widget, &ui_progress_bar_start, &ui_progress_bar_stop, - &ui_entry_add_clear_icon + &ui_entry_add_clear_icon, + &ui_menu_add_document_items, + &ui_widget_modify_font_from_string, + &ui_is_keyval_enter_or_return, + &ui_get_gtk_settings_integer }; static DialogFuncs dialog_funcs = { @@ -259,7 +267,8 @@ static KeybindingFuncs keybindings_funcs = { &keybindings_send_command, - &keybindings_set_item + &keybindings_set_item, + &keybindings_get_item }; static TagManagerFuncs tagmanager_funcs = { @@ -276,7 +285,8 @@ }; static HighlightingFuncs highlighting_funcs = { - &highlighting_get_style + &highlighting_get_style, + &highlighting_set_styles }; static FiletypeFuncs filetype_funcs = { @@ -291,7 +301,34 @@ static MainFuncs main_funcs = { &main_reload_configuration, - &main_locale_init + &main_locale_init, + &main_is_realized +}; + +static StashFuncs stash_funcs = { + &stash_group_new, + &stash_group_add_boolean, + &stash_group_add_integer, + &stash_group_add_string, + &stash_group_add_string_vector, + &stash_group_load_from_key_file, + &stash_group_save_to_key_file, + &stash_group_free, + &stash_group_load_from_file, + &stash_group_save_to_file, + &stash_group_add_toggle_button, + &stash_group_add_radio_buttons, + &stash_group_add_spin_button_integer, + &stash_group_add_combo_box, + &stash_group_add_combo_box_entry, + &stash_group_add_entry, + &stash_group_add_widget_property, + &stash_group_display, + &stash_group_update +}; + +static SymbolsFuncs symbols_funcs = { + &symbols_get_context_separator }; static GeanyFunctions geany_functions = { @@ -314,7 +351,9 @@ &main_funcs, &plugin_funcs, &scintilla_funcs, - &msgwin_funcs + &msgwin_funcs, + &stash_funcs, + &symbols_funcs }; static GeanyData geany_data; @@ -464,42 +503,40 @@ } -static void -add_kb_group(Plugin *plugin) +static void read_key_group(Plugin *plugin) { - guint i; - - if (!NZV(plugin->key_group->name)) - { - geany_debug("Plugin \"%s\" has not set a name for its keybinding group" - " - ignoring all keybindings!", - plugin->info.name); - return; - } - g_return_if_fail(! g_str_equal(plugin->key_group->name, keybindings_keyfile_group_name)); + GeanyKeyGroupInfo *p_key_info; + GeanyKeyGroup **p_key_group; - for (i = 0; i < plugin->key_group->count; i++) + g_module_symbol(plugin->module, "plugin_key_group_info", (void *) &p_key_info); + g_module_symbol(plugin->module, "plugin_key_group", (void *) &p_key_group); + if (p_key_info && p_key_group) { - GeanyKeyBinding *kb = &plugin->key_group->keys[i]; + GeanyKeyGroupInfo *key_info = p_key_info; - if (!NZV(kb->name)) + if (*p_key_group) + geany_debug("Ignoring plugin_key_group symbol for plugin '%s' - " + "use plugin_set_key_group() instead to allocate keybindings dynamically.", + plugin->info.name); + else { - geany_debug("Plugin \"%s\" has not set a name for keybinding %d" - " - ignoring all keybindings!", - plugin->info.name, i); - plugin->key_group->count = 0; - break; + if (key_info->count) + { + GeanyKeyGroup *key_group = + plugin_set_key_group(&plugin->public, key_info->name, key_info->count, NULL); + if (key_group) + *p_key_group = key_group; + } + else + geany_debug("Ignoring plugin_key_group_info symbol for plugin '%s' - " + "count field is zero. Maybe use plugin_set_key_group() instead?", + plugin->info.name); } } - if (plugin->key_group->count == 0) - { - plugin->key_group = NULL; /* Ignore the group (maybe the plugin has optional KB) */ - return; - } - - plugin->key_group->label = plugin->info.name; - - g_ptr_array_add(keybinding_groups, plugin->key_group); + else if (p_key_info || p_key_group) + geany_debug("Ignoring only one of plugin_key_group[_info] symbols defined for plugin '%s'. " + "Maybe use plugin_set_key_group() instead?", + plugin->info.name); } @@ -510,35 +547,32 @@ PluginCallback *callbacks; PluginInfo **p_info; PluginFields **plugin_fields; - GeanyData **p_geany_data; - GeanyFunctions **p_geany_functions; - /* set these symbols before plugin_init() is called */ + /* set these symbols before plugin_init() is called + * we don't set geany_functions and geany_data since they are set directly by plugin_new() */ g_module_symbol(plugin->module, "geany_plugin", (void *) &p_geany_plugin); if (p_geany_plugin) *p_geany_plugin = &plugin->public; g_module_symbol(plugin->module, "plugin_info", (void *) &p_info); if (p_info) *p_info = &plugin->info; - g_module_symbol(plugin->module, "geany_data", (void *) &p_geany_data); - if (p_geany_data) - *p_geany_data = &geany_data; - g_module_symbol(plugin->module, "geany_functions", (void *) &p_geany_functions); - if (p_geany_functions) - *p_geany_functions = &geany_functions; g_module_symbol(plugin->module, "plugin_fields", (void *) &plugin_fields); if (plugin_fields) *plugin_fields = &plugin->fields; + read_key_group(plugin); /* start the plugin */ g_return_if_fail(plugin->init); plugin->init(&geany_data); - if (p_geany_plugin && (*p_geany_plugin)->priv->resident) - g_module_make_resident(plugin->module); - /* store some function pointers for later use */ g_module_symbol(plugin->module, "plugin_configure", (void *) &plugin->configure); + g_module_symbol(plugin->module, "plugin_configure_single", (void *) &plugin->configure_single); + if (app->debug_mode && plugin->configure && plugin->configure_single) + g_warning("Plugin '%s' implements plugin_configure_single() unnecessarily - " + "only plugin_configure() will be used!", + plugin->info.name); + g_module_symbol(plugin->module, "plugin_help", (void *) &plugin->help); g_module_symbol(plugin->module, "plugin_cleanup", (void *) &plugin->cleanup); if (plugin->cleanup == NULL) @@ -559,10 +593,6 @@ if (callbacks) add_callbacks(plugin, callbacks); - g_module_symbol(plugin->module, "plugin_key_group", (void *) &plugin->key_group); - if (plugin->key_group) - add_kb_group(plugin); - /* remember which plugins are active */ active_plugin_list = g_list_append(active_plugin_list, plugin); @@ -581,6 +611,8 @@ { Plugin *plugin; GModule *module; + GeanyData **p_geany_data; + GeanyFunctions **p_geany_functions; void (*plugin_set_info)(PluginInfo*); g_return_val_if_fail(fname, NULL); @@ -638,6 +670,14 @@ plugin = g_new0(Plugin, 1); + /* set basic fields here to allow plugins to call Geany functions in set_info() */ + g_module_symbol(module, "geany_data", (void *) &p_geany_data); + if (p_geany_data) + *p_geany_data = &geany_data; + g_module_symbol(module, "geany_functions", (void *) &p_geany_functions); + if (p_geany_functions) + *p_geany_functions = &geany_functions; + /* read plugin name, etc. */ plugin_set_info(&plugin->info); if (!NZV(plugin->info.name)) @@ -667,7 +707,7 @@ plugin->filename = g_strdup(fname); plugin->module = module; plugin->public.info = &plugin->info; - plugin->public.priv = &plugin->priv; + plugin->public.priv = plugin; if (init_plugin) plugin_init(plugin); @@ -681,7 +721,7 @@ static void remove_callbacks(Plugin *plugin) { - GArray *signal_ids = plugin->priv.signal_ids; + GArray *signal_ids = plugin->signal_ids; SignalConnection *sc; if (signal_ids == NULL) @@ -712,9 +752,9 @@ remove_callbacks(plugin); if (plugin->key_group) - g_ptr_array_remove_fast(keybinding_groups, plugin->key_group); + keybindings_free_group(plugin->key_group); - widget = plugin->priv.toolbar_separator.widget; + widget = plugin->toolbar_separator.widget; if (widget) gtk_widget_destroy(widget); @@ -937,7 +977,7 @@ /* called even if plugin support is disabled */ void plugins_init(void) { - GeanyPrefGroup *group; + StashGroup *group; group = stash_group_new("plugins"); configuration_add_pref_group(group, TRUE); @@ -969,6 +1009,25 @@ } +/* Check whether there are any plugins loaded which provide a configure symbol */ +gboolean plugins_have_preferences(void) +{ + GList *item; + + if (active_plugin_list == NULL) + return FALSE; + + foreach_list(item, active_plugin_list) + { + Plugin *plugin = item->data; + if (plugin->configure != NULL || plugin->configure_single != NULL) + return TRUE; + } + + return FALSE; +} + + /* Plugin Manager */ enum @@ -996,7 +1055,18 @@ static PluginManagerWidgets pm_widgets; -void pm_selection_changed(GtkTreeSelection *selection, gpointer user_data) +static void pm_update_buttons(Plugin *p) +{ + gboolean is_active; + + is_active = is_active_plugin(p); + gtk_widget_set_sensitive(pm_widgets.configure_button, + (p->configure || p->configure_single) && is_active); + gtk_widget_set_sensitive(pm_widgets.help_button, p->help != NULL && is_active); +} + + +static void pm_selection_changed(GtkTreeSelection *selection, gpointer user_data) { GtkTreeIter iter; GtkTreeModel *model; @@ -1010,7 +1080,6 @@ { gchar *text; PluginInfo *pi; - gboolean is_active; pi = &p->info; text = g_strdup_printf( @@ -1020,9 +1089,7 @@ geany_wrap_label_set_text(GTK_LABEL(pm_widgets.description_label), text); g_free(text); - is_active = is_active_plugin(p); - gtk_widget_set_sensitive(pm_widgets.configure_button, p->configure != NULL && is_active); - gtk_widget_set_sensitive(pm_widgets.help_button, p->help != NULL && is_active); + pm_update_buttons(p); } } } @@ -1031,7 +1098,6 @@ static void pm_plugin_toggled(GtkCellRendererToggle *cell, gchar *pth, gpointer data) { gboolean old_state, state; - gboolean is_active; gchar *file_name; GtkTreeIter iter; GtkTreePath *path = gtk_tree_path_new_from_string(pth); @@ -1042,7 +1108,11 @@ gtk_tree_model_get(GTK_TREE_MODEL(pm_widgets.store), &iter, PLUGIN_COLUMN_CHECK, &old_state, PLUGIN_COLUMN_PLUGIN, &p, -1); - g_return_if_fail(p != NULL); + + /* no plugins item */ + if (p == NULL) + return; + state = ! old_state; /* toggle the state */ /* save the filename of the plugin */ @@ -1057,20 +1127,25 @@ /* reload plugin module and initialize it if item is checked */ p = plugin_new(file_name, state, TRUE); - if (state) - keybindings_load_keyfile(); /* load shortcuts */ + if (!p) + { + /* plugin file may no longer be on disk, or is now incompatible */ + gtk_list_store_remove(pm_widgets.store, &iter); + } + else + { + if (state) + keybindings_load_keyfile(); /* load shortcuts */ - /* update model */ - gtk_list_store_set(pm_widgets.store, &iter, - PLUGIN_COLUMN_CHECK, state, - PLUGIN_COLUMN_PLUGIN, p, -1); + /* update model */ + gtk_list_store_set(pm_widgets.store, &iter, + PLUGIN_COLUMN_CHECK, state, + PLUGIN_COLUMN_PLUGIN, p, -1); + /* set again the sensitiveness of the configure and help buttons */ + pm_update_buttons(p); + } g_free(file_name); - - /* set again the sensitiveness of the configure and help buttons */ - is_active = is_active_plugin(p); - gtk_widget_set_sensitive(pm_widgets.configure_button, p->configure != NULL && is_active); - gtk_widget_set_sensitive(pm_widgets.help_button, p->help != NULL && is_active); } @@ -1138,40 +1213,7 @@ } -static void configure_plugin(Plugin *p) -{ - GtkWidget *parent = pm_widgets.dialog; - GtkWidget *prefs_page, *dialog, *vbox; - - dialog = gtk_dialog_new_with_buttons(p->info.name, - GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_widget_set_name(dialog, "GeanyDialog"); - - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_show(vbox); - - prefs_page = p->configure(GTK_DIALOG(dialog)); - - if (! GTK_IS_WIDGET(prefs_page)) - { - geany_debug("Invalid widget returned from plugin_configure() in plugin \"%s\"!", - p->info.name); - } - else - { - gtk_container_add(GTK_CONTAINER(vbox), prefs_page); - - /* run the dialog */ - while (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_APPLY); - } - gtk_widget_destroy(dialog); -} - - -void pm_on_plugin_button_clicked(GtkButton *button, gpointer user_data) +static void pm_on_plugin_button_clicked(GtkButton *button, gpointer user_data) { GtkTreeModel *model; GtkTreeSelection *selection; @@ -1186,7 +1228,7 @@ if (p != NULL) { if (GPOINTER_TO_INT(user_data) == PM_BUTTON_CONFIGURE) - configure_plugin(p); + plugin_show_configure(&p->public); else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_HELP && p->help != NULL) p->help(); } @@ -1247,8 +1289,7 @@ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin), pm_widgets.tree); - label = geany_wrap_label_new(_("Below is a list of available plugins. " - "Select the plugins which should be loaded when Geany is started.")); + label = geany_wrap_label_new(_("Choose which plugins should be loaded at startup:")); pm_widgets.configure_button = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES); gtk_widget_set_sensitive(pm_widgets.configure_button, FALSE); diff -Nru geany-0.18/src/plugins.h geany-0.19/src/plugins.h --- geany-0.18/src/plugins.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/plugins.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * plugins.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: plugins.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: plugins.h 4518 2010-01-01 22:55:18Z eht16 $ */ @@ -28,12 +28,17 @@ #ifdef HAVE_PLUGINS +extern GList *active_plugin_list; + + void plugins_init(void); void plugins_finalize(void); void plugins_load_active(void); +gboolean plugins_have_preferences(void); + #endif #endif diff -Nru geany-0.18/src/pluginutils.c geany-0.19/src/pluginutils.c --- geany-0.18/src/pluginutils.c 2009-07-30 12:56:25.000000000 +0100 +++ geany-0.19/src/pluginutils.c 2010-05-23 11:49:10.000000000 +0100 @@ -1,8 +1,8 @@ /* * pluginutils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Nick Treleaven - * Copyright 2009 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven + * Copyright 2009-2010 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 @@ -19,22 +19,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: pluginutils.c 4047 2009-07-30 11:56:25Z ntrel $ + * $Id: pluginutils.c 4950 2010-05-23 10:49:10Z eht16 $ */ -/** @file pluginutils.c +/** @file pluginutils.h * Plugin utility functions. * These functions all take the @ref geany_plugin symbol as their first argument. */ #include "geany.h" + +#ifdef HAVE_PLUGINS + #include "pluginutils.h" #include "pluginprivate.h" #include "ui_utils.h" #include "toolbar.h" +#include "utils.h" +#include "support.h" +#include "plugins.h" -/** Insert a toolbar item before the Quit button, or after the previous plugin toolbar item. +/** Inserts a toolbar item before the Quit button, or after the previous plugin toolbar item. * A separator is added on the first call to this function, and will be shown when @a item is * shown; hidden when @a item is hidden. * @note You should still destroy @a item yourself, usually in @ref plugin_cleanup(). @@ -88,11 +94,11 @@ { g_return_if_fail(plugin); - plugin->priv->resident = TRUE; + g_module_make_resident(plugin->priv->module); } -/** Connect a signal which will be disconnected on unloading the plugin, to prevent a possible segfault. +/** Connects a signal which will be disconnected on unloading the plugin, to prevent a possible segfault. * @param plugin Must be @ref geany_plugin. * @param object Object to connect to, or @c NULL when using @link signals Geany signals @endlink. * @param signal_name The name of the signal. For a list of available @@ -103,7 +109,7 @@ * @param user_data The user data passed to the signal handler. * @see plugin_callbacks. */ void plugin_signal_connect(GeanyPlugin *plugin, - GObject *object, gchar *signal_name, gboolean after, + GObject *object, const gchar *signal_name, gboolean after, GCallback callback, gpointer user_data) { gulong id; @@ -125,3 +131,145 @@ } +/** Sets up or resizes a keybinding group for the plugin. + * You should then call keybindings_set_item() for each keybinding in the group. + * @param plugin Must be @ref geany_plugin. + * @param section_name Name used in the configuration file, such as @c "html_chars". + * @param count Number of keybindings for the group. + * @param callback Group callback, or @c NULL if you only want individual keybinding callbacks. + * @return The plugin's keybinding group. + * @since 0.19. */ +GeanyKeyGroup *plugin_set_key_group(GeanyPlugin *plugin, + const gchar *section_name, gsize count, GeanyKeyGroupCallback callback) +{ + Plugin *priv = plugin->priv; + + priv->key_group = keybindings_set_group(priv->key_group, section_name, + priv->info.name, count, callback); + return priv->key_group; +} + + +static void on_pref_btn_clicked(gpointer btn, Plugin *p) +{ + p->configure_single(main_widgets.window); +} + + +static GtkWidget *create_pref_page(Plugin *p, GtkWidget *dialog) +{ + GtkWidget *page = NULL; /* some plugins don't have prefs */ + + if (p->configure) + { + page = p->configure(GTK_DIALOG(dialog)); + + if (! GTK_IS_WIDGET(page)) + { + geany_debug("Invalid widget returned from plugin_configure() in plugin \"%s\"!", + p->info.name); + return NULL; + } + else + { + GtkWidget *align = gtk_alignment_new(0.5, 0.5, 1, 1); + + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 6, 6, 6, 6); + gtk_container_add(GTK_CONTAINER(align), page); + page = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(page), align, TRUE, TRUE, 0); + } + } + else if (p->configure_single) + { + GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0, 0); + GtkWidget *btn; + + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 6, 6, 6, 6); + + btn = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES); + g_signal_connect(btn, "clicked", G_CALLBACK(on_pref_btn_clicked), p); + gtk_container_add(GTK_CONTAINER(align), btn); + page = align; + } + return page; +} + + +/* multiple plugin configure dialog + * current_plugin can be NULL */ +static void configure_plugins(Plugin *current_plugin) +{ + GtkWidget *dialog, *vbox, *nb; + GList *node; + gint cur_page = -1; + + dialog = gtk_dialog_new_with_buttons(_("Configure Plugins"), + GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_widget_set_name(dialog, "GeanyDialog"); + + vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + nb = gtk_notebook_new(); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(nb), TRUE); + gtk_container_add(GTK_CONTAINER(vbox), nb); + + foreach_list(node, active_plugin_list) + { + Plugin *p = node->data; + GtkWidget *page = create_pref_page(p, dialog); + + if (page) + { + GtkWidget *label = gtk_label_new(p->info.name); + gint n = gtk_notebook_append_page(GTK_NOTEBOOK(nb), page, label); + + if (p == current_plugin) + cur_page = n; + } + } + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(nb))) + { + gtk_widget_show_all(vbox); + if (cur_page >= 0) + gtk_notebook_set_current_page(GTK_NOTEBOOK(nb), cur_page); + + /* run the dialog */ + while (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_APPLY); + } + else + utils_beep(); + + gtk_widget_destroy(dialog); +} + + +/** Shows the plugin's configure dialog. + * The plugin must implement one of the plugin_configure() or plugin_configure_single() symbols. + * @param plugin Must be @ref geany_plugin. + * @since 0.19. */ +/* if NULL, show all plugins */ +void plugin_show_configure(GeanyPlugin *plugin) +{ + Plugin *p; + + if (!plugin) + { + configure_plugins(NULL); + return; + } + p = plugin->priv; + + if (p->configure) + configure_plugins(p); + else + { + g_return_if_fail(p->configure_single); + p->configure_single(main_widgets.window); + } +} + + +#endif diff -Nru geany-0.18/src/pluginutils.h geany-0.19/src/pluginutils.h --- geany-0.18/src/pluginutils.h 2009-07-29 18:40:20.000000000 +0100 +++ geany-0.19/src/pluginutils.h 2010-04-22 13:03:37.000000000 +0100 @@ -1,8 +1,8 @@ /* * pluginutils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Nick Treleaven - * Copyright 2009 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven + * Copyright 2009-2010 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 @@ -19,21 +19,34 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: pluginutils.h 4041 2009-07-29 17:40:20Z ntrel $ + * $Id: pluginutils.h 4850 2010-04-22 12:03:37Z ntrel $ */ #ifndef PLUGINUTILS_H #define PLUGINUTILS_H -#include "plugindata.h" +#ifdef HAVE_PLUGINS -void plugin_add_toolbar_item(GeanyPlugin *plugin, GtkToolItem *item); +#include "keybindings.h" /* GeanyKeyGroupCallback */ -void plugin_module_make_resident(GeanyPlugin *plugin); -void plugin_signal_connect(GeanyPlugin *plugin, - GObject *object, gchar *signal_name, gboolean after, +/* avoid including plugindata.h otherwise this redefines the GEANY() macro */ +struct GeanyPlugin; + + +void plugin_add_toolbar_item(struct GeanyPlugin *plugin, GtkToolItem *item); + +void plugin_module_make_resident(struct GeanyPlugin *plugin); + +void plugin_signal_connect(struct GeanyPlugin *plugin, + GObject *object, const gchar *signal_name, gboolean after, GCallback callback, gpointer user_data); +struct GeanyKeyGroup *plugin_set_key_group(struct GeanyPlugin *plugin, + const gchar *section_name, gsize count, GeanyKeyGroupCallback callback); + +void plugin_show_configure(struct GeanyPlugin *plugin); + +#endif /* HAVE_PLUGINS */ #endif /* PLUGINUTILS_H */ diff -Nru geany-0.18/src/prefix.c geany-0.19/src/prefix.c --- geany-0.18/src/prefix.c 2008-02-20 11:24:23.000000000 +0000 +++ geany-0.19/src/prefix.c 2010-05-16 18:45:21.000000000 +0100 @@ -39,7 +39,7 @@ #ifdef __GNUC__ #define br_return_val_if_fail(expr,val) if (!(expr)) {fprintf (stderr, "** BinReloc (%s): assertion %s failed\n", __PRETTY_FUNCTION__, #expr); return val;} #else - #define br_return_val_if_fail(expr,val) if (!(expr)) return val + #define br_return_val_if_fail(expr, val) if (!(expr)) return val #endif /* __GNUC__ */ @@ -59,6 +59,7 @@ free (br_last_value); } + /** * br_thread_local_store: * str: A dynamically allocated string. @@ -205,18 +206,18 @@ tmp = g_strndup ((char *) path, end - path); if (!*tmp) { - free (tmp); + g_free (tmp); return strdup ("/"); } end = strrchr (tmp, '/'); if (!end) return tmp; result = g_strndup (tmp, end - tmp); - free (tmp); + g_free (tmp); if (!*result) { - free (result); + g_free (result); result = strdup ("/"); } @@ -287,6 +288,7 @@ return newpath; } + #else /* ENABLE_BINRELOC */ typedef int iso_c_forbids_an_empty_source_file; diff -Nru geany-0.18/src/prefs.c geany-0.19/src/prefs.c --- geany-0.18/src/prefs.c 2009-07-21 23:10:42.000000000 +0100 +++ geany-0.19/src/prefs.c 2010-05-16 19:22:24.000000000 +0100 @@ -1,8 +1,8 @@ /* * prefs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: prefs.c 4009 2009-07-21 22:10:42Z eht16 $ + * $Id: prefs.c 4929 2010-05-16 18:22:24Z eht16 $ + */ + +/* + * @file prefs.h + * Preferences dialog. */ /* @@ -48,7 +53,7 @@ #include "project.h" #include "editor.h" #include "main.h" -#include "treeviews.h" +#include "sidebar.h" #include "printing.h" #include "geanywraplabel.h" #include "templates.h" @@ -56,14 +61,13 @@ #include "toolbar.h" #include "stash.h" #include "keyfile.h" +#include "filetypes.h" +#include "win32.h" #ifdef HAVE_VTE # include "vte.h" #endif -#ifdef G_OS_WIN32 -# include "win32.h" -#endif GeanyPrefs prefs; @@ -80,13 +84,14 @@ static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data); static gboolean kb_keytype_dialog_response_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data); static void kb_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data); -static gboolean kb_find_duplicate(GeanyKeyBinding *search_kb, +static gboolean kb_find_duplicate(GtkWidget *parent, GeanyKeyBinding *search_kb, guint key, GdkModifierType mods, const gchar *action); static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data); +static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_radio_button_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_page_header_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -102,7 +107,7 @@ /* Synchronize Stash settings with widgets (see keyfile.c - init_pref_groups()). */ static void prefs_action(PrefCallbackAction action) { - GeanyPrefGroup *group; + StashGroup *group; guint i; foreach_ptr_array(group, i, pref_groups) @@ -296,7 +301,7 @@ { GtkTreeIter parent, iter; gsize g, i; - gchar *key_string; + gchar *key_string, *label; GeanyKeyGroup *group; GeanyKeyBinding *kb; @@ -315,11 +320,13 @@ { kb = &group->keys[i]; + label = keybindings_get_label(kb); key_string = gtk_accelerator_name(kb->key, kb->mods); gtk_tree_store_append(store, &iter, &parent); - gtk_tree_store_set(store, &iter, KB_TREE_ACTION, kb->label, + gtk_tree_store_set(store, &iter, KB_TREE_ACTION, label, KB_TREE_SHORTCUT, key_string, KB_TREE_INDEX, i, -1); g_free(key_string); + g_free(label); } } gtk_tree_view_expand_all(GTK_TREE_VIEW(tree)); @@ -368,6 +375,10 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_auto_focus"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), prefs.auto_focus); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_native_windows_dialogs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), + interface_prefs.use_native_windows_dialogs); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction"); gtk_entry_set_text(GTK_ENTRY(widget), tool_prefs.context_action_cmd); @@ -375,6 +386,10 @@ /* Interface settings */ + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ui_prefs.sidebar_visible); + on_sidebar_visible_toggled(GTK_TOGGLE_BUTTON(widget), NULL); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_symbol"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), interface_prefs.sidebar_symbol_visible); @@ -391,13 +406,15 @@ gtk_font_button_set_font_name(GTK_FONT_BUTTON(widget), interface_prefs.editor_font); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.long_line_column); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.long_line_global_column); + + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_long_line"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.long_line_global_enabled); - switch (editor_prefs.long_line_type) + switch (editor_prefs.long_line_global_type) { case 0: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_line"); break; case 1: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_background"); break; - default: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_disabled"); break; } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); @@ -441,6 +458,8 @@ case 1: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_text"); break; default: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_imagetext"); break; } + if (toolbar_prefs.use_gtk_default_style) + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_style_default"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); switch (toolbar_prefs.icon_size) @@ -451,6 +470,8 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_small"); break; default: widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_verysmall"); break; } + if (toolbar_prefs.use_gtk_default_icon) + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_icon_default"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); /* disable elements if toolbar is hidden */ @@ -465,6 +486,8 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_tab_left"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_tab_beside"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), file_prefs.tab_order_beside); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); /* luckily the index of the combo box items match the index of the encodings array */ @@ -587,8 +610,6 @@ (editor_prefs.autoclose_chars & GEANY_AC_DQUOTE)); /* Tools Settings */ - if (tool_prefs.make_cmd) - gtk_entry_set_text(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")), tool_prefs.make_cmd); if (tool_prefs.term_cmd) gtk_entry_set_text(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term")), tool_prefs.term_cmd); @@ -741,10 +762,18 @@ GtkWidget *widget; guint i; guint autoclose_brackets[5]; + gboolean old_invert_all = interface_prefs.highlighting_invert_all; + gboolean old_sidebar_pos = interface_prefs.sidebar_pos; /* Synchronize Stash settings */ prefs_action(PREF_UPDATE); + if (interface_prefs.highlighting_invert_all != old_invert_all) + filetypes_reload(); + + if (interface_prefs.sidebar_pos != old_sidebar_pos) + ui_swap_sidebar_pos(); + /* General settings */ /* startup */ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_load_session"); @@ -775,6 +804,10 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_auto_focus"); prefs.auto_focus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_native_windows_dialogs"); + interface_prefs.use_native_windows_dialogs = + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction"); g_free(tool_prefs.context_action_cmd); tool_prefs.context_action_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); @@ -783,24 +816,27 @@ /* Interface settings */ + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"); + ui_prefs.sidebar_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_symbol"); interface_prefs.sidebar_symbol_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_openfiles"); interface_prefs.sidebar_openfiles_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_long_line"); + editor_prefs.long_line_global_enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_line"); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) editor_prefs.long_line_type = 0; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + editor_prefs.long_line_global_type = 0; else - { - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_long_line_background"); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) editor_prefs.long_line_type = 1; - else - { /* now only the disabled radio remains, so disable it */ - editor_prefs.long_line_type = 2; - } - } - if (editor_prefs.long_line_column == 0) editor_prefs.long_line_type = 2; + /* now only the "background" radio remains */ + editor_prefs.long_line_global_type = 1; + + if (editor_prefs.long_line_global_column == 0) + editor_prefs.long_line_global_enabled = FALSE; widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_show_notebook_tabs"); interface_prefs.show_notebook_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -827,36 +863,48 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_in_menu"); toolbar_prefs.append_to_menu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_imagetext"); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - toolbar_prefs.icon_style = 2; - else + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_style_default"); + toolbar_prefs.use_gtk_default_style = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + if (! toolbar_prefs.use_gtk_default_style) { - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_image"); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_imagetext"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - toolbar_prefs.icon_style = 0; + toolbar_prefs.icon_style = 2; else - /* now only the text only radio remains, so set text only */ - toolbar_prefs.icon_style = 1; + { + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_image"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + toolbar_prefs.icon_style = 0; + else + /* now only the text only radio remains, so set text only */ + toolbar_prefs.icon_style = 1; + } } - - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_large"); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - toolbar_prefs.icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR; - else - { - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_small"); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_icon_default"); + toolbar_prefs.use_gtk_default_icon = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + if (! toolbar_prefs.use_gtk_default_icon) + { toolbar_prefs.icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR; + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_large"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - toolbar_prefs.icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; + toolbar_prefs.icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR; else - toolbar_prefs.icon_size = GTK_ICON_SIZE_MENU; + { + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_toolbar_small"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + toolbar_prefs.icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; + else + toolbar_prefs.icon_size = GTK_ICON_SIZE_MENU; + } } /* Files settings */ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_tab_right"); file_prefs.tab_order_ltr = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_tab_beside"); + file_prefs.tab_order_beside = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); file_prefs.default_new_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); @@ -890,7 +938,7 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); /* note: use stash for new code - it updates spin buttons itself */ gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); - editor_prefs.long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + editor_prefs.long_line_global_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_folding"); editor_prefs.folding = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -979,9 +1027,6 @@ | (autoclose_brackets[4] ? GEANY_AC_DQUOTE : 0); /* Tools Settings */ - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make"); - g_free(tool_prefs.make_cmd); - tool_prefs.make_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term"); g_free(tool_prefs.term_cmd); @@ -1105,7 +1150,7 @@ /* apply the changes made */ ui_statusbar_showhide(interface_prefs.statusbar_visible); - treeviews_openfiles_update_all(); /* to update if full path setting has changed */ + sidebar_openfiles_update_all(); /* to update if full path setting has changed */ toolbar_apply_settings(); toolbar_update_ui(); toolbar_show_hide(); @@ -1141,39 +1186,16 @@ } -void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data) +static void on_color_button_choose_cb(GtkColorButton *widget, gpointer user_data) { GdkColor color; - switch (GPOINTER_TO_INT(user_data)) - { - case 1: - { - gtk_color_button_get_color(widget, &color); - setptr(editor_prefs.long_line_color, utils_get_hex_from_color(&color)); - break; - } -#ifdef HAVE_VTE - case 2: - { - g_free(vc->colour_fore); - vc->colour_fore = g_new0(GdkColor, 1); - gtk_color_button_get_color(widget, vc->colour_fore); - break; - } - case 3: - { - g_free(vc->colour_back); - vc->colour_back = g_new0(GdkColor, 1); - gtk_color_button_get_color(widget, vc->colour_back); - break; - } -#endif - } + gtk_color_button_get_color(widget, &color); + setptr(editor_prefs.long_line_color, utils_get_hex_from_color(&color)); } -void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data) +static void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data) { const gchar *fontbtn = gtk_font_button_get_font_name(widget); guint i; @@ -1207,9 +1229,7 @@ ui_widget_modify_font_from_string(msgwindow.tree_compiler, interface_prefs.msgwin_font); ui_widget_modify_font_from_string(msgwindow.tree_msg, interface_prefs.msgwin_font); ui_widget_modify_font_from_string(msgwindow.tree_status, interface_prefs.msgwin_font); - ui_widget_modify_font_from_string( - ui_lookup_widget(main_widgets.window, "textview_scribble"), - interface_prefs.msgwin_font); + ui_widget_modify_font_from_string(msgwindow.scribble, interface_prefs.msgwin_font); break; } case 3: @@ -1217,17 +1237,6 @@ ui_set_editor_font(fontbtn); break; } -#ifdef HAVE_VTE - case 4: - { - /* VTE settings */ - if (strcmp(fontbtn, vc->font) == 0) - break; - setptr(vc->font, g_strdup(gtk_font_button_get_font_name(widget))); - vte_apply_user_settings(); - break; - } -#endif } } @@ -1265,13 +1274,12 @@ kb = kb_lookup_kb_from_iter(GTK_TREE_MODEL(store), &iter); - if (kb_find_duplicate(kb, lkey, lmods, new_text)) + if (kb_find_duplicate(ui_widgets.prefs_dialog, kb, lkey, lmods, new_text)) return; /* set the values here, because of the above check, setting it in * gtk_accelerator_parse would return a wrong key combination if it is duplicate */ - kb->key = lkey; - kb->mods = lmods; + keybindings_update_combo(kb, lkey, lmods); gtk_tree_store_set(store, &iter, KB_TREE_SHORTCUT, new_text, -1); @@ -1311,13 +1319,12 @@ gtk_accelerator_parse(gtk_label_get_text(GTK_LABEL(dialog_label)), &lkey, &lmods); - if (kb_find_duplicate(kb, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label)))) + if (kb_find_duplicate(dialog, kb, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label)))) return; /* set the values here, because of the above check, setting it in * gtk_accelerator_parse would return a wrong key combination if it is duplicate */ - kb->key = lkey; - kb->mods = lmods; + keybindings_update_combo(kb, lkey, lmods); gtk_tree_store_set(store, &g_iter, KB_TREE_SHORTCUT, gtk_label_get_text(GTK_LABEL(dialog_label)), -1); @@ -1371,8 +1378,9 @@ } -/* test if the entered key combination is already used */ -static gboolean kb_find_duplicate(GeanyKeyBinding *search_kb, +/* test if the entered key combination is already used + * returns true if cancelling duplicate */ +static gboolean kb_find_duplicate(GtkWidget *parent, GeanyKeyBinding *search_kb, guint key, GdkModifierType mods, const gchar *action) { gsize g, i; @@ -1395,17 +1403,25 @@ if (kb->key == key && kb->mods == mods && ! (kb->key == search_kb->key && kb->mods == search_kb->mods)) { - if (dialogs_show_question_full(main_widgets.window, _("_Override"), GTK_STOCK_CANCEL, + gchar *label = keybindings_get_label(kb); + gint ret = dialogs_show_prompt(parent, + _("_Allow"), GTK_RESPONSE_APPLY, + GTK_STOCK_CANCEL, GTK_RESPONSE_NO, + _("_Override"), GTK_RESPONSE_YES, _("Override that keybinding?"), _("The combination '%s' is already used for \"%s\"."), - action, kb->label)) + action, label); + + g_free(label); + + if (ret == GTK_RESPONSE_YES) { - kb->key = 0; - kb->mods = 0; + keybindings_update_combo(kb, 0, 0); kb_clear_tree_shortcut(g, i); + /* carry on looking for other duplicates if overriding */ continue; } - return TRUE; + return ret == GTK_RESPONSE_NO; } } } @@ -1417,7 +1433,12 @@ { gboolean sens = gtk_toggle_button_get_active(togglebutton); - gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "frame13"), sens); + gtk_widget_set_sensitive( + ui_lookup_widget(ui_widgets.prefs_dialog, "frame_toolbar_style"), sens); + gtk_widget_set_sensitive( + ui_lookup_widget(ui_widgets.prefs_dialog, "frame_toolbar_icon"), sens); + gtk_widget_set_sensitive( + ui_lookup_widget(ui_widgets.prefs_dialog, "button_customize_toolbar"), sens); gtk_widget_set_sensitive( ui_lookup_widget(ui_widgets.prefs_dialog, "check_toolbar_in_menu"), sens); } @@ -1459,6 +1480,15 @@ } +static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + gboolean sens = gtk_toggle_button_get_active(togglebutton); + + gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_openfiles"), sens); + gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_symbol"), sens); +} + + static void on_prefs_print_radio_button_toggled(GtkToggleButton *togglebutton, gpointer user_data) { gboolean sens = gtk_toggle_button_get_active(togglebutton); @@ -1477,6 +1507,77 @@ } +static void open_preferences_help(void) +{ + gchar *uri; + const gchar *label, *suffix = NULL; + GtkNotebook *notebook = GTK_NOTEBOOK( + ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2")); + gint page_nr = gtk_notebook_get_current_page(notebook); + GtkWidget *page = gtk_notebook_get_nth_page(notebook, page_nr); + + label = gtk_notebook_get_tab_label_text(notebook, page); + + /* TODO Find a better way to map the current notebook page to the + * corresponding chapter in the documentation, comparing translatable + * strings is easy to break. Maybe attach an identifying string to the + * tab label object. */ + if (utils_str_equal(label, _("General"))) + suffix = "#general-startup-preferences"; + else if (utils_str_equal(label, _("Interface"))) + suffix = "#interface-preferences"; + else if (utils_str_equal(label, _("Toolbar"))) + suffix = "#toolbar-preferences"; + else if (utils_str_equal(label, _("Editor"))) + suffix = "#editor-features-preferences"; + else if (utils_str_equal(label, _("Files"))) + suffix = "#files-preferences"; + else if (utils_str_equal(label, _("Tools"))) + suffix = "#tools-preferences"; + else if (utils_str_equal(label, _("Templates"))) + suffix = "#template-preferences"; + else if (utils_str_equal(label, _("Keybindings"))) + suffix = "#keybinding-preferences"; + else if (utils_str_equal(label, _("Printing"))) + suffix = "#printing-preferences"; + else if (utils_str_equal(label, _("Terminal"))) + suffix = "#terminal-vte-preferences"; + + uri = utils_get_help_url(suffix); + utils_open_browser(uri); + g_free(uri); +} + + +static gboolean prefs_dialog_key_press_response_cb(GtkWidget *dialog, GdkEventKey *event, + gpointer data) +{ + gint group, keybinding; + + if (keybindings_check_event(event, &group, &keybinding) != NULL) + { + if (group == GEANY_KEY_GROUP_HELP && keybinding == GEANY_KEYS_HELP_HELP) + { + open_preferences_help(); + return TRUE; + } + } + return FALSE; +} + + +static gboolean prefs_dialog_button_press_event_cb(GtkWidget *dialog, GdkEventButton *event, + gpointer data) +{ + if (event->button == 1) + { + open_preferences_help(); + return TRUE; + } + return FALSE; +} + + void prefs_show_dialog(void) { if (ui_widgets.prefs_dialog == NULL) @@ -1485,10 +1586,14 @@ GtkWidget *label; guint i; gchar *encoding_string; + GdkPixbuf *pb; ui_widgets.prefs_dialog = create_prefs_dialog(); gtk_widget_set_name(ui_widgets.prefs_dialog, "GeanyPrefsDialog"); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.prefs_dialog), GTK_WINDOW(main_widgets.window)); + pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); + gtk_window_set_icon(GTK_WINDOW(ui_widgets.prefs_dialog), pb); + g_object_unref(pb); /* free our reference */ /* init the default file encoding combo box */ combo_new = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); @@ -1545,30 +1650,40 @@ "label_project_indent_warning")), label, FALSE, TRUE, 5); /* add the clear icon to GtkEntry widgets in the dialog */ - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "startup_path_entry")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "extra_plugin_path_entry")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_toggle_mark")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_browser")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_developer")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_initial")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_mail")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_company")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_version")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_year")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_date")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_datetime")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_print_external_cmd")); - ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_print_dateformat")); + { + const gchar *names[] = { + "startup_path_entry", + "project_file_path_entry", + "extra_plugin_path_entry", + "entry_toggle_mark", + /* "entry_com_make", */ + "entry_com_term", + "entry_browser", + "entry_grep", + "entry_contextaction", + "entry_template_developer", + "entry_template_initial", + "entry_template_mail", + "entry_template_company", + "entry_template_version", + "entry_template_year", + "entry_template_date", + "entry_template_datetime", + "entry_print_external_cmd", + "entry_print_dateformat"}; + const gchar **name; + + foreach_c_array(name, names, G_N_ELEMENTS(names)) + ui_entry_add_clear_icon(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, *name))); + } #ifdef HAVE_VTE vte_append_preferences_tab(); #endif +#ifndef G_OS_WIN32 + gtk_widget_hide(ui_lookup_widget(ui_widgets.prefs_dialog, "check_native_windows_dialogs")); +#endif ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "startup_path_button"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "startup_path_entry"))); ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "extra_plugin_path_button"), NULL, @@ -1586,24 +1701,33 @@ g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "editor_font"), "font-set", G_CALLBACK(on_prefs_font_choosed), GINT_TO_POINTER(3)); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "long_line_color"), - "color-set", G_CALLBACK(on_prefs_color_choosed), GINT_TO_POINTER(1)); + "color-set", G_CALLBACK(on_color_button_choose_cb), NULL); /* file chooser buttons in the tools tab */ - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_make"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term")); - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_browser"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_browser")); - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_grep"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep")); + ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term"))); + ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_browser"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_browser"))); + ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_grep"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep"))); /* tools commands */ - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_contextaction"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction")); + ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_contextaction"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction"))); /* printing */ - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_print_external_cmd"), - "clicked", G_CALLBACK(on_prefs_tools_button_clicked), ui_lookup_widget(ui_widgets.prefs_dialog, "entry_print_external_cmd")); + ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_print_external_cmd"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_print_external_cmd"))); + g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "radio_print_gtk"), "toggled", G_CALLBACK(on_prefs_print_radio_button_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_print_pageheader"), @@ -1619,64 +1743,15 @@ "toggled", G_CALLBACK(on_use_folding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"), "toggled", G_CALLBACK(on_open_encoding_toggled), NULL); + g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"), + "toggled", G_CALLBACK(on_sidebar_visible_toggled), NULL); + + g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button_help"), + "button-press-event", G_CALLBACK(prefs_dialog_button_press_event_cb), NULL); + g_signal_connect(ui_widgets.prefs_dialog, + "key-press-event", G_CALLBACK(prefs_dialog_key_press_response_cb), NULL); } prefs_init_dialog(); gtk_window_present(GTK_WINDOW(ui_widgets.prefs_dialog)); } - - -void -on_prefs_tools_button_clicked (GtkButton *button, - gpointer item) -{ -#ifdef G_OS_WIN32 - win32_show_pref_file_dialog(item); -#else - GtkWidget *dialog; - gchar *filename, *tmp, **field; - - /* initialize the dialog */ - dialog = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(ui_widgets.prefs_dialog), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - /* cut the options from the command line */ - field = g_strsplit(gtk_entry_get_text(GTK_ENTRY(item)), " ", 2); - if (field[0]) - { - filename = g_find_program_in_path(field[0]); - if (filename) - { - gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(dialog), filename); - g_free(filename); - } - } - - /* run it */ - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - gchar *utf8_filename; - - tmp = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - utf8_filename = utils_get_utf8_from_locale(tmp); - - if (g_strv_length(field) > 1) - filename = g_strconcat(utf8_filename, " ", field[1], NULL); - else - { - filename = utf8_filename; - utf8_filename = NULL; - } - gtk_entry_set_text(GTK_ENTRY(item), filename); - g_free(filename); - g_free(tmp); - g_free(utf8_filename); - } - - g_strfreev(field); - gtk_widget_destroy(dialog); -#endif -} - - diff -Nru geany-0.18/src/prefs.h geany-0.19/src/prefs.h --- geany-0.18/src/prefs.h 2009-03-13 10:02:29.000000000 +0000 +++ geany-0.19/src/prefs.h 2010-03-18 13:13:11.000000000 +0000 @@ -1,8 +1,8 @@ /* * prefs.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -20,22 +20,21 @@ * */ - #ifndef GEANY_PREFS_H #define GEANY_PREFS_H 1 -/* General Preferences dialog settings. */ +/** General Preferences dialog settings. */ typedef struct GeanyPrefs { gboolean load_session; gboolean load_plugins; gboolean save_winpos; gboolean confirm_exit; - gboolean beep_on_errors; + gboolean beep_on_errors; /* use utils_beep() instead */ gboolean suppress_status_messages; gboolean switch_to_status; gboolean auto_focus; - gchar *default_open_path; + gchar *default_open_path; /**< Default path to look for files when no other path is appropriate. */ gchar *custom_plugin_path; } GeanyPrefs; @@ -46,7 +45,6 @@ typedef struct GeanyToolPrefs { gchar *browser_cmd; - gchar *make_cmd; gchar *term_cmd; gchar *grep_cmd; gchar *context_action_cmd; @@ -58,10 +56,4 @@ void prefs_show_dialog(void); -void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data); - -void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data); - -void on_prefs_tools_button_clicked(GtkButton *button, gpointer user_data); - #endif diff -Nru geany-0.18/src/printing.c geany-0.19/src/printing.c --- geany-0.18/src/printing.c 2009-07-23 17:01:45.000000000 +0100 +++ geany-0.19/src/printing.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * printing.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: printing.c 4014 2009-07-23 16:01:45Z ntrel $ + * $Id: printing.c 4518 2010-01-01 22:55:18Z eht16 $ */ @@ -270,7 +270,7 @@ } -static void add_page_header(PangoLayout *layout, cairo_t *cr, DocInfo *dinfo, gint width, gint page_nr) +static void add_page_header(DocInfo *dinfo, cairo_t *cr, gint width, gint page_nr) { gint ph_height = dinfo->line_height * 3; gchar *data; @@ -279,6 +279,7 @@ dinfo->doc->file_name : GEANY_STRING_UNTITLED; gchar *file_name = (printing_prefs.page_header_basename) ? g_path_get_basename(tmp_file_name) : g_strdup(tmp_file_name); + PangoLayout *layout = dinfo->layout; /* draw the frame */ cairo_set_line_width(cr, 0.3); @@ -417,7 +418,7 @@ gtk_box_pack_start(GTK_BOX(hbox10), label203, FALSE, FALSE, 0); w->entry_print_dateformat = gtk_entry_new(); - ui_entry_add_clear_icon(w->entry_print_dateformat); + ui_entry_add_clear_icon(GTK_ENTRY(w->entry_print_dateformat)); gtk_box_pack_start(GTK_BOX(hbox10), w->entry_print_dateformat, TRUE, TRUE, 0); ui_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.")); gtk_entry_set_text(GTK_ENTRY(w->entry_print_dateformat), printing_prefs.page_header_datefmt); @@ -526,6 +527,7 @@ gchar *text = g_strdup_printf(_("Page %d of %d"), page_nr, dinfo->n_pages); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(main_widgets.progressbar), fraction); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(main_widgets.progressbar), text); + g_free(text); } #ifdef GEANY_PRINT_DEBUG @@ -547,9 +549,12 @@ cairo_move_to(cr, 0, 0); pango_layout_set_width(dinfo->layout, width * PANGO_SCALE); + pango_layout_set_alignment(dinfo->layout, PANGO_ALIGN_LEFT); + pango_layout_set_ellipsize(dinfo->layout, FALSE); + pango_layout_set_justify(dinfo->layout, FALSE); if (printing_prefs.print_page_header) - add_page_header(dinfo->layout, cr, dinfo, width, page_nr); + add_page_header(dinfo, cr, width, page_nr); count = 0; /* the actual line counter for the current page, might be different from * dinfo->cur_line due to possible line breaks */ @@ -773,9 +778,9 @@ { gchar *filename = (data != NULL) ? data : GEANY_STRING_UNTITLED; if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED_ABORTED) - msgwin_status_add(_("Printing of file %s was cancelled."), filename); + msgwin_status_add(_("Did not send document %s to the printing subsystem."), filename); else if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED) - msgwin_status_add(_("File %s printed."), filename); + msgwin_status_add(_("Document %s was sent to the printing subsystem."), filename); } @@ -799,6 +804,9 @@ gtk_print_operation_set_unit(op, GTK_UNIT_POINTS); gtk_print_operation_set_show_progress(op, TRUE); +#if GTK_CHECK_VERSION(2, 18, 0) + gtk_print_operation_set_embed_page_setup(op, TRUE); +#endif g_signal_connect(op, "begin-print", G_CALLBACK(begin_print), dinfo); g_signal_connect(op, "end-print", G_CALLBACK(end_print), dinfo); diff -Nru geany-0.18/src/printing.h geany-0.19/src/printing.h --- geany-0.18/src/printing.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/printing.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * printing.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: printing.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: printing.h 4518 2010-01-01 22:55:18Z eht16 $ */ diff -Nru geany-0.18/src/project.c geany-0.19/src/project.c --- geany-0.18/src/project.c 2009-05-26 20:49:18.000000000 +0100 +++ geany-0.19/src/project.c 2010-05-16 18:43:24.000000000 +0100 @@ -1,8 +1,8 @@ /* * project.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: project.c 3814 2009-05-26 19:49:18Z eht16 $ + * $Id: project.c 4921 2010-05-16 17:43:24Z eht16 $ */ /** @file project.h @@ -41,14 +41,13 @@ #include "msgwindow.h" #include "main.h" #include "keyfile.h" -#ifdef G_OS_WIN32 -# include "win32.h" -#endif +#include "win32.h" #include "build.h" #include "interface.h" #include "editor.h" #include "stash.h" -#include "treeviews.h" +#include "sidebar.h" +#include "filetypes.h" ProjectPrefs project_prefs = { NULL, FALSE, FALSE }; @@ -57,12 +56,12 @@ static GeanyProjectPrivate priv; static GeanyIndentPrefs indentation; -static GeanyPrefGroup *indent_group = NULL; +static StashGroup *indent_group = NULL; static struct { gchar *project_file_path; /* in UTF-8 */ -} local_prefs = {NULL}; +} local_prefs = { NULL }; static gboolean entries_modified; @@ -75,24 +74,24 @@ GtkWidget *description; GtkWidget *file_name; GtkWidget *base_path; - GtkWidget *make_in_base_path; - GtkWidget *run_cmd; GtkWidget *patterns; + BuildTableData build_properties; } PropertyDialogElements; static gboolean update_config(const PropertyDialogElements *e); static void on_file_save_button_clicked(GtkButton *button, PropertyDialogElements *e); -static void on_file_open_button_clicked(GtkButton *button, PropertyDialogElements *e); static gboolean load_config(const gchar *filename); static gboolean write_config(gboolean emit_signal); static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e); static void on_entries_changed(GtkEditable *editable, PropertyDialogElements *e); +static void on_radio_long_line_custom_toggled(GtkToggleButton *radio, GtkWidget *spin_long_line); +static void apply_editor_prefs(void); #define SHOW_ERR(args) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args) -#define SHOW_ERR1(args,more) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args, more) +#define SHOW_ERR1(args, more) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args, more) #define MAX_NAME_LEN 50 /* "projects" is part of the default project base path so be careful when translating * please avoid special characters and spaces, look at the source for details or ask Frank */ @@ -108,9 +107,9 @@ GtkWidget *bbox; GtkWidget *label; PropertyDialogElements *e; - gint response; - if (! project_ask_close()) return; + if (! project_ask_close()) + return; g_return_if_fail(app->project == NULL); @@ -141,7 +140,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->name = gtk_entry_new(); - ui_entry_add_clear_icon(e->name); + ui_entry_add_clear_icon(GTK_ENTRY(e->name)); gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); ui_table_add_row(GTK_TABLE(table), 0, label, e->name, NULL); @@ -150,7 +149,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->file_name = gtk_entry_new(); - ui_entry_add_clear_icon(e->file_name); + ui_entry_add_clear_icon(GTK_ENTRY(e->file_name)); gtk_entry_set_width_chars(GTK_ENTRY(e->file_name), 30); button = gtk_button_new(); g_signal_connect(button, "clicked", G_CALLBACK(on_file_save_button_clicked), e); @@ -166,7 +165,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->base_path = gtk_entry_new(); - ui_entry_add_clear_icon(e->base_path); + ui_entry_add_clear_icon(GTK_ENTRY(e->base_path)); ui_widget_set_tooltip_text(e->base_path, _("Base directory of all files that make up the project. " "This can be a new path, or an existing directory tree. " @@ -188,16 +187,14 @@ gtk_widget_show_all(e->dialog); - retry: - response = gtk_dialog_run(GTK_DIALOG(e->dialog)); - if (response == GTK_RESPONSE_OK) + while (gtk_dialog_run(GTK_DIALOG(e->dialog)) == GTK_RESPONSE_OK) { - if (! update_config(e)) - goto retry; - else + if (update_config(e)) + { ui_add_recent_project_file(app->project->file_name); + break; + } } - gtk_widget_destroy(e->dialog); g_free(e); } @@ -222,12 +219,7 @@ #ifndef G_OS_WIN32 static void run_open_dialog(GtkDialog *dialog) { - gint response; - - retry: - response = gtk_dialog_run(dialog); - - if (response == GTK_RESPONSE_ACCEPT) + while (gtk_dialog_run(dialog) == GTK_RESPONSE_ACCEPT) { gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); @@ -240,9 +232,10 @@ gtk_widget_grab_focus(GTK_WIDGET(dialog)); g_free(utf8_filename); g_free(filename); - goto retry; + continue; } g_free(filename); + break; } } #endif @@ -316,9 +309,25 @@ /* Called when creating, opening, closing and updating projects. */ static void update_ui(void) { + if (main_status.quitting) + return; + ui_set_window_title(NULL); build_menu_update(NULL); - treeviews_openfiles_update_all(); + sidebar_openfiles_update_all(); +} + + +static void remove_foreach_project_filetype(gpointer data, gpointer user_data) +{ + GeanyFiletype *ft = (GeanyFiletype*)data; + if (ft != NULL) + { + setptr(ft->projfilecmds, NULL); + setptr(ft->projexeccmds, NULL); + setptr(ft->projerror_regex_string, NULL); + ft->project_list_entry = -1; + } } @@ -332,15 +341,27 @@ /* use write_config() to save project session files */ write_config(FALSE); + /* remove project filetypes build entries */ + if (app->project->build_filetypes_list != NULL) + { + g_ptr_array_foreach(app->project->build_filetypes_list, remove_foreach_project_filetype, NULL); + g_ptr_array_free(app->project->build_filetypes_list, FALSE); + } + + /* remove project non filetype build menu items */ + build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_NON_FT, -1); + build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_EXEC, -1); + g_free(app->project->name); g_free(app->project->description); g_free(app->project->file_name); g_free(app->project->base_path); - g_free(app->project->run_cmd); g_free(app->project); app->project = NULL; + apply_editor_prefs(); /* ensure that global settings are restored */ + if (project_prefs.project_session) { /* close all existing tabs first */ @@ -361,22 +382,28 @@ } +static void on_set_use_base_path_clicked(GtkWidget *unused1, gpointer user_data) +{ + build_set_non_ft_wd_to_proj((BuildTableData)user_data); +} + + static void create_properties_dialog(PropertyDialogElements *e) { - GtkWidget *table, *notebook; - GtkWidget *image; + GtkWidget *table, *notebook, *build_table; GtkWidget *button; GtkWidget *bbox; GtkWidget *label; GtkWidget *swin; + GeanyDocument *doc = document_get_current(); + GeanyFiletype *ft = NULL; e->dialog = create_project_dialog(); gtk_window_set_transient_for(GTK_WINDOW(e->dialog), GTK_WINDOW(main_widgets.window)); gtk_window_set_destroy_with_parent(GTK_WINDOW(e->dialog), TRUE); gtk_widget_set_name(e->dialog, "GeanyDialogProject"); - ui_entry_add_clear_icon(ui_lookup_widget(e->dialog, "spin_indent_width")); - ui_entry_add_clear_icon(ui_lookup_widget(e->dialog, "spin_tab_width")); + ui_entry_add_clear_icon(GTK_ENTRY(ui_lookup_widget(e->dialog, "spin_indent_width"))); table = gtk_table_new(6, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER(table), 6); @@ -387,10 +414,10 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->name = gtk_entry_new(); - ui_entry_add_clear_icon(e->name); + ui_entry_add_clear_icon(GTK_ENTRY(e->name)); gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -400,10 +427,10 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->file_name = gtk_entry_new(); - ui_entry_add_clear_icon(e->file_name); + ui_entry_add_clear_icon(GTK_ENTRY(e->file_name)); gtk_editable_set_editable(GTK_EDITABLE(e->file_name), FALSE); /* read-only */ gtk_table_attach(GTK_TABLE(table), e->file_name, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -413,7 +440,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->description = gtk_text_view_new(); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(e->description), GTK_WRAP_WORD); @@ -430,10 +457,10 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->base_path = gtk_entry_new(); - ui_entry_add_clear_icon(e->base_path); + ui_entry_add_clear_icon(GTK_ENTRY(e->base_path)); ui_widget_set_tooltip_text(e->base_path, _("Base directory of all files that make up the project. " "This can be a new path, or an existing directory tree. " @@ -444,33 +471,31 @@ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - e->make_in_base_path = gtk_check_button_new_with_label(_("Make in base path")); - gtk_table_attach(GTK_TABLE(table), e->make_in_base_path, 0, 3, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + if (doc != NULL) ft = doc->file_type; + build_table = build_commands_table(doc, GEANY_BCS_PROJ, &(e->build_properties), ft); + gtk_container_set_border_width(GTK_CONTAINER(build_table), 6); + label = gtk_label_new(_("Build")); + notebook = ui_lookup_widget(e->dialog, "project_notebook"); + gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), build_table, label, 2); - label = gtk_label_new(_("Run command:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + label = gtk_label_new(_("Set the Build non-filetype working directories to use base path:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - e->run_cmd = gtk_entry_new(); - ui_entry_add_clear_icon(e->run_cmd); - ui_widget_set_tooltip_text(e->run_cmd, - _("Command-line to run in the project base directory. " - "Options can be appended to the command. " - "Leave blank to use the default run command.")); - button = gtk_button_new(); - g_signal_connect(button, "clicked", G_CALLBACK(on_file_open_button_clicked), e); - image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_container_add(GTK_CONTAINER(button), image); + button = gtk_button_new_with_label(_("Set")); + ui_widget_set_tooltip_text(button, + _("Set the working directories (on the Build tab) " + "for the non-filetype build commands to use the base path")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + g_signal_connect(button, "clicked", G_CALLBACK(on_set_use_base_path_clicked), e->build_properties); bbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start_defaults(GTK_BOX(bbox), e->run_cmd); + gtk_box_pack_start(GTK_BOX(bbox), label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 5, 6, + gtk_table_attach(GTK_TABLE(table), bbox, 0, 2, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), 0, 0); + + g_signal_connect(ui_lookup_widget(e->dialog, "radio_long_line_custom"), "toggled", + G_CALLBACK(on_radio_long_line_custom_toggled), ui_lookup_widget(e->dialog, "spin_long_line")); #if 0 label = gtk_label_new(_("File patterns:")); @@ -478,7 +503,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->patterns = gtk_text_view_new(); swin = gtk_scrolled_window_new(NULL, NULL); @@ -491,7 +516,6 @@ (GtkAttachOptions) (0), 0, 0); #endif - notebook = ui_lookup_widget(e->dialog, "project_notebook"); label = gtk_label_new(_("Project")); gtk_widget_show(table); /* needed to switch current page */ gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), table, label, 0); @@ -503,7 +527,8 @@ { PropertyDialogElements *e = g_new(PropertyDialogElements, 1); GeanyProject *p = app->project; - gint response; + GtkWidget *widget = NULL; + GtkWidget *radio_long_line_custom; g_return_if_fail(app->project != NULL); @@ -515,6 +540,21 @@ /* fill the elements with the appropriate data */ gtk_entry_set_text(GTK_ENTRY(e->name), p->name); + gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); + gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); + + radio_long_line_custom = ui_lookup_widget(e->dialog, "radio_long_line_custom"); + switch (p->long_line_behaviour) + { + case 0: widget = ui_lookup_widget(e->dialog, "radio_long_line_disabled"); break; + case 1: widget = ui_lookup_widget(e->dialog, "radio_long_line_default"); break; + case 2: widget = radio_long_line_custom; break; + } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + + widget = ui_lookup_widget(e->dialog, "spin_long_line"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (gdouble)p->long_line_column); + on_radio_long_line_custom_toggled(GTK_TOGGLE_BUTTON(radio_long_line_custom), widget); if (p->description != NULL) { /* set text */ @@ -543,25 +583,17 @@ } #endif - gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); - gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->make_in_base_path), - p->make_in_base_path); - if (p->run_cmd != NULL) - gtk_entry_set_text(GTK_ENTRY(e->run_cmd), p->run_cmd); - gtk_widget_show_all(e->dialog); - retry: - response = gtk_dialog_run(GTK_DIALOG(e->dialog)); - if (response == GTK_RESPONSE_OK) + while (gtk_dialog_run(GTK_DIALOG(e->dialog)) == GTK_RESPONSE_OK) { - if (! update_config(e)) - goto retry; - - stash_group_update(indent_group, e->dialog); + if (update_config(e)) + { + stash_group_update(indent_group, e->dialog); + break; + } } - + build_free_fields(e->build_properties); gtk_widget_destroy(e->dialog); g_free(e); } @@ -598,6 +630,9 @@ priv.indentation = &indentation; project->priv = &priv; + project->long_line_behaviour = 1 /* use global settings */; + project->long_line_column = editor_prefs.long_line_global_column; + app->project = project; return project; } @@ -701,12 +736,11 @@ if (! new_project) /* save properties specific fields */ { GtkTextIter start, end; - /*gchar *tmp;*/ GtkTextBuffer *buffer; - - p->make_in_base_path = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(e->make_in_base_path)); - setptr(p->run_cmd, g_strdup(gtk_entry_get_text(GTK_ENTRY(e->run_cmd)))); + GeanyDocument *doc = document_get_current(); + GeanyBuildCommand *oldvalue; + GeanyFiletype *ft = doc ? doc->file_type : NULL; + GtkWidget *widget; /* get and set the project description */ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); @@ -714,6 +748,36 @@ gtk_text_buffer_get_end_iter(buffer, &end); setptr(p->description, g_strdup(gtk_text_buffer_get_text(buffer, &start, &end, FALSE))); + /* read the project build menu */ + oldvalue = ft ? ft->projfilecmds : NULL; + build_read_project(ft, e->build_properties); + + if (ft != NULL && ft->projfilecmds != oldvalue && ft->project_list_entry < 0) + { + if (p->build_filetypes_list == NULL) + p->build_filetypes_list = g_ptr_array_new(); + ft->project_list_entry = p->build_filetypes_list->len; + g_ptr_array_add(p->build_filetypes_list, ft); + } + build_menu_update(doc); + + widget = ui_lookup_widget(e->dialog, "radio_long_line_disabled"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + p->long_line_behaviour = 0; + else + { + widget = ui_lookup_widget(e->dialog, "radio_long_line_default"); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) + p->long_line_behaviour = 1; + else + /* "Custom" radio button must be checked */ + p->long_line_behaviour = 2; + } + + widget = ui_lookup_widget(e->dialog, "spin_long_line"); + p->long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + apply_editor_prefs(); + #if 0 /* get and set the project file patterns */ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); @@ -769,8 +833,7 @@ g_free(locale_dir); } } - else - if (gtk_file_chooser_get_action(GTK_FILE_CHOOSER(dialog)) != GTK_FILE_CHOOSER_ACTION_OPEN) + else if (gtk_file_chooser_get_action(GTK_FILE_CHOOSER(dialog)) != GTK_FILE_CHOOSER_ACTION_OPEN) { gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), utf8_filename); } @@ -821,35 +884,6 @@ } -static void on_file_open_button_clicked(GtkButton *button, PropertyDialogElements *e) -{ -#ifdef G_OS_WIN32 - gchar *path = win32_show_project_open_dialog(e->dialog, _("Choose Project Run Command"), - gtk_entry_get_text(GTK_ENTRY(e->run_cmd)), FALSE, FALSE); - if (path != NULL) - { - gtk_entry_set_text(GTK_ENTRY(e->run_cmd), path); - g_free(path); - } -#else - GtkWidget *dialog; - - /* initialise the dialog */ - dialog = gtk_file_chooser_dialog_new(_("Choose Project Run Command"), NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); - gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), TRUE); - gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - - run_dialog(dialog, e->run_cmd); -#endif -} - - /* sets the project base path and the project file name according to the project name */ static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e) { @@ -862,7 +896,7 @@ return; name = gtk_editable_get_chars(editable, 0, -1); - if (name != NULL && strlen(name) > 0) + if (NZV(name)) { base_path = g_strconcat(project_dir, G_DIR_SEPARATOR_S, name, G_DIR_SEPARATOR_S, NULL); @@ -896,6 +930,12 @@ } +static void on_radio_long_line_custom_toggled(GtkToggleButton *radio, GtkWidget *spin_long_line) +{ + gtk_widget_set_sensitive(spin_long_line, gtk_toggle_button_get_active(radio)); +} + + gboolean project_load_file(const gchar *locale_file_name) { g_return_val_if_fail(locale_file_name != NULL, FALSE); @@ -948,10 +988,15 @@ p->description = utils_get_setting_string(config, "project", "description", ""); p->file_name = utils_get_utf8_from_locale(filename); p->base_path = utils_get_setting_string(config, "project", "base_path", ""); - p->make_in_base_path = utils_get_setting_boolean(config, "project", "make_in_base_path", TRUE); - p->run_cmd = utils_get_setting_string(config, "project", "run_cmd", ""); p->file_patterns = g_key_file_get_string_list(config, "project", "file_patterns", NULL, NULL); + p->long_line_behaviour = utils_get_setting_integer(config, "long line marker", + "long_line_behaviour", 1 /* follow global */); + p->long_line_column = utils_get_setting_integer(config, "long line marker", + "long_line_column", editor_prefs.long_line_global_column); + apply_editor_prefs(); + + build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p); if (project_prefs.project_session) { /* save current (non-project) session (it could has been changed since program startup) */ @@ -969,6 +1014,15 @@ } +static void apply_editor_prefs(void) +{ + guint i; + + foreach_document(i) + editor_apply_update_prefs(documents[i]->editor); +} + + /* Write the project settings as well as the project session files into its configuration files. * emit_signal defines whether the project-save signal should be emitted. When write_config() * is called while closing a project, this is used to skip emitting the signal because @@ -998,17 +1052,17 @@ if (p->description) g_key_file_set_string(config, "project", "description", p->description); - g_key_file_set_boolean(config, "project", "make_in_base_path", p->make_in_base_path); - if (p->run_cmd) - g_key_file_set_string(config, "project", "run_cmd", p->run_cmd); if (p->file_patterns) g_key_file_set_string_list(config, "project", "file_patterns", (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + g_key_file_set_integer(config, "long line marker", "long_line_behaviour", p->long_line_behaviour); + g_key_file_set_integer(config, "long line marker", "long_line_column", p->long_line_column); + /* store the session files into the project too */ if (project_prefs.project_session) configuration_save_session_files(config); - + build_save_menu(config, (gpointer)p, GEANY_BCS_PROJ); if (emit_signal) { g_signal_emit_by_name(geany_object, "project-save", config); @@ -1055,19 +1109,6 @@ } -/* Returns: NULL if the default path should be used, or a UTF-8 path. - * Maybe in future this will support a separate project make path from base path. */ -gchar *project_get_make_dir(void) -{ - GeanyProject *project = app->project; - - if (project && ! project->make_in_base_path) - return NULL; - else - return project_get_base_path(); -} - - /* This is to save project-related global settings, NOT project file settings. */ void project_save_prefs(GKeyFile *config) { @@ -1075,7 +1116,7 @@ if (cl_options.load_session) { - gchar *utf8_filename = (project == NULL) ? "" : project->file_name; + const gchar *utf8_filename = (project == NULL) ? "" : project->file_name; g_key_file_set_string(config, "project", "session_file", utf8_filename); } @@ -1110,7 +1151,7 @@ static gboolean callback_setup = FALSE; g_return_if_fail(local_prefs.project_file_path != NULL); - + gtk_entry_set_text(GTK_ENTRY(path_entry), local_prefs.project_file_path); if (! callback_setup) { /* connect the callback only once */ @@ -1134,7 +1175,7 @@ void project_init(void) { - GeanyPrefGroup *group; + StashGroup *group; group = stash_group_new("indentation"); /* defaults are copied from editor indent prefs */ @@ -1149,8 +1190,9 @@ "radio_indent_tabs", GEANY_INDENT_TYPE_TABS, "radio_indent_both", GEANY_INDENT_TYPE_BOTH, NULL); - stash_group_add_spin_button_integer(group, &indentation.hard_tab_width, - "indent_hard_tab_width", 8, "spin_tab_width"); + /* This is a 'hidden' pref for backwards-compatibility */ + stash_group_add_integer(group, &indentation.hard_tab_width, + "indent_hard_tab_width", 8); stash_group_add_toggle_button(group, &indentation.detect_type, "detect_indent", FALSE, "check_detect_indent"); stash_group_add_combo_box(group, (gint*)(gpointer)&indentation.auto_indent_mode, @@ -1162,4 +1204,3 @@ { stash_group_free(indent_group); } - diff -Nru geany-0.18/src/project.h geany-0.19/src/project.h --- geany-0.18/src/project.h 2009-04-05 15:14:29.000000000 +0100 +++ geany-0.19/src/project.h 2010-03-10 16:20:34.000000000 +0000 @@ -1,8 +1,8 @@ /* * project.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2007-2009 Enrico Tröger - * Copyright 2007-2009 Nick Treleaven + * Copyright 2007-2010 Enrico Tröger + * Copyright 2007-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: project.h 3684 2009-04-05 14:14:29Z eht16 $ + * $Id: project.h 4751 2010-03-10 16:20:34Z ntrel $ */ @@ -35,14 +35,18 @@ gchar *description; /**< Short description of the project. */ gchar *file_name; /**< Where the project file is stored (in UTF-8). */ gchar *base_path; /**< Base path of the project directory (in UTF-8, maybe relative). */ - gchar *run_cmd; /**< Project run command (in UTF-8). */ /** Identifier whether it is a pure Geany project or modified/extended * by a plugin. */ gint type; gchar **file_patterns; /**< Array of filename extension patterns. */ - gboolean make_in_base_path; struct GeanyProjectPrivate *priv; /* must be last, append fields before this item */ +#ifdef GEANY_PRIVATE + /* Do not use following fields in plugins */ + GPtrArray *build_filetypes_list; /* Project has custom filetype builds for these. */ + gint long_line_behaviour; /* 0 - disabled, 1 - follow global settings, 2 - enabled (custom) */ + gint long_line_column; /* Long line marker position. */ +#endif } GeanyProject; @@ -79,8 +83,6 @@ gchar *project_get_base_path(void); -gchar *project_get_make_dir(void); - void project_save_prefs(GKeyFile *config); diff -Nru geany-0.18/src/projectprivate.h geany-0.19/src/projectprivate.h --- geany-0.18/src/projectprivate.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/projectprivate.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * projectprivate.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Nick Treleaven - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven + * Copyright 2008-2010 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 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: projectprivate.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: projectprivate.h 4518 2010-01-01 22:55:18Z eht16 $ */ diff -Nru geany-0.18/src/queue.c geany-0.19/src/queue.c --- geany-0.18/src/queue.c 2009-04-15 23:47:33.000000000 +0100 +++ geany-0.19/src/queue.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,141 +0,0 @@ -/* - * queue.c - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2009 kugel. aka Thomas Martitz - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id: queue.c 3708 2009-04-15 22:47:33Z eht16 $ - */ - -/* - * This provides a simple single linked list, with some functons to modify it. - * Being a queue, you can append data only to the end of the list, end retrieve - * data from the beginning. Only the first node is directly visible, but with the several foreach - * functions you can iterate through the entire list. - */ - - -#include "geany.h" - -#include -#include -#include "queue.h" - - -/* Allocates memory for queue_start, and sets next and data members to NULL */ -GeanyQueue *queue_init(void) -{ - return g_new0(GeanyQueue, 1); -} - - -/* Returns true if q_node is the last node in a queue */ -static gboolean queue_is_last_node(const GeanyQueue *q_node) -{ - return (q_node->next == NULL); -} - - -/* Appends a data in a new node at the end of the lst */ -void queue_append(GeanyQueue *queue_start, gpointer data) -{ - GeanyQueue *temp, *next; - - if (queue_start == NULL || data == NULL) - return; - - if (queue_start->data == NULL) - { - queue_start->data = data; - return; - } - - temp = g_new0(GeanyQueue, 1); - temp->data = data; - temp->next = NULL; - - next = queue_start; - while (! queue_is_last_node(next)) - next = next->next; - next->next = temp; -} - - -/* Removes and frees the first node in queue_start, and writes the data of the - * removed node into data. - * Returns a pointer to the new first item */ -GeanyQueue *queue_delete(GeanyQueue *queue_start, gpointer *data, const gboolean free_data) -{ - GeanyQueue *ret; - - if (NULL == queue_start) - return NULL; - - if (data != NULL) - *data = queue_start->data; - - if (free_data) - g_free(queue_start->data); - - ret = queue_start->next; - g_free(queue_start); - - return ret; -} - - -/* Removes and frees the entire queue staring at queue_start */ -void queue_destroy(GeanyQueue *queue_start) -{ - while ((queue_start = queue_delete(queue_start, NULL, FALSE))); -} - -typedef void (*ForeachFunc) (GeanyQueue *queue_start, gpointer data); - -/* Iterates through param, and calls func with the node queue_start and each node in param */ -static void queue_foreach_data_2(GeanyQueue *queue_start, ForeachFunc func, GeanyQueue *param) -{ - GeanyQueue *temp = param; - - if (! queue_start || ! param) - return; - - do - { - (*func) (queue_start, (temp->data)); - } - while ((temp = temp->next)); -} - - -/* Copies the data of each node in q1, then the data of each node in q2 to a newly - * created queue, using queue_append. Frees q1 and q2. - * Returns a pointer to the created queue. */ -GeanyQueue *queue_concat_copy(GeanyQueue *q1, GeanyQueue *q2) -{ - /* q1 + q2 = q3 * - * ->1->2 + ->4->5->6 = 4->5->6->1->2 */ - GeanyQueue *ret = queue_init(); - - queue_foreach_data_2(ret, queue_append, q1); - queue_foreach_data_2(ret, queue_append, q2); - - queue_destroy(q1); - queue_destroy(q2); - - return ret; -} - diff -Nru geany-0.18/src/queue.h geany-0.19/src/queue.h --- geany-0.18/src/queue.h 2009-01-11 21:05:03.000000000 +0000 +++ geany-0.19/src/queue.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -/* - * queue.h - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2009 kugel. aka Thomas Martitz - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id: queue.h 3461 2009-01-11 21:05:03Z eht16 $ - */ - -#ifndef __QUEUE_H__ -#define __QUEUE_H__ - - -typedef struct _GeanyQueue -{ - gpointer data; - struct _GeanyQueue *next; -} GeanyQueue; - - -GeanyQueue *queue_init(void); - -void queue_append(GeanyQueue *queue_start, gpointer data); - -GeanyQueue *queue_delete(GeanyQueue *queue_start, gpointer *data, const gboolean free_data); - -GeanyQueue *queue_concat_copy(GeanyQueue *q1, GeanyQueue *q2); - -void queue_destroy(GeanyQueue *queue_start); - - -#endif /* __QUEUE_H__ */ diff -Nru geany-0.18/src/sciwrappers.c geany-0.19/src/sciwrappers.c --- geany-0.18/src/sciwrappers.c 2009-07-29 18:54:48.000000000 +0100 +++ geany-0.19/src/sciwrappers.c 2010-05-03 15:46:32.000000000 +0100 @@ -1,8 +1,9 @@ /* * sciwrappers.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven + * * 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 @@ -17,15 +18,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: sciwrappers.c 4042 2009-07-29 17:54:48Z ntrel $ + * $Id: sciwrappers.c 4869 2010-05-03 14:46:32Z ntrel $ */ /** @file sciwrappers.h * Wrapper functions for the Scintilla editor widget @c SCI_* messages. * You should also check the http://scintilla.org documentation, as it is more detailed. + * + * To get Scintilla notifications, use the @c editor-notify @link signals Geany Signal @endlink. + * * @note These functions were originally from the cssed project * (http://cssed.sf.net, thanks). - * @see ScintillaFuncs::send_message(). + * @see scintilla_send_message(). */ #include @@ -39,7 +43,7 @@ /* line numbers visibility */ -void sci_set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width) +void sci_set_line_numbers(ScintillaObject *sci, gboolean set, gint extra_width) { if (set) { @@ -47,18 +51,24 @@ gint len = SSM(sci, SCI_GETLINECOUNT, 0, 0); gint width; - g_snprintf(tmp_str, 15, "_%d%d", len, extra_width); + g_snprintf(tmp_str, 15, "_%d", len); width = sci_text_width(sci, STYLE_LINENUMBER, tmp_str); - SSM (sci, SCI_SETMARGINWIDTHN, 0, width); - SSM (sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */ + if (extra_width) + { + g_snprintf(tmp_str, 15, "%d", extra_width); + width += sci_text_width(sci, STYLE_LINENUMBER, tmp_str); + } + SSM(sci, SCI_SETMARGINWIDTHN, 0, width); + SSM(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */ } else { - SSM (sci, SCI_SETMARGINWIDTHN, 0, 0 ); + SSM(sci, SCI_SETMARGINWIDTHN, 0, 0); } } -void sci_set_mark_long_lines(ScintillaObject * sci, gint type, gint column, const gchar *colour) + +void sci_set_mark_long_lines(ScintillaObject *sci, gint type, gint column, const gchar *colour) { if (column == 0) type = 2; @@ -86,7 +96,7 @@ /* symbol margin visibility */ -void sci_set_symbol_margin(ScintillaObject * sci, gboolean set ) +void sci_set_symbol_margin(ScintillaObject *sci, gboolean set) { if (set) { @@ -95,11 +105,12 @@ } else { - SSM (sci, SCI_SETMARGINWIDTHN, 1, 0); + SSM(sci, SCI_SETMARGINWIDTHN, 1, 0); SSM(sci, SCI_SETMARGINSENSITIVEN, 1, FALSE); } } + /* folding margin visibility */ void sci_set_folding_margin_visible(ScintillaObject *sci, gboolean set) { @@ -115,115 +126,123 @@ } } + /* end of lines */ -void sci_set_visible_eols(ScintillaObject* sci, gboolean set ) +void sci_set_visible_eols(ScintillaObject *sci, gboolean set) { - SSM(sci,SCI_SETVIEWEOL,set,0); + SSM(sci, SCI_SETVIEWEOL, set, 0); } -void sci_set_visible_white_spaces(ScintillaObject* sci, gboolean set ) + +void sci_set_visible_white_spaces(ScintillaObject *sci, gboolean set) { if (set) - SSM(sci,SCI_SETVIEWWS,SCWS_VISIBLEALWAYS,0); + SSM(sci, SCI_SETVIEWWS, SCWS_VISIBLEALWAYS, 0); else - SSM(sci,SCI_SETVIEWWS,SCWS_INVISIBLE,0); + SSM(sci, SCI_SETVIEWWS, SCWS_INVISIBLE, 0); } -void sci_set_lines_wrapped(ScintillaObject* sci, gboolean set ) + +void sci_set_lines_wrapped(ScintillaObject *sci, gboolean set) { if (set) - SSM(sci,SCI_SETWRAPMODE,SC_WRAP_WORD,0); + SSM(sci, SCI_SETWRAPMODE, SC_WRAP_WORD, 0); else - SSM(sci,SCI_SETWRAPMODE,SC_WRAP_NONE,0); + SSM(sci, SCI_SETWRAPMODE, SC_WRAP_NONE, 0); } -gint sci_get_eol_mode( ScintillaObject* sci) + +gint sci_get_eol_mode(ScintillaObject *sci) { - return SSM( sci, SCI_GETEOLMODE, 0, 0); + return SSM(sci, SCI_GETEOLMODE, 0, 0); } -void sci_set_eol_mode( ScintillaObject* sci, gint eolmode) + +void sci_set_eol_mode(ScintillaObject *sci, gint eolmode) { - SSM( sci, SCI_SETEOLMODE, eolmode, 0); + SSM(sci, SCI_SETEOLMODE, eolmode, 0); } -void sci_convert_eols( ScintillaObject* sci, gint eolmode) + +void sci_convert_eols(ScintillaObject *sci, gint eolmode) { - SSM( sci, SCI_CONVERTEOLS, eolmode,0); + SSM(sci, SCI_CONVERTEOLS, eolmode, 0); } -void sci_add_text(ScintillaObject* sci, const gchar* text) + +void sci_add_text(ScintillaObject *sci, const gchar *text) { if (text != NULL) - { /* if null text is passed to scintilla will segfault */ - SSM( sci, SCI_ADDTEXT, strlen(text), (sptr_t) text); + { /* if null text is passed scintilla will segfault */ + SSM(sci, SCI_ADDTEXT, strlen(text), (sptr_t) text); } } -/** Set all text. + +/** Sets all text. * @param sci Scintilla widget. * @param text Text. */ -void sci_set_text(ScintillaObject* sci, const gchar* text) +void sci_set_text(ScintillaObject *sci, const gchar *text) { if( text != NULL ){ /* if null text is passed to scintilla will segfault */ - SSM( sci, SCI_SETTEXT, 0, (sptr_t) text); + SSM(sci, SCI_SETTEXT, 0, (sptr_t) text); } } -gboolean sci_can_undo( ScintillaObject* sci ) +gboolean sci_can_undo(ScintillaObject *sci) { - return SSM( sci, SCI_CANUNDO, 0, 0); + return SSM(sci, SCI_CANUNDO, 0, 0); } -gboolean sci_can_redo( ScintillaObject* sci ) +gboolean sci_can_redo(ScintillaObject *sci) { - return SSM( sci, SCI_CANREDO, 0, 0); + return SSM(sci, SCI_CANREDO, 0, 0); } -void sci_undo( ScintillaObject* sci ) +void sci_undo(ScintillaObject *sci) { - if( sci_can_undo(sci) ) - SSM( sci, SCI_UNDO, 0, 0); + if (sci_can_undo(sci)) + SSM(sci, SCI_UNDO, 0, 0); } -void sci_redo( ScintillaObject* sci ) +void sci_redo(ScintillaObject *sci) { - if( sci_can_redo( sci ) ) - SSM( sci, SCI_REDO,0,0); + if (sci_can_redo(sci)) + SSM(sci, SCI_REDO, 0, 0); } -/** Begin grouping a set of edits together as one Undo action. +/** Begins grouping a set of edits together as one Undo action. * You must call sci_end_undo_action() after making your edits. * @param sci Scintilla @c GtkWidget. */ -void sci_start_undo_action( ScintillaObject* sci ) +void sci_start_undo_action(ScintillaObject *sci) { - SSM( sci,SCI_BEGINUNDOACTION,0,0 ); + SSM(sci, SCI_BEGINUNDOACTION, 0, 0); } -/** End grouping a set of edits together as one Undo action. +/** Ends grouping a set of edits together as one Undo action. * @param sci Scintilla @c GtkWidget. * @see sci_start_undo_action(). */ -void sci_end_undo_action( ScintillaObject* sci ) +void sci_end_undo_action(ScintillaObject *sci) { - SSM( sci, SCI_ENDUNDOACTION,0,0); + SSM(sci, SCI_ENDUNDOACTION, 0, 0); } -void sci_set_undo_collection( ScintillaObject* sci, gboolean set ) +void sci_set_undo_collection(ScintillaObject *sci, gboolean set) { - SSM( sci, SCI_SETUNDOCOLLECTION,set,0); + SSM(sci, SCI_SETUNDOCOLLECTION, set, 0); } -void sci_empty_undo_buffer( ScintillaObject* sci ) +void sci_empty_undo_buffer(ScintillaObject *sci) { - SSM( sci, SCI_EMPTYUNDOBUFFER,0,0); + SSM(sci, SCI_EMPTYUNDOBUFFER, 0, 0); } @@ -233,56 +252,79 @@ } -void sci_zoom_in( ScintillaObject* sci ) +void sci_zoom_in(ScintillaObject *sci) { - SSM( sci, SCI_ZOOMIN,0,0); + SSM(sci, SCI_ZOOMIN, 0, 0); } -void sci_zoom_out( ScintillaObject* sci ) +void sci_zoom_out(ScintillaObject *sci) { - SSM( sci, SCI_ZOOMOUT,0,0); + SSM(sci, SCI_ZOOMOUT, 0, 0); } -void sci_zoom_off( ScintillaObject* sci ) +void sci_zoom_off(ScintillaObject *sci) { - SSM( sci, SCI_SETZOOM,0,0); + SSM(sci, SCI_SETZOOM, 0, 0); } -gint sci_get_zoom( ScintillaObject* sci ) +gint sci_get_zoom(ScintillaObject *sci) { - return SSM( sci, SCI_GETZOOM,0,0); + return SSM(sci, SCI_GETZOOM, 0, 0); } -void sci_set_marker_at_line( ScintillaObject* sci, gint line_number, gboolean set, gint marker ) +/** Sets a line marker. + * @param sci Scintilla widget. + * @param line_number Line number. + * @param marker Marker number. */ +void sci_set_marker_at_line(ScintillaObject *sci, gint line_number, gint marker) { - if ( set ) - { - SSM( sci, SCI_MARKERADD, line_number, marker); - } - else - { - SSM( sci, SCI_MARKERDELETE, line_number, marker); - } + SSM(sci, SCI_MARKERADD, line_number, marker); } -gboolean sci_is_marker_set_at_line(ScintillaObject* sci, gint line, gint marker) +/** Deletes a line marker. + * @param sci Scintilla widget. + * @param line_number Line number. + * @param marker Marker number. */ +void sci_delete_marker_at_line(ScintillaObject *sci, gint line_number, gint marker) +{ + SSM(sci, SCI_MARKERDELETE, line_number, marker); +} + + +/** Checks if a line has a marker set. + * @param sci Scintilla widget. + * @param line Line number. + * @param marker Marker number. + * @return Whether it's set. */ +gboolean sci_is_marker_set_at_line(ScintillaObject *sci, gint line, gint marker) { gint state; - state = SSM( sci, SCI_MARKERGET, line, 0 ); + state = SSM(sci, SCI_MARKERGET, line, 0); return (state & (1 << marker)); } +void sci_toggle_marker_at_line(ScintillaObject *sci, gint line, gint marker) +{ + gboolean set = sci_is_marker_set_at_line(sci, line, marker); + + if (!set) + sci_set_marker_at_line(sci, line, marker); + else + sci_delete_marker_at_line(sci, line, marker); +} + + /* Returns the line number of the next marker that matches marker_mask, or -1. * marker_mask is a bitor of 1 << marker_index. (See MarkerHandleSet::MarkValue()). * Note: If there is a marker on the line, it returns the same line. */ -gint sci_marker_next(ScintillaObject* sci, gint line, gint marker_mask, gboolean wrap) +gint sci_marker_next(ScintillaObject *sci, gint line, gint marker_mask, gboolean wrap) { gint marker_line; @@ -296,7 +338,7 @@ /* Returns the line number of the previous marker that matches marker_mask, or -1. * marker_mask is a bitor of 1 << marker_index. (See MarkerHandleSet::MarkValue()). * Note: If there is a marker on the line, it returns the same line. */ -gint sci_marker_previous(ScintillaObject* sci, gint line, gint marker_mask, gboolean wrap) +gint sci_marker_previous(ScintillaObject *sci, gint line, gint marker_mask, gboolean wrap) { gint marker_line; @@ -312,48 +354,48 @@ } -/** Get line number from position. +/** Gets the line number from @a position. * @param sci Scintilla widget. * @param position Position. */ -gint sci_get_line_from_position(ScintillaObject* sci, gint position ) +gint sci_get_line_from_position(ScintillaObject *sci, gint position) { return SSM(sci, SCI_LINEFROMPOSITION, position, 0); } -/** Get column number relative to the start of the line that @a position is on. +/** Gets the column number relative to the start of the line that @a position is on. * @param sci Scintilla widget. * @param position Position. */ -gint sci_get_col_from_position(ScintillaObject* sci, gint position ) +gint sci_get_col_from_position(ScintillaObject *sci, gint position) { return SSM(sci, SCI_GETCOLUMN, position, 0); } -/** Get position for the start of @a line. +/** Gets the position for the start of @a line. * @param sci Scintilla widget. * @param line Line. * @return Position. */ -gint sci_get_position_from_line(ScintillaObject* sci, gint line ) +gint sci_get_position_from_line(ScintillaObject *sci, gint line) { return SSM(sci, SCI_POSITIONFROMLINE, line, 0); } -/** Get cursor position. +/** Gets the cursor position. * @param sci Scintilla widget. * @return Position. */ -gint sci_get_current_position(ScintillaObject* sci ) +gint sci_get_current_position(ScintillaObject *sci) { return SSM(sci, SCI_GETCURRENTPOS, 0, 0); } -/** Set the cursor position. +/** Sets the cursor position. * @param sci Scintilla widget. * @param position Position. * @param scroll_to_caret Whether to scroll the cursor in view. */ -void sci_set_current_position(ScintillaObject* sci, gint position, gboolean scroll_to_caret) +void sci_set_current_position(ScintillaObject *sci, gint position, gboolean scroll_to_caret) { if (scroll_to_caret) SSM(sci, SCI_GOTOPOS, position, 0); @@ -368,34 +410,34 @@ /* Set the cursor line without scrolling the view. * Use sci_goto_line() to also scroll. */ -void sci_set_current_line(ScintillaObject* sci, gint line) +void sci_set_current_line(ScintillaObject *sci, gint line) { gint pos = sci_get_position_from_line(sci, line); sci_set_current_position(sci, pos, FALSE); } -/** Get total number of lines. +/** Gets the total number of lines. * @param sci Scintilla widget. */ -gint sci_get_line_count( ScintillaObject* sci ) +gint sci_get_line_count(ScintillaObject *sci) { return SSM(sci, SCI_GETLINECOUNT, 0, 0); } -/** Set selection start position. +/** Sets the selection start position. * @param sci Scintilla widget. * @param position Position. */ -void sci_set_selection_start(ScintillaObject* sci, gint position) +void sci_set_selection_start(ScintillaObject *sci, gint position) { SSM(sci, SCI_SETSELECTIONSTART, position, 0); } -/** Set selection end position. +/** Sets the selection end position. * @param sci Scintilla widget. * @param position Position. */ -void sci_set_selection_end(ScintillaObject* sci, gint position) +void sci_set_selection_end(ScintillaObject *sci, gint position) { SSM(sci, SCI_SETSELECTIONEND, position, 0); } @@ -407,116 +449,125 @@ } -gint sci_get_line_end_position(ScintillaObject* sci, gint line) +gint sci_get_line_end_position(ScintillaObject *sci, gint line) { return SSM(sci, SCI_GETLINEENDPOSITION, line, 0); } -void sci_cut(ScintillaObject* sci) +void sci_cut(ScintillaObject *sci) { SSM(sci, SCI_CUT, 0, 0); } -void sci_copy(ScintillaObject* sci) +void sci_copy(ScintillaObject *sci) { SSM(sci, SCI_COPY, 0, 0); } -void sci_paste(ScintillaObject* sci) +void sci_paste(ScintillaObject *sci) { SSM(sci, SCI_PASTE, 0, 0); } -void sci_clear(ScintillaObject* sci) +void sci_clear(ScintillaObject *sci) { SSM(sci, SCI_CLEAR, 0, 0); } -/** Get position of selection start. +/** Gets the selection start position. * @param sci Scintilla widget. * @return Position. */ -gint sci_get_selection_start(ScintillaObject* sci) +gint sci_get_selection_start(ScintillaObject *sci) { - return SSM(sci, SCI_GETSELECTIONSTART,0,0); + return SSM(sci, SCI_GETSELECTIONSTART, 0, 0); } -/** Get position of selection end. +/** Gets the selection end position. * @param sci Scintilla widget. * @return Position. */ -gint sci_get_selection_end(ScintillaObject* sci) +gint sci_get_selection_end(ScintillaObject *sci) { - return SSM(sci, SCI_GETSELECTIONEND,0,0); + return SSM(sci, SCI_GETSELECTIONEND, 0, 0); } -/** Replace selection. +/** Replaces selection. * @param sci Scintilla widget. * @param text Text. */ -void sci_replace_sel(ScintillaObject* sci, const gchar* text) +void sci_replace_sel(ScintillaObject *sci, const gchar *text) { - SSM(sci, SCI_REPLACESEL,0, (sptr_t) text); + SSM(sci, SCI_REPLACESEL, 0, (sptr_t) text); } -/** Get length of all text. +/** Gets the length of all text. * @param sci Scintilla widget. * @return Length. */ -gint sci_get_length(ScintillaObject* sci) +gint sci_get_length(ScintillaObject *sci) { - return SSM(sci,SCI_GETLENGTH,0,0); + return SSM(sci, SCI_GETLENGTH, 0, 0); } -gint sci_get_lexer(ScintillaObject* sci) +gint sci_get_lexer(ScintillaObject *sci) { - return SSM(sci,SCI_GETLEXER,0,0); + return SSM(sci, SCI_GETLEXER, 0, 0); } -/** Get line length. +/** Gets line length. * @param sci Scintilla widget. * @param line Line number. * @return Length. */ -gint sci_get_line_length(ScintillaObject* sci,gint line) +gint sci_get_line_length(ScintillaObject *sci, gint line) { - return SSM(sci,SCI_LINELENGTH, line,0); + return SSM(sci, SCI_LINELENGTH, line, 0); } -/** Get line contents. +/* safe way to read Scintilla string into new memory. + * works with any string buffer messages that follow the Windows message convention. */ +gchar *sci_get_string(ScintillaObject *sci, gint msg, gulong wParam) +{ + gint size = SSM(sci, msg, wParam, 0) + 1; + gchar *str = g_malloc(size); + + SSM(sci, msg, wParam, (sptr_t)str); + str[size - 1] = '\0'; /* ensure termination, needed for SCI_GETLINE */ + return str; +} + + +/** Gets line contents. * @param sci Scintilla widget. * @param line_num Line number. * @return A @c NULL-terminated copy of the line text. */ -gchar *sci_get_line(ScintillaObject* sci, gint line_num) +gchar *sci_get_line(ScintillaObject *sci, gint line_num) { - gint len = sci_get_line_length(sci, line_num); - gchar *linebuf = g_malloc(len + 1); - - SSM(sci, SCI_GETLINE, line_num, (sptr_t) linebuf); - linebuf[len] = '\0'; - return linebuf; + return sci_get_string(sci, SCI_GETLINE, line_num); } -/** Get all text. +/** Gets all text. * @deprecated sci_get_text is deprecated and should not be used in newly-written code. * Use sci_get_contents() instead. * * @param sci Scintilla widget. * @param len Length of @a text buffer, usually sci_get_length() + 1. * @param text Text buffer; must be allocated @a len + 1 bytes for null-termination. */ -void sci_get_text(ScintillaObject* sci, gint len, gchar* text) +void sci_get_text(ScintillaObject *sci, gint len, gchar *text) { - SSM( sci, SCI_GETTEXT, len, (sptr_t) text ); + SSM(sci, SCI_GETTEXT, len, (sptr_t) text); } -/** Get all text inside a given text length. + +/** Gets all text inside a given text length. * @param sci Scintilla widget. * @param len Length of the text to retrieve from the start of the document, * usually sci_get_length() + 1. @@ -531,19 +582,21 @@ return text; } -/** Get selected text. + +/** Gets selected text. * @deprecated sci_get_selected_text is deprecated and should not be used in newly-written code. * Use sci_get_selection_contents() instead. * * @param sci Scintilla widget. * @param text Text buffer; must be allocated sci_get_selected_text_length() + 1 bytes * for null-termination. */ -void sci_get_selected_text(ScintillaObject* sci, gchar* text) +void sci_get_selected_text(ScintillaObject *sci, gchar *text) { - SSM( sci, SCI_GETSELTEXT, 0, (sptr_t) text); + SSM(sci, SCI_GETSELTEXT, 0, (sptr_t) text); } -/** Get selected text. + +/** Gets selected text. * @param sci Scintilla widget. * * @return The selected text. Should be freed when no longer needed. @@ -552,110 +605,107 @@ */ gchar *sci_get_selection_contents(ScintillaObject *sci) { - gint len = sci_get_selected_text_length(sci); - gchar *selection = g_malloc(len + 1); - - SSM(sci, SCI_GETSELTEXT, 0, (sptr_t) selection); - - return selection; + return sci_get_string(sci, SCI_GETSELTEXT, 0); } -/** Get selected text length. + +/** Gets selected text length. * @param sci Scintilla widget. * @return Length. */ -gint sci_get_selected_text_length(ScintillaObject* sci) +gint sci_get_selected_text_length(ScintillaObject *sci) { - return SSM( sci, SCI_GETSELTEXT, 0, 0); + return SSM(sci, SCI_GETSELTEXT, 0, 0); } -gint sci_get_position_from_xy(ScintillaObject* sci, gint x, gint y, gboolean nearby) + +gint sci_get_position_from_xy(ScintillaObject *sci, gint x, gint y, gboolean nearby) { /* for nearby return -1 if there is no character near to the x,y point. */ return SSM(sci, (nearby) ? SCI_POSITIONFROMPOINTCLOSE : SCI_POSITIONFROMPOINT, x, y); } -/** Check if a line is visible (folding may have hidden it). +/** Checks if a line is visible (folding may have hidden it). * @param sci Scintilla widget. * @param line Line number. * @return Whether @a line will be drawn on the screen. */ -gboolean sci_get_line_is_visible(ScintillaObject* sci, gint line) +gboolean sci_get_line_is_visible(ScintillaObject *sci, gint line) { - return SSM(sci,SCI_GETLINEVISIBLE, line,0); + return SSM(sci, SCI_GETLINEVISIBLE, line, 0); } -/** Make the @a line visible (folding may have hidden it). +/** Makes @a line visible (folding may have hidden it). * @param sci Scintilla widget. * @param line Line number. */ -void sci_ensure_line_is_visible(ScintillaObject* sci, gint line) +void sci_ensure_line_is_visible(ScintillaObject *sci, gint line) { - SSM(sci,SCI_ENSUREVISIBLE,line,0); + SSM(sci, SCI_ENSUREVISIBLE, line, 0); } -gint sci_get_fold_level(ScintillaObject* sci, gint line) +gint sci_get_fold_level(ScintillaObject *sci, gint line) { - return SSM(sci,SCI_GETFOLDLEVEL, line,0); + return SSM(sci, SCI_GETFOLDLEVEL, line, 0); } /* Get the line number of the fold point before start_line, or -1 if there isn't one */ -gint sci_get_fold_parent(ScintillaObject* sci, gint start_line) +gint sci_get_fold_parent(ScintillaObject *sci, gint start_line) { - return SSM( sci, SCI_GETFOLDPARENT, start_line, 0); + return SSM(sci, SCI_GETFOLDPARENT, start_line, 0); } -void sci_toggle_fold(ScintillaObject* sci, gint line) +void sci_toggle_fold(ScintillaObject *sci, gint line) { - SSM( sci, SCI_TOGGLEFOLD, line, 1); + SSM(sci, SCI_TOGGLEFOLD, line, 1); } -gboolean sci_get_fold_expanded(ScintillaObject* sci, gint line) +gboolean sci_get_fold_expanded(ScintillaObject *sci, gint line) { - return SSM( sci, SCI_GETFOLDEXPANDED, line, 0); + return SSM(sci, SCI_GETFOLDEXPANDED, line, 0); } -void sci_colourise( ScintillaObject* sci, gint start, gint end) +void sci_colourise(ScintillaObject *sci, gint start, gint end) { - SSM( sci, SCI_COLOURISE, start, end); + SSM(sci, SCI_COLOURISE, start, end); } -void sci_clear_all(ScintillaObject * sci) +void sci_clear_all(ScintillaObject *sci) { - SSM( sci, SCI_CLEARALL, 0, 0); + SSM(sci, SCI_CLEARALL, 0, 0); } -gint sci_get_end_styled(ScintillaObject * sci) +gint sci_get_end_styled(ScintillaObject *sci) { - return SSM(sci,SCI_GETENDSTYLED, 0,0); + return SSM(sci, SCI_GETENDSTYLED, 0, 0); } -void sci_set_tab_width(ScintillaObject * sci, gint width) +void sci_set_tab_width(ScintillaObject *sci, gint width) { SSM(sci, SCI_SETTABWIDTH, width, 0); } -/** Get display tab width (this is not indent width, see GeanyIndentPrefs). +/** Gets display tab width (this is not indent width, see GeanyIndentPrefs). * @param sci Scintilla widget. * @return Width. * * @since 0.15 **/ -gint sci_get_tab_width(ScintillaObject * sci) +gint sci_get_tab_width(ScintillaObject *sci) { return SSM(sci, SCI_GETTABWIDTH, 0, 0); } -/** Get character. +/** Gets a character. * @param sci Scintilla widget. * @param pos Position. * @return Char. */ @@ -670,6 +720,7 @@ SSM(sci, SCI_SETSAVEPOINT, 0, 0); } + void sci_set_indentation_guides(ScintillaObject *sci, gint mode) { SSM(sci, SCI_SETINDENTATIONGUIDES, mode, 0); @@ -682,7 +733,7 @@ } -/** Check if there's a selection. +/** Checks if there's a selection. * @param sci Scintilla widget. * @return Whether a selection is present. * @@ -690,7 +741,7 @@ **/ gboolean sci_has_selection(ScintillaObject *sci) { - if (SSM(sci, SCI_GETSELECTIONEND,0,0) - SSM(sci, SCI_GETSELECTIONSTART,0,0)) + if (SSM(sci, SCI_GETSELECTIONEND, 0, 0) - SSM(sci, SCI_GETSELECTIONSTART, 0, 0)) return TRUE; else return FALSE; @@ -699,7 +750,7 @@ void sci_goto_pos(ScintillaObject *sci, gint pos, gboolean unfold) { - if (unfold) SSM(sci,SCI_ENSUREVISIBLE,SSM(sci, SCI_LINEFROMPOSITION, pos, 0),0); + if (unfold) SSM(sci, SCI_ENSUREVISIBLE, SSM(sci, SCI_LINEFROMPOSITION, pos, 0), 0); SSM(sci, SCI_GOTOPOS, pos, 0); } @@ -720,7 +771,7 @@ } -/** Scroll the cursor in view. +/** Scrolls the cursor in view. * @param sci Scintilla widget. */ void sci_scroll_caret(ScintillaObject *sci) { @@ -742,29 +793,49 @@ gint sci_search_next(ScintillaObject *sci, gint flags, const gchar *text) { - return SSM(sci, SCI_SEARCHNEXT, flags, (sptr_t) text ); + return SSM(sci, SCI_SEARCHNEXT, flags, (sptr_t) text); } gint sci_search_prev(ScintillaObject *sci, gint flags, const gchar *text) { - return SSM(sci, SCI_SEARCHPREV, flags, (sptr_t) text ); + return SSM(sci, SCI_SEARCHPREV, flags, (sptr_t) text); } +/** Finds text in the document. + * The @a ttf argument should be a pointer to a Sci_TextToFind structure which contains + * the text to find and the range in which the text should be searched. + * + * Please refer to the Scintilla documentation for a more detailed description. + * + * @param sci Scintilla widget. + * @param flags Bitmask of Scintilla search flags (@c SCFIND_*, see Scintilla documentation). + * @param ttf Pointer to a TextToFind structure which contains the text to find and the range. + * @return The position of the start of the found text if it succeeds, otherwise @c -1. + * The @c chrgText.cpMin and @c chrgText.cpMax members of @c TextToFind are filled in + * with the start and end positions of the found text. + */ gint sci_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf) { - return SSM(sci, SCI_FINDTEXT, flags, (long) ttf ); + return SSM(sci, SCI_FINDTEXT, flags, (long) ttf); } -void sci_set_font(ScintillaObject *sci, gint style, const gchar* font, gint size) +void sci_set_font(ScintillaObject *sci, gint style, const gchar *font, gint size) { SSM(sci, SCI_STYLESETFONT, style, (sptr_t) font); SSM(sci, SCI_STYLESETSIZE, style, size); } +/** Jumps to the specified line in the document. + * If @a unfold is set and @a line is hidden by a fold, it is unfolded + * first to ensure it is visible. + * @param sci Scintilla widget. + * @param line Line. + * @param unfold Whether to unfold first. + */ void sci_goto_line(ScintillaObject *sci, gint line, gboolean unfold) { if (unfold) SSM(sci, SCI_ENSUREVISIBLE, line, 0); @@ -778,7 +849,7 @@ } -/** Get style ID for @a position. +/** Gets style ID at @a position. * @param sci Scintilla widget. * @param position Position. * @return Style ID. */ @@ -787,6 +858,7 @@ return SSM(sci, SCI_GETSTYLEAT, position, 0); } + void sci_set_codepage(ScintillaObject *sci, gint cp) { g_return_if_fail(cp == 0 || cp == SC_CP_UTF8); @@ -802,11 +874,11 @@ void sci_clear_cmdkey(ScintillaObject *sci, gint key) { - SSM (sci, SCI_CLEARCMDKEY, key, 0); + SSM(sci, SCI_CLEARCMDKEY, key, 0); } -/** Get text between @a start and @a end. +/** Gets text between @a start and @a end. * @deprecated sci_get_text_range is deprecated and should not be used in newly-written code. * Use sci_get_contents_range() instead. * @@ -823,7 +895,8 @@ SSM(sci, SCI_GETTEXTRANGE, 0, (long) &tr); } -/** Get text between @a start and @a end. + +/** Gets text between @a start and @a end. * * @param sci Scintilla widget. * @param start Start. @@ -852,9 +925,9 @@ } -/** Insert text. +/** Inserts text. * @param sci Scintilla widget. - * @param pos Position. + * @param pos Position, or -1 for current. * @param text Text. */ void sci_insert_text(ScintillaObject *sci, gint pos, const gchar *text) { @@ -886,30 +959,32 @@ } -void sci_set_keywords(ScintillaObject *sci, gint k, gchar *text) +void sci_set_keywords(ScintillaObject *sci, gint k, const gchar *text) { SSM(sci, SCI_SETKEYWORDS, k, (sptr_t) text); } + void sci_set_readonly(ScintillaObject *sci, gboolean readonly) { SSM(sci, SCI_SETREADONLY, readonly, 0); } -/** A simple convenience function for sending Scintilla commands without any parameters. + +/** Sends Scintilla commands without any parameters. * @param sci The Scintilla @c GtkWidget. * @param cmd @c SCI_COMMAND. * @see http://scintilla.org for the documentation. * * @since 0.16 */ -void sci_send_command(ScintillaObject * sci, gint cmd) +void sci_send_command(ScintillaObject *sci, gint cmd) { SSM(sci, cmd, 0, 0); } -/** Get current line number. +/** Gets current line number. * @param sci Scintilla widget. * @return Line number. */ gint sci_get_current_line(ScintillaObject *sci) @@ -917,6 +992,7 @@ return SSM(sci, SCI_LINEFROMPOSITION, SSM(sci, SCI_GETCURRENTPOS, 0, 0), 0); } + /* Get number of lines partially or fully selected. * Returns 1 if there is a partial selection on the same line. * Returns 2 if a whole line is selected including the line break char(s). */ @@ -931,6 +1007,7 @@ return SSM(sci, SCI_LINEFROMPOSITION, end, 0) - SSM(sci, SCI_LINEFROMPOSITION, start, 0) + 1; } + gint sci_get_first_visible_line(ScintillaObject *sci) { return SSM(sci, SCI_GETFIRSTVISIBLELINE, 0, 0); @@ -938,7 +1015,7 @@ /** - * Set the current indicator. This is necessary to define an indicator for a range of text or + * Sets the current indicator. This is necessary to define an indicator for a range of text or * clearing indicators for a range of text. * * @param sci Scintilla widget. @@ -953,13 +1030,15 @@ SSM(sci, SCI_SETINDICATORCURRENT, indic, 0); } + void sci_indicator_fill(ScintillaObject *sci, gint pos, gint len) { SSM(sci, SCI_INDICATORFILLRANGE, pos, len); } + /** - * Clear a range of text from the currently set indicator. + * Clears the currently set indicator from a range of text. * Starting at @a pos, @a len characters long. * In order to make this function properly, you need to set the current indicator before with * @ref sci_indicator_set(). @@ -975,22 +1054,26 @@ SSM(sci, SCI_INDICATORCLEARRANGE, pos, len); } + void sci_select_all(ScintillaObject *sci) { SSM(sci, SCI_SELECTALL, 0, 0); } + gint sci_get_line_indent_position(ScintillaObject *sci, gint line) { return SSM(sci, SCI_GETLINEINDENTPOSITION, line, 0); } + void sci_set_autoc_max_height(ScintillaObject *sci, gint val) { SSM(sci, SCI_AUTOCSETMAXHEIGHT, val, 0); } -/** Find a matching brace at @a pos. + +/** Finds a matching brace at @a pos. * @param sci Scintilla widget. * @param pos Position. * @return Matching brace position. @@ -1002,32 +1085,38 @@ return SSM(sci, SCI_BRACEMATCH, pos, 0); } + gint sci_get_overtype(ScintillaObject *sci) { return SSM(sci, SCI_GETOVERTYPE, 0, 0); } + void sci_set_tab_indents(ScintillaObject *sci, gboolean set) { SSM(sci, SCI_SETTABINDENTS, set, 0); } + void sci_set_use_tabs(ScintillaObject *sci, gboolean set) { SSM(sci, SCI_SETUSETABS, set, 0); } + gint sci_get_pos_at_line_sel_start(ScintillaObject *sci, gint line) { return SSM(sci, SCI_GETLINESELSTARTPOSITION, line, 0); } + gint sci_get_pos_at_line_sel_end(ScintillaObject *sci, gint line) { return SSM(sci, SCI_GETLINESELENDPOSITION, line, 0); } -/** Get selection mode. + +/** Gets selection mode. * @param sci Scintilla widget. * @return Selection mode. */ gint sci_get_selection_mode(ScintillaObject *sci) @@ -1035,7 +1124,8 @@ return SSM(sci, SCI_GETSELECTIONMODE, 0, 0); } -/** Set selection mode. + +/** Sets selection mode. * @param sci Scintilla widget. * @param mode Mode. */ void sci_set_selection_mode(ScintillaObject *sci, gint mode) @@ -1043,62 +1133,88 @@ SSM(sci, SCI_SETSELECTIONMODE, mode, 0); } + void sci_set_scrollbar_mode(ScintillaObject *sci, gboolean visible) { SSM(sci, SCI_SETHSCROLLBAR, visible, 0); SSM(sci, SCI_SETVSCROLLBAR, visible, 0); } + +/** Sets the indentation of a line. + * @param sci Scintilla widget. + * @param line Line to indent. + * @param indent Indentation width. + * + * @since 0.19 + */ void sci_set_line_indentation(ScintillaObject *sci, gint line, gint indent) { SSM(sci, SCI_SETLINEINDENTATION, line, indent); } -int sci_get_line_indentation(ScintillaObject *sci, gint line) + +/** Gets the indentation width of a line. + * @param sci Scintilla widget. + * @param line Line to get the indentation from. + * @return Indentation width. + * + * @since 0.19 + */ +gint sci_get_line_indentation(ScintillaObject *sci, gint line) { return SSM(sci, SCI_GETLINEINDENTATION, line, 0); } + void sci_set_caret_policy_x(ScintillaObject *sci, gint policy, gint slop) { SSM(sci, SCI_SETXCARETPOLICY, policy, slop); } + void sci_set_caret_policy_y(ScintillaObject *sci, gint policy, gint slop) { SSM(sci, SCI_SETYCARETPOLICY, policy, slop); } -void sci_set_scroll_stop_at_last_line(ScintillaObject* sci, gboolean set) + +void sci_set_scroll_stop_at_last_line(ScintillaObject *sci, gboolean set) { SSM(sci, SCI_SETENDATLASTLINE, set, 0); } + void sci_cancel(ScintillaObject *sci) { - SSM( sci, SCI_CANCEL, 0, 0); + SSM(sci, SCI_CANCEL, 0, 0); } + gint sci_get_target_end(ScintillaObject *sci) { - return SSM( sci, SCI_GETTARGETEND, 0, 0); + return SSM(sci, SCI_GETTARGETEND, 0, 0); } + gint sci_get_position_after(ScintillaObject *sci, gint start) { return SSM(sci, SCI_POSITIONAFTER, start, 0); } + void sci_lines_split(ScintillaObject *sci, gint pixelWidth) { SSM(sci, SCI_LINESSPLIT, pixelWidth, 0); } + void sci_lines_join(ScintillaObject *sci) { SSM(sci, SCI_LINESJOIN, 0, 0); } + gint sci_text_width(ScintillaObject *sci, gint styleNumber, const gchar *text) { return SSM(sci, SCI_TEXTWIDTH, styleNumber, (sptr_t) text); diff -Nru geany-0.18/src/sciwrappers.h geany-0.19/src/sciwrappers.h --- geany-0.18/src/sciwrappers.h 2009-07-29 18:54:48.000000000 +0100 +++ geany-0.19/src/sciwrappers.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * sciwrappers.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: sciwrappers.h 4042 2009-07-29 17:54:48Z ntrel $ + * $Id: sciwrappers.h 4518 2010-01-01 22:55:18Z eht16 $ */ #ifndef GEANY_SCIWRAPPERS_H @@ -28,150 +28,154 @@ #include "ScintillaWidget.h" -void sci_set_line_numbers (ScintillaObject* sci, gboolean set, gint extra_width); -void sci_set_mark_long_lines (ScintillaObject* sci, gint type, gint column, const gchar *color); +gchar* sci_get_string (ScintillaObject *sci, gint msg, gulong wParam); -void sci_set_text (ScintillaObject* sci, const gchar* text); -void sci_add_text (ScintillaObject* sci, const gchar* text); -gboolean sci_can_redo (ScintillaObject* sci); -gboolean sci_can_undo (ScintillaObject* sci); -gboolean sci_has_selection (ScintillaObject* sci); -void sci_undo (ScintillaObject* sci); -void sci_redo (ScintillaObject* sci); -void sci_empty_undo_buffer (ScintillaObject* sci); -void sci_end_undo_action (ScintillaObject* sci); -void sci_start_undo_action (ScintillaObject* sci); +void sci_set_line_numbers (ScintillaObject *sci, gboolean set, gint extra_width); +void sci_set_mark_long_lines (ScintillaObject *sci, gint type, gint column, const gchar *color); + +void sci_set_text (ScintillaObject *sci, const gchar *text); +void sci_add_text (ScintillaObject *sci, const gchar *text); +gboolean sci_can_redo (ScintillaObject *sci); +gboolean sci_can_undo (ScintillaObject *sci); +gboolean sci_has_selection (ScintillaObject *sci); +void sci_undo (ScintillaObject *sci); +void sci_redo (ScintillaObject *sci); +void sci_empty_undo_buffer (ScintillaObject *sci); +void sci_end_undo_action (ScintillaObject *sci); +void sci_start_undo_action (ScintillaObject *sci); gboolean sci_is_modified (ScintillaObject *sci); -void sci_set_visible_eols (ScintillaObject* sci, gboolean set ); -void sci_set_lines_wrapped (ScintillaObject* sci, gboolean set ); -void sci_set_visible_white_spaces(ScintillaObject* sci, gboolean set ); -void sci_convert_eols (ScintillaObject* sci, gint eolmode); -gint sci_get_eol_mode (ScintillaObject* sci); -void sci_set_eol_mode (ScintillaObject* sci, gint eolmode); -void sci_zoom_in (ScintillaObject* sci); -void sci_zoom_out (ScintillaObject* sci); -void sci_zoom_off (ScintillaObject* sci); -void sci_set_marker_at_line (ScintillaObject* sci, gint line_number, gboolean set, gint marker ); -gboolean sci_is_marker_set_at_line (ScintillaObject* sci, gint line, gint marker); -gint sci_marker_next (ScintillaObject* sci, gint line, gint marker_mask, gboolean wrap); -gint sci_marker_previous (ScintillaObject* sci, gint line, gint marker_mask, gboolean wrap); - -gint sci_get_col_from_position (ScintillaObject* sci, gint position); -gint sci_get_line_from_position (ScintillaObject* sci, gint position); -gint sci_get_position_from_line (ScintillaObject* sci, gint line); -gint sci_get_current_position (ScintillaObject* sci); -void sci_set_current_position (ScintillaObject* sci, gint position, gboolean scroll_to_caret); -void sci_set_current_line (ScintillaObject* sci, gint line); - -void sci_cut (ScintillaObject* sci); -void sci_copy (ScintillaObject* sci); -void sci_paste (ScintillaObject* sci); -void sci_clear (ScintillaObject* sci); - -gint sci_get_selection_start (ScintillaObject* sci); -gint sci_get_selection_end (ScintillaObject* sci); -void sci_replace_sel (ScintillaObject* sci, const gchar* text); -gint sci_get_selection_mode (ScintillaObject* sci); -void sci_set_selection_mode (ScintillaObject* sci, gint mode); +void sci_set_visible_eols (ScintillaObject *sci, gboolean set); +void sci_set_lines_wrapped (ScintillaObject *sci, gboolean set); +void sci_set_visible_white_spaces(ScintillaObject *sci, gboolean set); +void sci_convert_eols (ScintillaObject *sci, gint eolmode); +gint sci_get_eol_mode (ScintillaObject *sci); +void sci_set_eol_mode (ScintillaObject *sci, gint eolmode); +void sci_zoom_in (ScintillaObject *sci); +void sci_zoom_out (ScintillaObject *sci); +void sci_zoom_off (ScintillaObject *sci); +void sci_set_marker_at_line (ScintillaObject *sci, gint line_number, gint marker); +void sci_delete_marker_at_line (ScintillaObject *sci, gint line_number, gint marker); +void sci_toggle_marker_at_line (ScintillaObject *sci, gint line, gint marker); +gboolean sci_is_marker_set_at_line (ScintillaObject *sci, gint line, gint marker); +gint sci_marker_next (ScintillaObject *sci, gint line, gint marker_mask, gboolean wrap); +gint sci_marker_previous (ScintillaObject *sci, gint line, gint marker_mask, gboolean wrap); + +gint sci_get_col_from_position (ScintillaObject *sci, gint position); +gint sci_get_line_from_position (ScintillaObject *sci, gint position); +gint sci_get_position_from_line (ScintillaObject *sci, gint line); +gint sci_get_current_position (ScintillaObject *sci); +void sci_set_current_position (ScintillaObject *sci, gint position, gboolean scroll_to_caret); +void sci_set_current_line (ScintillaObject *sci, gint line); + +void sci_cut (ScintillaObject *sci); +void sci_copy (ScintillaObject *sci); +void sci_paste (ScintillaObject *sci); +void sci_clear (ScintillaObject *sci); + +gint sci_get_selection_start (ScintillaObject *sci); +gint sci_get_selection_end (ScintillaObject *sci); +void sci_replace_sel (ScintillaObject *sci, const gchar *text); +gint sci_get_selection_mode (ScintillaObject *sci); +void sci_set_selection_mode (ScintillaObject *sci, gint mode); gint sci_get_pos_at_line_sel_start(ScintillaObject*sci, gint line); -gint sci_get_pos_at_line_sel_end (ScintillaObject* sci, gint line); -void sci_set_selection_start (ScintillaObject* sci, gint position); -void sci_set_selection_end (ScintillaObject* sci, gint position); +gint sci_get_pos_at_line_sel_end (ScintillaObject *sci, gint line); +void sci_set_selection_start (ScintillaObject *sci, gint position); +void sci_set_selection_end (ScintillaObject *sci, gint position); void sci_set_selection (ScintillaObject *sci, gint anchorPos, gint currentPos); -gint sci_get_length (ScintillaObject* sci); -void sci_get_text (ScintillaObject* sci,gint len,gchar* text); -gchar* sci_get_contents (ScintillaObject* sci, gint len); -void sci_get_selected_text (ScintillaObject* sci, gchar* text); -gint sci_get_selected_text_length(ScintillaObject* sci); -gchar* sci_get_selection_contents (ScintillaObject* sci); -gchar* sci_get_line (ScintillaObject* sci, gint line_num); -gint sci_get_line_length (ScintillaObject* sci, gint line); -gint sci_get_line_count (ScintillaObject* sci); -gint sci_get_position_from_xy (ScintillaObject* sci, gint x, gint y, gboolean nearby); - -void sci_set_undo_collection (ScintillaObject* sci, gboolean set); - -gint sci_get_line_end_position (ScintillaObject* sci, gint line); - -void sci_toggle_fold (ScintillaObject* sci, gint line); -gboolean sci_get_line_is_visible (ScintillaObject* sci, gint line); -void sci_ensure_line_is_visible (ScintillaObject* sci, gint line); -gint sci_get_fold_level (ScintillaObject* sci, gint line); -gint sci_get_fold_parent (ScintillaObject* sci, gint start_line); - -void sci_set_folding_margin_visible (ScintillaObject * sci, gboolean set ); -gboolean sci_get_fold_expanded (ScintillaObject* sci, gint line); - -void sci_colourise (ScintillaObject* sci, gint start, gint end); -void sci_clear_all (ScintillaObject * sci); -gint sci_get_end_styled (ScintillaObject * sci); -void sci_set_tab_width (ScintillaObject * sci, gint width); -gint sci_get_tab_width (ScintillaObject * sci); -gchar sci_get_char_at (ScintillaObject * sci, gint pos); -void sci_set_savepoint (ScintillaObject * sci); -void sci_set_indentation_guides (ScintillaObject * sci, gint mode); -void sci_use_popup (ScintillaObject * sci, gboolean enable); -void sci_goto_pos (ScintillaObject * sci, gint pos, gboolean unfold); -void sci_set_search_anchor (ScintillaObject * sci); -void sci_set_anchor (ScintillaObject * sci, gint pos); -void sci_scroll_caret (ScintillaObject * sci); -void sci_scroll_lines (ScintillaObject * sci, gint lines); +gint sci_get_length (ScintillaObject *sci); +void sci_get_text (ScintillaObject *sci, gint len, gchar *text); +gchar* sci_get_contents (ScintillaObject *sci, gint len); +void sci_get_selected_text (ScintillaObject *sci, gchar *text); +gint sci_get_selected_text_length(ScintillaObject *sci); +gchar* sci_get_selection_contents (ScintillaObject *sci); +gchar* sci_get_line (ScintillaObject *sci, gint line_num); +gint sci_get_line_length (ScintillaObject *sci, gint line); +gint sci_get_line_count (ScintillaObject *sci); +gint sci_get_position_from_xy (ScintillaObject *sci, gint x, gint y, gboolean nearby); + +void sci_set_undo_collection (ScintillaObject *sci, gboolean set); + +gint sci_get_line_end_position (ScintillaObject *sci, gint line); + +void sci_toggle_fold (ScintillaObject *sci, gint line); +gboolean sci_get_line_is_visible (ScintillaObject *sci, gint line); +void sci_ensure_line_is_visible (ScintillaObject *sci, gint line); +gint sci_get_fold_level (ScintillaObject *sci, gint line); +gint sci_get_fold_parent (ScintillaObject *sci, gint start_line); + +void sci_set_folding_margin_visible (ScintillaObject *sci, gboolean set); +gboolean sci_get_fold_expanded (ScintillaObject *sci, gint line); + +void sci_colourise (ScintillaObject *sci, gint start, gint end); +void sci_clear_all (ScintillaObject *sci); +gint sci_get_end_styled (ScintillaObject *sci); +void sci_set_tab_width (ScintillaObject *sci, gint width); +gint sci_get_tab_width (ScintillaObject *sci); +gchar sci_get_char_at (ScintillaObject *sci, gint pos); +void sci_set_savepoint (ScintillaObject *sci); +void sci_set_indentation_guides (ScintillaObject *sci, gint mode); +void sci_use_popup (ScintillaObject *sci, gboolean enable); +void sci_goto_pos (ScintillaObject *sci, gint pos, gboolean unfold); +void sci_set_search_anchor (ScintillaObject *sci); +void sci_set_anchor (ScintillaObject *sci, gint pos); +void sci_scroll_caret (ScintillaObject *sci); +void sci_scroll_lines (ScintillaObject *sci, gint lines); void sci_scroll_columns (ScintillaObject *sci, gint columns); -gint sci_search_next (ScintillaObject * sci, gint flags, const gchar *text); -gint sci_search_prev (ScintillaObject * sci, gint flags, const gchar *text); -gint sci_find_text (ScintillaObject * sci, gint flags, struct Sci_TextToFind *ttf); -void sci_set_font (ScintillaObject * sci, gint style, const gchar* font, gint size); -void sci_goto_line (ScintillaObject * sci, gint line, gboolean unfold); -void sci_marker_delete_all (ScintillaObject * sci, gint marker); -gint sci_get_style_at (ScintillaObject * sci, gint position); -void sci_set_symbol_margin (ScintillaObject * sci, gboolean set); -void sci_set_codepage (ScintillaObject * sci, gint cp); -void sci_clear_cmdkey (ScintillaObject * sci, gint key); -void sci_assign_cmdkey (ScintillaObject * sci, gint key, gint command); -void sci_get_text_range (ScintillaObject * sci, gint start, gint end, gchar *text); -gchar* sci_get_contents_range (ScintillaObject * sci, gint start, gint end); -void sci_selection_duplicate (ScintillaObject * sci); -void sci_line_duplicate (ScintillaObject * sci); -void sci_insert_text (ScintillaObject * sci, gint pos, const gchar *text); - -void sci_target_from_selection (ScintillaObject * sci); -void sci_set_target_start (ScintillaObject * sci, gint start); -void sci_set_target_end (ScintillaObject * sci, gint end); -gint sci_get_target_end (ScintillaObject * sci); -gint sci_replace_target (ScintillaObject * sci, const gchar *text, gboolean regex); - -void sci_set_keywords (ScintillaObject * sci, gint k, gchar *text); -gint sci_get_lexer (ScintillaObject * sci); -void sci_set_readonly (ScintillaObject * sci, gboolean readonly); -gint sci_get_zoom (ScintillaObject * sci); -void sci_send_command (ScintillaObject * sci, gint cmd); - -gint sci_get_current_line (ScintillaObject * sci); -gint sci_get_lines_selected (ScintillaObject * sci); -gint sci_get_first_visible_line (ScintillaObject * sci); - -void sci_indicator_set (ScintillaObject * sci, gint indic); -void sci_indicator_fill (ScintillaObject * sci, gint pos, gint len); -void sci_indicator_clear (ScintillaObject * sci, gint pos, gint len); - -void sci_select_all (ScintillaObject * sci); -gint sci_get_line_indent_position(ScintillaObject * sci, gint line); -void sci_set_line_indentation (ScintillaObject * sci, gint line, gint indent); -int sci_get_line_indentation (ScintillaObject * sci, gint line); -void sci_set_autoc_max_height (ScintillaObject * sci, gint val); -gint sci_find_matching_brace (ScintillaObject * sci, gint pos); - -gint sci_get_overtype (ScintillaObject * sci); -void sci_set_tab_indents (ScintillaObject * sci, gboolean set); -void sci_set_use_tabs (ScintillaObject * sci, gboolean set); - -void sci_set_scrollbar_mode (ScintillaObject * sci, gboolean visible); -void sci_set_caret_policy_x (ScintillaObject * sci, gint policy, gint slop); -void sci_set_caret_policy_y (ScintillaObject * sci, gint policy, gint slop); +gint sci_search_next (ScintillaObject *sci, gint flags, const gchar *text); +gint sci_search_prev (ScintillaObject *sci, gint flags, const gchar *text); +gint sci_find_text (ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf); +void sci_set_font (ScintillaObject *sci, gint style, const gchar *font, gint size); +void sci_goto_line (ScintillaObject *sci, gint line, gboolean unfold); +void sci_marker_delete_all (ScintillaObject *sci, gint marker); +gint sci_get_style_at (ScintillaObject *sci, gint position); +void sci_set_symbol_margin (ScintillaObject *sci, gboolean set); +void sci_set_codepage (ScintillaObject *sci, gint cp); +void sci_clear_cmdkey (ScintillaObject *sci, gint key); +void sci_assign_cmdkey (ScintillaObject *sci, gint key, gint command); +void sci_get_text_range (ScintillaObject *sci, gint start, gint end, gchar *text); +gchar* sci_get_contents_range (ScintillaObject *sci, gint start, gint end); +void sci_selection_duplicate (ScintillaObject *sci); +void sci_line_duplicate (ScintillaObject *sci); +void sci_insert_text (ScintillaObject *sci, gint pos, const gchar *text); + +void sci_target_from_selection (ScintillaObject *sci); +void sci_set_target_start (ScintillaObject *sci, gint start); +void sci_set_target_end (ScintillaObject *sci, gint end); +gint sci_get_target_end (ScintillaObject *sci); +gint sci_replace_target (ScintillaObject *sci, const gchar *text, gboolean regex); + +void sci_set_keywords (ScintillaObject *sci, gint k, const gchar *text); +gint sci_get_lexer (ScintillaObject *sci); +void sci_set_readonly (ScintillaObject *sci, gboolean readonly); +gint sci_get_zoom (ScintillaObject *sci); +void sci_send_command (ScintillaObject *sci, gint cmd); + +gint sci_get_current_line (ScintillaObject *sci); +gint sci_get_lines_selected (ScintillaObject *sci); +gint sci_get_first_visible_line (ScintillaObject *sci); + +void sci_indicator_set (ScintillaObject *sci, gint indic); +void sci_indicator_fill (ScintillaObject *sci, gint pos, gint len); +void sci_indicator_clear (ScintillaObject *sci, gint pos, gint len); + +void sci_select_all (ScintillaObject *sci); +gint sci_get_line_indent_position(ScintillaObject *sci, gint line); +void sci_set_line_indentation (ScintillaObject *sci, gint line, gint indent); +gint sci_get_line_indentation (ScintillaObject *sci, gint line); +void sci_set_autoc_max_height (ScintillaObject *sci, gint val); +gint sci_find_matching_brace (ScintillaObject *sci, gint pos); + +gint sci_get_overtype (ScintillaObject *sci); +void sci_set_tab_indents (ScintillaObject *sci, gboolean set); +void sci_set_use_tabs (ScintillaObject *sci, gboolean set); + +void sci_set_scrollbar_mode (ScintillaObject *sci, gboolean visible); +void sci_set_caret_policy_x (ScintillaObject *sci, gint policy, gint slop); +void sci_set_caret_policy_y (ScintillaObject *sci, gint policy, gint slop); -void sci_set_scroll_stop_at_last_line (ScintillaObject* sci, gboolean set); +void sci_set_scroll_stop_at_last_line (ScintillaObject *sci, gboolean set); void sci_cancel (ScintillaObject *sci); @@ -179,6 +183,6 @@ void sci_lines_split (ScintillaObject *sci, gint pixelWidth); void sci_lines_join (ScintillaObject *sci); -gint sci_text_width (ScintillaObject *sci, int styleNumber, const char * text); +gint sci_text_width (ScintillaObject *sci, gint styleNumber, const gchar *text); #endif diff -Nru geany-0.18/src/search.c geany-0.19/src/search.c --- geany-0.18/src/search.c 2009-07-16 15:37:35.000000000 +0100 +++ geany-0.19/src/search.c 2010-05-11 13:10:31.000000000 +0100 @@ -1,8 +1,8 @@ /* * search.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: search.c 3974 2009-07-16 14:37:35Z ntrel $ + * $Id: search.c 4901 2010-05-11 12:10:31Z ntrel $ */ /* @@ -45,12 +45,19 @@ #include #include +#include #ifdef G_OS_UNIX # include # include #endif +#ifdef HAVE_REGEX_H +# include +#else +# include "gnuregex.h" +#endif + enum { @@ -91,7 +98,7 @@ } settings = {0, NULL, FALSE, FALSE, FALSE, FALSE, FALSE}; -static GeanyPrefGroup *fif_prefs = NULL; +static StashGroup *fif_prefs = NULL; static struct @@ -99,8 +106,9 @@ GtkWidget *dialog; GtkWidget *entry; gboolean all_expanded; + gint position[2]; /* x, y */ } -find_dlg = {NULL, NULL, FALSE}; +find_dlg = {NULL, NULL, FALSE, {0, 0}}; static struct { @@ -108,8 +116,9 @@ GtkWidget *find_entry; GtkWidget *replace_entry; gboolean all_expanded; + gint position[2]; /* x, y */ } -replace_dlg = {NULL, NULL, NULL, FALSE}; +replace_dlg = {NULL, NULL, NULL, FALSE, {0, 0}}; static struct { @@ -117,8 +126,9 @@ GtkWidget *dir_combo; GtkWidget *search_combo; GtkWidget *encoding_combo; + gint position[2]; /* x, y */ } -fif_dlg = {NULL, NULL, NULL, NULL}; +fif_dlg = {NULL, NULL, NULL, NULL, {0, 0}}; static gboolean search_read_io(GIOChannel *source, GIOCondition condition, gpointer data); @@ -157,7 +167,7 @@ static void init_prefs(void) { - GeanyPrefGroup *group; + StashGroup *group; group = stash_group_new("search"); configuration_add_pref_group(group, TRUE); @@ -165,6 +175,13 @@ "pref_search_current_file_dir", TRUE, "check_fif_current_dir"); stash_group_add_boolean(group, &find_dlg.all_expanded, "find_all_expanded", FALSE); stash_group_add_boolean(group, &replace_dlg.all_expanded, "replace_all_expanded", FALSE); + /* dialog positions */ + stash_group_add_integer(group, &find_dlg.position[0], "position_find_x", -1); + stash_group_add_integer(group, &find_dlg.position[1], "position_find_y", -1); + stash_group_add_integer(group, &replace_dlg.position[0], "position_replace_x", -1); + stash_group_add_integer(group, &replace_dlg.position[1], "position_replace_y", -1); + stash_group_add_integer(group, &fif_dlg.position[0], "position_fif_x", -1); + stash_group_add_integer(group, &fif_dlg.position[1], "position_fif_y", -1); group = stash_group_new("search"); fif_prefs = group; @@ -397,7 +414,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); entry = gtk_combo_box_entry_new_text(); - ui_entry_add_clear_icon(gtk_bin_get_child(GTK_BIN(entry))); + ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry)))); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 248); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50); @@ -464,6 +481,13 @@ } +static void set_dialog_position(GtkWidget *dialog, gint *position) +{ + if (position[0] >= 0) + gtk_window_move(GTK_WINDOW(dialog), position[0], position[1]); +} + + void search_show_find_dialog(void) { GeanyDocument *doc = document_get_current(); @@ -479,6 +503,7 @@ if (sel) gtk_entry_set_text(GTK_ENTRY(find_dlg.entry), sel); + set_dialog_position(find_dlg.dialog, find_dlg.position); gtk_widget_show_all(find_dlg.dialog); } else @@ -487,12 +512,14 @@ if (! GTK_WIDGET_VISIBLE(find_dlg.dialog) && sel) gtk_entry_set_text(GTK_ENTRY(find_dlg.entry), sel); gtk_widget_grab_focus(find_dlg.entry); + set_dialog_position(find_dlg.dialog, find_dlg.position); gtk_widget_show(find_dlg.dialog); if (sel != NULL) /* when we have a selection, reset the entry widget's background colour */ ui_set_search_entry_background(find_dlg.entry, TRUE); /* bring the dialog back in the foreground in case it is already open but the focus is away */ gtk_window_present(GTK_WINDOW(find_dlg.dialog)); } + g_free(sel); } @@ -539,7 +566,7 @@ gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5); entry_find = gtk_combo_box_entry_new_text(); - ui_entry_add_clear_icon(gtk_bin_get_child(GTK_BIN(entry_find))); + ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find)))); gtk_label_set_mnemonic_widget(GTK_LABEL(label_find), entry_find); gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 248); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 50); @@ -548,7 +575,7 @@ replace_dlg.find_entry = GTK_BIN(entry_find)->child; entry_replace = gtk_combo_box_entry_new_text(); - ui_entry_add_clear_icon(gtk_bin_get_child(GTK_BIN(entry_replace))); + ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace)))); gtk_label_set_mnemonic_widget(GTK_LABEL(label_replace), entry_replace); gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 248); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50); @@ -644,6 +671,7 @@ if (sel) gtk_entry_set_text(GTK_ENTRY(replace_dlg.find_entry), sel); + set_dialog_position(replace_dlg.dialog, replace_dlg.position); gtk_widget_show_all(replace_dlg.dialog); } else @@ -654,6 +682,7 @@ if (sel != NULL) /* when we have a selection, reset the entry widget's background colour */ ui_set_search_entry_background(replace_dlg.find_entry, TRUE); gtk_widget_grab_focus(replace_dlg.find_entry); + set_dialog_position(replace_dlg.dialog, replace_dlg.position); gtk_widget_show(replace_dlg.dialog); /* bring the dialog back in the foreground in case it is already open but the focus is away */ gtk_window_present(GTK_WINDOW(replace_dlg.dialog)); @@ -698,7 +727,7 @@ dir_combo = gtk_combo_box_entry_new_text(); entry = gtk_bin_get_child(GTK_BIN(dir_combo)); - ui_entry_add_clear_icon(entry); + ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry); gtk_entry_set_max_length(GTK_ENTRY(entry), 248); gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); @@ -713,7 +742,7 @@ combo = gtk_combo_box_entry_new_text(); entry = gtk_bin_get_child(GTK_BIN(combo)); - ui_entry_add_clear_icon(entry); + ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_entry_set_max_length(GTK_ENTRY(entry), 248); gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); @@ -817,7 +846,7 @@ gtk_button_set_focus_on_click(GTK_BUTTON(check_extra), FALSE); entry_extra = gtk_entry_new(); - ui_entry_add_clear_icon(entry_extra); + ui_entry_add_clear_icon(GTK_ENTRY(entry_extra)); gtk_widget_set_sensitive(entry_extra, FALSE); ui_widget_set_tooltip_text(entry_extra, _("Other options to pass to Grep")); ui_hookup_widget(fif_dlg.dialog, entry_extra, "entry_extra"); @@ -846,7 +875,6 @@ { GtkWidget *entry; /* for child GtkEntry of a GtkComboBoxEntry */ GeanyDocument *doc = document_get_current(); - GeanyEditor *editor = doc ? doc->editor : NULL; gchar *sel = NULL; gchar *cur_dir = NULL; GeanyEncodingIndex enc_idx = GEANY_ENCODING_UTF_8; @@ -855,13 +883,14 @@ { create_fif_dialog(); gtk_widget_show_all(fif_dlg.dialog); - sel = editor_get_default_selection(editor, search_prefs.use_current_word, NULL); + if (doc) + sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); } stash_group_display(fif_prefs, fif_dlg.dialog); /* only set selection if the dialog is not already visible, or has just been created */ - if (! sel && ! GTK_WIDGET_VISIBLE(fif_dlg.dialog)) - sel = editor_get_default_selection(editor, search_prefs.use_current_word, NULL); + if (doc && ! sel && ! GTK_WIDGET_VISIBLE(fif_dlg.dialog)) + sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); entry = GTK_BIN(fif_dlg.search_combo)->child; if (sel) @@ -912,6 +941,9 @@ else gtk_widget_grab_focus(fif_dlg.search_combo); + /* set dialog window position */ + set_dialog_position(fif_dlg.dialog, fif_dlg.position); + gtk_widget_show(fif_dlg.dialog); /* bring the dialog back in the foreground in case it is already open but the focus is away */ gtk_window_present(GTK_WINDOW(fif_dlg.dialog)); @@ -932,9 +964,12 @@ GtkWidget *check_wordstart = ui_lookup_widget(dialog, "check_wordstart"); GtkToggleButton *check_case = GTK_TOGGLE_BUTTON( ui_lookup_widget(dialog, "check_case")); + GtkWidget *check_escape = ui_lookup_widget(dialog, "check_escape"); static gboolean case_state = FALSE; /* state before regex enabled */ /* hide options that don't apply to regex searches */ + gtk_widget_set_sensitive(check_escape, ! regex_set); + if (dialog == find_dlg.dialog) gtk_widget_set_sensitive(ui_lookup_widget(dialog, "btn_previous"), ! regex_set); else @@ -959,7 +994,8 @@ } -/* @return Number of matches marked. */ +/* Clears markers if text is null/empty. + * @return Number of matches marked. */ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags) { gint pos, count = 0; @@ -1024,6 +1060,9 @@ static void on_find_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { + gtk_window_get_position(GTK_WINDOW(find_dlg.dialog), + &find_dlg.position[0], &find_dlg.position[1]); + if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) gtk_widget_hide(find_dlg.dialog); else @@ -1043,18 +1082,22 @@ g_free(search_data.text); search_data.text = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(user_data))))); - if (strlen(search_data.text) == 0 || - (search_replace_escape && ! utils_str_replace_escape(search_data.text))) + search_data.flags = get_search_flags(find_dlg.dialog); + + if (strlen(search_data.text) == 0) { + fail: utils_beep(); gtk_widget_grab_focus(find_dlg.entry); return; } - + if (search_replace_escape || search_data.flags & SCFIND_REGEXP) + { + if (! utils_str_replace_escape(search_data.text, search_data.flags & SCFIND_REGEXP)) + goto fail; + } ui_combo_box_add_to_history(GTK_COMBO_BOX(user_data), search_data.text); - search_data.flags = get_search_flags(find_dlg.dialog); - switch (response) { case GEANY_RESPONSE_FIND: @@ -1103,6 +1146,44 @@ } +static void replace_in_session(GeanyDocument *doc, + gint search_flags_re, gboolean search_replace_escape_re, + const gchar *find, const gchar *replace) +{ + guint n, page_count, rep_count = 0, file_count = 0; + + /* replace in all documents following notebook tab order */ + page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); + for (n = 0; n < page_count; n++) + { + GeanyDocument *tmp_doc = document_get_from_page(n); + gint reps = 0; + + reps = document_replace_all(tmp_doc, find, replace, search_flags_re, + search_replace_escape_re); + rep_count += reps; + if (reps) + file_count++; + } + if (file_count == 0) + { + utils_beep(); + ui_set_statusbar(FALSE, _("No matches found for \"%s\"."), find); + return; + } + /* if only one file was changed, don't override that document's status message + * so we don't have to translate 4 messages for ngettext */ + if (file_count > 1) + ui_set_statusbar(FALSE, _("Replaced %u matches in %u documents."), + rep_count, file_count); + + /* show which docs had replacements: */ + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_STATUS); + + ui_save_buttons_toggle(doc->changed); /* update save all */ +} + + static void on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { @@ -1112,6 +1193,9 @@ gboolean close_window; gchar *find, *replace; + gtk_window_get_position(GTK_WINDOW(replace_dlg.dialog), + &replace_dlg.position[0], &replace_dlg.position[1]); + if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) { gtk_widget_hide(replace_dlg.dialog); @@ -1132,24 +1216,29 @@ if ((response != GEANY_RESPONSE_FIND) && (search_flags_re & SCFIND_MATCHCASE) && (strcmp(find, replace) == 0)) { + fail: utils_beep(); gtk_widget_grab_focus(replace_dlg.find_entry); return; } + if (search_flags_re & SCFIND_REGEXP) + { + if (! utils_str_replace_escape(find, TRUE) || + ! utils_str_replace_escape(replace, TRUE)) + goto fail; + } + else if (search_replace_escape_re) + { + if (! utils_str_replace_escape(find, FALSE) || + ! utils_str_replace_escape(replace, FALSE)) + goto fail; + } ui_combo_box_add_to_history(GTK_COMBO_BOX( gtk_widget_get_parent(replace_dlg.find_entry)), find); ui_combo_box_add_to_history(GTK_COMBO_BOX( gtk_widget_get_parent(replace_dlg.replace_entry)), replace); - if (search_replace_escape_re && - (! utils_str_replace_escape(find) || ! utils_str_replace_escape(replace))) - { - utils_beep(); - gtk_widget_grab_focus(replace_dlg.find_entry); - return; - } - switch (response) { case GEANY_RESPONSE_REPLACE_AND_FIND: @@ -1162,11 +1251,10 @@ break; } case GEANY_RESPONSE_REPLACE: - { document_replace_text(doc, find, replace, search_flags_re, search_backwards_re); break; - } + case GEANY_RESPONSE_FIND: { gint result = document_find_text(doc, find, search_flags_re, @@ -1175,44 +1263,18 @@ break; } case GEANY_RESPONSE_REPLACE_IN_FILE: - { if (! document_replace_all(doc, find, replace, search_flags_re, search_replace_escape_re)) - { utils_beep(); - } break; - } - case GEANY_RESPONSE_REPLACE_IN_SESSION: - { - guint n, page_count, count = 0; - - /* replace in all documents following notebook tab order */ - page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); - for (n = 0; n < page_count; n++) - { - GeanyDocument *tmp_doc = document_get_from_page(n); - - if (document_replace_all(tmp_doc, find, replace, search_flags_re, - search_replace_escape_re)) count++; - } - if (count == 0) - utils_beep(); - - ui_set_statusbar(FALSE, - ngettext("Replaced text in %u file.", - "Replaced text in %u files.", count), count); - /* show which docs had replacements: */ - gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_STATUS); - ui_save_buttons_toggle(doc->changed); /* update save all */ + case GEANY_RESPONSE_REPLACE_IN_SESSION: + replace_in_session(doc, search_flags_re, search_replace_escape_re, find, replace); break; - } + case GEANY_RESPONSE_REPLACE_IN_SEL: - { document_replace_sel(doc, find, replace, search_flags_re, search_replace_escape_re); break; - } } switch (response) { @@ -1287,6 +1349,8 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response, G_GNUC_UNUSED gpointer user_data) { + gtk_window_get_position(GTK_WINDOW(fif_dlg.dialog), &fif_dlg.position[0], &fif_dlg.position[1]); + stash_group_update(fif_prefs, fif_dlg.dialog); if (response == GTK_RESPONSE_ACCEPT) @@ -1422,9 +1486,9 @@ msgwindow.find_in_files_dir = g_strdup(dir); /* we can pass 'enc' without strdup'ing it here because it's a global const string and * always exits longer than the lifetime of this function */ - utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + utils_set_up_io_channel(stdout_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, TRUE, search_read_io, (gpointer) enc); - utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + utils_set_up_io_channel(stderr_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, TRUE, search_read_io_stderr, (gpointer) enc); g_child_watch_add(child_pid, search_close_pid, NULL); @@ -1480,12 +1544,11 @@ } -static gboolean search_read_io(GIOChannel *source, GIOCondition condition, gpointer data) +static gboolean read_fif_io(GIOChannel *source, GIOCondition condition, gchar *enc, gint msg_color) { if (condition & (G_IO_IN | G_IO_PRI)) { gchar *msg, *utf8_msg; - gchar *enc = data; while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) { @@ -1505,7 +1568,7 @@ else utf8_msg = msg; - msgwin_msg_add_string(COLOR_BLACK, -1, NULL, utf8_msg); + msgwin_msg_add_string(msg_color, -1, NULL, utf8_msg); if (utf8_msg != msg) g_free(utf8_msg); @@ -1519,42 +1582,15 @@ } -static gboolean search_read_io_stderr(GIOChannel *source, GIOCondition condition, gpointer data) +static gboolean search_read_io(GIOChannel *source, GIOCondition condition, gpointer data) { - if (condition & (G_IO_IN | G_IO_PRI)) - { - gchar *msg, *utf8_msg; - gchar *enc = data; - - while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) - { - utf8_msg = NULL; - - g_strstrip(msg); - /* enc is NULL when encoding is set to UTF-8, so we can skip any conversion */ - if (enc != NULL) - { - if (! g_utf8_validate(msg, -1, NULL)) - { - utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); - } - if (utf8_msg == NULL) - utf8_msg = msg; - } - else - utf8_msg = msg; + return read_fif_io(source, condition, data, COLOR_BLACK); +} - g_warning("Find in Files: %s", utf8_msg); - if (utf8_msg != msg) - g_free(utf8_msg); - g_free(msg); - } - } - if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) - return FALSE; - - return TRUE; +static gboolean search_read_io_stderr(GIOChannel *source, GIOCondition condition, gpointer data) +{ + return read_fif_io(source, condition, data, COLOR_DARK_RED); } @@ -1562,8 +1598,7 @@ { /* TODO: port this also to Windows API */ #ifdef G_OS_UNIX - const gchar *msg = _("Search failed (see Help->Debug Messages for details)."); - gint color = COLOR_DARK_RED; + const gchar *msg = _("Search failed."); gint exit_status = 1; if (WIFEXITED(status)) @@ -1592,9 +1627,8 @@ } case 1: msg = _("No matches found."); - color = COLOR_BLUE; default: - msgwin_msg_add_string(color, -1, NULL, msg); + msgwin_msg_add_string(COLOR_BLUE, -1, NULL, msg); ui_set_statusbar(FALSE, "%s", msg); break; } @@ -1606,6 +1640,159 @@ } +static gboolean compile_regex(regex_t *regex, const gchar *str, gint sflags) +{ + gint err; + gint rflags = REG_EXTENDED | REG_NEWLINE; + + if (~sflags & SCFIND_MATCHCASE) + rflags |= REG_ICASE; + if (sflags & (SCFIND_WHOLEWORD | SCFIND_WORDSTART)) + { + g_warning("Unsupported regex flags found!"); + } + + err = regcomp(regex, str, rflags); + if (err != 0) + { + gchar buf[256]; + + regerror(err, regex, buf, sizeof buf); + ui_set_statusbar(FALSE, _("Bad regex: %s"), buf); + return FALSE; + } + return TRUE; +} + + +/* groups that don't exist are handled OK as len = end - start = (-1) - (-1) = 0 */ +static gchar *get_regex_match_string(const gchar *text, regmatch_t *pmatch, gint match_idx) +{ + return g_strndup(&text[pmatch[match_idx].rm_so], + pmatch[match_idx].rm_eo - pmatch[match_idx].rm_so); +} + + +static regmatch_t regex_matches[10]; +/* All matching text from regex_matches[0].rm_so to regex_matches[0].rm_eo */ +static gchar *regex_match_text = NULL; + +static gint find_regex(ScintillaObject *sci, guint pos, regex_t *regex) +{ + const gchar *text; + gint flags = 0; + + g_return_val_if_fail(pos <= (guint)sci_get_length(sci), FALSE); + + if (sci_get_col_from_position(sci, pos) != 0) + flags = REG_NOTBOL; + /* Warning: any SCI calls will invalidate 'text' after calling SCI_GETCHARACTERPOINTER */ + text = (void*)scintilla_send_message(sci, SCI_GETCHARACTERPOINTER, 0, 0); + text += pos; + + if (regexec(regex, text, G_N_ELEMENTS(regex_matches), regex_matches, flags) == 0) + { + setptr(regex_match_text, get_regex_match_string(text, regex_matches, 0)); + return regex_matches[0].rm_so + pos; + } + setptr(regex_match_text, NULL); + return -1; +} + + +gint search_find_next(ScintillaObject *sci, const gchar *str, gint flags) +{ + regex_t regex; + gint ret = -1; + gint pos; + + if (~flags & SCFIND_REGEXP) + return sci_search_next(sci, flags, str); + + if (!compile_regex(®ex, str, flags)) + return -1; + + pos = sci_get_current_position(sci); + ret = find_regex(sci, pos, ®ex); + if (ret >= 0) + sci_set_selection(sci, ret, regex_matches[0].rm_eo + pos); + + regfree(®ex); + return ret; +} + + +gint search_replace_target(ScintillaObject *sci, const gchar *replace_text, + gboolean regex) +{ + GString *str; + gint ret = 0; + gint i = 0; + + if (!regex) + return sci_replace_target(sci, replace_text, FALSE); + + str = g_string_new(replace_text); + while (str->str[i]) + { + gchar *ptr = &str->str[i]; + gchar *grp; + gchar c; + + if (ptr[0] != '\\') + { + i++; + continue; + } + c = ptr[1]; + /* backslash or unnecessary escape */ + if (c == '\\' || !isdigit(c)) + { + g_string_erase(str, i, 1); + i++; + continue; + } + /* digit escape */ + g_string_erase(str, i, 2); + /* fix match offsets by subtracting index of whole match start from the string */ + grp = get_regex_match_string(regex_match_text - regex_matches[0].rm_so, + regex_matches, c - '0'); + g_string_insert(str, i, grp); + i += strlen(grp); + g_free(grp); + } + ret = sci_replace_target(sci, str->str, FALSE); + g_string_free(str, TRUE); + return ret; +} + + +gint search_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf) +{ + regex_t regex; + gint pos; + gint ret; + + if (~flags & SCFIND_REGEXP) + return sci_find_text(sci, flags, ttf); + + if (!compile_regex(®ex, ttf->lpstrText, flags)) + return -1; + + pos = ttf->chrg.cpMin; + ret = find_regex(sci, pos, ®ex); + regfree(®ex); + + if (ret >= 0 && ret < ttf->chrg.cpMax) + { + ttf->chrgText.cpMin = regex_matches[0].rm_so + pos; + ttf->chrgText.cpMax = regex_matches[0].rm_eo + pos; + return ret; + } + return -1; +} + + static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gint flags) { gchar *buffer, *short_file_name; @@ -1624,7 +1811,7 @@ { gint pos, line, start, find_len; - pos = sci_find_text(doc->editor->sci, flags, &ttf); + pos = search_find_text(doc->editor->sci, flags, &ttf); if (pos == -1) break; /* no more matches */ find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; @@ -1637,7 +1824,7 @@ { buffer = sci_get_line(doc->editor->sci, line); msgwin_msg_add(COLOR_BLACK, line + 1, doc, - "%s:%d : %s", short_file_name, line + 1, g_strstrip(buffer)); + "%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer)); g_free(buffer); prev_line = line; } @@ -1700,3 +1887,67 @@ } +/* ttf is updated to include the last match position (ttf->chrg.cpMin) and + * the new search range end (ttf->chrg.cpMax). + * Note: Normally you would call sci_start/end_undo_action() around this call. */ +/* Warning: Scintilla recommends caching replacements to do all at once to avoid + * performance issues with SCI_GETCHARACTERPOINTER. */ +guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, + gint flags, const gchar *replace_text) +{ + gint count = 0; + const gchar *find_text = ttf->lpstrText; + gint start = ttf->chrg.cpMin; + gint end = ttf->chrg.cpMax; + + g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0); + if (! *find_text) + return 0; + + while (TRUE) + { + gint search_pos; + gint find_len = 0, replace_len = 0; + + search_pos = search_find_text(sci, flags, ttf); + find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; + if (search_pos == -1) + break; /* no more matches */ + if (find_len == 0 && ! NZV(replace_text)) + break; /* nothing to do */ + + if (search_pos + find_len > end) + break; /* found text is partly out of range */ + else + { + gint movepastEOL = 0; + + sci_set_target_start(sci, search_pos); + sci_set_target_end(sci, search_pos + find_len); + + if (find_len <= 0) + { + gchar chNext = sci_get_char_at(sci, sci_get_target_end(sci)); + + if (chNext == '\r' || chNext == '\n') + movepastEOL = 1; + } + replace_len = search_replace_target(sci, replace_text, + flags & SCFIND_REGEXP); + count++; + if (search_pos == end) + break; /* Prevent hang when replacing regex $ */ + + /* make the next search start after the replaced text */ + start = search_pos + replace_len + movepastEOL; + if (find_len == 0) + start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */ + ttf->chrg.cpMin = start; + end += replace_len - find_len; /* update end of range now text has changed */ + ttf->chrg.cpMax = end; + } + } + return count; +} + + diff -Nru geany-0.18/src/search.h geany-0.19/src/search.h --- geany-0.18/src/search.h 2009-07-10 16:17:27.000000000 +0100 +++ geany-0.19/src/search.h 2010-05-05 13:50:59.000000000 +0100 @@ -1,8 +1,8 @@ /* * search.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,9 +18,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: search.h 3949 2009-07-10 15:17:27Z ntrel $ + * $Id: search.h 4873 2010-05-05 12:50:59Z ntrel $ */ +/** + * @file search.h + * Search (prefs). + **/ + #ifndef GEANY_SEARCH_H #define GEANY_SEARCH_H 1 @@ -40,10 +45,11 @@ extern GeanySearchData search_data; +/** Search preferences */ typedef struct GeanySearchPrefs { gboolean suppress_dialogs; - gboolean use_current_word; + gboolean use_current_word; /**< Use current word for default search text */ gboolean use_current_file_dir; /* find in files directory to use on showing dialog */ } GeanySearchPrefs; @@ -61,10 +67,24 @@ void search_show_find_in_files_dialog(const gchar *dir); + +struct _ScintillaObject; +struct Sci_TextToFind; + +gint search_find_next(struct _ScintillaObject *sci, const gchar *str, gint flags); + +gint search_find_text(struct _ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf); + void search_find_usage(const gchar *search_text, gint flags, gboolean in_session); void search_find_selection(GeanyDocument *doc, gboolean search_backwards); gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags); +gint search_replace_target(struct _ScintillaObject *sci, const gchar *replace_text, + gboolean regex); + +guint search_replace_range(struct _ScintillaObject *sci, struct Sci_TextToFind *ttf, + gint flags, const gchar *replace_text); + #endif diff -Nru geany-0.18/src/sidebar.c geany-0.19/src/sidebar.c --- geany-0.18/src/sidebar.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/src/sidebar.c 2010-06-06 18:21:52.000000000 +0100 @@ -0,0 +1,1027 @@ +/* + * sidebar.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven + * + * 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: sidebar.c 5003 2010-06-06 17:21:52Z eht16 $ + */ + +/* + * Sidebar related code for the Symbol list and Open files GtkTreeViews. + */ + +#include + +#include "geany.h" +#include "support.h" +#include "callbacks.h" +#include "sidebar.h" +#include "document.h" +#include "editor.h" +#include "documentprivate.h" +#include "filetypes.h" +#include "utils.h" +#include "ui_utils.h" +#include "symbols.h" +#include "navqueue.h" +#include "project.h" +#include "stash.h" +#include "keyfile.h" +#include "sciwrappers.h" + +#include + + +SidebarTreeviews tv = {NULL, NULL, NULL}; +/* while typeahead searching, editor should not get focus */ +static gboolean may_steal_focus = FALSE; + +static struct +{ + GtkWidget *close; + GtkWidget *save; + GtkWidget *reload; + GtkWidget *show_paths; +} +doc_items = {NULL, NULL, NULL, NULL}; + +static struct +{ + GtkTreeSelection *selection; + guint keyval; +} selection_change = {NULL, 0}; + +enum +{ + TREEVIEW_SYMBOL = 0, + TREEVIEW_OPENFILES +}; + +enum +{ + OPENFILES_ACTION_REMOVE = 0, + OPENFILES_ACTION_SAVE, + OPENFILES_ACTION_RELOAD +}; + +/* documents tree model columns */ +enum +{ + DOCUMENTS_ICON, + DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ + DOCUMENTS_DOCUMENT, + DOCUMENTS_COLOR, + DOCUMENTS_FILENAME /* full filename */ +}; + +static GtkTreeStore *store_openfiles; +static GtkWidget *openfiles_popup_menu; +static gboolean documents_show_paths; +static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ + +/* callback prototypes */ +static gboolean on_openfiles_tree_selection_changed(gpointer data); +static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); +static gboolean on_taglist_tree_selection_changed(gpointer data); +static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event, + gpointer user_data); +static gboolean sidebar_key_press_cb(GtkWidget *widget, GdkEventKey *event, + gpointer user_data); +static void on_list_document_activate(GtkCheckMenuItem *item, gpointer user_data); +static void on_list_symbol_activate(GtkCheckMenuItem *item, gpointer user_data); +static void documents_menu_update(GtkTreeSelection *selection); +static void sidebar_tabs_show_hide(GtkNotebook *notebook, GtkWidget *child, + guint page_num, gpointer data); + + +/* the prepare_* functions are document-related, but I think they fit better here than in document.c */ +static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store) +{ + GtkCellRenderer *text_renderer, *icon_renderer; + GtkTreeViewColumn *column; + GtkTreeSelection *selection; + + text_renderer = gtk_cell_renderer_text_new(); + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new(); + + gtk_tree_view_column_pack_start(column, icon_renderer, FALSE); + gtk_tree_view_column_set_attributes(column, icon_renderer, "pixbuf", SYMBOLS_COLUMN_ICON, NULL); + g_object_set(icon_renderer, "xalign", 0.0, NULL); + + gtk_tree_view_column_pack_start(column, text_renderer, TRUE); + gtk_tree_view_column_set_attributes(column, text_renderer, "text", SYMBOLS_COLUMN_NAME, NULL); + g_object_set(text_renderer, "yalign", 0.5, NULL); + gtk_tree_view_column_set_title(column, _("Symbols")); + + gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE); + + ui_widget_modify_font_from_string(tree, interface_prefs.tagbar_font); + + gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); + g_object_unref(store); + + g_signal_connect(tree, "button-press-event", + G_CALLBACK(sidebar_button_press_cb), NULL); + g_signal_connect(tree, "key-press-event", + G_CALLBACK(sidebar_key_press_cb), NULL); + + if (gtk_check_version(2, 12, 0) == NULL) + { + g_object_set(tree, "show-expanders", interface_prefs.show_symbol_list_expanders, NULL); + if (! interface_prefs.show_symbol_list_expanders) + g_object_set(tree, "level-indentation", 10, NULL); + /* Tooltips */ + g_object_set(tree, + "has-tooltip", TRUE, + "tooltip-column", SYMBOLS_COLUMN_TOOLTIP, NULL); + } + + /* selection handling */ + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + /* callback for changed selection not necessary, will be handled by button-press-event */ +} + + +static gboolean +on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, + gpointer user_data) +{ + if (event->button == 3) + { + gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL, + event->button, event->time); + return TRUE; + } + return FALSE; +} + + +static void create_default_tag_tree(void) +{ + GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW(tag_window); + GtkWidget *label; + + /* default_tag_tree is a GtkViewPort with a GtkLabel inside it */ + tv.default_tag_tree = gtk_viewport_new( + gtk_scrolled_window_get_hadjustment(scrolled_window), + gtk_scrolled_window_get_vadjustment(scrolled_window)); + label = gtk_label_new(_("No tags found")); + gtk_misc_set_alignment(GTK_MISC(label), 0.1f, 0.01f); + gtk_container_add(GTK_CONTAINER(tv.default_tag_tree), label); + gtk_widget_show_all(tv.default_tag_tree); + g_signal_connect(tv.default_tag_tree, "button-press-event", + G_CALLBACK(on_default_tag_tree_button_press_event), NULL); + g_object_ref((gpointer)tv.default_tag_tree); /* to hold it after removing */ +} + + +/* update = rescan the tags for doc->filename */ +void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) +{ + if (gtk_bin_get_child(GTK_BIN(tag_window))) + gtk_container_remove(GTK_CONTAINER(tag_window), gtk_bin_get_child(GTK_BIN(tag_window))); + + if (tv.default_tag_tree == NULL) + create_default_tag_tree(); + + /* show default empty tag tree if there are no tags */ + if (doc == NULL || doc->file_type == NULL || ! filetype_has_tags(doc->file_type)) + { + gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); + return; + } + + if (update) + { /* updating the tag list in the left tag window */ + if (doc->priv->tag_tree == NULL) + { + doc->priv->tag_store = gtk_tree_store_new( + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING); + doc->priv->tag_tree = gtk_tree_view_new(); + prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); + gtk_widget_show(doc->priv->tag_tree); + g_object_ref((gpointer)doc->priv->tag_tree); /* to hold it after removing */ + } + + doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_USE_PREVIOUS); + } + + if (doc->has_tags) + { + gtk_container_add(GTK_CONTAINER(tag_window), doc->priv->tag_tree); + } + else + { + gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); + } +} + + +/* cleverly sorts documents by their short name */ +static gint documents_sort_func(GtkTreeModel *model, GtkTreeIter *iter_a, + GtkTreeIter *iter_b, gpointer data) +{ + gchar *key_a, *key_b; + gchar *name_a, *name_b; + gint cmp; + + gtk_tree_model_get(model, iter_a, DOCUMENTS_SHORTNAME, &name_a, -1); + key_a = g_utf8_collate_key_for_filename(name_a, -1); + g_free(name_a); + gtk_tree_model_get(model, iter_b, DOCUMENTS_SHORTNAME, &name_b, -1); + key_b = g_utf8_collate_key_for_filename(name_b, -1); + g_free(name_b); + cmp = strcmp(key_a, key_b); + g_free(key_b); + g_free(key_a); + + return cmp; +} + + +/* does some preparing things to the open files list widget */ +static void prepare_openfiles(void) +{ + GtkCellRenderer *icon_renderer; + GtkCellRenderer *text_renderer; + GtkTreeViewColumn *column; + GtkTreeSelection *selection; + GtkTreeSortable *sortable; + + tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6"); + + /* store the icon and the short filename to show, and the index as reference, + * the colour (black/red/green) and the full name for the tooltip */ + store_openfiles = gtk_tree_store_new(5, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING); + gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(store_openfiles)); + + /* set policy settings for the scolledwindow around the treeview again, because glade + * doesn't keep the settings */ + gtk_scrolled_window_set_policy( + GTK_SCROLLED_WINDOW(ui_lookup_widget(main_widgets.window, "scrolledwindow7")), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + icon_renderer = gtk_cell_renderer_pixbuf_new(); + text_renderer = gtk_cell_renderer_text_new(); + g_object_set(text_renderer, "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); + column = gtk_tree_view_column_new(); + gtk_tree_view_column_pack_start(column, icon_renderer, FALSE); + gtk_tree_view_column_set_attributes(column, icon_renderer, "stock-id", DOCUMENTS_ICON, NULL); + gtk_tree_view_column_pack_start(column, text_renderer, TRUE); + gtk_tree_view_column_set_attributes(column, text_renderer, "text", DOCUMENTS_SHORTNAME, + "foreground-gdk", DOCUMENTS_COLOR, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tv.tree_openfiles), column); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tv.tree_openfiles), FALSE); + + gtk_tree_view_set_search_column(GTK_TREE_VIEW(tv.tree_openfiles), + DOCUMENTS_SHORTNAME); + + /* sort opened filenames in the store_openfiles treeview */ + sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store_openfiles)); + gtk_tree_sortable_set_sort_func(sortable, DOCUMENTS_SHORTNAME, documents_sort_func, NULL, NULL); + gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); + + ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font); + + /* GTK 2.12 tooltips */ + if (gtk_check_version(2, 12, 0) == NULL) + g_object_set(tv.tree_openfiles, "has-tooltip", TRUE, "tooltip-column", DOCUMENTS_FILENAME, NULL); + + /* selection handling */ + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + g_object_unref(store_openfiles); + + g_signal_connect(GTK_TREE_VIEW(tv.tree_openfiles), "button-press-event", + G_CALLBACK(sidebar_button_press_cb), NULL); + g_signal_connect(GTK_TREE_VIEW(tv.tree_openfiles), "key-press-event", + G_CALLBACK(sidebar_key_press_cb), NULL); +} + + +/* iter should be toplevel */ +static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir) +{ + GeanyDocument *doc; + gchar *name; + gboolean result; + + if (utils_str_equal(dir, ".")) + dir = GEANY_STRING_UNTITLED; + + gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); + g_return_val_if_fail(!doc, FALSE); + + gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_SHORTNAME, &name, -1); + + result = utils_str_equal(name, dir); + g_free(name); + + return result; +} + + +static GtkTreeIter *get_doc_parent(GeanyDocument *doc) +{ + gchar *tmp_dirname; + gchar *project_base_path; + gchar *dirname = NULL; + static GtkTreeIter parent; + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + + if (!documents_show_paths) + return NULL; + + tmp_dirname = g_path_get_dirname(DOC_FILENAME(doc)); + /* replace the project base path with the project name */ + project_base_path = project_get_base_path(); + if (project_base_path != NULL) + { + gsize len = strlen(project_base_path); + const gchar *rest; + + if (project_base_path[len-1] == G_DIR_SEPARATOR) + project_base_path[len-1] = '\0'; + + /* check whether the dir name matches or uses the project base path */ + if (g_str_has_prefix(tmp_dirname, project_base_path)) + { + rest = tmp_dirname + len; + if (*rest == G_DIR_SEPARATOR || *rest == '\0') + dirname = g_strdup_printf("%s%s", app->project->name, rest); + } + g_free(project_base_path); + } + if (dirname == NULL) + dirname = tmp_dirname; + else + g_free(tmp_dirname); + + if (gtk_tree_model_get_iter_first(model, &parent)) + { + do + { + if (find_tree_iter_dir(&parent, dirname)) + { + g_free(dirname); + return &parent; + } + } + while (gtk_tree_model_iter_next(model, &parent)); + } + /* no match, add dir parent */ + gtk_tree_store_append(store_openfiles, &parent, NULL); + gtk_tree_store_set(store_openfiles, &parent, DOCUMENTS_ICON, GTK_STOCK_DIRECTORY, + DOCUMENTS_SHORTNAME, doc->file_name ? dirname : GEANY_STRING_UNTITLED, -1); + + g_free(dirname); + return &parent; +} + + +/* Also sets doc->priv->iter. + * This is called recursively in sidebar_openfiles_update_all(). */ +void sidebar_openfiles_add(GeanyDocument *doc) +{ + GtkTreeIter *iter = &doc->priv->iter; + GtkTreeIter *parent = get_doc_parent(doc); + gchar *basename; + const GdkColor *color = document_get_status_color(doc); + + gtk_tree_store_append(store_openfiles, iter, parent); + + /* check if new parent */ + if (parent && gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), parent) == 1) + { + GtkTreePath *path; + + /* expand parent */ + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), parent); + gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); + gtk_tree_path_free(path); + } + basename = g_path_get_basename(DOC_FILENAME(doc)); + gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, GTK_STOCK_FILE, + DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, + DOCUMENTS_FILENAME, DOC_FILENAME(doc), -1); + g_free(basename); +} + + +static void openfiles_remove(GeanyDocument *doc) +{ + GtkTreeIter *iter = &doc->priv->iter; + GtkTreeIter parent; + + if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter) && + gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), &parent) == 1) + gtk_tree_store_remove(store_openfiles, &parent); + else + gtk_tree_store_remove(store_openfiles, iter); +} + + +void sidebar_openfiles_update(GeanyDocument *doc) +{ + GtkTreeIter *iter = &doc->priv->iter; + gchar *fname; + + gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_FILENAME, &fname, -1); + + if (utils_str_equal(fname, DOC_FILENAME(doc))) + { + /* just update color */ + const GdkColor *color = document_get_status_color(doc); + + gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_COLOR, color, -1); + } + else + { + /* path has changed, so remove and re-add */ + GtkTreeSelection *treesel; + gboolean sel; + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + sel = gtk_tree_selection_iter_is_selected(treesel, &doc->priv->iter); + openfiles_remove(doc); + + sidebar_openfiles_add(doc); + if (sel) + gtk_tree_selection_select_iter(treesel, &doc->priv->iter); + } + g_free(fname); +} + + +void sidebar_openfiles_update_all() +{ + guint i, page_count; + GeanyDocument *doc; + + gtk_tree_store_clear(store_openfiles); + page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); + for (i = 0; i < page_count; i++) + { + doc = document_get_from_page(i); + if (G_UNLIKELY(doc == NULL)) + continue; + + sidebar_openfiles_add(doc); + } +} + + +void sidebar_remove_document(GeanyDocument *doc) +{ + openfiles_remove(doc); + + if (GTK_IS_WIDGET(doc->priv->tag_tree)) + { + gtk_widget_destroy(doc->priv->tag_tree); + if (GTK_IS_TREE_VIEW(doc->priv->tag_tree)) + { + /* Because it was ref'd in sidebar_update_tag_list, it needs unref'ing */ + g_object_unref((gpointer)doc->priv->tag_tree); + } + doc->priv->tag_tree = NULL; + } +} + + +static void on_hide_sidebar(void) +{ + ui_prefs.sidebar_visible = FALSE; + ui_sidebar_show_hide(); +} + + +static gboolean on_sidebar_display_symbol_list_show(GtkWidget *item) +{ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + interface_prefs.sidebar_symbol_visible); + return FALSE; +} + + +static gboolean on_sidebar_display_open_files_show(GtkWidget *item) +{ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + interface_prefs.sidebar_openfiles_visible); + return FALSE; +} + + +void sidebar_add_common_menu_items(GtkMenu *menu) +{ + GtkWidget *item; + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + item = gtk_check_menu_item_new_with_mnemonic(_("Show S_ymbol List")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "expose-event", + G_CALLBACK(on_sidebar_display_symbol_list_show), NULL); + gtk_widget_show(item); + g_signal_connect(item, "activate", + G_CALLBACK(on_list_symbol_activate), NULL); + + item = gtk_check_menu_item_new_with_mnemonic(_("Show _Document List")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "expose-event", + G_CALLBACK(on_sidebar_display_open_files_show), NULL); + gtk_widget_show(item); + g_signal_connect(item, "activate", + G_CALLBACK(on_list_document_activate), NULL); + + item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar")); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), + gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL); +} + + +static void on_openfiles_show_paths_activate(GtkCheckMenuItem *item, gpointer user_data) +{ + documents_show_paths = gtk_check_menu_item_get_active(item); + sidebar_openfiles_update_all(); +} + + +static void on_list_document_activate(GtkCheckMenuItem *item, gpointer user_data) +{ + interface_prefs.sidebar_openfiles_visible = gtk_check_menu_item_get_active(item); + ui_sidebar_show_hide(); + sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); +} + + +static void on_list_symbol_activate(GtkCheckMenuItem *item, gpointer user_data) +{ + interface_prefs.sidebar_symbol_visible = gtk_check_menu_item_get_active(item); + ui_sidebar_show_hide(); + sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); +} + + +static void create_openfiles_popup_menu(void) +{ + GtkWidget *item; + + openfiles_popup_menu = gtk_menu_new(); + + item = gtk_image_menu_item_new_from_stock("gtk-close", NULL); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); + g_signal_connect(item, "activate", + G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_REMOVE)); + doc_items.close = item; + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); + + item = gtk_image_menu_item_new_from_stock("gtk-save", NULL); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); + g_signal_connect(item, "activate", + G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_SAVE)); + doc_items.save = item; + + item = gtk_image_menu_item_new_with_mnemonic(_("_Reload")); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), + gtk_image_new_from_stock("gtk-revert-to-saved", GTK_ICON_SIZE_MENU)); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); + g_signal_connect(item, "activate", + G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_RELOAD)); + doc_items.reload = item; + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); + + doc_items.show_paths = gtk_check_menu_item_new_with_mnemonic(_("Show _Paths")); + gtk_widget_show(doc_items.show_paths); + gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.show_paths); + g_signal_connect(doc_items.show_paths, "activate", + G_CALLBACK(on_openfiles_show_paths_activate), NULL); + + sidebar_add_common_menu_items(GTK_MENU(openfiles_popup_menu)); +} + + +static void unfold_parent(GtkTreeIter *iter) +{ + GtkTreeIter parent; + GtkTreePath *path; + + if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter)) + { + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), &parent); + gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); + gtk_tree_path_free(path); + } +} + + +/* compares the given data with the doc pointer from the selected row of openfiles + * treeview, in case of a match the row is selected and TRUE is returned + * (called indirectly from gtk_tree_model_foreach()) */ +static gboolean tree_model_find_node(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data) +{ + GeanyDocument *doc; + + gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); + + if (doc == data) + { + /* unfolding also prevents a strange bug where the selection gets stuck on the parent + * when it is collapsed and then switching documents */ + unfold_parent(iter); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), path, NULL, FALSE); + return TRUE; + } + else return FALSE; +} + + +void sidebar_select_openfiles_item(GeanyDocument *doc) +{ + gtk_tree_model_foreach(GTK_TREE_MODEL(store_openfiles), tree_model_find_node, doc); +} + + +/* callbacks */ + +static void document_action(GeanyDocument *doc, gint action) +{ + if (! DOC_VALID(doc)) + return; + + switch (action) + { + case OPENFILES_ACTION_REMOVE: + { + document_close(doc); + break; + } + case OPENFILES_ACTION_SAVE: + { + document_save_file(doc, FALSE); + break; + } + case OPENFILES_ACTION_RELOAD: + { + on_toolbutton_reload_clicked(NULL, NULL); + break; + } + } +} + + +static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data) +{ + GtkTreeIter iter; + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + GtkTreeModel *model; + GeanyDocument *doc; + gint action = GPOINTER_TO_INT(user_data); + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); + if (doc) + { + document_action(doc, action); + } + else + { + /* parent item selected */ + GtkTreeIter child; + gint i = gtk_tree_model_iter_n_children(model, &iter) - 1; + + while (i >= 0 && gtk_tree_model_iter_nth_child(model, &child, &iter, i)) + { + gtk_tree_model_get(model, &child, DOCUMENTS_DOCUMENT, &doc, -1); + + document_action(doc, action); + i--; + } + } + } +} + + +static void change_focus_to_editor(GeanyDocument *doc, GtkWidget *source_widget) +{ + if (may_steal_focus) + document_try_focus(doc, source_widget); + may_steal_focus = FALSE; +} + + +static gboolean on_openfiles_tree_selection_changed(gpointer data) +{ + GtkTreeIter iter; + GtkTreeModel *model; + GeanyDocument *doc = NULL; + + /* use switch_notebook_page to ignore changing the notebook page because it is already done */ + if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter) && ! ignore_callback) + { + gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); + if (! doc) + return FALSE; /* parent */ + + /* switch to the doc and grab the focus */ + gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), + gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), + (GtkWidget*) doc->editor->sci)); + if (selection_change.keyval != GDK_space) + change_focus_to_editor(doc, tv.tree_openfiles); + } + return FALSE; +} + + +static gboolean on_taglist_tree_selection_changed(gpointer data) +{ + GtkTreeIter iter; + GtkTreeModel *model; + gint line = 0; + + if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter)) + { + const TMTag *tag; + + gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); + if (! tag) + return FALSE; + + line = tag->atts.entry.line; + if (line > 0) + { + GeanyDocument *doc = document_get_current(); + + if (doc != NULL) + { + navqueue_goto_line(doc, doc, line); + if (selection_change.keyval != GDK_space) + change_focus_to_editor(doc, NULL); + } + } + } + return FALSE; +} + + +static void update_selection_change(GtkTreeSelection *selection, guint keyval) +{ + selection_change.selection = selection; + selection_change.keyval = keyval; +} + + +static gboolean sidebar_key_press_cb(GtkWidget *widget, GdkEventKey *event, + gpointer user_data) +{ + may_steal_focus = FALSE; + if (ui_is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) + { + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + may_steal_focus = TRUE; + /* delay the query of selection state because this callback is executed before GTK + * changes the selection (g_signal_connect_after would be better but it doesn't work) */ + update_selection_change(selection, event->keyval); + + if (widget == tv.tree_openfiles) /* tag and doc list have separate handlers */ + g_idle_add(on_openfiles_tree_selection_changed, NULL); + else + g_idle_add(on_taglist_tree_selection_changed, NULL); + } + return FALSE; +} + + +static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event, + G_GNUC_UNUSED gpointer user_data) +{ + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + may_steal_focus = TRUE; + + if (event->type == GDK_2BUTTON_PRESS) + { /* double click on parent node(section) expands/collapses it */ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + if (gtk_tree_model_iter_has_child(model, &iter)) + { + GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); + + gtk_tree_path_free(path); + return TRUE; + } + } + } + else if (event->button == 1) + { /* allow reclicking of taglist treeview item */ + /* delay the query of selection state because this callback is executed before GTK + * changes the selection (g_signal_connect_after would be better but it doesn't work) */ + update_selection_change(selection, 0); + + if (widget == tv.tree_openfiles) + g_idle_add(on_openfiles_tree_selection_changed, NULL); + else + g_idle_add(on_taglist_tree_selection_changed, NULL); + } + else if (event->button == 3) + { + if (widget == tv.tree_openfiles) + { + if (!openfiles_popup_menu) + create_openfiles_popup_menu(); + + /* update menu item sensitivity */ + documents_menu_update(selection); + gtk_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, NULL, NULL, + event->button, event->time); + } + else + { + gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL, + event->button, event->time); + } + } + return FALSE; +} + + +static void documents_menu_update(GtkTreeSelection *selection) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gboolean sel, path; + gchar *shortname = NULL; + GeanyDocument *doc = NULL; + + /* maybe no selection e.g. if ctrl-click deselected */ + sel = gtk_tree_selection_get_selected(selection, &model, &iter); + if (sel) + { + gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, + DOCUMENTS_SHORTNAME, &shortname, -1); + } + path = NZV(shortname) && + (g_path_is_absolute(shortname) || + (app->project && g_str_has_prefix(shortname, app->project->name))); + + /* can close all, save all (except shortname), but only reload individually ATM */ + gtk_widget_set_sensitive(doc_items.close, sel); + gtk_widget_set_sensitive(doc_items.save, (doc && doc->real_path) || path); + gtk_widget_set_sensitive(doc_items.reload, doc && doc->real_path); + g_free(shortname); + + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), + documents_show_paths); +} + + +StashGroup *stash_group = NULL; + +static void on_load_settings(void) +{ + tag_window = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); + + prepare_openfiles(); + /* note: ui_prefs.sidebar_page is reapplied after plugins are loaded */ + stash_group_display(stash_group, NULL); + sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); +} + + +static void on_save_settings(void) +{ + stash_group_update(stash_group, NULL); + sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); +} + + +void sidebar_init(void) +{ + StashGroup *group; + + group = stash_group_new(PACKAGE); + stash_group_add_boolean(group, &documents_show_paths, "documents_show_paths", TRUE); + stash_group_add_widget_property(group, &ui_prefs.sidebar_page, "sidebar_page", GINT_TO_POINTER(0), + main_widgets.sidebar_notebook, "page", 0); + configuration_add_pref_group(group, FALSE); + stash_group = group; + + /* delay building documents treeview until sidebar font has been read */ + g_signal_connect(geany_object, "load-settings", on_load_settings, NULL); + g_signal_connect(geany_object, "save-settings", on_save_settings, NULL); + + + if (gtk_check_version(2, 10, 0) == NULL) + { + g_signal_connect(main_widgets.sidebar_notebook, "page-added", + G_CALLBACK(sidebar_tabs_show_hide), NULL); + + g_signal_connect(main_widgets.sidebar_notebook, "page-removed", + G_CALLBACK(sidebar_tabs_show_hide), NULL); + } + sidebar_tabs_show_hide(GTK_NOTEBOOK(main_widgets.sidebar_notebook), NULL, 0, NULL); +} + +#define WIDGET(w) w && GTK_IS_WIDGET(w) + +void sidebar_finalize(void) +{ + if (WIDGET(tv.default_tag_tree)) + { + g_object_unref(tv.default_tag_tree); + /* This is not exactly clean, default_tag_tree's ref_count is 2 when it is shown, + * 1 oherwise. We should probably handle the ref_count more accurate. */ + if (WIDGET(tv.default_tag_tree)) + gtk_widget_destroy(tv.default_tag_tree); + } + if (WIDGET(tv.popup_taglist)) + gtk_widget_destroy(tv.popup_taglist); + if (WIDGET(openfiles_popup_menu)) + gtk_widget_destroy(openfiles_popup_menu); +} + + +void sidebar_focus_openfiles_tab(void) +{ + if (ui_prefs.sidebar_visible && interface_prefs.sidebar_openfiles_visible) + { + GtkNotebook *notebook = GTK_NOTEBOOK(main_widgets.sidebar_notebook); + + gtk_notebook_set_current_page(notebook, TREEVIEW_OPENFILES); + gtk_widget_grab_focus(tv.tree_openfiles); + } +} + + +void sidebar_focus_symbols_tab(void) +{ + if (ui_prefs.sidebar_visible && interface_prefs.sidebar_symbol_visible) + { + GtkNotebook *notebook = GTK_NOTEBOOK(main_widgets.sidebar_notebook); + GtkWidget *symbol_list_scrollwin = gtk_notebook_get_nth_page(notebook, TREEVIEW_SYMBOL); + + gtk_notebook_set_current_page(notebook, TREEVIEW_SYMBOL); + gtk_widget_grab_focus(gtk_bin_get_child(GTK_BIN(symbol_list_scrollwin))); + } +} + + +static void sidebar_tabs_show_hide(GtkNotebook *notebook, GtkWidget *child, + guint page_num, gpointer data) +{ + if (gtk_check_version(2, 10, 0) == NULL) + { + gint tabs = gtk_notebook_get_n_pages(notebook); + + if (interface_prefs.sidebar_symbol_visible == FALSE) + tabs--; + if (interface_prefs.sidebar_openfiles_visible == FALSE) + tabs--; + + gtk_notebook_set_show_tabs(notebook, (tabs > 1)); + } +} diff -Nru geany-0.18/src/sidebar.h geany-0.19/src/sidebar.h --- geany-0.18/src/sidebar.h 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/src/sidebar.h 2010-02-21 18:06:42.000000000 +0000 @@ -0,0 +1,71 @@ +/* + * sidebar.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id: sidebar.h 4686 2010-02-21 18:06:42Z eht16 $ + */ + + + +#ifndef GEANY_SIDEBAR_H +#define GEANY_SIDEBAR_H 1 + + +typedef struct SidebarTreeviews +{ + GtkWidget *tree_openfiles; + GtkWidget *default_tag_tree; + GtkWidget *popup_taglist; +} +SidebarTreeviews; + +extern SidebarTreeviews tv; + +enum +{ + SYMBOLS_COLUMN_ICON, + SYMBOLS_COLUMN_NAME, + SYMBOLS_COLUMN_TAG, + SYMBOLS_COLUMN_TOOLTIP, + SYMBOLS_N_COLUMNS +}; + +void sidebar_init(void); + +void sidebar_finalize(void); + +void sidebar_update_tag_list(GeanyDocument *doc, gboolean update); + +void sidebar_openfiles_add(GeanyDocument *doc); + +void sidebar_openfiles_update(GeanyDocument *doc); + +void sidebar_openfiles_update_all(void); + +void sidebar_select_openfiles_item(GeanyDocument *doc); + +void sidebar_remove_document(GeanyDocument *doc); + +void sidebar_add_common_menu_items(GtkMenu *menu); + +void sidebar_focus_openfiles_tab(void); + +void sidebar_focus_symbols_tab(void); + +#endif diff -Nru geany-0.18/src/socket.c geany-0.19/src/socket.c --- geany-0.18/src/socket.c 2009-04-15 23:47:33.000000000 +0100 +++ geany-0.19/src/socket.c 2010-04-25 18:43:39.000000000 +0100 @@ -1,8 +1,8 @@ /* * socket.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * Copyright 2006 Hiroyuki Yamamoto (author of Sylpheed) * * This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: socket.c 3708 2009-04-15 22:47:33Z eht16 $ + * $Id: socket.c 4862 2010-04-25 17:43:39Z eht16 $ */ /* @@ -42,7 +42,7 @@ * The command window is only available on Windows and takes no additional data, instead it * writes back a Windows handle (HWND) for the main window to set it to the foreground (focus). * - * At the moment the commands window, open, line and column are available. + * At the moment the commands window, doclist, open, line and column are available. * * About the socket files on Unix-like systems: * Geany creates a socket in /tmp (or any other directory returned by g_get_tmp_dir()) and @@ -59,7 +59,6 @@ #ifdef HAVE_SOCKET #ifndef G_OS_WIN32 -# include # include # include # include @@ -72,6 +71,7 @@ # include # include #endif +#include #include #include #include @@ -86,6 +86,7 @@ #include "support.h" #include "ui_utils.h" #include "utils.h" +#include "dialogs.h" #include "encodings.h" @@ -97,7 +98,7 @@ #define SOCKET_IS_VALID(s) (G_LIKELY((s) >= 0)) #define INVALID_SOCKET (-1) #endif - +#define BUFFER_LENGTH 4096 struct socket_info_struct socket_info; @@ -121,7 +122,7 @@ -void send_open_command(gint sock, gint argc, gchar **argv) +static void send_open_command(gint sock, gint argc, gchar **argv) { gint i; gchar *filename; @@ -191,6 +192,49 @@ #endif +static void socket_get_document_list(gint sock) +{ + gchar doc_list[BUFFER_LENGTH]; + gint doc_list_len; + + if (sock < 0) + return; + + socket_fd_write_all(sock, "doclist\n", 8); + + doc_list_len = socket_fd_read(sock, doc_list, sizeof(doc_list)); + if (doc_list_len >= BUFFER_LENGTH) + doc_list_len = BUFFER_LENGTH -1; + doc_list[doc_list_len] = '\0'; + /* if we received ETX (end-of-text), there were no open files, so print only otherwise */ + if (! utils_str_equal(doc_list, "\3")) + printf("%s", doc_list); +} + + +#ifndef G_OS_WIN32 +static void check_socket_permissions(void) +{ + struct stat socket_stat; + + if (g_lstat(socket_info.file_name, &socket_stat) == 0) + { /* If the user id of the process is not the same as the owner of the socket + * file, then ignore this socket and start a new session. */ + if (socket_stat.st_uid != getuid()) + { + const gchar *msg = _( + /* TODO maybe this message needs a rewording */ + "Geany tried to access the Unix Domain socket of another instance running as another user.\n" + "This is a fatal error and Geany will now quit."); + g_warning("%s", msg); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", msg); + exit(1); + } + } +} +#endif + + /* (Unix domain) socket support to replace the old FIFO code * (taken from Sylpheed, thanks) * Returns the created socket, -1 if an error occurred or -2 if another socket exists and files @@ -246,6 +290,9 @@ g_free(display_name); g_free(hostname); + /* check whether the real user id is the same as this of the socket file */ + check_socket_permissions(); + sock = socket_fd_connect_unix(socket_info.file_name); if (sock < 0) { @@ -268,6 +315,11 @@ send_open_command(sock, argc, argv); } + if (cl_options.list_documents) + { + socket_get_document_list(sock); + } + socket_fd_close(sock); return -2; } @@ -504,16 +556,37 @@ locale_filename = utils_get_locale_from_utf8(utf8_filename); if (locale_filename) - main_handle_filename(locale_filename); + { + if (g_str_has_suffix(locale_filename, ".geany")) + main_load_project_from_command_line(locale_filename, TRUE); + else + main_handle_filename(locale_filename); + } g_free(utf8_filename); g_free(locale_filename); } +static gchar *build_document_list(void) +{ + GString *doc_list = g_string_new(NULL); + guint i; + const gchar *filename; + + foreach_document(i) + { + filename = DOC_FILENAME(documents[i]); + g_string_append(doc_list, filename); + g_string_append_c(doc_list, '\n'); + } + return g_string_free(doc_list, FALSE); +} + + gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data) { gint fd, sock; - gchar buf[4096]; + gchar buf[BUFFER_LENGTH]; struct sockaddr_in caddr; guint caddr_len = sizeof(caddr); GtkWidget *window = data; @@ -533,6 +606,17 @@ } popup = TRUE; } + else if (strncmp(buf, "doclist", 7) == 0) + { + gchar *doc_list = build_document_list(); + if (NZV(doc_list)) + socket_fd_write_all(sock, doc_list, strlen(doc_list)); + else + /* send ETX (end-of-text) in case we have no open files, we must send anything + * otherwise the client would hang on reading */ + socket_fd_write_all(sock, "\3", 1); + g_free(doc_list); + } else if (strncmp(buf, "line", 4) == 0) { while (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') @@ -704,6 +788,7 @@ #endif } + #endif diff -Nru geany-0.18/src/socket.h geany-0.19/src/socket.h --- geany-0.18/src/socket.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/socket.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * socket.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: socket.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: socket.h 4518 2010-01-01 22:55:18Z eht16 $ */ diff -Nru geany-0.18/src/stash.c geany-0.19/src/stash.c --- geany-0.18/src/stash.c 2009-07-29 18:40:20.000000000 +0100 +++ geany-0.19/src/stash.c 2010-03-31 17:21:28.000000000 +0100 @@ -1,8 +1,8 @@ /* * stash.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Nick Treleaven - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven + * Copyright 2008-2010 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 @@ -19,35 +19,66 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: stash.c 4041 2009-07-29 17:40:20Z ntrel $ + * $Id: stash.c 4795 2010-03-31 16:21:28Z ntrel $ */ -/* Mini-library for reading/writing GKeyFile settings and synchronizing widgets with - * C variables. */ - -/* Terms +/** + * @file stash.h + * Lightweight library for reading/writing @c GKeyFile settings and synchronizing widgets with + * C variables. + * + * Note: Stash should only depend on GLib and GTK, but currently has some minor + * dependencies on Geany's utils.c. + * + * @section Terms * 'Setting' is used only for data stored on disk or in memory. * 'Pref' can also include visual widget information. * - * Memory Usage + * @section Memory Usage * Stash will not duplicate strings if they are normally static arrays, such as * keyfile group names and key names, string default values, widget_id names, property names. * - * String Settings - * String settings and other dynamically allocated settings must be initialized to NULL as they - * will be freed before reassigning. + * @section String Settings + * String settings and other dynamically allocated settings will be initialized to NULL when + * added to a StashGroup (so they can safely be reassigned later). * - * Widget Support + * @section Widget Support * Widgets very commonly used in configuration dialogs will be supported with their own function. - * Widgets less commonly used such as GtkExpander or widget settings that aren't commonly needed + * Widgets less commonly used such as @c GtkExpander or widget settings that aren't commonly needed * to be persistent won't be directly supported, to keep the library lightweight. However, you can * use stash_group_add_widget_property() to also save these settings for any read/write widget - * property. + * property. Macros could be added for common widget properties such as @c GtkExpander:"expanded". + * + * @section settings-example Settings Example + * @include stash-example.c + * @note You might want to handle the warning/error conditions differently from above. + * + * @section prefs-example GUI Prefs Example + * For prefs, it's the same as the above example but you add widget prefs instead of e.g. + * boolean settings. + * + * This example uses lookup strings for widgets as they are more flexible than widget pointers. + * @code +gboolean want_handle; +GtkWidget *parent; +GtkWidget *my_check_button; + +stash_group_add_toggle_button(group, &want_handle, "handle", TRUE, "check_handle"); +... +gtk_container_add(GTK_CONTAINER(parent), my_check_button); +ui_hookup_widget(parent, my_check_button, "check_handle"); +... +stash_group_display(group, parent); +* @endcode +* Now let the user manipulate widgets. To synchronize the Stash settings afterwards, call: +* @code +stash_group_update(group, parent); + * @endcode */ /* Implementation Note * We use a GArray to hold prefs. It would be more efficient for user code to declare - * a static array of GeanyPrefEntry structs, but we don't do this because: + * a static array of StashPref structs, but we don't do this because: * * * It would be more ugly (lots of casts and NULLs). * * Less type checking. @@ -56,7 +87,9 @@ * Usually the prefs code isn't what user code will spend most of its time doing, so this * should be efficient enough. But, if desired we could add a stash_group_set_size() function * to reduce reallocation. - * */ + * + * TODO: Maybe using GSlice chunks with an extra 'next' pointer would be more (memory) efficient. + */ #include @@ -65,28 +98,30 @@ #include "utils.h" /* only for foreach_*, utils_get_setting_*(). Stash should not depend on Geany. */ -struct GeanyPrefEntry +struct StashPref { GType setting_type; /* e.g. G_TYPE_INT */ gpointer setting; const gchar *key_name; gpointer default_value; GType widget_type; /* e.g. GTK_TYPE_TOGGLE_BUTTON */ - gpointer widget_id; /* can be GtkWidget or gchararray */ + StashWidgetID widget_id; /* (GtkWidget*) or (gchar*) */ gpointer fields; /* extra fields */ }; -struct GeanyPrefGroup +typedef struct StashPref StashPref; + +struct StashGroup { const gchar *name; /* group name to use in the keyfile */ - GArray *entries; /* array of GeanyPrefEntry */ + GArray *entries; /* array of StashPref */ gboolean write_once; /* only write settings if they don't already exist */ gboolean use_defaults; /* use default values if there's no keyfile entry */ }; typedef struct EnumWidget { - gpointer widget_id; + StashWidgetID widget_id; gint enum_id; } EnumWidget; @@ -107,7 +142,7 @@ PrefAction; -static void handle_boolean_setting(GeanyPrefGroup *group, GeanyPrefEntry *se, +static void handle_boolean_setting(StashGroup *group, StashPref *se, GKeyFile *config, SettingAction action) { gboolean *setting = se->setting; @@ -125,7 +160,7 @@ } -static void handle_integer_setting(GeanyPrefGroup *group, GeanyPrefEntry *se, +static void handle_integer_setting(StashGroup *group, StashPref *se, GKeyFile *config, SettingAction action) { gboolean *setting = se->setting; @@ -143,7 +178,7 @@ } -static void handle_string_setting(GeanyPrefGroup *group, GeanyPrefEntry *se, +static void handle_string_setting(StashGroup *group, StashPref *se, GKeyFile *config, SettingAction action) { gchararray *setting = se->setting; @@ -163,7 +198,7 @@ } -static void handle_strv_setting(GeanyPrefGroup *group, GeanyPrefEntry *se, +static void handle_strv_setting(StashGroup *group, StashPref *se, GKeyFile *config, SettingAction action) { gchararray **setting = se->setting; @@ -192,11 +227,11 @@ } -static void keyfile_action(SettingAction action, GeanyPrefGroup *group, GKeyFile *keyfile) +static void keyfile_action(SettingAction action, StashGroup *group, GKeyFile *keyfile) { - GeanyPrefEntry *entry; + StashPref *entry; - foreach_array(GeanyPrefEntry, entry, group->entries) + foreach_array(StashPref, entry, group->entries) { /* don't overwrite write_once prefs */ if (group->write_once && action == SETTING_WRITE && @@ -227,34 +262,101 @@ } -void stash_group_load_from_key_file(GeanyPrefGroup *group, GKeyFile *keyfile) +/** Reads key values from @a keyfile into the group settings. + * @note You should still call this even if the keyfile couldn't be loaded from disk + * so that all Stash settings are initialized to defaults. + * @param group . + * @param keyfile Usually loaded from a configuration file first. */ +void stash_group_load_from_key_file(StashGroup *group, GKeyFile *keyfile) { keyfile_action(SETTING_READ, group, keyfile); } -void stash_group_save_to_key_file(GeanyPrefGroup *group, GKeyFile *keyfile) +/** Writes group settings into key values in @a keyfile. + * @a keyfile is usually written to a configuration file afterwards. + * @param group . + * @param keyfile . */ +void stash_group_save_to_key_file(StashGroup *group, GKeyFile *keyfile) { keyfile_action(SETTING_WRITE, group, keyfile); } -GeanyPrefGroup *stash_group_new(const gchar *name) +/** Reads group settings from a configuration file using @c GKeyFile. + * @note Stash settings will be initialized to defaults if the keyfile + * couldn't be loaded from disk. + * @param group . + * @param filename Filename of the file to read, in locale encoding. + * @return @c TRUE if a key file could be loaded. + * @see stash_group_load_from_key_file(). + **/ +gboolean stash_group_load_from_file(StashGroup *group, const gchar *filename) +{ + GKeyFile *keyfile; + gboolean ret; + + keyfile = g_key_file_new(); + ret = g_key_file_load_from_file(keyfile, filename, 0, NULL); + /* even on failure we load settings to apply defaults */ + stash_group_load_from_key_file(group, keyfile); + + g_key_file_free(keyfile); + return ret; +} + + +/** Writes group settings to a configuration file using @c GKeyFile. + * + * @param group . + * @param filename Filename of the file to write, in locale encoding. + * @param flags Keyfile options - @c G_KEY_FILE_NONE is the most efficient. + * @return 0 if the file was successfully written, otherwise the @c errno of the + * failed operation is returned. + * @see stash_group_save_to_key_file(). + **/ +gint stash_group_save_to_file(StashGroup *group, const gchar *filename, + GKeyFileFlags flags) +{ + GKeyFile *keyfile; + gchar *data; + gint ret; + + keyfile = g_key_file_new(); + /* if we need to keep comments or translations, try to load first */ + if (flags) + g_key_file_load_from_file(keyfile, filename, flags, NULL); + + stash_group_save_to_key_file(group, keyfile); + data = g_key_file_to_data(keyfile, NULL, NULL); + ret = utils_write_file(filename, data); + g_free(data); + g_key_file_free(keyfile); + return ret; +} + + +/** Creates a new group. + * @param name Name used for @c GKeyFile group. + * @return Group. */ +StashGroup *stash_group_new(const gchar *name) { - GeanyPrefGroup *group = g_new0(GeanyPrefGroup, 1); + StashGroup *group = g_new0(StashGroup, 1); group->name = name; - group->entries = g_array_new(FALSE, FALSE, sizeof(GeanyPrefEntry)); + group->entries = g_array_new(FALSE, FALSE, sizeof(StashPref)); group->use_defaults = TRUE; return group; } -void stash_group_free(GeanyPrefGroup *group) +/** Frees a group. + * @param group . */ +void stash_group_free(StashGroup *group) { - GeanyPrefEntry *entry; + StashPref *entry; - foreach_array(GeanyPrefEntry, entry, group->entries) + foreach_array(StashPref, entry, group->entries) { if (entry->widget_type == GTK_TYPE_RADIO_BUTTON) g_free(entry->fields); @@ -271,7 +373,7 @@ /* Useful so the user can edit the keyfile manually while the program is running, * and the setting won't be overridden. * @c FALSE by default. */ -void stash_group_set_write_once(GeanyPrefGroup *group, gboolean write_once) +void stash_group_set_write_once(StashGroup *group, gboolean write_once) { group->write_once = write_once; } @@ -280,53 +382,75 @@ /* When @c FALSE, Stash doesn't change the setting if there is no keyfile entry, so it * remains whatever it was initialized/set to by user code. * @c TRUE by default. */ -void stash_group_set_use_defaults(GeanyPrefGroup *group, gboolean use_defaults) +void stash_group_set_use_defaults(StashGroup *group, gboolean use_defaults) { group->use_defaults = use_defaults; } -static GeanyPrefEntry * -add_pref(GeanyPrefGroup *group, GType type, gpointer setting, +static StashPref * +add_pref(StashGroup *group, GType type, gpointer setting, const gchar *key_name, gpointer default_value) { - GeanyPrefEntry entry = {type, setting, key_name, default_value, G_TYPE_NONE, NULL, NULL}; + StashPref entry = {type, setting, key_name, default_value, G_TYPE_NONE, NULL, NULL}; GArray *array = group->entries; + /* init any pointer settings to NULL so they can be freed later */ + if (type == G_TYPE_STRING || + type == G_TYPE_STRV) + if (group->use_defaults) + *(gpointer**)setting = NULL; + g_array_append_val(array, entry); - return &g_array_index(array, GeanyPrefEntry, array->len - 1); + return &g_array_index(array, StashPref, array->len - 1); } -void stash_group_add_boolean(GeanyPrefGroup *group, gboolean *setting, +/** Adds boolean setting. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. */ +void stash_group_add_boolean(StashGroup *group, gboolean *setting, const gchar *key_name, gboolean default_value) { add_pref(group, G_TYPE_BOOLEAN, setting, key_name, GINT_TO_POINTER(default_value)); } -void stash_group_add_integer(GeanyPrefGroup *group, gint *setting, +/** Adds integer setting. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. */ +void stash_group_add_integer(StashGroup *group, gint *setting, const gchar *key_name, gint default_value) { add_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value)); } -/* The contents of @a setting will be freed before being replaced, so make sure it is - * allocated, or initialized to @c NULL. - * @param default_value Not duplicated. */ -void stash_group_add_string(GeanyPrefGroup *group, gchar **setting, +/** Adds string setting. + * The contents of @a setting will be initialized to @c NULL. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value String to copy if the key doesn't exist when loading, or @c NULL. */ +void stash_group_add_string(StashGroup *group, gchar **setting, const gchar *key_name, const gchar *default_value) { add_pref(group, G_TYPE_STRING, setting, key_name, (gpointer)default_value); } -/* The contents of @a setting will be freed before being replaced, so make sure it is - * allocated, or initialized to @c NULL. - * @param default_value Not duplicated. */ -void stash_group_add_string_vector(GeanyPrefGroup *group, gchar ***setting, +/** Adds string vector setting (array of strings). + * The contents of @a setting will be initialized to @c NULL. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Vector to copy if the key doesn't exist when loading. Usually @c NULL. */ +void stash_group_add_string_vector(StashGroup *group, gchar ***setting, const gchar *key_name, const gchar **default_value) { add_pref(group, G_TYPE_STRV, setting, key_name, (gpointer)default_value); @@ -350,7 +474,7 @@ } -static void handle_spin_button(GtkWidget *widget, GeanyPrefEntry *entry, +static void handle_spin_button(GtkWidget *widget, StashPref *entry, PrefAction action) { gint *setting = entry->setting; @@ -371,7 +495,7 @@ } -static void handle_combo_box(GtkWidget *widget, GeanyPrefEntry *entry, +static void handle_combo_box(GtkWidget *widget, StashPref *entry, PrefAction action) { gint *setting = entry->setting; @@ -388,7 +512,7 @@ } -static void handle_entry(GtkWidget *widget, GeanyPrefEntry *entry, +static void handle_entry(GtkWidget *widget, StashPref *entry, PrefAction action) { gchararray *setting = entry->setting; @@ -406,7 +530,7 @@ } -static void handle_combo_box_entry(GtkWidget *widget, GeanyPrefEntry *entry, +static void handle_combo_box_entry(GtkWidget *widget, StashPref *entry, PrefAction action) { widget = gtk_bin_get_child(GTK_BIN(widget)); @@ -441,7 +565,7 @@ static GtkWidget * -get_widget(GtkWidget *owner, gpointer widget_id) +get_widget(GtkWidget *owner, StashWidgetID widget_id) { GtkWidget *widget = widget_id; @@ -503,7 +627,7 @@ } -static void handle_widget_property(GtkWidget *widget, GeanyPrefEntry *entry, +static void handle_widget_property(GtkWidget *widget, StashPref *entry, PrefAction action) { GObject *object = G_OBJECT(widget); @@ -525,11 +649,11 @@ } -static void pref_action(PrefAction action, GeanyPrefGroup *group, GtkWidget *owner) +static void pref_action(PrefAction action, StashGroup *group, GtkWidget *owner) { - GeanyPrefEntry *entry; + StashPref *entry; - foreach_array(GeanyPrefEntry, entry, group->entries) + foreach_array(StashPref, entry, group->entries) { GtkWidget *widget; @@ -572,25 +696,36 @@ } -/** @param owner If non-NULL, used to lookup widgets by name. */ -void stash_group_display(GeanyPrefGroup *group, GtkWidget *owner) +/** Applies Stash settings to widgets, usually called before displaying the widgets. + * The @a owner argument depends on which type you use for @ref StashWidgetID. + * @param group . + * @param owner If non-NULL, used to lookup widgets by name, otherwise + * widget pointers are assumed. + * @see stash_group_update(). */ +void stash_group_display(StashGroup *group, GtkWidget *owner) { pref_action(PREF_DISPLAY, group, owner); } -void stash_group_update(GeanyPrefGroup *group, GtkWidget *owner) +/** Applies widget values to Stash settings, usually called after displaying the widgets. + * The @a owner argument depends on which type you use for @ref StashWidgetID. + * @param group . + * @param owner If non-NULL, used to lookup widgets by name, otherwise + * widget pointers are assumed. + * @see stash_group_display(). */ +void stash_group_update(StashGroup *group, GtkWidget *owner) { pref_action(PREF_UPDATE, group, owner); } -static GeanyPrefEntry * -add_widget_pref(GeanyPrefGroup *group, GType setting_type, gpointer setting, +static StashPref * +add_widget_pref(StashGroup *group, GType setting_type, gpointer setting, const gchar *key_name, gpointer default_value, - GType widget_type, gpointer widget_id) + GType widget_type, StashWidgetID widget_id) { - GeanyPrefEntry *entry = + StashPref *entry = add_pref(group, setting_type, setting, key_name, default_value); entry->widget_type = widget_type; @@ -599,28 +734,40 @@ } -/* Used for GtkCheckButton or GtkToggleButton widgets. +/** Adds a @c GtkToggleButton (or @c GtkCheckButton) widget pref. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * @param widget_id @c GtkWidget pointer or string to lookup widget later. * @see stash_group_add_radio_buttons(). */ -void stash_group_add_toggle_button(GeanyPrefGroup *group, gboolean *setting, - const gchar *key_name, gboolean default_value, gpointer widget_id) +void stash_group_add_toggle_button(StashGroup *group, gboolean *setting, + const gchar *key_name, gboolean default_value, StashWidgetID widget_id) { add_widget_pref(group, G_TYPE_BOOLEAN, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_TOGGLE_BUTTON, widget_id); } -/* @param ... pairs of widget_id, enum_id. +/** Adds a @c GtkRadioButton widget group pref. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * @param widget_id @c GtkWidget pointer or string to lookup widget later. + * @param enum_id Enum value for @a widget_id. + * @param ... pairs of @a widget_id, @a enum_id. * Example (using widget lookup strings, but widget pointers can also work): * @code * enum {FOO, BAR}; * stash_group_add_radio_buttons(group, &which_one_setting, "which_one", BAR, * "radio_foo", FOO, "radio_bar", BAR, NULL); * @endcode */ -void stash_group_add_radio_buttons(GeanyPrefGroup *group, gint *setting, +void stash_group_add_radio_buttons(StashGroup *group, gint *setting, const gchar *key_name, gint default_value, - gpointer widget_id, gint enum_id, ...) + StashWidgetID widget_id, gint enum_id, ...) { - GeanyPrefEntry *entry = + StashPref *entry = add_widget_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_RADIO_BUTTON, NULL); va_list args; @@ -662,35 +809,59 @@ } -void stash_group_add_spin_button_integer(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id) +/** Adds a @c GtkSpinButton widget pref. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * @param widget_id @c GtkWidget pointer or string to lookup widget later. */ +void stash_group_add_spin_button_integer(StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, StashWidgetID widget_id) { add_widget_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_SPIN_BUTTON, widget_id); } -/* @see stash_group_add_combo_box_entry(). */ -void stash_group_add_combo_box(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id) +/** Adds a @c GtkComboBox widget pref. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * @param widget_id @c GtkWidget pointer or string to lookup widget later. + * @see stash_group_add_combo_box_entry(). */ +void stash_group_add_combo_box(StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, StashWidgetID widget_id) { add_widget_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_COMBO_BOX, widget_id); } +/** Adds a @c GtkComboBoxEntry widget pref. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * @param widget_id @c GtkWidget pointer or string to lookup widget later. */ /* We could maybe also have something like stash_group_add_combo_box_entry_with_menu() * for the history list - or should that be stored as a separate setting? */ -void stash_group_add_combo_box_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id) +void stash_group_add_combo_box_entry(StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value, StashWidgetID widget_id) { add_widget_pref(group, G_TYPE_STRING, setting, key_name, (gpointer)default_value, GTK_TYPE_COMBO_BOX_ENTRY, widget_id); } -void stash_group_add_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id) +/** Adds a @c GtkEntry widget pref. + * @param group . + * @param setting Address of setting variable. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * @param widget_id @c GtkWidget pointer or string to lookup widget later. */ +void stash_group_add_entry(StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value, StashWidgetID widget_id) { add_widget_pref(group, G_TYPE_STRING, setting, key_name, (gpointer)default_value, GTK_TYPE_ENTRY, widget_id); @@ -707,16 +878,22 @@ } -/* Add a widget's read/write property to the stash group. The property will be set when calling +/** Adds a widget's read/write property to the stash group. + * The property will be set when calling * stash_group_display(), and read when calling stash_group_update(). - * @param setting address of e.g. an integer if using an integer property. - * @param default_value should be cast into a pointer e.g. with @c GINT_TO_POINTER(). - * @param type can be 0 if passing a GtkWidget as the @a widget_id argument to look it up from the - * GObject data. + * @param group . + * @param setting Address of e.g. an integer if using an integer property. + * @param key_name Name for key in a @c GKeyFile. + * @param default_value Value to use if the key doesn't exist when loading. + * Should be cast into a pointer e.g. with @c GINT_TO_POINTER(). + * @param widget_id @c GtkWidget pointer or string to lookup widget later. + * @param property_name . + * @param type can be @c 0 if passing a @c GtkWidget as the @a widget_id argument to look it up from the + * @c GObject data. * @warning Currently only string GValue properties will be freed before setting; patch for - * other types - see handle_widget_property(). */ -void stash_group_add_widget_property(GeanyPrefGroup *group, gpointer setting, - const gchar *key_name, gpointer default_value, gpointer widget_id, + * other types - see @c handle_widget_property(). */ +void stash_group_add_widget_property(StashGroup *group, gpointer setting, + const gchar *key_name, gpointer default_value, StashWidgetID widget_id, const gchar *property_name, GType type) { if (!type) diff -Nru geany-0.18/src/stash.h geany-0.19/src/stash.h --- geany-0.18/src/stash.h 2009-07-20 13:00:06.000000000 +0100 +++ geany-0.19/src/stash.h 2010-03-31 17:21:28.000000000 +0100 @@ -1,8 +1,8 @@ /* * stash.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2008-2009 Nick Treleaven - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Nick Treleaven + * Copyright 2008-2010 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 @@ -19,69 +19,77 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: stash.h 3996 2009-07-20 12:00:06Z ntrel $ + * $Id: stash.h 4795 2010-03-31 16:21:28Z ntrel $ */ #ifndef GEANY_STASH_H #define GEANY_STASH_H -typedef struct GeanyPrefEntry GeanyPrefEntry; +/** Opaque type for a group of settings. */ +typedef struct StashGroup StashGroup; -typedef struct GeanyPrefGroup GeanyPrefGroup; +/** Can be @c GtkWidget* or @c gchar* depending on whether the @a owner argument is used for + * stash_group_display() and stash_group_update(). */ +typedef gpointer StashWidgetID; -GeanyPrefGroup *stash_group_new(const gchar *name); +StashGroup *stash_group_new(const gchar *name); -void stash_group_set_write_once(GeanyPrefGroup *group, gboolean write_once); +void stash_group_set_write_once(StashGroup *group, gboolean write_once); -void stash_group_set_use_defaults(GeanyPrefGroup *group, gboolean use_defaults); +void stash_group_set_use_defaults(StashGroup *group, gboolean use_defaults); -void stash_group_add_boolean(GeanyPrefGroup *group, gboolean *setting, +void stash_group_add_boolean(StashGroup *group, gboolean *setting, const gchar *key_name, gboolean default_value); -void stash_group_add_integer(GeanyPrefGroup *group, gint *setting, +void stash_group_add_integer(StashGroup *group, gint *setting, const gchar *key_name, gint default_value); -void stash_group_add_string(GeanyPrefGroup *group, gchar **setting, +void stash_group_add_string(StashGroup *group, gchar **setting, const gchar *key_name, const gchar *default_value); -void stash_group_add_string_vector(GeanyPrefGroup *group, gchar ***setting, +void stash_group_add_string_vector(StashGroup *group, gchar ***setting, const gchar *key_name, const gchar **default_value); -void stash_group_load_from_key_file(GeanyPrefGroup *group, GKeyFile *keyfile); +void stash_group_load_from_key_file(StashGroup *group, GKeyFile *keyfile); -void stash_group_save_to_key_file(GeanyPrefGroup *group, GKeyFile *keyfile); +void stash_group_save_to_key_file(StashGroup *group, GKeyFile *keyfile); -void stash_group_free(GeanyPrefGroup *group); +gboolean stash_group_load_from_file(StashGroup *group, const gchar *filename); + +gint stash_group_save_to_file(StashGroup *group, const gchar *filename, + GKeyFileFlags flags); + +void stash_group_free(StashGroup *group); /* *** GTK-related functions *** */ -void stash_group_add_toggle_button(GeanyPrefGroup *group, gboolean *setting, - const gchar *key_name, gboolean default_value, gpointer widget_id); +void stash_group_add_toggle_button(StashGroup *group, gboolean *setting, + const gchar *key_name, gboolean default_value, StashWidgetID widget_id); -void stash_group_add_radio_buttons(GeanyPrefGroup *group, gint *setting, +void stash_group_add_radio_buttons(StashGroup *group, gint *setting, const gchar *key_name, gint default_value, - gpointer widget_id, gint enum_id, ...) G_GNUC_NULL_TERMINATED; + StashWidgetID widget_id, gint enum_id, ...) G_GNUC_NULL_TERMINATED; -void stash_group_add_spin_button_integer(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id); +void stash_group_add_spin_button_integer(StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, StashWidgetID widget_id); -void stash_group_add_combo_box(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id); +void stash_group_add_combo_box(StashGroup *group, gint *setting, + const gchar *key_name, gint default_value, StashWidgetID widget_id); -void stash_group_add_combo_box_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id); +void stash_group_add_combo_box_entry(StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value, StashWidgetID widget_id); -void stash_group_add_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id); +void stash_group_add_entry(StashGroup *group, gchar **setting, + const gchar *key_name, const gchar *default_value, StashWidgetID widget_id); -void stash_group_add_widget_property(GeanyPrefGroup *group, gpointer setting, - const gchar *key_name, gpointer default_value, gpointer widget_id, +void stash_group_add_widget_property(StashGroup *group, gpointer setting, + const gchar *key_name, gpointer default_value, StashWidgetID widget_id, const gchar *property_name, GType type); -void stash_group_display(GeanyPrefGroup *group, GtkWidget *owner); +void stash_group_display(StashGroup *group, GtkWidget *owner); -void stash_group_update(GeanyPrefGroup *group, GtkWidget *owner); +void stash_group_update(StashGroup *group, GtkWidget *owner); #endif diff -Nru geany-0.18/src/support.h geany-0.19/src/support.h --- geany-0.18/src/support.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/support.h 2010-05-15 10:55:50.000000000 +0100 @@ -1,8 +1,8 @@ /* * support.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,9 +18,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: support.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: support.h 4910 2010-05-15 09:55:50Z frlan $ */ +/** + * @file support.h + * Defines internationalization macros. + * @see GLib's @c gi18n-lib.h. + **/ + + #include "geany.h" #ifdef GETTEXT_PACKAGE @@ -31,6 +38,6 @@ # define bindtextdomain(Domain,Charset) (Domain) # define ngettext(String) (String) # define _(String) String -# define Q_(String) g_strip_context((String), (String)) +# define Q_(String) g_strip_context((String), (String)) # define N_(String) String #endif diff -Nru geany-0.18/src/symbols.c geany-0.19/src/symbols.c --- geany-0.18/src/symbols.c 2009-07-20 13:25:24.000000000 +0100 +++ geany-0.19/src/symbols.c 2010-06-06 19:02:49.000000000 +0100 @@ -1,8 +1,8 @@ /* * symbols.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,9 +18,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: symbols.c 3997 2009-07-20 12:25:24Z ntrel $ + * $Id: symbols.c 5004 2010-06-06 18:02:49Z eht16 $ */ +/** + * @file symbols.h + * Tag-related functions. + **/ + /* * Symbol Tree and TagManager-related convenience functions. * TagManager parses tags for each document, and also adds them to the workspace (session). @@ -44,7 +49,7 @@ #include "documentprivate.h" #include "support.h" #include "msgwindow.h" -#include "treeviews.h" +#include "sidebar.h" #include "main.h" #include "navqueue.h" #include "ui_utils.h" @@ -128,7 +133,7 @@ } -static gsize get_tag_count() +static gsize get_tag_count(void) { GPtrArray *tags = tm_get_workspace()->global_tags; gsize count = tags ? tags->len : 0; @@ -172,6 +177,9 @@ if (cl_options.ignore_global_tags || app->tm_workspace == NULL) return; + /* load config in case of custom filetypes */ + filetypes_load_config(file_type_idx, FALSE); + load_user_tags(file_type_idx); switch (file_type_idx) @@ -266,6 +274,13 @@ } +/** Gets the context separator used by the tag manager for a particular file + * type. + * @param ft_id File type identifier. + * @return The context separator string. + * + * @since 0.19 + */ const gchar *symbols_get_context_separator(gint ft_id) { switch (ft_id) @@ -601,7 +616,6 @@ &(tv_iters.tag_struct), _("Appendix"), NULL, &(tv_iters.tag_other), _("Other"), NULL, NULL); - /* &(tv_iters.tag_namespace), _("Other"), NULL, NULL); */ break; } case GEANY_FILETYPES_HASKELL: @@ -647,18 +661,23 @@ NULL); break; } + case GEANY_FILETYPES_R: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_function), _("Functions"), "classviewer-method", + &(tv_iters.tag_struct), _("Other"), NULL, + NULL); + break; + } case GEANY_FILETYPES_PERL: { tag_list_add_groups(tag_store, - &(tv_iters.tag_class), _("Package"), NULL, + &(tv_iters.tag_namespace), _("Package"), "classviewer-namespace", &(tv_iters.tag_function), _("Functions"), "classviewer-method", - &(tv_iters.tag_member), _("My"), NULL, - &(tv_iters.tag_macro), _("Local"), NULL, - &(tv_iters.tag_variable), _("Our"), NULL, - NULL); - /*&(tv_iters.tag_struct), _("Label"), NULL,*/ - /*&(tv_iters.tag_namespace), _("Begin"), NULL,*/ - /*&(tv_iters.tag_other), _("Other"), NULL, NULL);*/ + &(tv_iters.tag_macro), _("Labels"), NULL, + &(tv_iters.tag_type), _("Constants"), NULL, + &(tv_iters.tag_other), _("Other"), "classviewer-other", + NULL); break; } case GEANY_FILETYPES_PHP: @@ -670,9 +689,6 @@ &(tv_iters.tag_macro), _("Constants"), "classviewer-macro", &(tv_iters.tag_variable), _("Variables"), "classviewer-var", NULL); - /*&(tv_iters.tag_struct), _("Label"),*/ - /*&(tv_iters.tag_namespace), _("Begin"),*/ - /*&(tv_iters.tag_other), _("Other"), NULL);*/ break; } case GEANY_FILETYPES_HTML: @@ -695,6 +711,8 @@ break; } case GEANY_FILETYPES_REST: + case GEANY_FILETYPES_TXT2TAGS: + case GEANY_FILETYPES_ABC: { tag_list_add_groups(tag_store, &(tv_iters.tag_namespace), _("Chapter"), NULL, @@ -712,8 +730,6 @@ &(tv_iters.tag_member), _("Singletons"), "classviewer-struct", &(tv_iters.tag_function), _("Methods"), "classviewer-method", NULL); - /*&(tv_iters.tag_namespace), _("Begin"),*/ - /*&(tv_iters.tag_other), _("Other"), NULL);*/ break; } case GEANY_FILETYPES_TCL: @@ -735,37 +751,41 @@ &(tv_iters.tag_variable), _("Variables"), "classviewer-var", &(tv_iters.tag_namespace), _("Imports"), "classviewer-namespace", NULL); - /*&(tv_iters.tag_macro), _("Mixin"),*/ - /*&(tv_iters.tag_variable), _("Variables"),*/ - /*&(tv_iters.tag_struct), _("Members"),*/ - /*&(tv_iters.tag_namespace), _("Begin"),*/ - /*&(tv_iters.tag_other), _("Other"), NULL);*/ break; } case GEANY_FILETYPES_VHDL: { tag_list_add_groups(tag_store, - &(tv_iters.tag_function), _("Functions"), "classviewer-method", - /*&(tv_iters.tag_class), _("Constants"),*/ - /*&(tv_iters.tag_member), _("Members"),*/ - /*&(tv_iters.tag_macro), _("Macros"),*/ + &(tv_iters.tag_namespace), _("Package"), "classviewer-namespace", + &(tv_iters.tag_class), _("Entities"), "classviewer-class", + &(tv_iters.tag_struct), _("Architectures"), "classviewer-struct", + &(tv_iters.tag_type), _("Types"), "classviewer-other", + &(tv_iters.tag_function), _("Functions / Procedures"), "classviewer-method", + &(tv_iters.tag_variable), _("Variables / Signals"), "classviewer-var", + &(tv_iters.tag_member), _("Processes / Components"), "classviewer-member", + &(tv_iters.tag_other), _("Other"), "classviewer-other", + NULL); + break; + } + case GEANY_FILETYPES_VERILOG: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_type), _("Events"), "classviewer-macro", + &(tv_iters.tag_class), _("Modules"), "classviewer-class", + &(tv_iters.tag_function), _("Functions / Tasks"), "classviewer-method", &(tv_iters.tag_variable), _("Variables"), "classviewer-var", + &(tv_iters.tag_other), _("Other"), "classviewer-other", NULL); - /*&(tv_iters.tag_namespace), _("Namespaces"),*/ - /*&(tv_iters.tag_struct), _("Signals"),*/ - /*&(tv_iters.tag_other), _("Other"), NULL);*/ break; } case GEANY_FILETYPES_JAVA: { tag_list_add_groups(tag_store, - &(tv_iters.tag_namespace), _("Package"), NULL, + &(tv_iters.tag_namespace), _("Package"), "classviewer-namespace", &(tv_iters.tag_struct), _("Interfaces"), "classviewer-struct", &(tv_iters.tag_class), _("Classes"), "classviewer-class", &(tv_iters.tag_function), _("Methods"), "classviewer-method", &(tv_iters.tag_member), _("Members"), "classviewer-member", - /*&(tv_iters.tag_macro), _("Macros"),*/ - /*&(tv_iters.tag_variable), _("Variables"),*/ &(tv_iters.tag_other), _("Other"), "classviewer-other", NULL); break; @@ -967,7 +987,7 @@ /* find the last word in "foo::bar::blah", e.g. "blah" */ -const gchar *get_parent_name(const TMTag *tag, filetype_id ft_id) +static const gchar *get_parent_name(const TMTag *tag, filetype_id ft_id) { const gchar *scope = tag->atts.entry.scope; const gchar *separator = symbols_get_context_separator(ft_id); @@ -1059,6 +1079,21 @@ } +static GdkPixbuf *get_child_icon(GtkTreeStore *tree_store, GtkTreeIter *parent) +{ + GdkPixbuf *icon = NULL; + + if (parent == &tv_iters.tag_other) + { + return get_tag_icon("classviewer-var"); + } + /* copy parent icon */ + gtk_tree_model_get(GTK_TREE_MODEL(tree_store), parent, + SYMBOLS_COLUMN_ICON, &icon, -1); + return icon; +} + + static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash) { filetype_id ft_id = FILETYPE_ID(doc->file_type); @@ -1072,14 +1107,11 @@ const gchar *name; const gchar *parent_name = get_parent_name(tag, ft_id); GtkTreeIter iter; - GtkTreeIter *icon_iter = NULL, *child = NULL; - GdkPixbuf *icon = NULL; + GtkTreeIter *child = NULL; + GdkPixbuf *icon = NULL; - child = &iter; - icon_iter = (parent != &tv_iters.tag_other) ? parent : &tv_iters.tag_variable; - - gtk_tree_model_get(GTK_TREE_MODEL(tree_store), icon_iter, - SYMBOLS_COLUMN_ICON, &icon, -1); + child = &iter; + icon = get_child_icon(tree_store, parent); if (parent_name) { @@ -1219,6 +1251,12 @@ } else { + /* this is what g_strcmp0() does */ + if (! astr) + return -(astr != bstr); + if (! bstr) + return astr != bstr; + cmp = strcmp(astr, bstr); /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ @@ -1237,10 +1275,10 @@ static void sort_tree(GtkTreeStore *store, gboolean sort_by_name) { - gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), 1, tree_sort_func, + gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), SYMBOLS_COLUMN_NAME, tree_sort_func, GINT_TO_POINTER(sort_by_name), NULL); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 1, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), SYMBOLS_COLUMN_NAME, GTK_SORT_ASCENDING); } @@ -1300,10 +1338,6 @@ ft = filetypes_detect_from_extension(shortname); } g_free(shortname); - - if (ft == NULL || ! filetype_has_tags(ft)) - return NULL; - return ft; } @@ -1337,6 +1371,9 @@ g_printerr(_("Unknown filetype extension for \"%s\".\n"), tags_file); return 1; } + /* load config in case of custom filetypes */ + filetypes_load_config(ft->id, FALSE); + /* load ignore list for C/C++ parser */ if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) load_c_ignore_tags(); @@ -1445,18 +1482,6 @@ } -static void utils_slist_add_path(GSList *list, const gchar *path) -{ - GSList *node; - - for (node = list; node != NULL; node = g_slist_next(node)) - { - setptr(node->data, - g_build_path(G_DIR_SEPARATOR_S, path, node->data, NULL)); - } -} - - static GHashTable *init_user_tags(void) { GSList *file_list = NULL, *list = NULL; @@ -1469,12 +1494,10 @@ { utils_mkdir(dir, FALSE); } - file_list = utils_get_file_list(dir, NULL, NULL); - utils_slist_add_path(file_list, dir); + file_list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); dir = utils_build_path(app->datadir, "tags", NULL); - list = utils_get_file_list(dir, NULL, NULL); - utils_slist_add_path(list, dir); + list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); file_list = g_slist_concat(file_list, list); lang_hash = get_tagfile_hash(file_list); @@ -1487,15 +1510,16 @@ static void load_user_tags(filetype_id ft_id) { - static guchar tags_loaded[GEANY_MAX_BUILT_IN_FILETYPES] = {0}; + static guchar *tags_loaded = NULL; static GHashTable *lang_hash = NULL; GList *fnames; const GList *node; GeanyFiletype *ft = filetypes[ft_id]; g_return_if_fail(ft_id > 0); - g_return_if_fail(ft_id < GEANY_MAX_BUILT_IN_FILETYPES); + if (!tags_loaded) + tags_loaded = g_new0(guchar, filetypes_array->len); if (tags_loaded[ft_id]) return; tags_loaded[ft_id] = TRUE; /* prevent reloading */ @@ -1732,7 +1756,7 @@ tm_file = doc->tm_file; /* if the document has no changes, get the previous function name from TM */ - if(! doc->changed && tm_file != NULL && tm_file->tags_array != NULL) + if (! doc->changed && tm_file != NULL && tm_file->tags_array != NULL) { const TMTag *tag = (const TMTag*) tm_get_current_function(tm_file->tags_array, line); diff -Nru geany-0.18/src/symbols.h geany-0.19/src/symbols.h --- geany-0.18/src/symbols.h 2009-04-07 23:09:08.000000000 +0100 +++ geany-0.19/src/symbols.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * symbols.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: symbols.h 3698 2009-04-07 22:09:08Z eht16 $ + * $Id: symbols.h 4518 2010-01-01 22:55:18Z eht16 $ */ diff -Nru geany-0.18/src/templates.c geany-0.19/src/templates.c --- geany-0.18/src/templates.c 2009-08-15 18:33:20.000000000 +0100 +++ geany-0.19/src/templates.c 2010-05-15 14:14:38.000000000 +0100 @@ -1,8 +1,8 @@ /* * templates.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: templates.c 4088 2009-08-15 17:33:20Z eht16 $ + * $Id: templates.c 4917 2010-05-15 13:14:38Z eht16 $ */ /* @@ -39,13 +39,16 @@ #include "ui_utils.h" #include "toolbar.h" #include "geanymenubuttonaction.h" +#include "project.h" GeanyTemplatePrefs template_prefs; -static GtkWidget *new_with_template_menu = NULL; /* File menu submenu */ +static GtkWidget *new_with_template_menu = NULL; /* submenu used for both file menu and toolbar */ +/* TODO: implement custom insertion templates, put these into files in data/templates */ + /* default templates, only for initial tempate file creation on first start of Geany */ static const gchar templates_gpl_notice[] = "\ This program is free software; you can redistribute it and/or modify\n\ @@ -117,132 +120,20 @@ \n\ * \n\n\n"; -static const gchar templates_filetype_none[] = ""; - -static const gchar templates_filetype_c[] = "{fileheader}\n\n\ -#include \n\ -\n\ -int main(int argc, char** argv)\n\ -{\n\ - \n\ - return 0;\n\ -}\n\ -"; - -static const gchar templates_filetype_cpp[] = "{fileheader}\n\n\ -#include \n\ -\n\ -int main(int argc, char** argv)\n\ -{\n\ - \n\ - return 0;\n\ -}\n\ -"; - -static const gchar templates_filetype_d[] = "{fileheader}\n\n\ -import std.stdio;\n\ -\n\ -int main(char[][] args)\n\ -{\n\ - \n\ - return 0;\n\ -}\n\ -"; - -static const gchar templates_filetype_php[] = "\ -\n\n\ -\n\ -\n\ -\n\ -\n\ - {untitled}\n\ - \n\ - \n\ -\n\ -\n\ -\n\ - \n\ -\n\ -\n\ -"; - -static const gchar templates_filetype_html[] = "{fileheader}\n\ -\n\ -\n\ -\n\ -\n\ - {untitled}\n\ - \n\ - \n\ -\n\ -\n\ -\n\ - \n\ -\n\ -\n\ -"; - -static const gchar templates_filetype_pascal[] = "{fileheader}\n\n\ -program {untitled};\n\ -\n\ -uses crt;\n\ -var i : byte;\n\ -\n\ -BEGIN\n\ - \n\ - \n\ -END.\n\ -"; - -static const gchar templates_filetype_java[] = "{fileheader}\n\n\ -public class {untitled} {\n\ -\n\ - public static void main (String args[]) {\ - \n\ - \n\ - }\n\ -}\n\ -"; +static gchar *templates[GEANY_MAX_TEMPLATES]; -static const gchar templates_filetype_ruby[] = "{fileheader}\n\n\ -class StdClass\n\ - def initialize\n\ - \n\ - end\n\ -end\n\ -\n\ -x = StdClass.new\n\ -"; +/* We should probably remove filetype templates support soon - users can use custom + * file templates instead. */ +static gchar *ft_templates[GEANY_MAX_BUILT_IN_FILETYPES] = {NULL}; -static const gchar templates_filetype_python[] = "#!/usr/bin/env python\n\ -# -*- coding: utf-8 -*-\n#\n\ -{fileheader}\n\n\ -\n\ -def main():\n\ - \n\ - return 0\n\ -\n\ -if __name__ == '__main__':\n\ - main()\n\ -"; -static const gchar templates_filetype_latex[] = "\ -\\documentclass[a4paper]{article}\n\ -\\usepackage[T1]{fontenc}\n\ -\\usepackage[utf8]{inputenc}\n\ -\\usepackage{lmodern}\n\ -\\usepackage{babel}\n\ -\\begin{document}\n\ -\n\ -\\end{document}\n\ -"; +static void replace_static_values(GString *text); +static gchar *get_template_fileheader(GeanyFiletype *ft); -static gchar *templates[GEANY_MAX_TEMPLATES]; -static gchar *ft_templates[GEANY_MAX_BUILT_IN_FILETYPES] = {NULL}; +/* called by templates_replace_common */ +static void templates_replace_default_dates(GString *text); +static void templates_replace_command(GString *text, const gchar *file_name, + const gchar *file_type, const gchar *func_name); /* some simple macros to reduce code size and make the code readable */ @@ -274,6 +165,7 @@ } } + /* FIXME the callers should use GStrings instead of char arrays */ static gchar *replace_all(gchar *text, const gchar *year, const gchar *date, const gchar *datetime) { @@ -285,7 +177,11 @@ str = g_string_new(text); g_free(text); - templates_replace_all(str, year, date, datetime); + templates_replace_valist(str, + "{year}", year, + "{date}", date, + "{datetime}", datetime, + NULL); return g_string_free(str, FALSE); } @@ -341,43 +237,6 @@ gchar *shortname = g_strconcat("filetype.", ext, NULL); gchar *fname = TEMPLATES_GET_FILENAME(shortname); - switch (ft_id) - { - case GEANY_FILETYPES_NONE: - create_template_file_if_necessary(fname, templates_filetype_none); - break; - case GEANY_FILETYPES_C: - create_template_file_if_necessary(fname, templates_filetype_c); - break; - case GEANY_FILETYPES_CPP: - create_template_file_if_necessary(fname, templates_filetype_cpp); - break; - case GEANY_FILETYPES_D: - create_template_file_if_necessary(fname, templates_filetype_d); - break; - case GEANY_FILETYPES_JAVA: - create_template_file_if_necessary(fname, templates_filetype_java); - break; - case GEANY_FILETYPES_PASCAL: - create_template_file_if_necessary(fname, templates_filetype_pascal); - break; - case GEANY_FILETYPES_PHP: - create_template_file_if_necessary(fname, templates_filetype_php); - break; - case GEANY_FILETYPES_HTML: - create_template_file_if_necessary(fname, templates_filetype_html); - break; - case GEANY_FILETYPES_RUBY: - create_template_file_if_necessary(fname, templates_filetype_ruby); - break; - case GEANY_FILETYPES_PYTHON: - create_template_file_if_necessary(fname, templates_filetype_python); - break; - case GEANY_FILETYPES_LATEX: - create_template_file_if_necessary(fname, templates_filetype_latex); - break; - default: break; - } TEMPLATES_READ_FILE(fname, &ft_templates[ft_id]); ft_templates[ft_id] = replace_all(ft_templates[ft_id], year, date, datetime); @@ -389,8 +248,7 @@ static void -on_new_with_template (GtkMenuItem *menuitem, - gpointer user_data) +on_new_with_filetype_template(GtkMenuItem *menuitem, gpointer user_data) { GeanyFiletype *ft = user_data; gchar *template = templates_get_template_new_file(ft); @@ -400,30 +258,69 @@ } -/* template items for the new file menu */ -static void create_new_menu_items(GtkWidget *toolbar_new_file_menu) +/* TODO: remove filetype template support after 0.19 */ +static gboolean create_new_filetype_items(void) { GSList *node; + gboolean ret = FALSE; + GtkWidget *menu = NULL; foreach_slist(node, filetypes_by_title) { GeanyFiletype *ft = node->data; - GtkWidget *tmp_menu, *tmp_button; - const gchar *label = ft->title; + GtkWidget *item; - if (ft_templates[ft->id] == NULL) + if (ft->id >= GEANY_MAX_BUILT_IN_FILETYPES || ft_templates[ft->id] == NULL) continue; - tmp_menu = gtk_menu_item_new_with_label(label); - gtk_widget_show(tmp_menu); - gtk_container_add(GTK_CONTAINER(new_with_template_menu), tmp_menu); - g_signal_connect(tmp_menu, "activate", G_CALLBACK(on_new_with_template), ft); - - tmp_button = gtk_menu_item_new_with_label(label); - gtk_widget_show(tmp_button); - gtk_container_add(GTK_CONTAINER(toolbar_new_file_menu), tmp_button); - g_signal_connect(tmp_button, "activate", G_CALLBACK(on_new_with_template), ft); + if (!menu) + { + item = gtk_menu_item_new_with_label(_("Old")); + menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu); + gtk_widget_show_all(item); + gtk_container_add(GTK_CONTAINER(new_with_template_menu), item); + } + item = gtk_menu_item_new_with_label(ft->title); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_new_with_filetype_template), ft); + ret = TRUE; } + return ret; +} + + +void templates_replace_common(GString *template, const gchar *fname, + GeanyFiletype *ft, const gchar *func_name) +{ + gchar *shortname; + + if (fname == NULL) + { + if (!ft->extension) + shortname = g_strdup(GEANY_STRING_UNTITLED); + else + shortname = g_strconcat(GEANY_STRING_UNTITLED, ".", ft->extension, NULL); + } + else + shortname = g_path_get_basename(fname); + + templates_replace_valist(template, + "{filename}", shortname, + "{project}", app->project ? app->project->name : "", + "{description}", app->project ? app->project->description : "", + NULL); + g_free(shortname); + + templates_replace_default_dates(template); + templates_replace_command(template, fname, ft->name, func_name); + /* Bug: command results could have {ob} {cb} strings in! */ + /* replace braces last */ + templates_replace_valist(template, + "{ob}", "{", + "{cb}", "}", + NULL); } @@ -438,20 +335,19 @@ if (content != NULL) { gchar *file_header; - gchar *year = utils_get_date_time(template_prefs.year_format, NULL); - gchar *date = utils_get_date_time(template_prefs.date_format, NULL); - gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); template = g_string_new(content); - file_header = templates_get_template_fileheader(FILETYPE_ID(ft), doc_filename); - templates_replace_all(template, year, date, datetime); - utils_string_replace_all(template, "{filename}", doc_filename); - utils_string_replace_all(template, "{fileheader}", file_header); + file_header = get_template_fileheader(ft); + templates_replace_valist(template, + "{fileheader}", file_header, + NULL); + templates_replace_common(template, doc_filename, ft, NULL); - utils_free_pointers(5, year, date, datetime, file_header, content, NULL); + utils_free_pointers(2, file_header, content, NULL); + return g_string_free(template, FALSE); } - return g_string_free(template, FALSE); + return NULL; } @@ -461,120 +357,137 @@ gchar *fname = ui_menu_item_get_text(menuitem); GeanyFiletype *ft; gchar *template; - gchar *extension = strrchr(fname, '.'); /* easy way to get the file extension */ + const gchar *extension = strrchr(fname, '.'); /* easy way to get the file extension */ gchar *new_filename = g_strconcat(GEANY_STRING_UNTITLED, extension, NULL); + gchar *path; ft = filetypes_detect_from_extension(fname); setptr(fname, utils_get_locale_from_utf8(fname)); - /* fname is just the basename from the menu item, so prepend the custom files path */ - setptr(fname, g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR, - "files", fname, NULL)); - template = get_template_from_file(fname, new_filename, ft); - g_free(fname); - document_new_file(new_filename, ft, template); + /* fname is just the basename from the menu item, so prepend the custom files path */ + path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR, + "files", fname, NULL); + template = get_template_from_file(path, new_filename, ft); + if (!template) + { + /* try the system path */ + g_free(path); + path = g_build_path(G_DIR_SEPARATOR_S, app->datadir, GEANY_TEMPLATES_SUBDIR, + "files", fname, NULL); + template = get_template_from_file(path, new_filename, ft); + } + if (template) + document_new_file(new_filename, ft, template); + else + { + setptr(fname, utils_get_utf8_from_locale(fname)); + ui_set_statusbar(TRUE, _("Could not find file '%s'."), fname); + } g_free(template); + g_free(path); g_free(new_filename); + g_free(fname); } -static void add_file_item(gpointer data, gpointer user_data) +static void add_file_item(const gchar *fname, GtkWidget *menu) { - GtkWidget *tmp_menu, *tmp_button; - GtkWidget *toolbar_new_file_menu = user_data; + GtkWidget *tmp_button; gchar *label; - g_return_if_fail(data); + g_return_if_fail(fname); + g_return_if_fail(menu); - label = utils_get_utf8_from_locale(data); - - tmp_menu = gtk_menu_item_new_with_label(label); - gtk_widget_show(tmp_menu); - gtk_container_add(GTK_CONTAINER(new_with_template_menu), tmp_menu); - g_signal_connect(tmp_menu, "activate", G_CALLBACK(on_new_with_file_template), NULL); + label = utils_get_utf8_from_locale(fname); tmp_button = gtk_menu_item_new_with_label(label); gtk_widget_show(tmp_button); - gtk_container_add(GTK_CONTAINER(toolbar_new_file_menu), tmp_button); + gtk_container_add(GTK_CONTAINER(menu), tmp_button); g_signal_connect(tmp_button, "activate", G_CALLBACK(on_new_with_file_template), NULL); g_free(label); } -static gint compare_filenames_by_filetype(gconstpointer a, gconstpointer b) +static gboolean add_custom_template_items(void) { - GeanyFiletype *ft_a = filetypes_detect_from_extension(a); - GeanyFiletype *ft_b = filetypes_detect_from_extension(b); + GSList *list = utils_get_config_files(GEANY_TEMPLATES_SUBDIR G_DIR_SEPARATOR_S "files"); + GSList *node; - /* sort by filetype name first */ - if (G_LIKELY(ft_a != ft_b)) + foreach_slist(node, list) { - /* None filetypes should come first */ - if (G_UNLIKELY(ft_a->id == GEANY_FILETYPES_NONE)) - return -1; - if (G_UNLIKELY(ft_b->id == GEANY_FILETYPES_NONE)) - return 1; + gchar *fname = node->data; - return utils_str_casecmp(ft_a->name, ft_b->name); + add_file_item(fname, new_with_template_menu); + g_free(fname); } - return utils_str_casecmp(a, b); + g_slist_free(list); + return list != NULL; } -static gboolean add_custom_template_items(GtkWidget *toolbar_new_file_menu) +static void create_file_template_menu(void) { - gchar *path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR, - "files", NULL); - GSList *list = utils_get_file_list(path, NULL, NULL); + GtkWidget *sep = NULL; + + new_with_template_menu = gtk_menu_new(); - if (list == NULL) + if (add_custom_template_items()) { - utils_mkdir(path, FALSE); - return FALSE; + sep = gtk_separator_menu_item_new(); + gtk_container_add(GTK_CONTAINER(new_with_template_menu), sep); } - list = g_slist_sort(list, compare_filenames_by_filetype); - g_slist_foreach(list, add_file_item, toolbar_new_file_menu); - g_slist_foreach(list, (GFunc) g_free, NULL); - g_slist_free(list); - g_free(path); - return TRUE; + if (create_new_filetype_items() && sep) + { + gtk_widget_show(sep); + } + /* unless the file menu is showing, menu should be in the toolbar widget */ + geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION( + toolbar_get_action_by_name("New")), new_with_template_menu); } -static void create_file_template_menus(void) +static void on_file_menu_show(GtkWidget *item) { - GtkWidget *sep1, *sep2 = NULL; - GtkWidget *toolbar_new_file_menu = NULL; + geany_menu_button_action_set_menu( + GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New")), NULL); + item = ui_lookup_widget(main_widgets.window, "menu_new_with_template1"); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), new_with_template_menu); +} - new_with_template_menu = ui_lookup_widget(main_widgets.window, "menu_new_with_template1_menu"); - toolbar_new_file_menu = gtk_menu_new(); - /* we hold our own ref on the menu in case it is not used in the toolbar */ - g_object_ref(toolbar_new_file_menu); - create_new_menu_items(toolbar_new_file_menu); +static void on_file_menu_hide(GtkWidget *item) +{ + item = ui_lookup_widget(main_widgets.window, "menu_new_with_template1"); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), NULL); + geany_menu_button_action_set_menu( + GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New")), new_with_template_menu); +} - sep1 = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(new_with_template_menu), sep1); - sep2 = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(toolbar_new_file_menu), sep2); - if (add_custom_template_items(toolbar_new_file_menu)) +/* reload templates if any file in the templates path is saved */ +static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) +{ + const gchar *path = utils_build_path(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); + + g_return_if_fail(NZV(doc->real_path)); + + if (strncmp(doc->real_path, path, strlen(path)) == 0) { - gtk_widget_show(sep1); - gtk_widget_show(sep2); + /* reload templates */ + templates_free_templates(); + templates_init(); } - - geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION( - toolbar_get_action_by_name("New")), toolbar_new_file_menu); } +/* warning: also called when reloading template settings */ void templates_init(void) { gchar *year = utils_get_date_time(template_prefs.year_format, NULL); gchar *date = utils_get_date_time(template_prefs.date_format, NULL); gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); + static gboolean init_done = FALSE; init_general_templates(year, date, datetime); init_ft_templates(year, date, datetime); @@ -583,7 +496,23 @@ g_free(datetime); g_free(year); - create_file_template_menus(); + create_file_template_menu(); + /* we hold our own ref for the menu as it has no parent whilst being moved */ + g_object_ref(new_with_template_menu); + + /* only connect signals to persistent objects once */ + if (!init_done) + { + GtkWidget *item; + /* reparent the template menu as needed */ + item = ui_lookup_widget(main_widgets.window, "file1"); + item = gtk_menu_item_get_submenu(GTK_MENU_ITEM(item)); + g_signal_connect(item, "show", G_CALLBACK(on_file_menu_show), NULL); + g_signal_connect(item, "hide", G_CALLBACK(on_file_menu_hide), NULL); + + g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); + } + init_done = TRUE; } @@ -591,11 +520,12 @@ * e.g. indent = 8 prints " * here comes the text of the line" * indent is meant to be the whole amount of characters before the real line content follows, i.e. * 6 characters are filled with whitespace when the comment characters include " *" */ +/* TODO make this function operating on a GString */ static gchar *make_comment_block(const gchar *comment_text, gint filetype_idx, guint indent) { - gchar *frame_start; /* to add before comment_text */ - gchar *frame_end; /* to add after comment_text */ - gchar *line_prefix; /* to add before every line in comment_text */ + gchar *frame_start; /* to add before comment_text */ + gchar *frame_end; /* to add after comment_text */ + const gchar *line_prefix; /* to add before every line in comment_text */ gchar *result; gchar *tmp; gchar *prefix; @@ -664,109 +594,113 @@ } -gchar *templates_get_template_licence(gint filetype_idx, gint licence_type) +gchar *templates_get_template_licence(GeanyDocument *doc, gint licence_type) { - if (licence_type != GEANY_TEMPLATE_GPL && licence_type != GEANY_TEMPLATE_BSD) - return NULL; + GString *template; + gchar *result = NULL; - return make_comment_block(templates[licence_type], filetype_idx, 8); -} + g_return_val_if_fail(doc != NULL, NULL); + g_return_val_if_fail(licence_type == GEANY_TEMPLATE_GPL || licence_type == GEANY_TEMPLATE_BSD, NULL); + template = g_string_new(templates[licence_type]); + replace_static_values(template); + templates_replace_default_dates(template); + templates_replace_command(template, DOC_FILENAME(doc), doc->file_type->name, NULL); -gchar *templates_get_template_fileheader(gint filetype_idx, const gchar *fname) -{ - gchar *template = g_strdup(templates[GEANY_TEMPLATE_FILEHEADER]); - gchar *shortname; - gchar *result; - gchar *date = utils_get_date_time(template_prefs.datetime_format, NULL); - filetype_id ft_id = filetype_idx; - GeanyFiletype *ft = filetypes[ft_id]; + result = make_comment_block(template->str, FILETYPE_ID(doc->file_type), 8); - filetypes_load_config(ft_id, FALSE); /* load any user extension setting */ + g_string_free(template, TRUE); + + return result; +} - if (fname == NULL) - { - if (ft_id == GEANY_FILETYPES_NONE) - shortname = g_strdup(GEANY_STRING_UNTITLED); - else - shortname = g_strconcat(GEANY_STRING_UNTITLED, ".", ft->extension, NULL); - } - else - shortname = g_path_get_basename(fname); - utils_str_replace_all(&template, "{filename}", shortname); - utils_str_replace_all(&template, "{gpl}", templates[GEANY_TEMPLATE_GPL]); - utils_str_replace_all(&template, "{bsd}", templates[GEANY_TEMPLATE_BSD]); - utils_str_replace_all(&template, "{datetime}", date); +static gchar *get_template_fileheader(GeanyFiletype *ft) +{ + GString *template = g_string_new(templates[GEANY_TEMPLATE_FILEHEADER]); + gchar *result; - result = make_comment_block(template, ft_id, 8); + filetypes_load_config(ft->id, FALSE); /* load any user extension setting */ - g_free(template); - g_free(shortname); - g_free(date); + templates_replace_valist(template, + "{gpl}", templates[GEANY_TEMPLATE_GPL], + "{bsd}", templates[GEANY_TEMPLATE_BSD], + NULL); + + /* we don't replace other wildcards here otherwise they would get done twice for files */ + result = make_comment_block(template->str, ft->id, 8); + g_string_free(template, TRUE); return result; } -static gchar *get_file_template(GeanyFiletype *ft) +/* TODO change the signature to take a GeanyDocument? this would break plugin API/ABI */ +gchar *templates_get_template_fileheader(gint filetype_idx, const gchar *fname) { - filetype_id ft_id = FILETYPE_ID(ft); + GeanyFiletype *ft = filetypes[filetype_idx]; + gchar *str = get_template_fileheader(ft); + GString *template = g_string_new(str); - return g_strdup(ft_templates[ft_id]); + g_free(str); + templates_replace_common(template, fname, ft, NULL); + return g_string_free(template, FALSE); } gchar *templates_get_template_new_file(GeanyFiletype *ft) { - gchar *ft_template = NULL; + GString *ft_template; gchar *file_header = NULL; + g_return_val_if_fail(ft != NULL, NULL); + g_return_val_if_fail(ft->id < GEANY_MAX_BUILT_IN_FILETYPES, NULL); + + ft_template = g_string_new(ft_templates[ft->id]); if (FILETYPE_ID(ft) == GEANY_FILETYPES_NONE) - return get_file_template(ft); + { + replace_static_values(ft_template); + } + else + { /* file template only used for new files */ + file_header = get_template_fileheader(ft); + templates_replace_valist(ft_template, "{fileheader}", file_header, NULL); + } + templates_replace_common(ft_template, NULL, ft, NULL); - file_header = templates_get_template_fileheader(ft->id, NULL); /* file template only used for new files */ - ft_template = get_file_template(ft); - utils_str_replace_all(&ft_template, "{fileheader}", file_header); g_free(file_header); - return ft_template; -} - - -gchar *templates_get_template_generic(gint template) -{ - return g_strdup(templates[template]); + return g_string_free(ft_template, FALSE); } -gchar *templates_get_template_function(gint filetype_idx, const gchar *func_name) +gchar *templates_get_template_function(GeanyDocument *doc, const gchar *func_name) { - gchar *template = g_strdup(templates[GEANY_TEMPLATE_FUNCTION]); - gchar *date = utils_get_date_time(template_prefs.date_format, NULL); - gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); gchar *result; + GString *text; - utils_str_replace_all(&template, "{date}", date); - utils_str_replace_all(&template, "{datetime}", datetime); - utils_str_replace_all(&template, "{functionname}", (func_name) ? func_name : ""); + func_name = (func_name != NULL) ? func_name : ""; + text = g_string_new(templates[GEANY_TEMPLATE_FUNCTION]); - result = make_comment_block(template, filetype_idx, 3); + templates_replace_valist(text, "{functionname}", func_name, NULL); + templates_replace_default_dates(text); + templates_replace_command(text, DOC_FILENAME(doc), doc->file_type->name, func_name); - g_free(template); - g_free(date); - g_free(datetime); + result = make_comment_block(text->str, doc->file_type->id, 3); + + g_string_free(text, TRUE); return result; } -gchar *templates_get_template_changelog(void) +gchar *templates_get_template_changelog(GeanyDocument *doc) { - gchar *date = utils_get_date_time(template_prefs.datetime_format, NULL); - gchar *result = g_strdup(templates[GEANY_TEMPLATE_CHANGELOG]); + GString *result = g_string_new(templates[GEANY_TEMPLATE_CHANGELOG]); + const gchar *file_type_name = (doc != NULL) ? doc->file_type->name : ""; - utils_str_replace_all(&result, "{date}", date); + replace_static_values(result); + templates_replace_default_dates(result); + templates_replace_command(result, DOC_FILENAME(doc), file_type_name, NULL); - g_free(date); - return result; + return g_string_free(result, FALSE); } @@ -774,8 +708,11 @@ { gint i; GList *children, *item; - GtkWidget *toolbar_new_file_menu = geany_menu_button_action_get_menu( - GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New"))); + + /* disconnect the menu from the action widget, so destroying the items below doesn't + * trigger rebuilding of the menu on each item destroy */ + geany_menu_button_action_set_menu( + GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New")), NULL); for (i = 0; i < GEANY_MAX_TEMPLATES; i++) { @@ -786,26 +723,20 @@ g_free(ft_templates[i]); } /* destroy "New with template" sub menu items (in case we want to reload the templates) */ - children = gtk_container_get_children(GTK_CONTAINER(toolbar_new_file_menu)); - foreach_list(item, children) - { - gtk_widget_destroy(GTK_WIDGET(item->data)); - } - g_object_unref(toolbar_new_file_menu); children = gtk_container_get_children(GTK_CONTAINER(new_with_template_menu)); foreach_list(item, children) { gtk_widget_destroy(GTK_WIDGET(item->data)); } + g_list_free(children); + + g_object_unref(new_with_template_menu); + new_with_template_menu = NULL; } -void templates_replace_all(GString *text, const gchar *year, const gchar *date, - const gchar *datetime) +static void replace_static_values(GString *text) { - utils_string_replace_all(text, "{year}", year); - utils_string_replace_all(text, "{date}", date); - utils_string_replace_all(text, "{datetime}", datetime); utils_string_replace_all(text, "{version}", template_prefs.version); utils_string_replace_all(text, "{initial}", template_prefs.initials); utils_string_replace_all(text, "{developer}", template_prefs.developer); @@ -815,3 +746,122 @@ utils_string_replace_all(text, "{geanyversion}", "Geany " VERSION); } + +/* Replaces all static template wildcards (version, mail, company, name, ...) + * plus those wildcard, value pairs which are passed, e.g. + * + * templates_replace_valist(text, "{some_wildcard}", "some value", + * "{another_wildcard}", "another value", NULL); + * + * The argument list must be terminated with NULL. */ +void templates_replace_valist(GString *text, const gchar *first_wildcard, ...) +{ + va_list args; + const gchar *key, *value; + + g_return_if_fail(text != NULL); + + va_start(args, first_wildcard); + + key = first_wildcard; + value = va_arg(args, gchar*); + + while (key != NULL) + { + utils_string_replace_all(text, key, value); + + key = va_arg(args, gchar*); + if (key == NULL || text == NULL) + break; + value = va_arg(args, gchar*); + } + va_end(args); + + replace_static_values(text); +} + + +static void templates_replace_default_dates(GString *text) +{ + gchar *year = utils_get_date_time(template_prefs.year_format, NULL); + gchar *date = utils_get_date_time(template_prefs.date_format, NULL); + gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); + + g_return_if_fail(text != NULL); + + templates_replace_valist(text, + "{year}", year, + "{date}", date, + "{datetime}", datetime, + NULL); + + utils_free_pointers(3, year, date, datetime, NULL); +} + + +static gchar *run_command(const gchar *command, const gchar *file_name, + const gchar *file_type, const gchar *func_name) +{ + gchar *result = NULL; + gchar **argv; + + if (g_shell_parse_argv(command, NULL, &argv, NULL)) + { + GError *error = NULL; + gchar **env; + + file_name = (file_name != NULL) ? file_name : ""; + file_type = (file_type != NULL) ? file_type : ""; + func_name = (func_name != NULL) ? func_name : ""; + + env = utils_copy_environment(NULL, + "GEANY_FILENAME", file_name, + "GEANY_FILETYPE", file_type, + "GEANY_FUNCNAME", func_name, + NULL); + if (! utils_spawn_sync(NULL, argv, env, G_SPAWN_SEARCH_PATH, + NULL, NULL, &result, NULL, NULL, &error)) + { + g_warning("templates_replace_command: %s", error->message); + g_error_free(error); + return NULL; + } + g_strfreev(argv); + g_strfreev(env); + } + return result; +} + + +static void templates_replace_command(GString *text, const gchar *file_name, + const gchar *file_type, const gchar *func_name) +{ + gchar *match = NULL; + gchar *wildcard = NULL; + gchar *cmd; + gchar *result; + + g_return_if_fail(text != NULL); + + while ((match = strstr(text->str, "{command:")) != NULL) + { + cmd = match; + while (*match != '}' && *match != '\0') + match++; + + wildcard = g_strndup(cmd, match - cmd + 1); + cmd = g_strndup(wildcard + 9, strlen(wildcard) - 10); + + result = run_command(cmd, file_name, file_type, func_name); + if (result != NULL) + { + utils_string_replace_first(text, wildcard, result); + g_free(result); + } + else + utils_string_replace_first(text, wildcard, ""); + + g_free(wildcard); + g_free(cmd); + } +} diff -Nru geany-0.18/src/templates.h geany-0.19/src/templates.h --- geany-0.18/src/templates.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.19/src/templates.h 2010-04-22 14:01:45.000000000 +0100 @@ -1,8 +1,8 @@ /* * templates.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,9 +18,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: templates.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: templates.h 4852 2010-04-22 13:01:45Z ntrel $ */ +/** + * @file templates.h + * Templates (prefs). + **/ + + #ifndef GEANY_TEMPLATES_H #define GEANY_TEMPLATES_H 1 @@ -35,13 +41,14 @@ }; +/** Template preferences. */ typedef struct GeanyTemplatePrefs { - gchar *developer; - gchar *company; - gchar *mail; - gchar *initials; - gchar *version; + gchar *developer; /**< Name */ + gchar *company; /**< Company */ + gchar *mail; /**< Email */ + gchar *initials; /**< Initials */ + gchar *version; /**< Initial version */ gchar *year_format; gchar *date_format; gchar *datetime_format; @@ -59,16 +66,17 @@ gchar *templates_get_template_new_file(GeanyFiletype *ft); -gchar *templates_get_template_changelog(void); +gchar *templates_get_template_changelog(GeanyDocument *doc); -gchar *templates_get_template_generic(gint template); +gchar *templates_get_template_function(GeanyDocument *doc, const gchar *func_name); -gchar *templates_get_template_function(gint filetype_idx, const gchar *func_name); +gchar *templates_get_template_licence(GeanyDocument *doc, gint licence_type); -gchar *templates_get_template_licence(gint filetype_idx, gint licence_type); +void templates_replace_common(GString *template, const gchar *fname, + GeanyFiletype *ft, const gchar *func_name); -void templates_replace_all(GString *source, const gchar *year, const gchar *date, - const gchar *datetime); +void templates_replace_valist(GString *text, + const gchar *first_wildcard, ...) G_GNUC_NULL_TERMINATED; void templates_free_templates(void); diff -Nru geany-0.18/src/toolbar.c geany-0.19/src/toolbar.c --- geany-0.18/src/toolbar.c 2009-07-23 12:00:32.000000000 +0100 +++ geany-0.19/src/toolbar.c 2010-05-22 20:39:03.000000000 +0100 @@ -1,8 +1,8 @@ /* * toolbar.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Enrico Tröger - * Copyright 2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -18,13 +18,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: toolbar.c 4012 2009-07-23 11:00:32Z ntrel $ + * $Id: toolbar.c 4941 2010-05-22 19:39:03Z eht16 $ */ - -/** @file toolbar.c - * Utility functions to create the toolbar. +/** + * @file toolbar.h + * Toolbar (prefs). */ +/* Utility functions to create the toolbar */ #include "geany.h" #include "support.h" @@ -287,9 +288,10 @@ if (main_status.main_window_realized) { GeanyDocument *doc = document_get_current(); + gboolean doc_changed = (doc != NULL) ? doc->changed : FALSE; ui_document_buttons_update(); - ui_save_buttons_toggle(doc->changed); /* update save all */ + ui_save_buttons_toggle(doc_changed); /* update save all */ ui_update_popup_reundo_items(doc); toolbar_apply_settings(); @@ -315,6 +317,24 @@ } +static void toolbar_notify_style_cb(GObject *object, GParamSpec *arg1, gpointer data) +{ + const gchar *arg_name = g_param_spec_get_name(arg1); + gint value; + + if (toolbar_prefs.use_gtk_default_style && utils_str_equal(arg_name, "gtk-toolbar-style")) + { + value = ui_get_gtk_settings_integer(arg_name, toolbar_prefs.icon_style); + gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), value); + } + else if (toolbar_prefs.use_gtk_default_icon && utils_str_equal(arg_name, "gtk-toolbar-size")) + { + value = ui_get_gtk_settings_integer(arg_name, toolbar_prefs.icon_size); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), value); + } +} + + GtkWidget *toolbar_init(void) { GtkWidget *toolbar; @@ -323,6 +343,7 @@ GtkAction *action_build; GtkAction *action_searchentry; GtkAction *action_gotoentry; + GtkSettings *gtk_settings; uim = gtk_ui_manager_new(); group = gtk_action_group_new("GeanyToolbar"); @@ -331,17 +352,27 @@ gtk_action_group_add_actions(group, ui_entries, ui_entries_n, NULL); /* Create our custom actions */ - action_new = geany_menu_button_action_new("New", NULL, _("Create a new file"), GTK_STOCK_NEW); + action_new = geany_menu_button_action_new( + "New", NULL, + _("Create a new file"), + _("Create a new file from a template"), + GTK_STOCK_NEW); g_signal_connect(action_new, "button-clicked", G_CALLBACK(on_toolbutton_new_clicked), NULL); gtk_action_group_add_action(group, action_new); action_open = geany_menu_button_action_new( - "Open", NULL, _("Open an existing file"), GTK_STOCK_OPEN); + "Open", NULL, + _("Open an existing file"), + _("Open a recent file"), + GTK_STOCK_OPEN); g_signal_connect(action_open, "button-clicked", G_CALLBACK(on_toolbutton_open_clicked), NULL); gtk_action_group_add_action(group, action_open); action_build = geany_menu_button_action_new( - "Build", NULL, _("Build the current file"), GEANY_STOCK_BUILD); + "Build", NULL, + _("Build the current file"), + _("Choose more build actions"), + GEANY_STOCK_BUILD); g_signal_connect(action_build, "button-clicked", G_CALLBACK(build_toolbutton_build_clicked), NULL); gtk_action_group_add_action(group, action_build); @@ -364,6 +395,13 @@ toolbar = toolbar_reload(NULL); + gtk_settings = gtk_widget_get_settings(GTK_WIDGET(toolbar)); + if (gtk_settings != NULL) + { + g_signal_connect(gtk_settings, "notify::gtk-toolbar-style", + G_CALLBACK(toolbar_notify_style_cb), NULL); + } + return toolbar; } @@ -372,17 +410,20 @@ { static GtkWidget *hbox_menubar = NULL; static GtkWidget *menubar = NULL; - static GtkWidget *menubar_toolbar_separator = NULL; + GtkWidget *menubar_toolbar_separator = NULL; GtkWidget *parent; + GtkToolItem *first_item; if (menubar == NULL) { /* cache widget pointers */ hbox_menubar = ui_lookup_widget(main_widgets.window, "hbox_menubar"); menubar = ui_lookup_widget(main_widgets.window, "menubar1"); - - menubar_toolbar_separator = GTK_WIDGET(gtk_separator_tool_item_new()); - gtk_toolbar_insert(GTK_TOOLBAR(main_widgets.toolbar), - GTK_TOOL_ITEM(menubar_toolbar_separator), 0); + } + /* the separator between the menubar and the toolbar */ + first_item = gtk_toolbar_get_nth_item(GTK_TOOLBAR(main_widgets.toolbar), 0); + if (first_item != NULL && GTK_IS_SEPARATOR_TOOL_ITEM(first_item)) + { + gtk_widget_destroy(GTK_WIDGET(first_item)); } parent = gtk_widget_get_parent(main_widgets.toolbar); @@ -405,6 +446,12 @@ } else gtk_box_pack_start(GTK_BOX(hbox_menubar), main_widgets.toolbar, TRUE, TRUE, 0); + + /* the separator between the menubar and the toolbar */ + menubar_toolbar_separator = GTK_WIDGET(gtk_separator_tool_item_new()); + gtk_widget_show(menubar_toolbar_separator); + gtk_toolbar_insert(GTK_TOOLBAR(main_widgets.toolbar), + GTK_TOOL_ITEM(menubar_toolbar_separator), 0); } else { @@ -429,8 +476,6 @@ gtk_box_reorder_child(GTK_BOX(box), main_widgets.toolbar, 1); } } - /* the separator between the menubar and the toolbar */ - ui_widget_show_hide(menubar_toolbar_separator, toolbar_prefs.append_to_menu); /* we need to adjust the packing flags for the menubar to expand it if it is alone in the * hbox and not expand it if the toolbar is appended */ gtk_box_set_child_packing(GTK_BOX(hbox_menubar), menubar, @@ -473,8 +518,9 @@ void toolbar_finalize(void) { - g_object_unref(geany_menu_button_action_get_menu( - GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("Open")))); + GeanyMenubuttonAction *open_action = GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("Open")); + g_object_unref(geany_menu_button_action_get_menu(open_action)); + geany_menu_button_action_set_menu(open_action, NULL); /* unref'ing the GtkUIManager object will destroy all its widgets unless they were ref'ed */ g_object_unref(uim); @@ -494,39 +540,38 @@ } -void toolbar_apply_settings(void) +/* sets the icon style of the toolbar */ +static void toolbar_set_icon_style(void) { - /* sets the icon style of the toolbar */ - switch (toolbar_prefs.icon_style) - { - case GTK_TOOLBAR_BOTH: - { - /*gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "images_and_text1")), TRUE);*/ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(ui_widgets.toolbar_menu, "images_and_text2")), TRUE); - break; - } - case GTK_TOOLBAR_ICONS: - { - /*gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "images_only1")), TRUE);*/ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(ui_widgets.toolbar_menu, "images_only2")), TRUE); - break; - } - case GTK_TOOLBAR_TEXT: - { - /*gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "text_only1")), TRUE);*/ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(ui_widgets.toolbar_menu, "text_only2")), TRUE); - break; - } - } - gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), toolbar_prefs.icon_style); + gint icon_style; - /* sets the icon size of the toolbar, use user preferences (.gtkrc) if not set */ - if (toolbar_prefs.icon_size == GTK_ICON_SIZE_SMALL_TOOLBAR || - toolbar_prefs.icon_size == GTK_ICON_SIZE_LARGE_TOOLBAR || - toolbar_prefs.icon_size == GTK_ICON_SIZE_MENU) - { - gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), toolbar_prefs.icon_size); - } + icon_style = toolbar_prefs.icon_style; + + if (toolbar_prefs.use_gtk_default_style) + icon_style = ui_get_gtk_settings_integer("gtk-toolbar-style", toolbar_prefs.icon_style); + + gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), icon_style); +} + + +/* sets the icon size of the toolbar */ +static void toolbar_set_icon_size(void) +{ + gint icon_size; + + icon_size = toolbar_prefs.icon_size; + + if (toolbar_prefs.use_gtk_default_icon) + icon_size = ui_get_gtk_settings_integer("gtk-toolbar-icon-size", toolbar_prefs.icon_size); + + gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), icon_size); +} + + +void toolbar_apply_settings(void) +{ + toolbar_set_icon_style(); + toolbar_set_icon_size(); } @@ -583,6 +628,7 @@ } } + static const GMarkupParser tb_editor_xml_parser = { tb_editor_handler_start_element, NULL, NULL, NULL, NULL @@ -870,7 +916,7 @@ } -static TBEditorWidget *tb_editor_create_dialog(void) +static TBEditorWidget *tb_editor_create_dialog(GtkWindow *parent) { GtkWidget *dialog, *vbox, *hbox, *vbox_buttons, *button_add, *button_remove; GtkWidget *swin_available, *swin_used, *tree_available, *tree_used, *label; @@ -878,8 +924,11 @@ GtkTreeViewColumn *column; TBEditorWidget *tbw = g_new(TBEditorWidget, 1); + if (parent == NULL) + parent = GTK_WINDOW(main_widgets.window); + dialog = gtk_dialog_new_with_buttons(_("Customize Toolbar"), - GTK_WINDOW(main_widgets.window), + parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); @@ -999,7 +1048,7 @@ } -void toolbar_configure(void) +void toolbar_configure(GtkWindow *parent) { gchar *markup; const gchar *name; @@ -1018,7 +1067,7 @@ all_items = gtk_action_group_list_actions(group); /* create the GUI */ - tbw = tb_editor_create_dialog(); + tbw = tb_editor_create_dialog(parent); /* fill the stores */ gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, diff -Nru geany-0.18/src/toolbar.h geany-0.19/src/toolbar.h --- geany-0.18/src/toolbar.h 2009-07-21 23:10:42.000000000 +0100 +++ geany-0.19/src/toolbar.h 2010-04-11 22:56:23.000000000 +0100 @@ -1,8 +1,8 @@ /* * toolbar.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Enrico Tröger - * Copyright 2009 Nick Treleaven + * Copyright 2009-2010 Enrico Tröger + * Copyright 2009-2010 Nick Treleaven * * 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 @@ -18,18 +18,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: toolbar.h 4009 2009-07-21 22:10:42Z eht16 $ + * $Id: toolbar.h 4818 2010-04-11 21:56:23Z eht16 $ */ #ifndef GEANY_TOOLBAR_H #define GEANY_TOOLBAR_H - +/** Toolbar settings. */ typedef struct GeanyToolbarPrefs { gboolean visible; GtkIconSize icon_size; - gint icon_style; + GtkToolbarStyle icon_style; /**< Icon style. */ + gboolean use_gtk_default_style; + gboolean use_gtk_default_icon; gboolean append_to_menu; } GeanyToolbarPrefs; @@ -57,6 +59,6 @@ void toolbar_finalize(void); -void toolbar_configure(void); +void toolbar_configure(GtkWindow *parent); #endif diff -Nru geany-0.18/src/tools.c geany-0.19/src/tools.c --- geany-0.18/src/tools.c 2009-05-02 18:04:35.000000000 +0100 +++ geany-0.19/src/tools.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * tools.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: tools.c 3763 2009-05-02 17:04:35Z eht16 $ + * $Id: tools.c 4518 2010-01-01 22:55:18Z eht16 $ */ /* @@ -76,7 +76,7 @@ entry = gtk_entry_new(); if (idx >= 0) gtk_entry_set_text(GTK_ENTRY(entry), ui_prefs.custom_commands[idx]); - ui_entry_add_clear_icon(entry); + ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_entry_set_max_length(GTK_ENTRY(entry), 255); gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); @@ -257,10 +257,10 @@ g_child_watch_add(pid, (GChildWatchFunc) cc_exit_cb, doc); /* use GIOChannel to monitor stdout */ - utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + utils_set_up_io_channel(stdout_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, FALSE, cc_iofunc, NULL); /* copy program's stderr to Geany's stdout to help error tracking */ - utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, + utils_set_up_io_channel(stderr_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, FALSE, cc_iofunc_err, (gpointer)command); /* get selection */ @@ -343,22 +343,20 @@ { /* get all hboxes which contain a label and an entry element */ GList *children = gtk_container_get_children(GTK_CONTAINER(cc.box)); - GList *tmp; + GList *node, *list; GSList *result_list = NULL; gint j = 0; gint len = 0; gchar **result = NULL; const gchar *text; - while (children != NULL) + foreach_list(node, children) { /* get the contents of each hbox */ - tmp = gtk_container_get_children(GTK_CONTAINER(children->data)); + list = gtk_container_get_children(GTK_CONTAINER(node->data)); /* first element of the list is the label, so skip it and get the entry element */ - tmp = tmp->next; - - text = gtk_entry_get_text(GTK_ENTRY(tmp->data)); + text = gtk_entry_get_text(GTK_ENTRY(list->next->data)); /* if the content of the entry is non-empty, add it to the result array */ if (text[0] != '\0') @@ -366,7 +364,7 @@ result_list = g_slist_append(result_list, g_strdup(text)); len++; } - children = children->next; + g_list_free(list); } /* create a new null-terminated array but only if there any commands defined */ if (len > 0) @@ -400,7 +398,7 @@ GeanyDocument *doc = document_get_current(); gint i, len; gboolean enable; - GList *children; + GList *children, *node; g_return_if_fail(doc != NULL); @@ -409,15 +407,15 @@ children = gtk_container_get_children(GTK_CONTAINER(user_data)); len = g_list_length(children); i = 0; - while (children != NULL) + foreach_list(node, children) { if (i == (len - 2)) break; /* stop before the last two elements (the seperator and the set entry) */ - gtk_widget_set_sensitive(GTK_WIDGET(children->data), enable); - children = children->next; + gtk_widget_set_sensitive(GTK_WIDGET(node->data), enable); i++; } + g_list_free(children); } @@ -443,7 +441,7 @@ } -static void cc_insert_custom_command_items(GtkMenu *me, GtkMenu *mp, gchar *label, gint idx) +static void cc_insert_custom_command_items(GtkMenu *me, gchar *label, gint idx) { GtkWidget *item; gint key_idx = -1; @@ -467,39 +465,21 @@ gtk_widget_show(item); g_signal_connect(item, "activate", G_CALLBACK(cc_on_custom_command_activate), GINT_TO_POINTER(idx)); - - item = gtk_menu_item_new_with_label(label); - if (key_idx != -1) - gtk_widget_add_accelerator(item, "activate", gtk_accel_group_new(), - kb->key, kb->mods, GTK_ACCEL_VISIBLE); - gtk_container_add(GTK_CONTAINER(mp), item); - gtk_widget_show(item); - g_signal_connect(item, "activate", G_CALLBACK(cc_on_custom_command_activate), - GINT_TO_POINTER(idx)); } void tools_create_insert_custom_command_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(ui_lookup_widget(main_widgets.window, "send_selection_to2_menu")); - GtkMenu *menu_popup = GTK_MENU(ui_lookup_widget(main_widgets.editor_menu, "send_selection_to1_menu")); GtkWidget *item; - GList *me_children; - GList *mp_children; + GList *me_children, *node; static gboolean signal_set = FALSE; /* first clean the menus to be able to rebuild them */ me_children = gtk_container_get_children(GTK_CONTAINER(menu_edit)); - mp_children = gtk_container_get_children(GTK_CONTAINER(menu_popup)); - while (me_children != NULL) - { - gtk_widget_destroy(GTK_WIDGET(me_children->data)); - gtk_widget_destroy(GTK_WIDGET(mp_children->data)); - - me_children = me_children->next; - mp_children = mp_children->next; - } - + foreach_list(node, me_children) + gtk_widget_destroy(GTK_WIDGET(node->data)); + g_list_free(me_children); if (ui_prefs.custom_commands == NULL || g_strv_length(ui_prefs.custom_commands) == 0) { @@ -507,10 +487,6 @@ gtk_container_add(GTK_CONTAINER(menu_edit), item); gtk_widget_set_sensitive(item, FALSE); gtk_widget_show(item); - item = gtk_menu_item_new_with_label(_("No custom commands defined.")); - gtk_container_add(GTK_CONTAINER(menu_popup), item); - gtk_widget_set_sensitive(item, FALSE); - gtk_widget_show(item); } else { @@ -521,7 +497,7 @@ { if (ui_prefs.custom_commands[i][0] != '\0') /* skip empty fields */ { - cc_insert_custom_command_items(menu_edit, menu_popup, ui_prefs.custom_commands[i], idx); + cc_insert_custom_command_items(menu_edit, ui_prefs.custom_commands[i], idx); idx++; } } @@ -531,16 +507,11 @@ item = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu_edit), item); gtk_widget_show(item); - item = gtk_separator_menu_item_new(); - gtk_container_add(GTK_CONTAINER(menu_popup), item); - gtk_widget_show(item); - cc_insert_custom_command_items(menu_edit, menu_popup, _("Set Custom Commands"), -1); + cc_insert_custom_command_items(menu_edit, _("Set Custom Commands"), -1); if (! signal_set) { - g_signal_connect(ui_lookup_widget(main_widgets.editor_menu, "send_selection_to1"), - "activate", G_CALLBACK(cc_on_custom_command_menu_activate), menu_popup); g_signal_connect(ui_lookup_widget(main_widgets.window, "send_selection_to2"), "activate", G_CALLBACK(cc_on_custom_command_menu_activate), menu_edit); signal_set = TRUE; diff -Nru geany-0.18/src/tools.h geany-0.19/src/tools.h --- geany-0.18/src/tools.h 2009-04-05 22:07:40.000000000 +0100 +++ geany-0.19/src/tools.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * tools.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: tools.h 3687 2009-04-05 21:07:40Z eht16 $ + * $Id: tools.h 4518 2010-01-01 22:55:18Z eht16 $ */ @@ -29,7 +29,6 @@ void tools_execute_custom_command(GeanyDocument *doc, const gchar *command); - void tools_word_count(void); void tools_color_chooser(const gchar *color); diff -Nru geany-0.18/src/treeviews.c geany-0.19/src/treeviews.c --- geany-0.18/src/treeviews.c 2009-07-20 16:46:35.000000000 +0100 +++ geany-0.19/src/treeviews.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,937 +0,0 @@ -/* - * treeviews.c - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven - * - * 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: treeviews.c 3999 2009-07-20 15:46:35Z ntrel $ - */ - -/* - * Sidebar related code for the Symbol list and Open files GtkTreeViews. - */ - -#include - -#include "geany.h" -#include "support.h" -#include "callbacks.h" -#include "treeviews.h" -#include "document.h" -#include "editor.h" -#include "documentprivate.h" -#include "filetypes.h" -#include "utils.h" -#include "ui_utils.h" -#include "symbols.h" -#include "navqueue.h" -#include "project.h" -#include "stash.h" -#include "keyfile.h" - -#include - -SidebarTreeviews tv = {NULL, NULL, NULL}; - -static struct -{ - GtkWidget *close; - GtkWidget *save; - GtkWidget *reload; - GtkWidget *show_paths; -} -doc_items = {NULL, NULL, NULL, NULL}; - -enum -{ - TREEVIEW_SYMBOL = 0, - TREEVIEW_OPENFILES -}; - -enum -{ - OPENFILES_ACTION_REMOVE = 0, - OPENFILES_ACTION_SAVE, - OPENFILES_ACTION_RELOAD -}; - -/* documents tree model columns */ -enum -{ - DOCUMENTS_ICON, - DOCUMENTS_SHORTNAME, /* dirname for parents, basename for children */ - DOCUMENTS_DOCUMENT, - DOCUMENTS_COLOR, - DOCUMENTS_FILENAME /* full filename */ -}; - -static GtkTreeStore *store_openfiles; -static GtkWidget *openfiles_popup_menu; -static gboolean documents_show_paths; -static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ - -/* callback prototypes */ -static void on_openfiles_tree_selection_changed(GtkTreeSelection *selection, gpointer data); -static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); -static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection); -static gboolean on_symbols_button_press_event(GtkWidget *widget, GdkEventButton *event, - gpointer user_data); -static gboolean on_documents_button_release_event(GtkWidget *widget, GdkEventButton *event, - gpointer user_data); -static gboolean on_treeviews_key_press_event(GtkWidget *widget, GdkEventKey *event, - gpointer user_data); -static void on_list_document_activate(GtkCheckMenuItem *item, gpointer user_data); -static void on_list_symbol_activate(GtkCheckMenuItem *item, gpointer user_data); - - -/* the prepare_* functions are document-related, but I think they fit better here than in document.c */ -static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store) -{ - GtkCellRenderer *text_renderer, *icon_renderer; - GtkTreeViewColumn *column; - GtkTreeSelection *select; - - text_renderer = gtk_cell_renderer_text_new(); - icon_renderer = gtk_cell_renderer_pixbuf_new(); - column = gtk_tree_view_column_new(); - - gtk_tree_view_column_pack_start(column, icon_renderer, FALSE); - gtk_tree_view_column_set_attributes(column, icon_renderer, "pixbuf", SYMBOLS_COLUMN_ICON, NULL); - g_object_set(icon_renderer, "xalign", 0.0, NULL); - - gtk_tree_view_column_pack_start(column, text_renderer, TRUE); - gtk_tree_view_column_set_attributes(column, text_renderer, "text", SYMBOLS_COLUMN_NAME, NULL); - g_object_set(text_renderer, "yalign", 0.5, NULL); - gtk_tree_view_column_set_title(column, _("Symbols")); - - gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE); - - ui_widget_modify_font_from_string(tree, interface_prefs.tagbar_font); - - gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); - g_object_unref(store); - - g_signal_connect(tree, "button-press-event", - G_CALLBACK(on_symbols_button_press_event), NULL); - g_signal_connect(tree, "key-press-event", - G_CALLBACK(on_treeviews_key_press_event), GINT_TO_POINTER(TREEVIEW_SYMBOL)); - - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE); - - if (gtk_check_version(2, 12, 0) == NULL) - { - g_object_set(tree, "show-expanders", interface_prefs.show_symbol_list_expanders, NULL); - if (! interface_prefs.show_symbol_list_expanders) - g_object_set(tree, "level-indentation", 10, NULL); - /* Tooltips */ - g_object_set(tree, - "has-tooltip", TRUE, - "tooltip-column", SYMBOLS_COLUMN_TOOLTIP, NULL); - } - - /* selection handling */ - select = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); - gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); - /* callback for changed selection not necessary, will be handled by button-press-event */ -} - - -static gboolean -on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, - gpointer user_data) -{ - if (event->button == 3) - { - gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL, - event->button, event->time); - return TRUE; - } - return FALSE; -} - - -static void create_default_tag_tree(void) -{ - GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW(tag_window); - GtkWidget *label; - - /* default_tag_tree is a GtkViewPort with a GtkLabel inside it */ - tv.default_tag_tree = gtk_viewport_new( - gtk_scrolled_window_get_hadjustment(scrolled_window), - gtk_scrolled_window_get_vadjustment(scrolled_window)); - label = gtk_label_new(_("No tags found")); - gtk_misc_set_alignment(GTK_MISC(label), 0.1, 0.01); - gtk_container_add(GTK_CONTAINER(tv.default_tag_tree), label); - gtk_widget_show_all(tv.default_tag_tree); - g_signal_connect(tv.default_tag_tree, "button-press-event", - G_CALLBACK(on_default_tag_tree_button_press_event), NULL); - g_object_ref((gpointer)tv.default_tag_tree); /* to hold it after removing */ -} - - -/* update = rescan the tags for doc->filename */ -void treeviews_update_tag_list(GeanyDocument *doc, gboolean update) -{ - if (gtk_bin_get_child(GTK_BIN(tag_window))) - gtk_container_remove(GTK_CONTAINER(tag_window), gtk_bin_get_child(GTK_BIN(tag_window))); - - if (tv.default_tag_tree == NULL) - create_default_tag_tree(); - - /* show default empty tag tree if there are no tags */ - if (doc == NULL || doc->file_type == NULL || ! filetype_has_tags(doc->file_type)) - { - gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); - return; - } - - if (update) - { /* updating the tag list in the left tag window */ - if (doc->priv->tag_tree == NULL) - { - doc->priv->tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING); - doc->priv->tag_tree = gtk_tree_view_new(); - prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); - gtk_widget_show(doc->priv->tag_tree); - g_object_ref((gpointer)doc->priv->tag_tree); /* to hold it after removing */ - } - - doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_USE_PREVIOUS); - } - - if (doc->has_tags) - { - gtk_container_add(GTK_CONTAINER(tag_window), doc->priv->tag_tree); - } - else - { - gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); - } -} - - -/* does some preparing things to the open files list widget */ -static void prepare_openfiles(void) -{ - GtkCellRenderer *icon_renderer; - GtkCellRenderer *text_renderer; - GtkTreeViewColumn *column; - GtkTreeSelection *select; - GtkTreeSortable *sortable; - - tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6"); - - /* store the icon and the short filename to show, and the index as reference, - * the colour (black/red/green) and the full name for the tooltip */ - store_openfiles = gtk_tree_store_new(5, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_POINTER, GDK_TYPE_COLOR, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(store_openfiles)); - g_object_unref(store_openfiles); - - /* set policy settings for the scolledwindow around the treeview again, because glade - * doesn't keep the settings */ - gtk_scrolled_window_set_policy( - GTK_SCROLLED_WINDOW(ui_lookup_widget(main_widgets.window, "scrolledwindow7")), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - icon_renderer = gtk_cell_renderer_pixbuf_new(); - text_renderer = gtk_cell_renderer_text_new(); - g_object_set(text_renderer, "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); - column = gtk_tree_view_column_new(); - gtk_tree_view_column_pack_start(column, icon_renderer, FALSE); - gtk_tree_view_column_set_attributes(column, icon_renderer, "stock-id", DOCUMENTS_ICON, NULL); - gtk_tree_view_column_pack_start(column, text_renderer, TRUE); - gtk_tree_view_column_set_attributes(column, text_renderer, "text", DOCUMENTS_SHORTNAME, - "foreground-gdk", DOCUMENTS_COLOR, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(tv.tree_openfiles), column); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tv.tree_openfiles), FALSE); - - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tv.tree_openfiles), FALSE); - - /* sort opened filenames in the store_openfiles treeview */ - sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store_openfiles)); - gtk_tree_sortable_set_sort_column_id(sortable, DOCUMENTS_SHORTNAME, GTK_SORT_ASCENDING); - - ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font); - - /* GTK 2.12 tooltips */ - if (gtk_check_version(2, 12, 0) == NULL) - g_object_set(tv.tree_openfiles, "has-tooltip", TRUE, "tooltip-column", DOCUMENTS_FILENAME, NULL); - - g_signal_connect(tv.tree_openfiles, "button-release-event", - G_CALLBACK(on_documents_button_release_event), NULL); - - /* selection handling */ - select = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); - g_signal_connect(select, "changed", G_CALLBACK(on_openfiles_tree_selection_changed), NULL); -} - - -/* iter should be toplevel */ -static gboolean find_tree_iter_dir(GtkTreeIter *iter, const gchar *dir) -{ - GeanyDocument *doc; - gchar *name; - gboolean result; - - if (utils_str_equal(dir, ".")) - dir = GEANY_STRING_UNTITLED; - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); - g_return_val_if_fail(!doc, FALSE); - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_SHORTNAME, &name, -1); - - result = utils_str_equal(name, dir); - g_free(name); - - return result; -} - - -static GtkTreeIter *get_doc_parent(GeanyDocument *doc) -{ - gchar *tmp_dirname; - gchar *project_base_path; - gchar *dirname = NULL; - static GtkTreeIter parent; - GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); - - if (!documents_show_paths) - return NULL; - - tmp_dirname = g_path_get_dirname(DOC_FILENAME(doc)); - /* replace the project base path with the project name */ - project_base_path = project_get_base_path(); - if (project_base_path != NULL) - { - gsize len = strlen(project_base_path); - const gchar *rest; - - /* check whether the dir name matches or uses the project base path */ - if (!utils_str_equal(project_base_path, tmp_dirname)) - setptr(project_base_path, g_strconcat(project_base_path, G_DIR_SEPARATOR_S, NULL)); - if (g_str_has_prefix(tmp_dirname, project_base_path)) - { - rest = tmp_dirname + len; - dirname = g_strdup_printf("%s%s%s", - app->project->name, - (*rest != G_DIR_SEPARATOR && *rest != '\0') ? G_DIR_SEPARATOR_S : "", - rest); - } - g_free(project_base_path); - } - if (dirname == NULL) - dirname = tmp_dirname; - else - g_free(tmp_dirname); - - if (gtk_tree_model_get_iter_first(model, &parent)) - { - do - { - if (find_tree_iter_dir(&parent, dirname)) - { - g_free(dirname); - return &parent; - } - } - while (gtk_tree_model_iter_next(model, &parent)); - } - /* no match, add dir parent */ - gtk_tree_store_append(store_openfiles, &parent, NULL); - gtk_tree_store_set(store_openfiles, &parent, DOCUMENTS_ICON, GTK_STOCK_DIRECTORY, - DOCUMENTS_SHORTNAME, doc->file_name ? dirname : GEANY_STRING_UNTITLED, -1); - - g_free(dirname); - return &parent; -} - - -/* Also sets doc->priv->iter. - * This is called recursively in treeviews_openfiles_update_all(). */ -void treeviews_openfiles_add(GeanyDocument *doc) -{ - GtkTreeIter *iter = &doc->priv->iter; - GtkTreeIter *parent = get_doc_parent(doc); - gchar *basename; - const GdkColor *color = document_get_status_color(doc); - - gtk_tree_store_append(store_openfiles, iter, parent); - - /* check if new parent */ - if (parent && gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), parent) == 1) - { - GtkTreePath *path; - - /* expand parent */ - path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), parent); - gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); - gtk_tree_path_free(path); - } - basename = g_path_get_basename(DOC_FILENAME(doc)); - gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, GTK_STOCK_FILE, - DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, - DOCUMENTS_FILENAME, DOC_FILENAME(doc), -1); - g_free(basename); -} - - -static void openfiles_remove(GeanyDocument *doc) -{ - GtkTreeIter *iter = &doc->priv->iter; - GtkTreeIter parent; - - if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter) && - gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), &parent) == 1) - gtk_tree_store_remove(store_openfiles, &parent); - else - gtk_tree_store_remove(store_openfiles, iter); -} - - -void treeviews_openfiles_update(GeanyDocument *doc) -{ - GtkTreeIter *iter = &doc->priv->iter; - gchar *fname; - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_FILENAME, &fname, -1); - - if (utils_str_equal(fname, DOC_FILENAME(doc))) - { - /* just update color */ - const GdkColor *color = document_get_status_color(doc); - - gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_COLOR, color, -1); - } - else - { - /* path has changed, so remove and re-add */ - GtkTreeSelection *treesel; - gboolean sel; - - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - sel = gtk_tree_selection_iter_is_selected(treesel, &doc->priv->iter); - openfiles_remove(doc); - - treeviews_openfiles_add(doc); - if (sel) - gtk_tree_selection_select_iter(treesel, &doc->priv->iter); - } - g_free(fname); -} - - -void treeviews_openfiles_update_all() -{ - guint i, page_count; - GeanyDocument *doc; - - gtk_tree_store_clear(store_openfiles); - page_count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); - for (i = 0; i < page_count; i++) - { - doc = document_get_from_page(i); - if (G_UNLIKELY(doc == NULL)) - continue; - - treeviews_openfiles_add(doc); - } -} - - -void treeviews_remove_document(GeanyDocument *doc) -{ - openfiles_remove(doc); - - if (GTK_IS_WIDGET(doc->priv->tag_tree)) - { - gtk_widget_destroy(doc->priv->tag_tree); - if (GTK_IS_TREE_VIEW(doc->priv->tag_tree)) - { - /* Because it was ref'd in treeviews_update_tag_list, it needs unref'ing */ - g_object_unref((gpointer)doc->priv->tag_tree); - } - doc->priv->tag_tree = NULL; - } -} - - -static void on_hide_sidebar(void) -{ - ui_prefs.sidebar_visible = FALSE; - ui_sidebar_show_hide(); -} - - -static gboolean on_sidebar_display_symbol_list_show(GtkWidget *item) -{ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), - interface_prefs.sidebar_symbol_visible); - return FALSE; -} - - -static gboolean on_sidebar_display_open_files_show(GtkWidget *item) -{ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), - interface_prefs.sidebar_openfiles_visible); - return FALSE; -} - - -void sidebar_add_common_menu_items(GtkMenu *menu) -{ - GtkWidget *item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - - item = gtk_check_menu_item_new_with_mnemonic(_("Show S_ymbol List")); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "expose-event", - G_CALLBACK(on_sidebar_display_symbol_list_show), NULL); - gtk_widget_show(item); - g_signal_connect(item, "activate", - G_CALLBACK(on_list_symbol_activate), NULL); - - item = gtk_check_menu_item_new_with_mnemonic(_("Show _Document List")); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "expose-event", - G_CALLBACK(on_sidebar_display_open_files_show), NULL); - gtk_widget_show(item); - g_signal_connect(item, "activate", - G_CALLBACK(on_list_document_activate), NULL); - - item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL); -} - - -static void on_openfiles_show_paths_activate(GtkCheckMenuItem *item, gpointer user_data) -{ - documents_show_paths = gtk_check_menu_item_get_active(item); - treeviews_openfiles_update_all(); -} - - -static void on_list_document_activate(GtkCheckMenuItem *item, gpointer user_data) -{ - interface_prefs.sidebar_openfiles_visible = gtk_check_menu_item_get_active(item); - ui_sidebar_show_hide(); -} - - -static void on_list_symbol_activate(GtkCheckMenuItem *item, gpointer user_data) -{ - interface_prefs.sidebar_symbol_visible = gtk_check_menu_item_get_active(item); - ui_sidebar_show_hide(); -} - - -static void create_openfiles_popup_menu(void) -{ - GtkWidget *item; - - openfiles_popup_menu = gtk_menu_new(); - - item = gtk_image_menu_item_new_from_stock("gtk-close", NULL); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - g_signal_connect(item, "activate", - G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_REMOVE)); - doc_items.close = item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - - item = gtk_image_menu_item_new_from_stock("gtk-save", NULL); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - g_signal_connect(item, "activate", - G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_SAVE)); - doc_items.save = item; - - item = gtk_image_menu_item_new_with_mnemonic(_("_Reload")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock("gtk-revert-to-saved", GTK_ICON_SIZE_MENU)); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - g_signal_connect(item, "activate", - G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_RELOAD)); - doc_items.reload = item; - - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - - doc_items.show_paths = gtk_check_menu_item_new_with_mnemonic(_("Show _Paths")); - gtk_widget_show(doc_items.show_paths); - gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.show_paths); - g_signal_connect(doc_items.show_paths, "activate", - G_CALLBACK(on_openfiles_show_paths_activate), NULL); - - sidebar_add_common_menu_items(GTK_MENU(openfiles_popup_menu)); -} - - -static void unfold_parent(GtkTreeIter *iter) -{ - GtkTreeIter parent; - GtkTreePath *path; - - if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_openfiles), &parent, iter)) - { - path = gtk_tree_model_get_path(GTK_TREE_MODEL(store_openfiles), &parent); - gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); - gtk_tree_path_free(path); - } -} - - -/* compares the given data with the doc pointer from the selected row of openfiles - * treeview, in case of a match the row is selected and TRUE is returned - * (called indirectly from gtk_tree_model_foreach()) */ -static gboolean tree_model_find_node(GtkTreeModel *model, GtkTreePath *path, - GtkTreeIter *iter, gpointer data) -{ - GeanyDocument *doc; - - gtk_tree_model_get(GTK_TREE_MODEL(store_openfiles), iter, DOCUMENTS_DOCUMENT, &doc, -1); - - if (doc == data) - { - /* unfolding also prevents a strange bug where the selection gets stuck on the parent - * when it is collapsed and then switching documents */ - unfold_parent(iter); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv.tree_openfiles), path, NULL, FALSE); - return TRUE; - } - else return FALSE; -} - - -void treeviews_select_openfiles_item(GeanyDocument *doc) -{ - gtk_tree_model_foreach(GTK_TREE_MODEL(store_openfiles), tree_model_find_node, doc); -} - - -/* callbacks */ - -static void document_action(GeanyDocument *doc, gint action) -{ - if (! DOC_VALID(doc)) - return; - - switch (action) - { - case OPENFILES_ACTION_REMOVE: - { - document_close(doc); - break; - } - case OPENFILES_ACTION_SAVE: - { - document_save_file(doc, FALSE); - break; - } - case OPENFILES_ACTION_RELOAD: - { - on_toolbutton_reload_clicked(NULL, NULL); - break; - } - } - -} - - -static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data) -{ - GtkTreeIter iter; - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - GtkTreeModel *model; - GeanyDocument *doc; - gint action = GPOINTER_TO_INT(user_data); - - if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); - if (doc) - { - document_action(doc, action); - } - else - { - /* parent item selected */ - GtkTreeIter child; - gint i = gtk_tree_model_iter_n_children(model, &iter) - 1; - - while (i >= 0 && gtk_tree_model_iter_nth_child(model, &child, &iter, i)) - { - gtk_tree_model_get(model, &child, DOCUMENTS_DOCUMENT, &doc, -1); - - document_action(doc, action); - i--; - } - } - } -} - - -static gboolean change_focus_to_editor(GeanyDocument *doc, GtkWidget *focus_widget) -{ - /* idx might not be valid e.g. if user closed a tab whilst Geany is opening files */ - if (DOC_VALID(doc)) - { - GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - GtkWidget *sci = GTK_WIDGET(doc->editor->sci); - - if (focusw == focus_widget) - gtk_widget_grab_focus(sci); - } - return FALSE; -} - - -static gboolean change_focus_cb(gpointer data) -{ - change_focus_to_editor(data, tv.tree_openfiles); - - return FALSE; -} - - -static void on_openfiles_tree_selection_changed(GtkTreeSelection *selection, gpointer data) -{ - GtkTreeIter iter; - GtkTreeModel *model; - GeanyDocument *doc = NULL; - - /* use switch_notebook_page to ignore changing the notebook page because it is already done */ - if (gtk_tree_selection_get_selected(selection, &model, &iter) && ! ignore_callback) - { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); - if (! doc) - return; /* parent */ - gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), - gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), - (GtkWidget*) doc->editor->sci)); - g_idle_add((GSourceFunc) change_focus_cb, doc); - } -} - - -static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection) -{ - GtkTreeIter iter; - GtkTreeModel *model; - gint line = 0; - - if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - const TMTag *tag; - - gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); - if (! tag) - return FALSE; - - line = tag->atts.entry.line; - if (line > 0) - { - GeanyDocument *doc = document_get_current(); - - if (doc != NULL) - { - navqueue_goto_line(doc, doc, line); - change_focus_to_editor(doc, doc->priv->tag_tree); - } - } - } - return FALSE; -} - - -static gboolean on_treeviews_key_press_event(GtkWidget *widget, GdkEventKey *event, - gpointer user_data) -{ - if (event->keyval == GDK_Return || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_space) - { - GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - /* delay the query of selection state because this callback is executed before GTK - * changes the selection (g_signal_connect_after would be better but it doesn't work) */ - g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, select); - } - return FALSE; -} - - -static gboolean on_symbols_button_press_event(GtkWidget *widget, GdkEventButton *event, - G_GNUC_UNUSED gpointer user_data) -{ - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - - if (event->type == GDK_2BUTTON_PRESS) - { /* double click on parent node(section) expands/collapses it */ - GtkTreeModel *model; - GtkTreeIter iter; - - if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - if (gtk_tree_model_iter_has_child(model, &iter)) - { - GtkTreePath *path = gtk_tree_model_get_path(model, &iter); - - if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) - gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); - else - gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); - - gtk_tree_path_free(path); - return TRUE; - } - } - } - else if (event->button == 1) - { /* allow reclicking of taglist treeview item */ - /* delay the query of selection state because this callback is executed before GTK - * changes the selection (g_signal_connect_after would be better but it doesn't work) */ - g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, selection); - } - else if (event->button == 3) - { - gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL, - event->button, event->time); - return TRUE; /* prevent selection changed signal for symbol tags */ - } - return FALSE; -} - - -static void documents_menu_update(GtkTreeSelection *selection) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gboolean sel, path; - gchar *shortname = NULL; - GeanyDocument *doc = NULL; - - /* maybe no selection e.g. if ctrl-click deselected */ - sel = gtk_tree_selection_get_selected(selection, &model, &iter); - if (sel) - { - gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, - DOCUMENTS_SHORTNAME, &shortname, -1); - } - path = NZV(shortname) && - (g_path_is_absolute(shortname) || - (app->project && g_str_has_prefix(shortname, app->project->name))); - - /* can close all, save all (except shortname), but only reload individually ATM */ - gtk_widget_set_sensitive(doc_items.close, sel); - gtk_widget_set_sensitive(doc_items.save, (doc && doc->real_path) || path); - gtk_widget_set_sensitive(doc_items.reload, doc && doc->real_path); - g_free(shortname); - - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), - documents_show_paths); -} - - -static gboolean on_documents_button_release_event(GtkWidget *widget, GdkEventButton *event, - gpointer user_data) -{ - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - - if (event->button == 3) - { - if (!openfiles_popup_menu) - create_openfiles_popup_menu(); - - documents_menu_update(selection); - gtk_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, NULL, NULL, - event->button, event->time); - } - return FALSE; -} - - -GeanyPrefGroup *stash_group = NULL; - -static void on_load_settings(void) -{ - tag_window = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); - - prepare_openfiles(); - /* note: ui_prefs.sidebar_page is reapplied after plugins are loaded */ - stash_group_display(stash_group, NULL); -} - - -static void on_save_settings(void) -{ - stash_group_update(stash_group, NULL); -} - - -void treeviews_init(void) -{ - GeanyPrefGroup *group; - - group = stash_group_new(PACKAGE); - stash_group_add_boolean(group, &documents_show_paths, "documents_show_paths", TRUE); - stash_group_add_widget_property(group, &ui_prefs.sidebar_page, "sidebar_page", GINT_TO_POINTER(0), - main_widgets.sidebar_notebook, "page", 0); - configuration_add_pref_group(group, FALSE); - stash_group = group; - - /* delay building documents treeview until sidebar font has been read */ - g_signal_connect(geany_object, "load-settings", on_load_settings, NULL); - g_signal_connect(geany_object, "save-settings", on_save_settings, NULL); -} - - -#define WIDGET(w) w && GTK_IS_WIDGET(w) - -void treeviews_finalize(void) -{ - if (WIDGET(tv.default_tag_tree)) - { - g_object_unref(tv.default_tag_tree); - gtk_widget_destroy(tv.default_tag_tree); - } - if (WIDGET(tv.popup_taglist)) - gtk_widget_destroy(tv.popup_taglist); - if (WIDGET(openfiles_popup_menu)) - gtk_widget_destroy(openfiles_popup_menu); -} diff -Nru geany-0.18/src/treeviews.h geany-0.19/src/treeviews.h --- geany-0.18/src/treeviews.h 2009-07-16 16:50:13.000000000 +0100 +++ geany-0.19/src/treeviews.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -/* - * treeviews.h - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id: treeviews.h 3979 2009-07-16 15:50:13Z ntrel $ - */ - - - -#ifndef GEANY_TREEVIEWS_H -#define GEANY_TREEVIEWS_H 1 - - -typedef struct SidebarTreeviews -{ - GtkWidget *tree_openfiles; - GtkWidget *default_tag_tree; - GtkWidget *popup_taglist; -} -SidebarTreeviews; - -extern SidebarTreeviews tv; - -enum -{ - SYMBOLS_COLUMN_ICON, - SYMBOLS_COLUMN_NAME, - SYMBOLS_COLUMN_TAG, - SYMBOLS_COLUMN_TOOLTIP, - SYMBOLS_N_COLUMNS -}; - -void treeviews_init(void); - -void treeviews_finalize(void); - -void treeviews_update_tag_list(GeanyDocument *doc, gboolean update); - -void treeviews_openfiles_add(GeanyDocument *doc); - -void treeviews_openfiles_update(GeanyDocument *doc); - -void treeviews_openfiles_update_all(void); - -void treeviews_select_openfiles_item(GeanyDocument *doc); - -void treeviews_remove_document(GeanyDocument *doc); - -void sidebar_add_common_menu_items(GtkMenu *menu); - -#endif diff -Nru geany-0.18/src/ui_utils.c geany-0.19/src/ui_utils.c --- geany-0.18/src/ui_utils.c 2009-06-25 18:21:45.000000000 +0100 +++ geany-0.19/src/ui_utils.c 2010-05-22 20:39:14.000000000 +0100 @@ -1,8 +1,8 @@ /* * ui_utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ui_utils.c 3898 2009-06-25 17:21:45Z eht16 $ + * $Id: ui_utils.c 4942 2010-05-22 19:39:14Z eht16 $ */ /** @file ui_utils.h @@ -28,6 +28,8 @@ #include "geany.h" #include +#include +#include #include "ui_utils.h" #include "prefs.h" @@ -41,7 +43,7 @@ #include "callbacks.h" #include "encodings.h" #include "images.c" -#include "treeviews.h" +#include "sidebar.h" #include "win32.h" #include "project.h" #include "editor.h" @@ -70,6 +72,8 @@ GtkWidget *undo_items[3]; GtkWidget *save_buttons[4]; GtkWidget *config_files_menu; + GtkWidget *commands_menu; + GtkWidget *format_menu; } widgets; @@ -132,16 +136,16 @@ } -/** Display text on the statusbar. +/** Displays text on the statusbar. * @param log Whether the message should be recorded in the Status window. * @param format A @c printf -style string. */ void ui_set_statusbar(gboolean log, const gchar *format, ...) { - gchar string[512]; + gchar *string; va_list args; va_start(args, format); - g_vsnprintf(string, 512, format, args); + string = g_strdup_vprintf(format, args); va_end(args); if (! prefs.suppress_status_messages) @@ -149,6 +153,8 @@ if (log || prefs.suppress_status_messages) msgwin_status_add("%s", string); + + g_free(string); } @@ -185,8 +191,8 @@ col = 0; /* Status bar statistics: col = column, sel = selection. */ - g_string_printf(stats_str, _("line: %d\t col: %d\t sel: %d\t "), - (line + 1), col, + g_string_printf(stats_str, _("line: %d / %d\t col: %d\t sel: %d\t "), + (line + 1), sci_get_line_count(doc->editor->sci), col, sci_get_selected_text_length(doc->editor->sci) - 1); g_string_append(stats_str, @@ -646,6 +652,7 @@ add_doc_widget("menu_select_all1"); add_doc_widget("insert_date1"); add_doc_widget("menu_format1"); + add_doc_widget("commands2"); add_doc_widget("menu_open_selected_file1"); add_doc_widget("page_setup1"); add_doc_widget("find1"); @@ -677,6 +684,8 @@ add_doc_toolitem("Color"); add_doc_toolitem("Goto"); add_doc_toolitem("GotoEntry"); + add_doc_toolitem("Replace"); + add_doc_toolitem("Print"); } @@ -702,7 +711,7 @@ } -/** Add a widget to the list of widgets that should be set sensitive/insensitive +/** Adds a widget to the list of widgets that should be set sensitive/insensitive * when some documents are present/no documents are open. * It will be removed when the widget is destroyed. * @param widget The widget to add. @@ -764,7 +773,7 @@ void ui_document_show_hide(GeanyDocument *doc) { - gchar *widget_name; + const gchar *widget_name; GtkWidget *item; const GeanyIndentPrefs *iprefs; @@ -870,7 +879,7 @@ /* Note: remember to unref the pixbuf once an image or window has added a reference. */ GdkPixbuf *ui_new_pixbuf_from_inline(gint img) { - switch(img) + switch (img) { case GEANY_IMAGE_LOGO: return gdk_pixbuf_new_from_inline(-1, aladin_inline, FALSE, NULL); @@ -1109,6 +1118,7 @@ item = g_list_find_custom(children, utf8_filename, (GCompareFunc) find_recent_file_item); if (item != NULL) gtk_widget_destroy(GTK_WIDGET(item->data)); + g_list_free(children); if (grf->toolbar != NULL) { @@ -1116,6 +1126,7 @@ item = g_list_find_custom(children, utf8_filename, (GCompareFunc) find_recent_file_item); if (item != NULL) gtk_widget_destroy(GTK_WIDGET(item->data)); + g_list_free(children); } /* now prepend a new menuitem for the filename, * first for the recent files menu in the menu bar */ @@ -1158,6 +1169,8 @@ item = g_list_next(item); } } + g_list_free(children); + /* create item for the menu bar menu */ tmp = gtk_menu_item_new_with_label(filename); gtk_widget_show(tmp); @@ -1178,6 +1191,8 @@ item = g_list_next(item); } } + g_list_free(children); + /* create item for the tool bar menu */ tmp = gtk_menu_item_new_with_label(filename); gtk_widget_show(tmp); @@ -1193,7 +1208,7 @@ gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); GeanyDocument *doc; - for(i = 0; i < max; i++) + for (i = 0; i < max; i++) { doc = document_get_from_page(i); @@ -1238,43 +1253,36 @@ GtkWidget *ui_frame_new_with_alignment(const gchar *label_text, GtkWidget **alignment) { GtkWidget *label, *align; - GtkWidget *frame = gtk_frame_new (NULL); - gchar *label_markup; + GtkWidget *frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); - align = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_container_add (GTK_CONTAINER (frame), align); - gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0); - - label_markup = g_strconcat("", label_text, "", NULL); - label = gtk_label_new (label_markup); - gtk_frame_set_label_widget (GTK_FRAME (frame), label); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - g_free(label_markup); + align = gtk_alignment_new(0.5, 0.5, 1, 1); + gtk_container_add(GTK_CONTAINER(frame), align); + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 12, 0); + + label = ui_label_new_bold(label_text); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); *alignment = align; return frame; } -const gint BUTTON_BOX_BORDER = 5; - -/** Convenience function for getting a fixed border for dialogs that doesn't - * increase the button box border. +/** Makes a fixed border for dialogs without increasing the button box border. * @param dialog The parent container for the @c GtkVBox. * @return The packed @c GtkVBox. */ GtkWidget *ui_dialog_vbox_new(GtkDialog *dialog) { GtkWidget *vbox = gtk_vbox_new(FALSE, 12); /* need child vbox to set a separate border. */ - gtk_container_set_border_width(GTK_CONTAINER(vbox), BUTTON_BOX_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox); return vbox; } -/** Create a @c GtkButton with custom text and a stock image, aligned like +/** Creates a @c GtkButton with custom text and a stock image similar to * @c gtk_button_new_from_stock(). * @param stock_id A @c GTK_STOCK_NAME string. * @param text Button label text, can include mnemonics. @@ -1282,24 +1290,18 @@ */ GtkWidget *ui_button_new_with_image(const gchar *stock_id, const gchar *text) { - GtkWidget *image, *label, *align, *hbox, *button; + GtkWidget *image, *button; - hbox = gtk_hbox_new(FALSE, 2); + button = gtk_button_new_with_mnemonic(text); + gtk_widget_show(button); image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON); - label = gtk_label_new_with_mnemonic(text); - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - button = gtk_button_new(); - align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); - gtk_container_add(GTK_CONTAINER(align), hbox); - gtk_container_add(GTK_CONTAINER(button), align); - gtk_widget_show_all(align); + gtk_button_set_image(GTK_BUTTON(button), image); + /* note: image is shown by gtk */ return button; } -/** Create a @c GtkImageMenuItem with a stock image and a custom label. +/** Creates a @c GtkImageMenuItem with a stock image and a custom label. * @param stock_id Stock image ID, e.g. @c GTK_STOCK_OPEN. * @param label Menu item label, can include mnemonics. * @return The new @c GtkImageMenuItem. @@ -1324,11 +1326,12 @@ if (event->button.button == 1 && icon_pos == 1) { gtk_entry_set_text(entry, ""); + gtk_widget_grab_focus(GTK_WIDGET(entry)); } } -/** Convenience function to add a small clear icon to the right end of the passed @a entry. +/** Adds a small clear icon to the right end of the passed @a entry. * A callback to clear the contents of the GtkEntry is automatically added. * * This feature is only available with GTK 2.16 but implemented as a runtime check, @@ -1339,7 +1342,7 @@ * * @since 0.16 */ -void ui_entry_add_clear_icon(GtkWidget *entry) +void ui_entry_add_clear_icon(GtkEntry *entry) { if (gtk_check_version(2, 15, 2) == NULL) { @@ -1445,7 +1448,7 @@ gtk_widget_modify_fg(doc->priv->tab_label, GTK_STATE_NORMAL, color); gtk_widget_modify_fg(doc->priv->tab_label, GTK_STATE_ACTIVE, color); - treeviews_openfiles_update(doc); + sidebar_openfiles_update(doc); } @@ -1488,7 +1491,7 @@ while (TRUE) { gtk_tree_selection_select_iter(treesel, &iter); - if (cb()) + if (cb(0)) break; /* found next message */ if (! tree_model_iter_get_next(model, &iter, down)) @@ -1521,12 +1524,18 @@ } -void ui_widget_modify_font_from_string(GtkWidget *wid, const gchar *str) +/** + * Modifies the font of a widget using gtk_widget_modify_font(). + * + * @param widget The widget. + * @param str The font name as expected by pango_font_description_from_string(). + */ +void ui_widget_modify_font_from_string(GtkWidget *widget, const gchar *str) { PangoFontDescription *pfd; pfd = pango_font_description_from_string(str); - gtk_widget_modify_font(wid, pfd); + gtk_widget_modify_font(widget, pfd); pango_font_description_free(pfd); } @@ -1610,6 +1619,11 @@ if (g_path_is_absolute(locale_path) && g_file_test(locale_path, G_FILE_TEST_IS_DIR)) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), locale_path); } + else if (action == GTK_FILE_CHOOSER_ACTION_OPEN) + { + if (g_path_is_absolute(locale_path)) + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), locale_path); + } g_free(locale_path); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) @@ -1634,21 +1648,36 @@ GtkEntry *entry = (GtkEntry *) g_object_get_data(G_OBJECT(path_box), "entry"); const gchar *title = g_object_get_data(G_OBJECT(path_box), "title"); - gchar *utf8_path; + gchar *utf8_path = NULL; /* TODO: extend for other actions */ - g_return_if_fail(action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + g_return_if_fail(action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER || + action == GTK_FILE_CHOOSER_ACTION_OPEN); if (title == NULL) title = (action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) ? _("Select Folder") : _("Select File"); + if (action == GTK_FILE_CHOOSER_ACTION_OPEN) + { #ifdef G_OS_WIN32 - utf8_path = win32_show_project_folder_dialog(ui_widgets.prefs_dialog, title, + utf8_path = win32_show_file_dialog(GTK_WINDOW(ui_widgets.prefs_dialog), title, gtk_entry_get_text(GTK_ENTRY(entry))); #else - utf8_path = run_file_chooser(title, action, gtk_entry_get_text(GTK_ENTRY(entry))); + utf8_path = run_file_chooser(title, action, gtk_entry_get_text(GTK_ENTRY(entry))); #endif + } + else if (action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) + { + gchar *path = g_path_get_dirname(gtk_entry_get_text(GTK_ENTRY(entry))); +#ifdef G_OS_WIN32 + utf8_path = win32_show_folder_dialog(ui_widgets.prefs_dialog, title, + gtk_entry_get_text(GTK_ENTRY(entry))); +#else + utf8_path = run_file_chooser(title, action, path); +#endif + g_free(path); + } if (utf8_path != NULL) { @@ -1671,7 +1700,7 @@ } -/** Pack all @c GtkWidgets passed after the row argument into a table, using +/** Packs all @c GtkWidgets passed after the row argument into a table, using * one widget per cell. The first widget is not expanded as the table grows, * as this is usually a label. * @param table @@ -1707,7 +1736,7 @@ document_open_file(file_name, FALSE, ft, NULL); else { - gchar *utf8 = utils_get_utf8_from_locale(file_name); + gchar *utf8_filename = utils_get_utf8_from_locale(file_name); gchar *base_name = g_path_get_basename(file_name); gchar *global_file = g_build_filename(app->datadir, base_name, NULL); gchar *global_content = NULL; @@ -1717,8 +1746,9 @@ if (g_file_test(global_file, G_FILE_TEST_EXISTS)) g_file_get_contents(global_file, &global_content, NULL, NULL); - document_new_file(utf8, ft, global_content); - utils_free_pointers(4, utf8, base_name, global_file, global_content, NULL); + document_new_file(utf8_filename, ft, global_content); + + utils_free_pointers(4, utf8_filename, base_name, global_file, global_content, NULL); } } @@ -1764,10 +1794,8 @@ widgets.config_files_menu = menu = gtk_menu_new(); - item = ui_image_menu_item_new(GTK_STOCK_FILE, _("C_onfiguration Files")); - gtk_widget_show(item); + item = ui_lookup_widget(main_widgets.window, "configuration_files1"); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu); - gtk_container_add(GTK_CONTAINER(main_widgets.tools_menu), item); /* sort menu after all items added */ g_idle_add(sort_menu, widgets.config_files_menu); @@ -1813,6 +1841,24 @@ } +void ui_swap_sidebar_pos(void) +{ + GtkWidget *pane = ui_lookup_widget(main_widgets.window, "hpaned1"); + GtkWidget *left = gtk_paned_get_child1(GTK_PANED(pane)); + GtkWidget *right = gtk_paned_get_child2(GTK_PANED(pane)); + GtkWidget *box = ui_lookup_widget(main_widgets.window, "vbox1"); + + /* reparenting avoids scintilla problem with middle click paste */ + gtk_widget_reparent(left, box); + gtk_widget_reparent(right, box); + gtk_widget_reparent(right, pane); + gtk_widget_reparent(left, pane); + + gtk_paned_set_position(GTK_PANED(pane), pane->allocation.width + - gtk_paned_get_position(GTK_PANED(pane))); +} + + static void init_recent_files(void) { GtkWidget *toolbar_recent_files_menu; @@ -1831,8 +1877,45 @@ } +static void ui_menu_move(GtkWidget *menu, GtkWidget *old, GtkWidget *new) +{ + g_object_ref(menu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(old), NULL); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(new), menu); + g_object_unref(menu); +} + + +static void on_editor_menu_show(GtkWidget *item) +{ + GtkWidget *popup = ui_lookup_widget(main_widgets.editor_menu, "commands1"); + GtkWidget *bar = ui_lookup_widget(main_widgets.window, "commands2"); + + ui_menu_move(widgets.commands_menu, bar, popup); + + popup = ui_lookup_widget(main_widgets.editor_menu, "menu_format2"); + bar = ui_lookup_widget(main_widgets.window, "menu_format1"); + ui_menu_move(widgets.format_menu, bar, popup); +} + + +static void on_editor_menu_hide(GtkWidget *item) +{ + GtkWidget *popup = ui_lookup_widget(main_widgets.editor_menu, "commands1"); + GtkWidget *bar = ui_lookup_widget(main_widgets.window, "commands2"); + + ui_menu_move(widgets.commands_menu, popup, bar); + + popup = ui_lookup_widget(main_widgets.editor_menu, "menu_format2"); + bar = ui_lookup_widget(main_widgets.window, "menu_format1"); + ui_menu_move(widgets.format_menu, popup, bar); +} + + void ui_init(void) { + GtkWidget *item; + init_recent_files(); ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar"); @@ -1859,6 +1942,16 @@ widgets.undo_items[0] = ui_lookup_widget(main_widgets.editor_menu, "undo1"); widgets.undo_items[1] = ui_lookup_widget(main_widgets.window, "menu_undo2"); + item = ui_lookup_widget(main_widgets.window, "menu_format1"); + widgets.format_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(item)); + item = ui_lookup_widget(main_widgets.window, "commands2"); + widgets.commands_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(item)); + + /* reparent edit submenus as needed */ + item = main_widgets.editor_menu; + g_signal_connect(item, "show", G_CALLBACK(on_editor_menu_show), NULL); + g_signal_connect(item, "hide", G_CALLBACK(on_editor_menu_hide), NULL); + ui_init_toolbar_widgets(); init_document_widgets(); create_config_files_menu(); @@ -1943,7 +2036,7 @@ } -/** This function returns a widget from a name in a component, usually created by Glade. +/** Returns a widget from a name in a component, usually created by Glade. * Call it with the toplevel widget in the component (i.e. a window/dialog), * or alternatively any widget in the component, and the name of the widget * you want returned. @@ -1981,7 +2074,6 @@ } - /* Progress Bar */ static guint progress_bar_timer_id = (guint) -1; @@ -2088,3 +2180,115 @@ g_list_free(list); } + +/* return value is for macros */ +GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...) +{ + va_list a; + gchar *text; + + va_start(a, format); + text = g_strdup_vprintf(format, a); + va_end(a); + + gtk_label_set_text(label, text); + gtk_label_set_use_markup(label, TRUE); + g_free(text); + return GTK_WIDGET(label); +} + + +/** Adds a list of document items to @a menu. + * @param menu Menu. + * @param active Which document to highlight, or @c NULL. + * @param callback is used for each menu item's @c "activate" signal and will be passed + * the corresponding document pointer as @c user_data. + * @warning You should check @c doc->is_valid in the callback. + * @since 0.19 */ +void ui_menu_add_document_items(GtkMenu *menu, GeanyDocument *active, GCallback callback) +{ + GtkWidget *menu_item, *menu_item_label; + const GdkColor *color; + GeanyDocument *doc; + guint i, len; + gchar *base_name; + + len = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); + for (i = 0; i < len; i++) + { + doc = document_get_from_page(i); + if (! DOC_VALID(doc)) + continue; + + base_name = g_path_get_basename(DOC_FILENAME(doc)); + menu_item = gtk_menu_item_new_with_label(base_name); + gtk_widget_show(menu_item); + gtk_container_add(GTK_CONTAINER(menu), menu_item); + g_signal_connect(menu_item, "activate", callback, doc); + + color = document_get_status_color(doc); + menu_item_label = gtk_bin_get_child(GTK_BIN(menu_item)); + gtk_widget_modify_fg(menu_item_label, GTK_STATE_NORMAL, color); + gtk_widget_modify_fg(menu_item_label, GTK_STATE_ACTIVE, color); + + if (doc == active) + ui_label_set_markup(GTK_LABEL(menu_item_label), "%s", base_name); + + g_free(base_name); + } +} + + +/** Checks whether the passed @a keyval is the Enter or Return key. + * There are three different Enter/Return key values + * (@c GDK_Return, @c GDK_ISO_Enter, @c GDK_KP_Enter). + * This is just a convenience function. + * @param keyval A keyval. + * @return @c TRUE if @a keyval is the one of the Enter/Return key values, otherwise @c FALSE. + * @since 0.19 */ +gboolean ui_is_keyval_enter_or_return(guint keyval) +{ + return (keyval == GDK_Return || keyval == GDK_ISO_Enter|| keyval == GDK_KP_Enter); +} + + +/** Reads an integer from the GTK default settings registry + * (see http://library.gnome.org/devel/gtk/stable/GtkSettings.html). + * @param property_name The property to read. + * @param default_value The default value in case the value could not be read. + * @return The value for the property if it exists, otherwise the @a default_value. + * @since 0.19 */ +gint ui_get_gtk_settings_integer(const gchar *property_name, gint default_value) +{ + if (g_object_class_find_property(G_OBJECT_GET_CLASS(G_OBJECT( + gtk_settings_get_default())), property_name)) + { + gint value; + g_object_get(G_OBJECT(gtk_settings_get_default()), property_name, &value, NULL); + return value; + } + else + return default_value; +} + + +void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text, + gint new_text_len, gint *position, gpointer data) +{ + gboolean stop_signal = FALSE; + const gchar c = *new_text; + + /* allow inserting '+' and '-' as the first character */ + if (position != NULL && *position == 0) + { + if (c != '+' && c != '-' && ! isdigit(c)) + stop_signal = TRUE; + } + /* don't insert any text when it is not a digit */ + else if (! isdigit(c)) + stop_signal = TRUE; + + if (stop_signal) + g_signal_stop_emission_by_name(editable, "insert-text"); +} + diff -Nru geany-0.18/src/ui_utils.h geany-0.19/src/ui_utils.h --- geany-0.18/src/ui_utils.h 2009-06-20 17:53:28.000000000 +0100 +++ geany-0.19/src/ui_utils.h 2010-05-22 20:40:12.000000000 +0100 @@ -1,8 +1,8 @@ /* * ui_utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2006-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,13 +18,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ui_utils.h 3882 2009-06-20 16:53:28Z eht16 $ + * $Id: ui_utils.h 4946 2010-05-22 19:40:12Z eht16 $ */ #ifndef GEANY_UI_UTILS_H #define GEANY_UI_UTILS_H 1 -/** Set a name to lookup @a widget from @a owner. +/** Sets a name to lookup @a widget from @a owner. * @param owner Usually a @c GtkWindow. * @param widget Widget. * @param widget_name Name. @@ -52,6 +52,13 @@ gboolean show_symbol_list_expanders; gboolean notebook_double_click_hides_widgets; gboolean highlighting_invert_all; + gint sidebar_pos; + gboolean msgwin_status_visible; + gboolean msgwin_compiler_visible; + gboolean msgwin_messages_visible; + gboolean msgwin_scribble_visible; + gboolean use_native_windows_dialogs; /* only used on Windows */ + gboolean compiler_tab_autoscroll; } GeanyInterfacePrefs; @@ -196,7 +203,15 @@ void ui_widget_set_sensitive(GtkWidget *widget, gboolean set); -void ui_entry_add_clear_icon(GtkWidget *entry); +void ui_entry_add_clear_icon(GtkEntry *entry); + +void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text, + gint new_text_len, gint *position, gpointer data); + +#define ui_label_new_bold(text)\ + ui_label_set_markup(GTK_LABEL(gtk_label_new(NULL)), "%s", text); + +GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...) G_GNUC_PRINTF(2, 3); /* End of general widget functions */ @@ -210,6 +225,8 @@ void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent); +void ui_menu_add_document_items(GtkMenu *menu, GeanyDocument *active, GCallback callback); + void ui_set_statusbar(gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); @@ -270,7 +287,7 @@ void ui_update_tab_status(GeanyDocument *doc); -typedef gboolean TVMatchCallback(void); +typedef gboolean TVMatchCallback(guint); gboolean ui_tree_view_find_next(GtkTreeView *treeview, TVMatchCallback cb); @@ -289,4 +306,10 @@ void ui_progress_bar_stop(void); +void ui_swap_sidebar_pos(void); + +gboolean ui_is_keyval_enter_or_return(guint keyval); + +gint ui_get_gtk_settings_integer(const gchar *property_name, gint default_value); + #endif diff -Nru geany-0.18/src/utils.c geany-0.19/src/utils.c --- geany-0.18/src/utils.c 2009-07-23 17:01:45.000000000 +0100 +++ geany-0.19/src/utils.c 2010-05-08 14:10:33.000000000 +0100 @@ -1,8 +1,8 @@ /* * utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: utils.c 4014 2009-07-23 16:01:45Z ntrel $ + * $Id: utils.c 4884 2010-05-08 13:10:33Z eht16 $ */ /* @@ -139,14 +139,14 @@ } else if (buffer[i] == 0x0d) { - if (i >= (size-1)) + if (i >= (size - 1)) { /* Last char, CR */ cr++; } else { - if (buffer[i+1] != 0x0a) + if (buffer[i + 1] != 0x0a) { /* CR */ cr++; @@ -214,14 +214,14 @@ /** - * Write the given @a text into a file with @a filename. + * Writes the given @a text into a file with @a filename. * If the file doesn't exist, it will be created. * If it already exists, it will be overwritten. * * @param filename The filename of the file to write, in locale encoding. * @param text The text to write into the file. * - * @return 0 if the directory was successfully created, otherwise the @c errno of the + * @return 0 if the file was successfully written, otherwise the @c errno of the * failed operation is returned. **/ gint utils_write_file(const gchar *filename, const gchar *text) @@ -292,11 +292,25 @@ else cur = &sel[size - 1]; - cur--; /* Skip past the > */ + /* Skip to the character before the closing brace */ while (cur > begin) { - if (*cur == '<') break; - else if (! check_tag && *cur == '>') break; + if (*cur == '>') + break; + --cur; + } + --cur; + /* skip whitespace */ + while (cur > begin && isspace(*cur)) + cur--; + if (*cur == '/') + return NULL; /* we found a short tag which doesn't need to be closed */ + while (cur > begin) + { + if (*cur == '<') + break; + else if (! check_tag && *cur == '>') + break; --cur; } @@ -508,7 +522,7 @@ /** - * Remove the extension from @a filename and return the result in a newly allocated string. + * Removes the extension from @a filename and return the result in a newly allocated string. * * @param filename The filename to operate on. * @@ -641,7 +655,7 @@ { for (j = 1; (j < needle_length); j++) { - if (haystack[i+j] == needle[j]) + if (haystack[i + j] == needle[j]) { if (pos == -1) pos = i; @@ -660,7 +674,7 @@ /** - * This is a convenience function to retrieve a formatted date/time string from strftime(). + * Retrieves a formatted date/time string from strftime(). * This function should be preferred to directly calling strftime() since this function * works on UTF-8 encoded strings. * @@ -729,7 +743,7 @@ /** - * Convenience function for g_key_file_get_integer() to add a default value argument. + * Wraps g_key_file_get_integer() to add a default value argument. * * @param config A GKeyFile object. * @param section The group name to look in for the key. @@ -760,7 +774,7 @@ /** - * Convenience function for g_key_file_get_boolean() to add a default value argument. + * Wraps g_key_file_get_boolean() to add a default value argument. * * @param config A GKeyFile object. * @param section The group name to look in for the key. @@ -791,7 +805,7 @@ /** - * Convenience function for g_key_file_get_string() to add a default value argument. + * Wraps g_key_file_get_string() to add a default value argument. * * @param config A GKeyFile object. * @param section The group name to look in for the key. @@ -806,15 +820,13 @@ const gchar *default_value) { gchar *tmp; - GError *error = NULL; if (G_UNLIKELY(config == NULL)) return g_strdup(default_value); - tmp = g_key_file_get_string(config, section, key, &error); - if (G_UNLIKELY(error)) + tmp = g_key_file_get_string(config, section, key, NULL); + if (G_UNLIKELY(!tmp)) { - g_error_free(error); return g_strdup(default_value); } return tmp; @@ -913,7 +925,7 @@ { f = fmt_tenths; ++u; - frac = ((((gint)(val % 1024)) * 10) + (1024/2)) / 1024; + frac = ((((gint)(val % 1024)) * 10) + (1024 / 2)) / 1024; val /= 1024; } if (frac >= 10) @@ -1047,8 +1059,9 @@ /* Contributed by Stefan Oltmanns, thanks. - * Replaces \\, \r, \n, \t and \uXXX by their real counterparts */ -gboolean utils_str_replace_escape(gchar *string) + * Replaces \\, \r, \n, \t and \uXXX by their real counterparts. + * keep_backslash is used for regex strings to leave '\\' and '\?' in place */ +gboolean utils_str_replace_escape(gchar *string, gboolean keep_backslash) { gsize i, j, len; guint unicodechar; @@ -1068,6 +1081,8 @@ switch (string[i]) { case '\\': + if (keep_backslash) + string[j++] = '\\'; string[j] = '\\'; break; case 'n': @@ -1086,57 +1101,58 @@ { return FALSE; } - if (isdigit(string[i-1])) string[j] = string[i-1]-48; - else if (isxdigit(string[i-1])) string[j] = tolower(string[i-1])-87; + if (isdigit(string[i - 1])) string[j] = string[i - 1] - 48; + else if (isxdigit(string[i - 1])) string[j] = tolower(string[i - 1])-87; else return FALSE; string[j] <<= 4; - if (isdigit(string[i])) string[j] |= string[i]-48; + if (isdigit(string[i])) string[j] |= string[i] - 48; else if (isxdigit(string[i])) string[j] |= tolower(string[i])-87; else return FALSE; break; #endif case 'u': + { i += 2; if (i >= strlen(string)) { return FALSE; } - if (isdigit(string[i-1])) unicodechar = string[i-1]-48; - else if (isxdigit(string[i-1])) unicodechar = tolower(string[i-1])-87; + if (isdigit(string[i - 1])) unicodechar = string[i - 1] - 48; + else if (isxdigit(string[i - 1])) unicodechar = tolower(string[i - 1])-87; else return FALSE; unicodechar <<= 4; - if (isdigit(string[i])) unicodechar |= string[i]-48; + if (isdigit(string[i])) unicodechar |= string[i] - 48; else if (isxdigit(string[i])) unicodechar |= tolower(string[i])-87; else return FALSE; - if (((i+2) < strlen(string)) && (isdigit(string[i+1]) || isxdigit(string[i+1])) - && (isdigit(string[i+2]) || isxdigit(string[i+2]))) + if (((i + 2) < strlen(string)) && (isdigit(string[i + 1]) || isxdigit(string[i + 1])) + && (isdigit(string[i + 2]) || isxdigit(string[i + 2]))) { i += 2; unicodechar <<= 8; - if (isdigit(string[i-1])) unicodechar |= ((string[i-1]-48)<<4); - else unicodechar |= ((tolower(string[i-1])-87) << 4); - if (isdigit(string[i])) unicodechar |= string[i]-48; + if (isdigit(string[i - 1])) unicodechar |= ((string[i - 1] - 48) << 4); + else unicodechar |= ((tolower(string[i - 1])-87) << 4); + if (isdigit(string[i])) unicodechar |= string[i] - 48; else unicodechar |= tolower(string[i])-87; } - if (((i+2) < strlen(string)) && (isdigit(string[i+1]) || isxdigit(string[i+1])) - && (isdigit(string[i+2]) || isxdigit(string[i+2]))) + if (((i + 2) < strlen(string)) && (isdigit(string[i + 1]) || isxdigit(string[i + 1])) + && (isdigit(string[i + 2]) || isxdigit(string[i + 2]))) { i += 2; unicodechar <<= 8; - if (isdigit(string[i-1])) unicodechar |= ((string[i-1]-48) << 4); - else unicodechar |= ((tolower(string[i-1])-87) << 4); - if (isdigit(string[i])) unicodechar |= string[i]-48; + if (isdigit(string[i - 1])) unicodechar |= ((string[i - 1] - 48) << 4); + else unicodechar |= ((tolower(string[i - 1])-87) << 4); + if (isdigit(string[i])) unicodechar |= string[i] - 48; else unicodechar |= tolower(string[i])-87; } - if(unicodechar < 0x80) + if (unicodechar < 0x80) { string[j] = unicodechar; } else if (unicodechar < 0x800) { - string[j] = (unsigned char) ((unicodechar >> 6)| 0xC0); + string[j] = (unsigned char) ((unicodechar >> 6) | 0xC0); j++; - string[j] = (unsigned char) ((unicodechar & 0x3F)| 0x80); + string[j] = (unsigned char) ((unicodechar & 0x3F) | 0x80); } else if (unicodechar < 0x10000) { @@ -1161,8 +1177,12 @@ return FALSE; } break; + } default: - return FALSE; + /* unnecessary escapes are allowed */ + if (keep_backslash) + string[j++] = '\\'; + string[j] = string[i]; } } else @@ -1316,8 +1336,8 @@ /** - * Create a directory if it doesn't already exist. - * Create intermediate parent directories as needed, too. + * Creates a directory if it doesn't already exist. + * Creates intermediate parent directories as needed, too. * The permissions of the created directory are set 0700. * * @param path The path of the directory to create, in locale encoding. @@ -1342,47 +1362,76 @@ /** - * Gets a sorted list of files from the specified directory. - * Locale encoding is expected for path and used for the file list. The list and the data - * in the list should be freed after use. - * - * @param path The path of the directory to scan, in locale encoding. - * @param length The location to store the number of non-@c NULL data items in the list, - * unless @c NULL. - * @param error The is the location for storing a possible error, or @c NULL. - * - * @return A newly allocated list or @c NULL if no files found. The list and its data should be - * freed when no longer needed. + * Gets a list of files from the specified directory. + * Locale encoding is expected for @a path and used for the file list. The list and the data + * in the list should be freed after use, e.g.: + * @code + * g_slist_foreach(list, (GFunc) g_free, NULL); + * g_slist_free(list); @endcode + * + * @note If you don't need a list you should use the foreach_dir() macro instead - + * it's more efficient. + * + * @param path The path of the directory to scan, in locale encoding. + * @param full_path Whether to include the full path for each filename in the list. Obviously this + * will use more memory. + * @param sort Whether to sort alphabetically (UTF-8 safe). + * @param error The location for storing a possible error, or @c NULL. + * + * @return A newly allocated list or @c NULL if no files were found. The list and its data should be + * freed when no longer needed. + * @see utils_get_file_list(). **/ -GSList *utils_get_file_list(const gchar *path, guint *length, GError **error) +GSList *utils_get_file_list_full(const gchar *path, gboolean full_path, gboolean sort, GError **error) { GSList *list = NULL; - guint len = 0; GDir *dir; + const gchar *filename; if (error) *error = NULL; - if (length) - *length = 0; g_return_val_if_fail(path != NULL, NULL); dir = g_dir_open(path, 0, error); if (dir == NULL) return NULL; - while (1) + foreach_dir(filename, dir) { - const gchar *filename = g_dir_read_name(dir); - if (filename == NULL) - break; - - list = g_slist_insert_sorted(list, g_strdup(filename), (GCompareFunc) utils_str_casecmp); - len++; + list = g_slist_append(list, full_path ? + g_build_path(G_DIR_SEPARATOR_S, path, filename, NULL) : g_strdup(filename)); } g_dir_close(dir); + /* sorting last is quicker than on insertion */ + if (sort) + list = g_slist_sort(list, (GCompareFunc) utils_str_casecmp); + return list; +} + + +/** + * Gets a sorted list of files from the specified directory. + * Locale encoding is expected for @a path and used for the file list. The list and the data + * in the list should be freed after use, e.g.: + * @code + * g_slist_foreach(list, (GFunc) g_free, NULL); + * g_slist_free(list); @endcode + * + * @param path The path of the directory to scan, in locale encoding. + * @param length The location to store the number of non-@c NULL data items in the list, + * unless @c NULL. + * @param error The location for storing a possible error, or @c NULL. + * + * @return A newly allocated list or @c NULL if no files were found. The list and its data should be + * freed when no longer needed. + * @see utils_get_file_list_full(). + **/ +GSList *utils_get_file_list(const gchar *path, guint *length, GError **error) +{ + GSList *list = utils_get_file_list_full(path, FALSE, TRUE, error); if (length) - *length = len; + *length = g_slist_length(list); return list; } @@ -1453,7 +1502,7 @@ * @param needle The string which should be replaced. * @param replace The replacement for @a needle. * - * @return amount of replacements done + * @return Number of replacements made. **/ guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace) { @@ -1462,7 +1511,7 @@ /** - * Convenience function to replace only the first occurrence of @a needle in @a haystack + * Replaces only the first occurrence of @a needle in @a haystack * with @a replace. * For details, see utils_string_replace_all(). * @@ -1470,7 +1519,7 @@ * @param needle The string which should be replaced. * @param replace The replacement for @a needle. * - * @return amount of replacements done + * @return Number of replacements made. * * @since 0.16 */ @@ -1514,7 +1563,7 @@ /** - * This is a wrapper function for g_spawn_sync() and internally calls this function on Unix-like + * Wraps g_spawn_sync() and internally calls this function on Unix-like * systems. On Win32 platforms, it uses the Windows API. * * @param dir The child's current working directory, or @a NULL to inherit parent's. @@ -1562,7 +1611,7 @@ /** - * This is a wrapper function for g_spawn_async() and internally calls this function on Unix-like + * Wraps g_spawn_async() and internally calls this function on Unix-like * systems. On Win32 platforms, it uses the Windows API. * * @param dir The child's current working directory, or @a NULL to inherit parent's. @@ -1719,15 +1768,22 @@ const gchar *c, *needle; gchar *tmp; gssize pos; + gboolean preserve_double_backslash = FALSE; g_return_if_fail(g_path_is_absolute(filename)); + if (str->len >= 2 && strncmp(str->str, "\\\\", 2) == 0) + preserve_double_backslash = TRUE; + /* replace "/./" and "//" */ utils_string_replace_all(str, G_DIR_SEPARATOR_S "." G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); utils_string_replace_all(str, G_DIR_SEPARATOR_S G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); - /* replace "/.." */ - needle = G_DIR_SEPARATOR_S ".."; + if (preserve_double_backslash) + g_string_prepend(str, "\\"); + + /* replace "/../" */ + needle = G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S; while (1) { c = strstr(str->str, needle); @@ -1739,9 +1795,11 @@ if (pos <= 3) break; /* bad path */ - g_string_erase(str, pos, strlen(needle)); /* erase "/.." */ + /* replace "/../" */ + g_string_erase(str, pos, strlen(needle)); + g_string_insert_c(str, pos, G_DIR_SEPARATOR); - tmp = g_strndup(str->str, pos); /* path up to "/.." */ + tmp = g_strndup(str->str, pos); /* path up to "/../" */ c = g_strrstr(tmp, G_DIR_SEPARATOR_S); g_return_if_fail(c); @@ -1756,12 +1814,8 @@ } -/* @warning Doesn't include null terminating character. */ -#define foreach_str(char_ptr, string) \ - for (char_ptr = string; *char_ptr; char_ptr++) - /** - * Replace or remove characters from a string in place. + * Removes characters from a string, in place. * * @param string String to search. * @param chars Characters to remove. @@ -1790,3 +1844,166 @@ } +static void utils_slist_remove_next(GSList *node) +{ + GSList *old = node->next; + + g_return_if_fail(old); + + node->next = old->next; + g_slist_free_1(old); +} + + +/* Gets list of sorted filenames with no path and no duplicates from user and system config */ +GSList *utils_get_config_files(const gchar *subdir) +{ + gchar *path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, subdir, NULL); + GSList *list = utils_get_file_list_full(path, FALSE, FALSE, NULL); + GSList *syslist, *node; + + if (!list) + { + utils_mkdir(path, FALSE); + } + setptr(path, g_build_path(G_DIR_SEPARATOR_S, app->datadir, subdir, NULL)); + syslist = utils_get_file_list_full(path, FALSE, FALSE, NULL); + /* merge lists */ + list = g_slist_concat(list, syslist); + + list = g_slist_sort(list, (GCompareFunc) utils_str_casecmp); + /* remove duplicates (next to each other after sorting) */ + foreach_slist(node, list) + { + if (node->next && utils_str_equal(node->next->data, node->data)) + { + g_free(node->next->data); + utils_slist_remove_next(node); + } + } + g_free(path); + return list; +} + + +/* Suffix can be NULL or a string which should be appended to the Help URL like + * an anchor link, e.g. "#some_anchor". */ +gchar *utils_get_help_url(const gchar *suffix) +{ + gint skip; + gchar *uri; + +#ifdef G_OS_WIN32 + skip = 8; + uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL); + g_strdelimit(uri, "\\", '/'); /* replace '\\' by '/' */ +#else + skip = 7; + uri = g_strconcat("file://", app->docdir, "index.html", NULL); +#endif + + if (! g_file_test(uri + skip, G_FILE_TEST_IS_REGULAR)) + { /* fall back to online documentation if it is not found on the hard disk */ + g_free(uri); + uri = g_strconcat(GEANY_HOMEPAGE, "manual/", VERSION, "/index.html", NULL); + } + + if (suffix != NULL) + { + setptr(uri, g_strconcat(uri, suffix, NULL)); + } + + return uri; +} + + +static gboolean str_in_array(const gchar **haystack, const gchar *needle) +{ + const gchar **p; + + for (p = haystack; *p != NULL; ++p) + { + if (utils_str_equal(*p, needle)) + return TRUE; + } + return FALSE; +} + + +/** + * Copies the current environment into a new array. + * @a exclude_vars is a @c NULL-terminated array of variable names which should be not copied. + * All further arguments are key, value pairs of variables which should be added to + * the environment. + * + * The argument list must be @c NULL-terminated. + * + * @param exclude_vars @c NULL-terminated array of variable names to exclude. + * @param first_varname Name of the first variable to copy into the new array. + * @param ... Key-value pairs of variable names and values, @c NULL-terminated. + * + * @return The new environment array. + **/ +gchar **utils_copy_environment(const gchar **exclude_vars, const gchar *first_varname, ...) +{ + gchar **result; + gchar **p; + gchar **env; + va_list args; + const gchar *key, *value; + guint n, o; + + /* get all the environ variables */ + env = g_listenv(); + + /* count the additional variables */ + va_start(args, first_varname); + for (o = 1; va_arg(args, gchar*) != NULL; o++); + va_end(args); + /* the passed arguments should be even (key, value pairs) */ + g_return_val_if_fail(o % 2 == 0, NULL); + + o /= 2; + + /* create an array large enough to hold the new environment */ + n = g_strv_length(env); + /* 'n + o + 1' could leak a little bit when exclude_vars is set */ + result = g_new(gchar *, n + o + 1); + + /* copy the environment */ + for (n = 0, p = env; *p != NULL; ++p) + { + /* copy the variable */ + value = g_getenv(*p); + if (G_LIKELY(value != NULL)) + { + /* skip excluded variables */ + if (exclude_vars != NULL && str_in_array(exclude_vars, *p)) + continue; + + result[n++] = g_strconcat(*p, "=", value, NULL); + } + } + g_strfreev(env); + + /* now add additional variables */ + va_start(args, first_varname); + key = first_varname; + value = va_arg(args, gchar*); + while (key != NULL) + { + result[n++] = g_strconcat(key, "=", value, NULL); + + key = va_arg(args, gchar*); + if (key == NULL) + break; + value = va_arg(args, gchar*); + } + va_end(args); + + result[n] = NULL; + + return result; +} + + diff -Nru geany-0.18/src/utils.h geany-0.19/src/utils.h --- geany-0.18/src/utils.h 2009-07-29 18:40:20.000000000 +0100 +++ geany-0.19/src/utils.h 2010-03-15 13:01:16.000000000 +0000 @@ -1,8 +1,8 @@ /* * utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: utils.h 4041 2009-07-29 17:40:20Z ntrel $ + * $Id: utils.h 4760 2010-03-15 13:01:16Z ntrel $ */ /** @@ -33,12 +33,12 @@ #include -/** Returns: TRUE if @a ptr points to a non-zero value. */ +/** Returns TRUE if @a ptr points to a non-zero value. */ #define NZV(ptr) \ (G_LIKELY((ptr)) && G_LIKELY((ptr)[0])) /** - * Free's @a ptr (if not @c NULL), then assigns @a result to it. + * Frees @a ptr (if not @c NULL), then assigns @a result to it. * @a result can be an expression using the 'old' value of @a ptr. * It prevents a memory leak compared with: @code ptr = func(ptr); @endcode **/ @@ -49,8 +49,8 @@ g_free(setptr_tmp);\ } -/** Like glibc's @c strdupa(), but portable. - * Duplicate a string on the stack using @c g_alloca(). +/** Duplicates a string on the stack using @c g_alloca(). + * Like glibc's @c strdupa(), but portable. * @note You must include @c string.h yourself. * @warning Don't use excessively or for long strings otherwise there may be stack exhaustion - * see the GLib docs for @c g_alloca(). */ @@ -91,6 +91,22 @@ #define foreach_slist(node, list) \ foreach_list(node, list) +/** Iterates through each unsorted filename in a @c GDir. + * @param filename (@c const @c gchar*) locale-encoded filename, without path. Do not modify or free. + * @param dir @c GDir created with @c g_dir_open(). Call @c g_dir_close() afterwards. + * @see utils_get_file_list() if you want a sorted list. + * @since Geany 0.19. */ +#define foreach_dir(filename, dir)\ + for ((filename) = g_dir_read_name(dir); (filename) != NULL; (filename) = g_dir_read_name(dir)) + +/** Iterates through each character in @a string. + * @param char_ptr Pointer to character. + * @param string String to traverse. + * @warning Doesn't include null terminating character. + * @since Geany 0.19. */ +#define foreach_str(char_ptr, string) \ + for (char_ptr = string; *char_ptr; char_ptr++) + void utils_open_browser(const gchar *uri); @@ -164,7 +180,7 @@ gchar **utils_read_file_in_array(const gchar *filename); -gboolean utils_str_replace_escape(gchar *string); +gboolean utils_str_replace_escape(gchar *string, gboolean keep_backslash); gboolean utils_wrap_string(gchar *string, gint wrapstart); @@ -180,6 +196,12 @@ GSList *utils_get_file_list(const gchar *path, guint *length, GError **error); +GSList *utils_get_file_list_full(const gchar *path, gboolean full_path, gboolean sort, GError **error); + +GSList *utils_get_config_files(const gchar *subdir); + +gchar *utils_get_help_url(const gchar *suffix); + gboolean utils_str_has_upper(const gchar *str); gint utils_is_file_writeable(const gchar *locale_filename); @@ -207,4 +229,6 @@ gchar *utils_str_remove_chars(gchar *string, const gchar *chars); +gchar **utils_copy_environment(const gchar **exclude_vars, const gchar *first_varname, ...) G_GNUC_NULL_TERMINATED; + #endif diff -Nru geany-0.18/src/vte.c geany-0.19/src/vte.c --- geany-0.18/src/vte.c 2009-04-15 23:47:33.000000000 +0100 +++ geany-0.19/src/vte.c 2010-03-30 15:43:40.000000000 +0100 @@ -1,8 +1,8 @@ /* * vte.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: vte.c 3708 2009-04-15 22:47:33Z eht16 $ + * $Id: vte.c 4789 2010-03-30 14:43:40Z ntrel $ */ /* @@ -56,7 +56,6 @@ VteInfo vte_info; VteConfig *vc; -extern gchar **environ; static pid_t pid = 0; static gboolean clean = TRUE; static GModule *module = NULL; @@ -108,6 +107,7 @@ void (*vte_terminal_paste_clipboard) (VteTerminal *terminal); void (*vte_terminal_set_emulation) (VteTerminal *terminal, const gchar *emulation); void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground); + void (*vte_terminal_set_color_bold) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background); void (*vte_terminal_feed_child) (VteTerminal *terminal, const char *data, glong length); void (*vte_terminal_im_append_menuitems) (VteTerminal *terminal, GtkMenuShell *menushell); @@ -155,43 +155,11 @@ }; -/* taken from anjuta, thanks */ static gchar **vte_get_child_environment(void) { - /* code from gnome-terminal, sort of. */ - gchar **p; - gint i; - gchar **retval; -#define EXTRA_ENV_VARS 5 - - /* count env vars that are set */ - for (p = environ; *p; p++); - - i = p - environ; - retval = g_new0(gchar *, i + 1 + EXTRA_ENV_VARS); - - for (i = 0, p = environ; *p; p++) - { - /* Strip all these out, we'll replace some of them */ - if ((strncmp(*p, "COLUMNS=", 8) == 0) || - (strncmp(*p, "LINES=", 6) == 0) || - (strncmp(*p, "TERM=", 5) == 0)) - { - /* nothing: do not copy */ - } - else - { - retval[i] = g_strdup(*p); - ++i; - } - } - - retval[i] = g_strdup("TERM=xterm"); - ++i; - - retval[i] = NULL; + const gchar *exclude_vars[] = {"COLUMNS", "LINES", "TERM", NULL}; - return retval; + return utils_copy_environment(exclude_vars, "TERM", "xterm", NULL); } @@ -235,7 +203,7 @@ const gchar *sonames[] = { "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9", NULL }; - for (i = 0; sonames[i] != NULL && module == NULL; i++ ) + for (i = 0; sonames[i] != NULL && module == NULL; i++) { module = g_module_open(sonames[i], G_MODULE_BIND_LAZY); } @@ -329,10 +297,8 @@ static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Return || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter || - ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) + if (ui_is_keyval_enter_or_return(event->keyval) || + ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) { /* assume any text on the prompt has been executed when pressing Enter/Return */ clean = TRUE; @@ -454,6 +420,7 @@ g_module_symbol(mod, "vte_terminal_paste_clipboard", (void*)&vf->vte_terminal_paste_clipboard); g_module_symbol(mod, "vte_terminal_set_emulation", (void*)&vf->vte_terminal_set_emulation); g_module_symbol(mod, "vte_terminal_set_color_foreground", (void*)&vf->vte_terminal_set_color_foreground); + g_module_symbol(mod, "vte_terminal_set_color_bold", (void*)&vf->vte_terminal_set_color_bold); g_module_symbol(mod, "vte_terminal_set_color_background", (void*)&vf->vte_terminal_set_color_background); g_module_symbol(mod, "vte_terminal_feed_child", (void*)&vf->vte_terminal_feed_child); g_module_symbol(mod, "vte_terminal_im_append_menuitems", (void*)&vf->vte_terminal_im_append_menuitems); @@ -476,6 +443,7 @@ vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation); vf->vte_terminal_set_font_from_string(VTE_TERMINAL(vc->vte), vc->font); vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), vc->colour_fore); + vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), vc->colour_fore); vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), vc->colour_back); vte_set_cursor_blink_mode(); @@ -705,6 +673,40 @@ } +static void font_button_clicked_cb(GtkFontButton *widget, gpointer user_data) +{ + const gchar *fontbtn = gtk_font_button_get_font_name(widget); + + if (! utils_str_equal(fontbtn, vc->font)) + { + setptr(vc->font, g_strdup(gtk_font_button_get_font_name(widget))); + vte_apply_user_settings(); + } +} + + +static void on_color_button_choose_cb(GtkColorButton *widget, gpointer user_data) +{ + switch (GPOINTER_TO_INT(user_data)) + { + case 1: + { + g_free(vc->colour_fore); + vc->colour_fore = g_new0(GdkColor, 1); + gtk_color_button_get_color(widget, vc->colour_fore); + break; + } + case 2: + { + g_free(vc->colour_back); + vc->colour_back = g_new0(GdkColor, 1); + gtk_color_button_get_color(widget, vc->colour_back); + break; + } + } +} + + void vte_append_preferences_tab(void) { if (vte_info.have_vte) @@ -718,7 +720,7 @@ notebook = ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2"); - frame = ui_frame_new_with_alignment(_("Terminal plugin"), &alignment); + frame = ui_frame_new_with_alignment(_("Terminal"), &alignment); gtk_container_set_border_width(GTK_CONTAINER(frame), 5); vbox = gtk_vbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(alignment), vbox); @@ -726,18 +728,12 @@ label = gtk_label_new(_("Terminal")); vte_prefs_tab_num = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, label); - label = geany_wrap_label_new(_("These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded.")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); - gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - table = gtk_table_new(6, 2, FALSE); gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); gtk_table_set_row_spacings(GTK_TABLE(table), 3); gtk_table_set_col_spacings(GTK_TABLE(table), 10); - label = gtk_label_new(_("Terminal font:")); + label = gtk_label_new(_("Font:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -783,7 +779,7 @@ spin_scrollback_adj = gtk_adjustment_new(500, 0, 5000, 1, 10, 0); spin_scrollback = gtk_spin_button_new(GTK_ADJUSTMENT(spin_scrollback_adj), 1, 0); - ui_entry_add_clear_icon(spin_scrollback); + ui_entry_add_clear_icon(GTK_ENTRY(spin_scrollback)); gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -798,7 +794,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); entry_shell = gtk_entry_new(); - ui_entry_add_clear_icon(entry_shell); + ui_entry_add_clear_icon(GTK_ENTRY(entry_shell)); ui_widget_set_tooltip_text(entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation")); button_shell = gtk_button_new(); @@ -887,14 +883,13 @@ gtk_widget_show_all(frame); - g_signal_connect(font_term, "font-set", G_CALLBACK(on_prefs_font_choosed), - GINT_TO_POINTER(4)); - g_signal_connect(color_fore, "color-set", G_CALLBACK(on_prefs_color_choosed), + g_signal_connect(font_term, "font-set", G_CALLBACK(font_button_clicked_cb), NULL); + g_signal_connect(color_fore, "color-set", G_CALLBACK(on_color_button_choose_cb), + GINT_TO_POINTER(1)); + g_signal_connect(color_back, "color-set", G_CALLBACK(on_color_button_choose_cb), GINT_TO_POINTER(2)); - g_signal_connect(color_back, "color-set", G_CALLBACK(on_prefs_color_choosed), - GINT_TO_POINTER(3)); - g_signal_connect(button_shell, "clicked", - G_CALLBACK(on_prefs_tools_button_clicked), entry_shell); + ui_setup_open_button_callback(button_shell, NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_shell)); } } @@ -921,9 +916,23 @@ len = strlen(text); - /* Make sure there is no newline character at the end to prevent unwanted execution */ - if (text[len-1] == '\n' || text[len-1] == '\r') - text[len-1] = '\0'; + if (vc->send_selection_unsafe) + { /* Explicitly append a trailing newline character to get the command executed, + this is disabled by default as it could cause all sorts of damage. */ + if (text[len-1] != '\n' && text[len-1] != '\r') + { + setptr(text, g_strconcat(text, "\n", NULL)); + len++; + } + } + else + { /* Make sure there is no newline character at the end to prevent unwanted execution */ + while (text[len-1] == '\n' || text[len-1] == '\r') + { + text[len-1] = '\0'; + len--; + } + } vf->vte_terminal_feed_child(VTE_TERMINAL(vc->vte), text, len); @@ -935,4 +944,5 @@ g_free(text); } + #endif diff -Nru geany-0.18/src/vte.h geany-0.19/src/vte.h --- geany-0.18/src/vte.h 2009-02-25 23:28:01.000000000 +0000 +++ geany-0.19/src/vte.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* * vte.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven < + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven < * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: vte.h 3601 2009-02-25 23:28:01Z eht16 $ + * $Id: vte.h 4518 2010-01-01 22:55:18Z eht16 $ */ @@ -52,6 +52,7 @@ gboolean skip_run_script; gboolean enable_bash_keys; gboolean cursor_blinks; + gboolean send_selection_unsafe; gint scrollback_lines; gchar *emulation; gchar *shell; diff -Nru geany-0.18/src/win32.c geany-0.19/src/win32.c --- geany-0.18/src/win32.c 2009-08-16 18:27:01.000000000 +0100 +++ geany-0.19/src/win32.c 2010-05-15 12:57:40.000000000 +0100 @@ -1,8 +1,8 @@ /* * win32.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: win32.c 4098 2009-08-16 17:27:01Z eht16 $ + * $Id: win32.c 4914 2010-05-15 11:57:40Z eht16 $ */ /* @@ -57,6 +57,7 @@ #include "editor.h" #define BUFSIZE 4096 +#define CMDSIZE 32768 struct _geany_win32_spawn { @@ -84,19 +85,16 @@ { gchar *string; guint i, j, len; - static wchar_t title[1024]; + static wchar_t title[4096]; GString *str = g_string_sized_new(100); GString *all_patterns = g_string_sized_new(100); + GSList *node; gchar *tmp; - for (i = 0; i < filetypes_array->len; i++) - { - tmp = g_strjoinv(";", filetypes[i]->pattern); - g_string_append_printf(str, "%s\t%s\t", filetypes[i]->title, tmp); - g_free(tmp); - } - /* create meta file filter "All Source" */ - for (i = 0; i < filetypes_array->len; i++) + /* create meta file filter "All files" */ + g_string_append_printf(str, "%s\t*\t", _("All files")); + /* create meta file filter "All Source" (skip GEANY_FILETYPES_NONE) */ + for (i = GEANY_FILETYPES_NONE + 1; i < filetypes_array->len; i++) { for (j = 0; filetypes[i]->pattern[j] != NULL; j++) { @@ -106,16 +104,27 @@ } g_string_append_printf(str, "%s\t%s\t", _("All Source"), all_patterns->str); g_string_free(all_patterns, TRUE); + /* add 'usual' filetypes */ + foreach_slist(node, filetypes_by_title) + { + GeanyFiletype *ft = node->data; + if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) + continue; + tmp = g_strjoinv(";", ft->pattern); + g_string_append_printf(str, "%s\t%s\t", ft->title, tmp); + g_free(tmp); + } g_string_append_c(str, '\t'); /* the final \0 byte to mark the end of the string */ string = str->str; g_string_free(str, FALSE); /* replace all "\t"s by \0 */ len = strlen(string); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - if (string[i] == '\t') string[i] = '\0'; + if (string[i] == '\t') + string[i] = '\0'; } MultiByteToWideChar(CP_UTF8, 0, string, len, title, sizeof(title)); g_free(string); @@ -124,6 +133,23 @@ } +static wchar_t *get_file_filter_all_files(void) +{ + guint len; + static wchar_t title[4096]; + gchar *filter; + + /* create meta file filter "All files" */ + filter = g_strdup_printf("%s\0*\0", _("All files")); + + len = strlen(_("All files")) + 3; + MultiByteToWideChar(CP_UTF8, 0, filter, len, title, sizeof(title)); + g_free(filter); + + return title; +} + + static wchar_t *get_filters(gboolean project_files) { gchar *string; @@ -145,7 +171,7 @@ /* replace all "\t"s by \0 */ len = strlen(string); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { if (string[i] == '\t') string[i] = '\0'; } @@ -183,7 +209,7 @@ * folder when the dialog is initialised. Yeah, I like Windows. */ INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) { - switch(uMsg) + switch (uMsg) { case BFFM_INITIALIZED: { @@ -208,8 +234,7 @@ /* Shows a folder selection dialog. * initial_dir is expected in UTF-8 * The selected folder name is returned. */ -gchar *win32_show_project_folder_dialog(GtkWidget *parent, const gchar *title, - const gchar *initial_dir) +gchar *win32_show_folder_dialog(GtkWidget *parent, const gchar *title, const gchar *initial_dir) { BROWSEINFOW bi; LPCITEMIDLIST pidl; @@ -314,19 +339,23 @@ /* initial_dir can be NULL to use the current working directory. * Returns: TRUE if the dialog was not cancelled. */ -gboolean win32_show_file_dialog(gboolean file_open, const gchar *initial_dir) +gboolean win32_show_document_open_dialog(GtkWindow *parent, const gchar *title, const gchar *initial_dir) { OPENFILENAMEW of; gint retval; + guint x; gchar tmp[MAX_PATH]; wchar_t fname[MAX_PATH]; wchar_t w_dir[MAX_PATH]; + wchar_t w_title[512]; fname[0] = '\0'; if (initial_dir != NULL) MultiByteToWideChar(CP_UTF8, 0, initial_dir, -1, w_dir, sizeof(w_dir)); + MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)); + /* initialise file dialog info struct */ memset(&of, 0, sizeof of); #ifdef OPENFILENAME_SIZE_VERSION_400 @@ -334,7 +363,7 @@ #else of.lStructSize = sizeof of; #endif - of.hwndOwner = GDK_WINDOW_HWND(main_widgets.window->window); + of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window); of.lpstrFilter = get_file_filters(); of.lpstrCustomFilter = NULL; @@ -343,18 +372,11 @@ of.lpstrInitialDir = (initial_dir != NULL) ? w_dir : NULL; of.nMaxFile = 2048; of.lpstrFileTitle = NULL; - of.lpstrTitle = NULL; + of.lpstrTitle = w_title; of.lpstrDefExt = L""; - if (file_open) - { - of.Flags = OFN_ALLOWMULTISELECT | OFN_FILEMUSTEXIST | OFN_EXPLORER; - retval = GetOpenFileNameW(&of); - } - else - { - of.Flags = OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST; - retval = GetSaveFileNameW(&of); - } + of.Flags = OFN_ALLOWMULTISELECT | OFN_FILEMUSTEXIST | OFN_EXPLORER; + + retval = GetOpenFileNameW(&of); if (!retval) { @@ -367,49 +389,146 @@ return FALSE; } - if (file_open) - { - guint x; - - x = of.nFileOffset - 1; - if (x != wcslen(fname)) - { /* open a single file */ - WideCharToMultiByte(CP_UTF8, 0, fname, -1, tmp, sizeof(tmp), NULL, NULL); - document_open_file(tmp, of.Flags & OFN_READONLY, NULL, NULL); - } - else - { /* open multiple files */ - gchar file_name[MAX_PATH]; - gchar dir_name[MAX_PATH]; - - WideCharToMultiByte(CP_UTF8, 0, fname, of.nFileOffset, - dir_name, sizeof(dir_name), NULL, NULL); - for (; ;) + x = of.nFileOffset - 1; + if (x != wcslen(fname)) + { /* open a single file */ + WideCharToMultiByte(CP_UTF8, 0, fname, -1, tmp, sizeof(tmp), NULL, NULL); + document_open_file(tmp, of.Flags & OFN_READONLY, NULL, NULL); + } + else + { /* open multiple files */ + gchar file_name[MAX_PATH]; + gchar dir_name[MAX_PATH]; + + WideCharToMultiByte(CP_UTF8, 0, fname, of.nFileOffset, + dir_name, sizeof(dir_name), NULL, NULL); + for (; ;) + { + if (! fname[x]) { - if (! fname[x]) - { - if (! fname[x+1]) - break; - - WideCharToMultiByte(CP_UTF8, 0, fname + x + 1, -1, - tmp, sizeof(tmp), NULL, NULL); - g_snprintf(file_name, 511, "%s\\%s", dir_name, tmp); - - /* convert the resulting filename into UTF-8 */ - document_open_file(file_name, of.Flags & OFN_READONLY, NULL, NULL); - } - x++; + if (! fname[x + 1]) + break; + + WideCharToMultiByte(CP_UTF8, 0, fname + x + 1, -1, + tmp, sizeof(tmp), NULL, NULL); + g_snprintf(file_name, 511, "%s\\%s", dir_name, tmp); + + /* convert the resulting filename into UTF-8 */ + document_open_file(file_name, of.Flags & OFN_READONLY, NULL, NULL); } + x++; } } - else + return (retval != 0); +} + + +gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, + const gchar *initial_file) +{ + OPENFILENAMEW of; + gint retval; + gchar tmp[MAX_PATH]; + wchar_t w_file[MAX_PATH]; + wchar_t w_title[512]; + guint x; + + w_file[0] = '\0'; + + if (initial_file != NULL) + MultiByteToWideChar(CP_UTF8, 0, initial_file, -1, w_file, sizeof(w_file)); + + MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)); + + /* initialise file dialog info struct */ + memset(&of, 0, sizeof of); +#ifdef OPENFILENAME_SIZE_VERSION_400 + of.lStructSize = OPENFILENAME_SIZE_VERSION_400; +#else + of.lStructSize = sizeof of; +#endif + of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window); + + of.lpstrFilter = get_file_filter_all_files(); + of.lpstrCustomFilter = NULL; + of.nFilterIndex = 0; + + of.lpstrFile = w_file; + of.nMaxFile = 2048; + of.lpstrFileTitle = NULL; + of.lpstrTitle = w_title; + of.lpstrDefExt = L""; + of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER; + retval = GetSaveFileNameW(&of); + + if (! retval) { - GeanyDocument *doc = document_get_current(); + if (CommDlgExtendedError()) + { + gchar *error = g_strdup_printf( + "File dialog box error (%x)", (gint) CommDlgExtendedError()); + win32_message_dialog(NULL, GTK_MESSAGE_ERROR, error); + g_free(error); + } + return NULL; + } - WideCharToMultiByte(CP_UTF8, 0, fname, -1, tmp, sizeof(tmp), NULL, NULL); - document_save_file_as(doc, tmp); + WideCharToMultiByte(CP_UTF8, 0, w_file, -1, tmp, sizeof(tmp), NULL, NULL); + + return g_strdup(tmp); +} + + +/* initial_dir can be NULL to use the current working directory. + * Returns: the selected filename */ +gchar *win32_show_file_dialog(GtkWindow *parent, const gchar *title, const gchar *initial_file) +{ + OPENFILENAMEW of; + gint retval; + gchar tmp[MAX_PATH]; + wchar_t w_file[MAX_PATH]; + wchar_t w_title[512]; + guint x; + + w_file[0] = '\0'; + + if (initial_file != NULL) + MultiByteToWideChar(CP_UTF8, 0, initial_file, -1, w_file, sizeof(w_file)); + + MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)); + + /* initialise file dialog info struct */ + memset(&of, 0, sizeof of); +#ifdef OPENFILENAME_SIZE_VERSION_400 + of.lStructSize = OPENFILENAME_SIZE_VERSION_400; +#else + of.lStructSize = sizeof of; +#endif + of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window); + + of.lpstrFile = w_file; + of.nMaxFile = 2048; + of.lpstrFileTitle = NULL; + of.lpstrTitle = w_title; + of.lpstrDefExt = L""; + of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER; + retval = GetOpenFileNameW(&of); + + if (! retval) + { + if (CommDlgExtendedError()) + { + gchar *error = g_strdup_printf( + "File dialog box error (%x)", (gint) CommDlgExtendedError()); + win32_message_dialog(NULL, GTK_MESSAGE_ERROR, error); + g_free(error); + } + return NULL; } - return (retval != 0); + + WideCharToMultiByte(CP_UTF8, 0, w_file, -1, tmp, sizeof(tmp), NULL, NULL); + + return g_strdup(tmp); } @@ -630,7 +749,7 @@ parent_hwnd = GDK_WINDOW_HWND(main_widgets.window->window); ret = MessageBoxW(parent_hwnd, w_msg, w_title, MB_YESNOCANCEL | MB_ICONQUESTION); - switch(ret) + switch (ret) { case IDYES: ret = GTK_RESPONSE_YES; break; case IDNO: ret = GTK_RESPONSE_NO; break; @@ -640,14 +759,18 @@ return ret; } + /* Just a simple wrapper function to open a browser window */ void win32_open_browser(const gchar *uri) { if (strncmp(uri, "file://", 7) == 0) { uri += 7; - while (*uri == '/') - uri++; + if (strchr(uri, ':') != NULL) + { + while (*uri == '/') + uri++; + } } ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL); } @@ -726,12 +849,12 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, gchar **std_out, gchar **std_err, gint *exit_status, GError **error) { - TCHAR buffer[MAX_PATH]=TEXT(""); - TCHAR cmdline[MAX_PATH] = TEXT(""); - TCHAR* lpPart[MAX_PATH]={NULL}; - DWORD retval=0; + TCHAR buffer[CMDSIZE]=TEXT(""); + TCHAR cmdline[CMDSIZE] = TEXT(""); + TCHAR* lpPart[CMDSIZE]={NULL}; + DWORD retval = 0; gint argc = 0, i; - gint cmdpos=0; + gint cmdpos = 0; SECURITY_ATTRIBUTES saAttr; BOOL fSuccess; @@ -755,9 +878,9 @@ if (flags & G_SPAWN_SEARCH_PATH) { - retval = SearchPath(NULL, argv[0], ".exe", MAX_PATH, buffer, lpPart); + retval = SearchPath(NULL, argv[0], ".exe", sizeof(buffer), buffer, lpPart); if (retval > 0) - g_snprintf(cmdline, MAX_PATH, "\"%s\"", buffer); + g_snprintf(cmdline, sizeof(cmdline), "\"%s\"", buffer); else g_strlcpy(cmdline, argv[0], sizeof(cmdline)); cmdpos = 1; @@ -765,7 +888,7 @@ for (i = cmdpos; i < argc; i++) { - g_snprintf(cmdline, MAX_PATH, "%s %s", cmdline, argv[i]); + g_snprintf(cmdline, sizeof(cmdline), "%s %s", cmdline, argv[i]); /*MessageBox(NULL, cmdline, cmdline, MB_OK);*/ } @@ -954,15 +1077,17 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir, GError **error) { PROCESS_INFORMATION piProcInfo; - STARTUPINFO siStartInfo; + STARTUPINFOW siStartInfo; BOOL bFuncRetn = FALSE; gchar *expandedCmdline; + wchar_t w_commandline[CMDSIZE]; + wchar_t w_dir[MAX_PATH]; /* Set up members of the PROCESS_INFORMATION structure. */ - ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION) ); + ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); /* Set up members of the STARTUPINFO structure.*/ - ZeroMemory(&siStartInfo, sizeof(STARTUPINFO) ); + ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); siStartInfo.cb = sizeof(STARTUPINFO); siStartInfo.hStdError = gw_spawn->hChildStderrWr; @@ -973,15 +1098,18 @@ /* Expand environment variables like %blah%. */ expandedCmdline = win32_expand_environment_variables(szCmdline); + MultiByteToWideChar(CP_UTF8, 0, expandedCmdline, -1, w_commandline, sizeof(w_commandline)); + MultiByteToWideChar(CP_UTF8, 0, dir, -1, w_dir, sizeof(w_dir)); + /* Create the child process. */ - bFuncRetn = CreateProcess(NULL, - expandedCmdline, /* command line */ + bFuncRetn = CreateProcessW(NULL, + w_commandline, /* command line */ NULL, /* process security attributes */ NULL, /* primary thread security attributes */ TRUE, /* handles are inherited */ CREATE_NO_WINDOW, /* creation flags */ NULL, /* use parent's environment */ - dir, /* use parent's current directory */ + w_dir, /* use parent's current directory */ &siStartInfo, /* STARTUPINFO pointer */ &piProcInfo); /* receives PROCESS_INFORMATION */ @@ -1055,7 +1183,7 @@ static HANDLE GetTempFileHandle(GError **error) { /* Temp file */ - DWORD dwBufSize=BUFSIZE; + DWORD dwBufSize = BUFSIZE; UINT uRetVal; TCHAR szTempName[BUFSIZE]; TCHAR lpPathBuffer[BUFSIZE]; @@ -1195,11 +1323,13 @@ return path; } + void win32_set_working_directory(const gchar *dir) { SetCurrentDirectory(dir); } + gchar *win32_get_installation_dir(void) { #if GLIB_CHECK_VERSION(2, 16, 0) @@ -1209,4 +1339,5 @@ #endif } + #endif diff -Nru geany-0.18/src/win32.h geany-0.19/src/win32.h --- geany-0.18/src/win32.h 2009-08-02 14:33:39.000000000 +0100 +++ geany-0.19/src/win32.h 2010-05-16 18:42:45.000000000 +0100 @@ -1,8 +1,8 @@ /* * win32.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2009 Enrico Tröger - * Copyright 2006-2009 Nick Treleaven + * Copyright 2005-2010 Enrico Tröger + * Copyright 2006-2010 Nick Treleaven * * 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 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: win32.h 4050 2009-08-02 13:33:39Z eht16 $ + * $Id: win32.h 4918 2010-05-16 17:42:45Z eht16 $ */ @@ -27,7 +27,12 @@ void win32_show_pref_file_dialog(GtkEntry *item); -gboolean win32_show_file_dialog(gboolean file_open, const gchar *initial_dir); +gchar *win32_show_file_dialog(GtkWindow *parent, const gchar *title, const gchar *initial_dir); + +gboolean win32_show_document_open_dialog(GtkWindow *parent, const gchar *title, const gchar *initial_dir); + +gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, + const gchar *initial_file); void win32_show_font_dialog(void); @@ -43,8 +48,7 @@ const gchar *initial_dir, gboolean allow_new_file, gboolean project_file_filter); -gchar *win32_show_project_folder_dialog(GtkWidget *parent, const gchar *title, - const gchar *initial_dir); +gchar *win32_show_folder_dialog(GtkWidget *parent, const gchar *title, const gchar *initial_dir); gint win32_check_write_permission(const gchar *dir); diff -Nru geany-0.18/tagmanager/abc.c geany-0.19/tagmanager/abc.c --- geany-0.18/tagmanager/abc.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/tagmanager/abc.c 2009-09-20 19:46:56.000000000 +0100 @@ -0,0 +1,127 @@ +/* +* Copyright (c) 2009, Eric Forgeot +* +* Based on work by Jon Strait +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for Abc files. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include +#include + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ + +static kindOption AbcKinds[] = { + { TRUE, 'm', "member", "sections" }, + { TRUE, 's', "struct", "header1"} +}; + +/* +* FUNCTION DEFINITIONS +*/ + +/* checks if str is all the same character */ +/*static boolean issame(const char *str) +{ + char first = *str; + + while (*(++str)) + { + if (*str && *str != first) + return FALSE; + } + return TRUE; +}*/ + + +static void makeAbcTag (const vString* const name, boolean name_before) +{ + tagEntryInfo e; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; /* we want the line before the underline chars */ + e.kindName = AbcKinds[0].name; + e.kind = AbcKinds[0].letter; + + makeTagEntry(&e); +} + +/*static void makeAbcTag2 (const vString* const name, boolean name_before) +{ + tagEntryInfo e; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; + e.kindName = "struct"; + e.kind = 's'; + + makeTagEntry(&e); +}*/ + +static void findAbcTags (void) +{ + vString *name = vStringNew(); + const unsigned char *line; + + while ((line = fileReadLine()) != NULL) + { + /*int name_len = vStringLength(name);*/ + + /* underlines must be the same length or more */ + /*if (name_len > 0 && (line[0] == '=' || line[0] == '-') && issame((const char*) line)) + { + makeAbcTag(name, TRUE); + }*/ +/* if (line[1] == '%') { + vStringClear(name); + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeAbcTag(name, FALSE); + }*/ + if (line[0] == 'T') { + /*vStringClear(name);*/ + vStringCatS(name, " / "); + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeAbcTag(name, FALSE); + } + else { + vStringClear (name); + if (! isspace(*line)) + vStringCatS(name, (const char*) line); + vStringTerminate(name); + } + } + vStringDelete (name); +} + +extern parserDefinition* AbcParser (void) +{ + static const char *const patterns [] = { "*.abc", NULL }; + static const char *const extensions [] = { "abc", NULL }; + parserDefinition* const def = parserNew ("Abc"); + + def->kinds = AbcKinds; + def->kindCount = KIND_COUNT (AbcKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findAbcTags; + return def; +} + diff -Nru geany-0.18/tagmanager/c.c geany-0.19/tagmanager/c.c --- geany-0.18/tagmanager/c.c 2008-12-09 19:00:45.000000000 +0000 +++ geany-0.19/tagmanager/c.c 2010-05-30 18:48:08.000000000 +0100 @@ -58,9 +58,9 @@ typedef enum eKeywordId { KEYWORD_NONE = -1, - KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, + KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, KEYWORD_ALIAS, KEYWORD_BOOLEAN, KEYWORD_BYTE, KEYWORD_BAD_STATE, KEYWORD_BAD_TRANS, - KEYWORD_BIND, KEYWORD_BIND_VAR, KEYWORD_BIT, + KEYWORD_BIND, KEYWORD_BIND_VAR, KEYWORD_BIT, KEYWORD_BODY, KEYWORD_CASE, KEYWORD_CATCH, KEYWORD_CHAR, KEYWORD_CLASS, KEYWORD_CONST, KEYWORD_CONSTRAINT, KEYWORD_COVERAGE_BLOCK, KEYWORD_COVERAGE_DEF, KEYWORD_DEFAULT, KEYWORD_DELEGATE, KEYWORD_DELETE, KEYWORD_DO, @@ -69,7 +69,7 @@ KEYWORD_EXTENDS, KEYWORD_EVENT, KEYWORD_FINAL, KEYWORD_FINALLY, KEYWORD_FLOAT, KEYWORD_FOR, KEYWORD_FRIEND, KEYWORD_FUNCTION, KEYWORD_GET, KEYWORD_GOTO, - KEYWORD_IF, KEYWORD_IMPLEMENTS, KEYWORD_IMPORT, KEYWORD_INLINE, KEYWORD_INT, + KEYWORD_IF, KEYWORD_IMPLEMENTS, KEYWORD_IMPORT, KEYWORD_IN, KEYWORD_INLINE, KEYWORD_INT, KEYWORD_INOUT, KEYWORD_INPUT, KEYWORD_INTEGER, KEYWORD_INTERFACE, KEYWORD_INTERNAL, KEYWORD_LOCAL, KEYWORD_LONG, @@ -294,12 +294,38 @@ { FALSE, 'x', "externvar", "external variable declarations"}, }; +/* Used to index into the DKinds table. */ +typedef enum +{ + DK_UNDEFINED = -1, + DK_CLASS, DK_ENUMERATOR, DK_FUNCTION, + DK_ENUMERATION, DK_INTERFACE, DK_MEMBER, DK_NAMESPACE, DK_PROTOTYPE, + DK_STRUCT, DK_TYPEDEF, DK_UNION, DK_VARIABLE, + DK_EXTERN_VARIABLE +} dKind; + +static kindOption DKinds [] = { + { TRUE, 'c', "class", "classes"}, + { TRUE, 'e', "enumerator", "enumerators (values inside an enumeration)"}, + { TRUE, 'f', "function", "function definitions"}, + { TRUE, 'g', "enum", "enumeration names"}, + { TRUE, 'i', "interface", "interfaces"}, + { TRUE, 'm', "member", "class, struct, and union members"}, + { TRUE, 'n', "namespace", "namespaces"}, + { FALSE, 'p', "prototype", "function prototypes"}, + { TRUE, 's', "struct", "structure names"}, + { TRUE, 't', "typedef", "typedefs"}, + { TRUE, 'u', "union", "union names"}, + { TRUE, 'v', "variable", "variable definitions"}, + { FALSE, 'x', "externvar", "external variable declarations"}, +}; + /* Used to index into the JavaKinds table. */ typedef enum { JK_UNDEFINED = -1, JK_CLASS, JK_FIELD, JK_INTERFACE, JK_METHOD, - JK_PACKAGE, JK_ACCESS, JK_CLASS_PREFIX + JK_PACKAGE } javaKind; static kindOption JavaKinds [] = { @@ -365,13 +391,15 @@ /* keyword keyword ID | | | | | | | */ { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0, 0, 1 } }, { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0, 1, 1 } }, + { "alias", KEYWORD_TYPEDEF, { 0, 0, 0, 0, 0, 0, 1 } }, /* handle like typedef */ { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0, 0 } }, { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1, 0, 0 } }, { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1, 0, 0 } }, { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0, 0 } }, { "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1, 0, 0 } }, + { "body", KEYWORD_BODY, { 0, 0, 0, 0, 0, 0, 1 } }, { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0, 0, 0 } }, - { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0, 0, 0 } }, + { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0, 0, 1 } }, { "case", KEYWORD_CASE, { 1, 1, 1, 1, 0, 1, 1 } }, { "catch", KEYWORD_CATCH, { 0, 1, 1, 0, 0, 1, 1 } }, { "char", KEYWORD_CHAR, { 1, 1, 1, 1, 0, 1, 1 } }, @@ -391,19 +419,21 @@ { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1, 0, 0 } }, { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0, 0, 1 } }, { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1, 0, 0 } }, - { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1, 1 } }, - { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0, 0, 0 } }, - { "finally", KEYWORD_FINALLY, { 0, 0, 0, 0, 0, 1, 0 } }, + { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1, 0 } }, + { "extern", KEYWORD_NAMESPACE, { 0, 0, 0, 0, 0, 0, 1 } }, /* hack to ignore extern */ + { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0, 0, 1 } }, + { "finally", KEYWORD_FINALLY, { 0, 0, 0, 0, 0, 1, 1 } }, { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0, 1, 1 } }, { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0, 1, 1 } }, { "friend", KEYWORD_FRIEND, { 0, 1, 0, 0, 0, 0, 0 } }, - { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1, 0, 0 } }, + { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1, 0, 1 } }, { "get", KEYWORD_GET, { 0, 0, 0, 0, 0, 1, 0 } }, { "goto", KEYWORD_GOTO, { 1, 1, 1, 1, 0, 1, 1 } }, { "if", KEYWORD_IF, { 1, 1, 1, 1, 0, 1, 1 } }, { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 0, 1, 0, 0, 0 } }, { "import", KEYWORD_IMPORT, { 0, 0, 0, 1, 0, 0, 1 } }, { "inline", KEYWORD_INLINE, { 0, 1, 0, 0, 0, 1, 0 } }, + { "in", KEYWORD_IN, { 0, 0, 0, 0, 0, 0, 1 } }, { "inout", KEYWORD_INOUT, { 0, 0, 0, 0, 1, 0, 1 } }, { "input", KEYWORD_INPUT, { 0, 0, 0, 0, 1, 0, 0 } }, { "int", KEYWORD_INT, { 1, 1, 1, 1, 0, 1, 1 } }, @@ -418,12 +448,12 @@ { "m_trans", KEYWORD_M_TRANS, { 0, 0, 0, 0, 1, 0, 0 } }, { "mutable", KEYWORD_MUTABLE, { 0, 1, 0, 0, 0, 0, 0 } }, { "module", KEYWORD_MODULE, { 0, 0, 0, 0, 0, 0, 1 } }, - { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0, 1, 1 } }, + { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0, 1, 0 } }, { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0, 0, 0 } }, { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0, 1, 1 } }, { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1, 0, 0 } }, { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0, 0, 0 } }, - { "out", KEYWORD_OUT, { 0, 0, 0, 0, 0, 1, 0 } }, + { "out", KEYWORD_OUT, { 0, 0, 0, 0, 0, 1, 1 } }, { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1, 0, 0 } }, { "overload", KEYWORD_OVERLOAD, { 0, 1, 0, 0, 0, 0, 0 } }, { "override", KEYWORD_OVERRIDE, { 0, 0, 1, 0, 0, 1, 1 } }, @@ -434,7 +464,7 @@ { "program", KEYWORD_PROGRAM, { 0, 0, 0, 0, 1, 0, 0 } }, { "protected", KEYWORD_PROTECTED, { 0, 1, 1, 1, 1, 1, 1 } }, { "public", KEYWORD_PUBLIC, { 0, 1, 1, 1, 1, 1, 1 } }, - { "ref", KEYWORD_REF, { 0, 0, 0, 0, 0, 1, 0 } }, + { "ref", KEYWORD_REF, { 0, 0, 0, 0, 0, 1, 1 } }, { "register", KEYWORD_REGISTER, { 1, 1, 0, 0, 0, 0, 0 } }, { "return", KEYWORD_RETURN, { 1, 1, 1, 1, 0, 1, 1 } }, { "set", KEYWORD_SET, { 0, 0, 0, 0, 0, 1, 0 } }, @@ -466,6 +496,7 @@ { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 1, 0, 0, 0, 1 } }, { "ushort", KEYWORD_USHORT, { 0, 0, 1, 0, 0, 1, 1 } }, { "using", KEYWORD_USING, { 0, 1, 1, 0, 0, 1, 0 } }, + { "version", KEYWORD_NAMESPACE, { 0, 0, 0, 0, 0, 0, 1 } }, /* hack to ignore version */ { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1, 1, 0 } }, { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1, 1, 1 } }, { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0, 0, 1 } }, @@ -547,7 +578,15 @@ extern boolean includingDefineTags (void) { - return CKinds [CK_DEFINE].enabled; + if (isLanguage(Lang_c) || + isLanguage(Lang_cpp) || + isLanguage(Lang_csharp) || + isLanguage(Lang_ferite) || + isLanguage(Lang_glsl) || + isLanguage(Lang_vala)) + return CKinds [CK_DEFINE].enabled; + + return FALSE; } /* @@ -999,6 +1038,30 @@ return result; } +static dKind dTagKind (const tagType type) +{ + dKind result = DK_UNDEFINED; + switch (type) + { + case TAG_CLASS: result = DK_CLASS; break; + case TAG_ENUM: result = DK_ENUMERATION; break; + case TAG_ENUMERATOR: result = DK_ENUMERATOR; break; + case TAG_FUNCTION: result = DK_FUNCTION; break; + case TAG_INTERFACE: result = DK_INTERFACE; break; + case TAG_MEMBER: result = DK_MEMBER; break; + case TAG_NAMESPACE: result = DK_NAMESPACE; break; + case TAG_PROTOTYPE: result = DK_PROTOTYPE; break; + case TAG_STRUCT: result = DK_STRUCT; break; + case TAG_TYPEDEF: result = DK_TYPEDEF; break; + case TAG_UNION: result = DK_UNION; break; + case TAG_VARIABLE: result = DK_VARIABLE; break; + case TAG_EXTERN_VAR: result = DK_EXTERN_VARIABLE; break; + + default: Assert ("Bad D tag type" == NULL); break; + } + return result; +} + static valaKind valaTagKind (const tagType type) { valaKind result = VK_UNDEFINED; @@ -1044,6 +1107,8 @@ result = JavaKinds [javaTagKind (type)].name; else if (isLanguage (Lang_csharp)) result = CsharpKinds [csharpTagKind (type)].name; + else if (isLanguage (Lang_d)) + result = DKinds [dTagKind (type)].name; else if (isLanguage (Lang_vala)) result = ValaKinds [valaTagKind (type)].name; else @@ -1056,6 +1121,8 @@ int result; if (isLanguage (Lang_csharp)) result = CsharpKinds [csharpTagKind (type)].letter; + else if (isLanguage (Lang_d)) + result = DKinds [dTagKind (type)].letter; else if (isLanguage (Lang_java)) result = JavaKinds [javaTagKind (type)].letter; else if (isLanguage (Lang_vala)) @@ -1489,6 +1556,7 @@ else if (st->scope == SCOPE_GLOBAL || st->scope == SCOPE_STATIC) makeTag (nameToken, st, TRUE, TAG_MEMBER); } + else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)); else { if (st->scope == SCOPE_EXTERN || ! st->haveQualifyingName) @@ -2112,6 +2180,18 @@ if (isident1 (c)) { readIdentifier (token, c); + if (isLanguage(Lang_d)) + { /* parse D contracts */ + switch (token->keyword) + { + case KEYWORD_IN: + case KEYWORD_OUT: + case KEYWORD_BODY: + token->keyword = KEYWORD_CONST; + default: + break; + } + } switch (token->keyword) { case KEYWORD_ATTRIBUTE: skipParens (); break; @@ -2475,13 +2555,15 @@ else { cppUngetc (c); - if (((isLanguage (Lang_cpp) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) && + if ((((isLanguage (Lang_cpp) && + (st->declaration == DECL_CLASS || st->declaration == DECL_STRUCT)) || + isLanguage (Lang_csharp) || isLanguage (Lang_vala)) && inheritingDeclaration (st->declaration)) || isLanguage (Lang_d)) { readParents (st, ':'); } - else if (parentDecl (st) == DECL_STRUCT) + else if (parentDecl (st) == DECL_STRUCT || parentDecl (st) == DECL_CLASS) { c = skipToOneOf (",;"); if (c == ',') @@ -3052,8 +3134,8 @@ { static const char *const extensions [] = { "d", "di", NULL }; parserDefinition* def = parserNew ("D"); - def->kinds = CKinds; - def->kindCount = KIND_COUNT (CKinds); + def->kinds = DKinds; + def->kindCount = KIND_COUNT (DKinds); def->extensions = extensions; def->parser2 = findCTags; def->initialize = initializeDParser; diff -Nru geany-0.18/tagmanager/ctags.c geany-0.19/tagmanager/ctags.c --- geany-0.18/tagmanager/ctags.c 2008-10-06 19:37:10.000000000 +0100 +++ geany-0.19/tagmanager/ctags.c 2010-04-25 18:42:24.000000000 +0100 @@ -373,8 +373,8 @@ extern void eFree (void *const ptr) { - Assert (ptr != NULL); - free (ptr); + if (ptr != NULL) + free (ptr); } extern void toLowerString (char* str) @@ -1392,4 +1392,10 @@ } #endif +/* wrap g_warning so we don't include glib.h for all parsers, to keep compat with CTags */ +void utils_warn(const char *msg) +{ + g_warning("%s", msg); +} + /* vi:set tabstop=8 shiftwidth=4: */ diff -Nru geany-0.18/tagmanager/entry.c geany-0.19/tagmanager/entry.c --- geany-0.18/tagmanager/entry.c 2008-11-07 14:37:17.000000000 +0000 +++ geany-0.19/tagmanager/entry.c 2010-04-18 22:42:38.000000000 +0100 @@ -395,6 +395,12 @@ } } +extern void setTagArglistByName (const char *tag_name, const char *arglist) +{ + if (NULL != TagEntrySetArglistFunction) + TagEntrySetArglistFunction(tag_name, arglist); +} + extern void initTagEntry (tagEntryInfo *const e, const char *const name) { Assert (File.source.name != NULL); diff -Nru geany-0.18/tagmanager/entry.h geany-0.19/tagmanager/entry.h --- geany-0.18/tagmanager/entry.h 2008-11-07 14:37:17.000000000 +0000 +++ geany-0.19/tagmanager/entry.h 2010-04-18 22:42:38.000000000 +0100 @@ -95,6 +95,7 @@ extern void beginEtagsFile (void); extern void endEtagsFile (const char *const name); extern void makeTagEntry (const tagEntryInfo *const tag); +extern void setTagArglistByName (const char *tag_name, const char *arglist); extern void initTagEntry (tagEntryInfo *const e, const char *const name); #endif /* _ENTRY_H */ diff -Nru geany-0.18/tagmanager/general.h geany-0.19/tagmanager/general.h --- geany-0.18/tagmanager/general.h 2008-10-22 16:36:16.000000000 +0100 +++ geany-0.19/tagmanager/general.h 2009-11-12 12:39:36.000000000 +0000 @@ -205,8 +205,9 @@ /* fake debug statement macro */ #define DebugStatement(x) ; #define PrintStatus(x) ; -#define Assert(x) ; - +/* wrap g_warning so we don't include glib.h for all parsers, to keep compat with CTags */ +void utils_warn(const char *msg); +#define Assert(x) if (!(x)) utils_warn("Assert(" #x ") failed!") /* * DATA DECLARATIONS */ diff -Nru geany-0.18/tagmanager/include/gnuregex.h geany-0.19/tagmanager/include/gnuregex.h --- geany-0.18/tagmanager/include/gnuregex.h 2008-04-27 15:33:40.000000000 +0100 +++ geany-0.19/tagmanager/include/gnuregex.h 2009-09-06 17:49:38.000000000 +0100 @@ -42,7 +42,7 @@ #define RE_BACKSLASH_ESCAPE_IN_LISTS (1) /* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. + literals. If set, then \+ and \? are operators and + and ? are literals. */ #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) @@ -58,7 +58,7 @@ ^ is an anchor if it is at the beginning of a regular expression or after an open-group or an alternation operator; $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. + before a close-group or an alternation operator. This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because POSIX draft 11.2 says that * etc. in leading positions is undefined. @@ -69,7 +69,7 @@ /* If this bit is set, then special characters are always special regardless of where they are in the pattern. If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, + some contexts; otherwise they are ordinary. Specifically, * + ? and intervals are only special when not after the beginning, open-group, or alternation operator. */ #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) @@ -91,7 +91,7 @@ #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) /* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. + interval, depending on RE_NO_BK_BRACES. If not set, \{, \}, {, and } are literals. */ #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) @@ -116,7 +116,7 @@ If not set, then \ is a back-reference. */ #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) -/* If this bit is set, then | is an alternation operator, and \| is literal. +/* If this bit is set, then | is an alternation operator, and \| is literal. If not set, then \| is an alternation operator, and | is literal. */ #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) @@ -135,10 +135,10 @@ stored in the pattern buffer, so changing this does not affect already-compiled regexps. */ extern reg_syntax_t re_syntax_options; - + /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ + don't delete them!) */ /* [[[begin syntaxes]]] */ #define RE_SYNTAX_EMACS 0 @@ -198,14 +198,14 @@ | RE_NO_BK_PARENS | RE_NO_BK_REFS \ | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) /* [[[end syntaxes]]] */ - + /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ #ifdef RE_DUP_MAX #undef RE_DUP_MAX #endif -#define RE_DUP_MAX ((1 << 15) - 1) +#define RE_DUP_MAX ((1 << 15) - 1) /* POSIX `cflags' bits (i.e., information for `regcomp'). */ @@ -217,7 +217,7 @@ /* If this bit is set, then ignore case when matching. If not set, then case is significant. */ #define REG_ICASE (REG_EXTENDED << 1) - + /* If this bit is set, then anchors do not match at newline characters in the string. If not set, then anchors do match at newlines. */ @@ -256,7 +256,7 @@ REG_EESCAPE, /* Trailing backslash. */ REG_ESUBREG, /* Invalid back reference. */ REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ + REG_EPAREN, /* Parenthesis imbalance. */ REG_EBRACE, /* Unmatched \{. */ REG_BADBR, /* Invalid contents of \{\}. */ REG_ERANGE, /* Invalid range end. */ @@ -268,7 +268,7 @@ REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ } reg_errcode_t; - + /* This data structure represents a compiled pattern. Before calling the pattern compiler, the fields `buffer', `allocated', `fastmap', `translate', and `no_sub' can be set. After the pattern has been @@ -287,7 +287,7 @@ unsigned long allocated; /* Number of bytes actually used in `buffer'. */ - unsigned long used; + unsigned long used; /* Syntax setting with which the pattern was compiled. */ reg_syntax_t syntax; @@ -331,7 +331,7 @@ unsigned no_sub : 1; /* If set, a beginning-of-line anchor doesn't match at the - beginning of the string. */ + beginning of the string. */ unsigned not_bol : 1; /* Similarly for an end-of-line anchor. */ @@ -349,7 +349,7 @@ /* search.c (search_buffer) in Emacs needs this one opcode value. It is defined both in `regex.c' and here. */ #define RE_EXACTN_VALUE 1 - + /* Type for byte offsets within the string. POSIX mandates this. */ typedef int regoff_t; @@ -380,7 +380,7 @@ regoff_t rm_so; /* Byte offset from string's start to substring's start. */ regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ } regmatch_t; - + /* Declarations for routines. */ /* To avoid duplicating every routine declaration -- once with a @@ -443,7 +443,7 @@ /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern int re_match_2 +extern int re_match_2 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, int length1, const char *string2, int length2, int start, struct re_registers *regs, int stop)); @@ -480,7 +480,7 @@ extern void regfree _RE_ARGS ((regex_t *preg)); #endif /* not __REGEXP_LIBRARY_H__ */ - + /* Local variables: make-backup-files: t diff -Nru geany-0.18/tagmanager/include/Makefile.in geany-0.19/tagmanager/include/Makefile.in --- geany-0.18/tagmanager/include/Makefile.in 2009-08-16 18:29:21.000000000 +0100 +++ geany-0.19/tagmanager/include/Makefile.in 2010-06-12 13:14:29.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@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 @@ -36,12 +38,19 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(tagmanager_include_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -49,9 +58,23 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +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__installdirs = "$(DESTDIR)$(tagmanager_includedir)" -tagmanager_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(noinst_HEADERS) $(tagmanager_include_HEADERS) ETAGS = etags CTAGS = ctags @@ -59,6 +82,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -136,6 +160,8 @@ 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@ @@ -227,9 +253,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tagmanager/include/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tagmanager/include/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tagmanager/include/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tagmanager/include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -247,6 +273,7 @@ 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 @@ -256,20 +283,23 @@ install-tagmanager_includeHEADERS: $(tagmanager_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(tagmanager_includedir)" || $(MKDIR_P) "$(DESTDIR)$(tagmanager_includedir)" - @list='$(tagmanager_include_HEADERS)'; for p in $$list; do \ + @list='$(tagmanager_include_HEADERS)'; test -n "$(tagmanager_includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(tagmanager_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(tagmanager_includedir)/$$f'"; \ - $(tagmanager_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(tagmanager_includedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(tagmanager_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(tagmanager_includedir)" || exit $$?; \ done uninstall-tagmanager_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(tagmanager_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(tagmanager_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(tagmanager_includedir)/$$f"; \ - done + @list='$(tagmanager_include_HEADERS)'; test -n "$(tagmanager_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(tagmanager_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(tagmanager_includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -283,7 +313,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -291,29 +321,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -334,13 +369,17 @@ 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -371,6 +410,7 @@ 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" @@ -389,6 +429,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -397,18 +439,28 @@ 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 @@ -445,6 +497,7 @@ ps ps-am tags uninstall uninstall-am \ uninstall-tagmanager_includeHEADERS + # 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-0.18/tagmanager/include/tm_source_file.h geany-0.19/tagmanager/include/tm_source_file.h --- geany-0.18/tagmanager/include/tm_source_file.h 2009-06-10 21:36:21.000000000 +0100 +++ geany-0.19/tagmanager/include/tm_source_file.h 2010-04-18 22:42:38.000000000 +0100 @@ -144,6 +144,15 @@ */ const gchar *tm_source_file_get_lang_name(gint lang); +/* Gets the language index for \a name. + \param name The language name. + \return The language index, or -2. +*/ +gint tm_source_file_get_named_lang(const gchar *name); + +/* Set the argument list of tag identified by its name */ +void tm_source_file_set_tag_arglist(const char *tag_name, const char *arglist); + #ifdef __cplusplus } #endif diff -Nru geany-0.18/tagmanager/include/tm_tag.h geany-0.19/tagmanager/include/tm_tag.h --- geany-0.18/tagmanager/include/tm_tag.h 2009-01-14 16:08:00.000000000 +0000 +++ geany-0.19/tagmanager/include/tm_tag.h 2010-04-18 22:42:22.000000000 +0100 @@ -287,6 +287,7 @@ \param sorted_tags_array Tag array sorted on name \param name Name of the tag to locate. \param partial If TRUE, matches the first part of the name instead of doing exact match. + \param tagCount Return location of the matched tags. */ TMTag **tm_tags_find(const GPtrArray *sorted_tags_array, const char *name, gboolean partial, int * tagCount); diff -Nru geany-0.18/tagmanager/include/tm_tagmanager.h geany-0.19/tagmanager/include/tm_tagmanager.h --- geany-0.18/tagmanager/include/tm_tagmanager.h 2005-11-22 12:26:26.000000000 +0000 +++ geany-0.19/tagmanager/include/tm_tagmanager.h 2009-11-29 13:38:45.000000000 +0000 @@ -28,39 +28,7 @@ TagManager is free software, licenced under the GPL. You can only use it with free software (GPL compatible) projects. This is chiefly because it uses - code from ctags which is under GPL. I plan to replace the ctags part with a custom parser - in the future in which case it will be placed under LGPL. If you want to use it with - a commercial project, feel free to contribute a C/C++/Java parser. - \section Hacking - TagManager is tested to work on Linux. You need a basic GNOME 1.4 installation and - the auto tools (autoconf, automake, etc) if you want to configure it to your taste. - Anjuta 0.1.7 or above is recommended - if you want to hack on the sources. If you simply plan to use it, only GLib is required. - \section Installation - TagManager can be installed using the standard UNIX method, i.e.: - - -# tar zxvf TagManager-[Version].tar.gz - -# cd TagManager-[Version] - -# ./configure [configure options] - -# make - - Currently, 'make install' will not do anything since TagManager is meant to be - included statically in projects. This might change in the future. - \section Usage - I have tried to make the API as simple as possible. Memory allocation/deallocation - is mostly automatic, so you shouldn't have to directly malloc() or free() - anything. The API is pseudo-OO, similar is structure to the GTK+ API. This document - provides a good reference to the API. However, if you want to see real-world usage - of the API, then the utility programs are the best place to start. Currently, there - are three such programs in the 'tests' subdirectory, namely tm_tag_print.c, - tm_project_test.c and tm_global_tags.c. It might be a good idea if you go through the - code for these programs once before starting to use the tag manager library. - \section Limitations - Currently, only C, C++ and Java are supported. Adding other languages should be easy - but I did not require them so they are missing. Tag Manager is also MT-unsafe - this is - a deliberate design decision since making it MT-safe did not seem to be very useful - to me and it slows things down. Previous versions has rudimentary code to support MT - operations but they have been removed since version 0.5. + code from ctags which is under GPL. */ /*! \file diff -Nru geany-0.18/tagmanager/latex.c geany-0.19/tagmanager/latex.c --- geany-0.18/tagmanager/latex.c 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.19/tagmanager/latex.c 2009-11-22 23:51:59.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: latex.c 2287 2008-02-27 13:17:29Z eht16 $ + * $Id: latex.c 4437 2009-11-22 23:51:59Z eht16 $ * * Copyright (c) 2000-2001, Jérôme Plût * Copyright (c) 2006, Enrico Tröger @@ -80,8 +80,15 @@ l++; if (flags & (TEX_BRACES | TEX_LABEL)) { - if ((*(l++)) != '{') + if (*l == '[') + { + while (*l != ']') + l++; + l++; /* skip the closing square bracket */ + } + if (*l != '{') goto no_tag; + l++; } if (flags & TEX_BSLASH) { diff -Nru geany-0.18/tagmanager/Makefile.am geany-0.19/tagmanager/Makefile.am --- geany-0.18/tagmanager/Makefile.am 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/tagmanager/Makefile.am 2010-05-25 20:49:49.000000000 +0100 @@ -1,11 +1,10 @@ ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 4046 2009-07-30 11:29:53Z ntrel $ +# $Id: Makefile.am 4954 2010-05-25 19:49:49Z eht16 $ SUBDIRS = include INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -# -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ -# -DGDK_PIXBUF_DEPRECATED \ -# -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED + +AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\" # regex.c is the GNU regex implementation needed for Windows EXTRA_DIST = regex.c @@ -34,6 +33,7 @@ strlist.h\ args.c\ args.h\ + abc.c\ basic.c\ c.c\ conf.c\ @@ -61,9 +61,12 @@ python.c\ tcl.c\ sh.c\ + txt2tags.c\ vhdl.c\ + verilog.c\ actionscript.c\ nsis.c\ + r.c \ ctags.c\ entry.c\ get.c\ diff -Nru geany-0.18/tagmanager/Makefile.in geany-0.19/tagmanager/Makefile.in --- geany-0.18/tagmanager/Makefile.in 2009-08-16 18:29:21.000000000 +0100 +++ geany-0.19/tagmanager/Makefile.in 2010-06-12 13:14:29.000000000 +0100 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. @@ -14,12 +15,13 @@ @SET_MAKE@ -# $Id: Makefile.am 4046 2009-07-30 11:29:53Z ntrel $ +# $Id: Makefile.am 4954 2010-05-25 19:49:49Z eht16 $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@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 @@ -37,38 +39,46 @@ subdir = tagmanager DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_$(V)) +am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) +am__v_AR_0 = @echo " AR " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ libtagmanager_a_AR = $(AR) $(ARFLAGS) libtagmanager_a_LIBADD = am__libtagmanager_a_SOURCES_DIST = general.h keyword.h parsers.h \ sort.h vstring.h ctags.h entry.h get.h main.h nestlevel.h \ - read.h parse.h strlist.h args.c args.h basic.c c.c conf.c \ - css.c diff.c docbook.c fortran.c haskell.c haxe.c html.c js.c \ - lua.c make.c asm.c latex.c lregex.c matlab.c markdown.c \ - pascal.c perl.c rest.c ruby.c sql.c php.c python.c tcl.c sh.c \ - vhdl.c actionscript.c nsis.c ctags.c entry.c get.c keyword.c \ - nestlevel.c options.h options.c parse.c read.c sort.c \ - strlist.c vstring.c tm_workspace.c tm_work_object.c \ - tm_source_file.c tm_project.c tm_tag.c tm_symbol.c \ - tm_file_entry.c tm_tagmanager.c regex.c + read.h parse.h strlist.h args.c args.h abc.c basic.c c.c \ + conf.c css.c diff.c docbook.c fortran.c haskell.c haxe.c \ + html.c js.c lua.c make.c asm.c latex.c lregex.c matlab.c \ + markdown.c pascal.c perl.c rest.c ruby.c sql.c php.c python.c \ + tcl.c sh.c txt2tags.c vhdl.c verilog.c actionscript.c nsis.c \ + r.c ctags.c entry.c get.c keyword.c nestlevel.c options.h \ + options.c parse.c read.c sort.c strlist.c vstring.c \ + tm_workspace.c tm_work_object.c tm_source_file.c tm_project.c \ + tm_tag.c tm_symbol.c tm_file_entry.c tm_tagmanager.c regex.c @USE_INCLUDED_REGEX_TRUE@am__objects_1 = regex.$(OBJEXT) -am_libtagmanager_a_OBJECTS = args.$(OBJEXT) basic.$(OBJEXT) \ - c.$(OBJEXT) conf.$(OBJEXT) css.$(OBJEXT) diff.$(OBJEXT) \ - docbook.$(OBJEXT) fortran.$(OBJEXT) haskell.$(OBJEXT) \ - haxe.$(OBJEXT) html.$(OBJEXT) js.$(OBJEXT) lua.$(OBJEXT) \ - make.$(OBJEXT) asm.$(OBJEXT) latex.$(OBJEXT) lregex.$(OBJEXT) \ - matlab.$(OBJEXT) markdown.$(OBJEXT) pascal.$(OBJEXT) \ - perl.$(OBJEXT) rest.$(OBJEXT) ruby.$(OBJEXT) sql.$(OBJEXT) \ - php.$(OBJEXT) python.$(OBJEXT) tcl.$(OBJEXT) sh.$(OBJEXT) \ - vhdl.$(OBJEXT) actionscript.$(OBJEXT) nsis.$(OBJEXT) \ - ctags.$(OBJEXT) entry.$(OBJEXT) get.$(OBJEXT) \ +am_libtagmanager_a_OBJECTS = args.$(OBJEXT) abc.$(OBJEXT) \ + basic.$(OBJEXT) c.$(OBJEXT) conf.$(OBJEXT) css.$(OBJEXT) \ + diff.$(OBJEXT) docbook.$(OBJEXT) fortran.$(OBJEXT) \ + haskell.$(OBJEXT) haxe.$(OBJEXT) html.$(OBJEXT) js.$(OBJEXT) \ + lua.$(OBJEXT) make.$(OBJEXT) asm.$(OBJEXT) latex.$(OBJEXT) \ + lregex.$(OBJEXT) matlab.$(OBJEXT) markdown.$(OBJEXT) \ + pascal.$(OBJEXT) perl.$(OBJEXT) rest.$(OBJEXT) ruby.$(OBJEXT) \ + sql.$(OBJEXT) php.$(OBJEXT) python.$(OBJEXT) tcl.$(OBJEXT) \ + sh.$(OBJEXT) txt2tags.$(OBJEXT) vhdl.$(OBJEXT) \ + verilog.$(OBJEXT) actionscript.$(OBJEXT) nsis.$(OBJEXT) \ + r.$(OBJEXT) ctags.$(OBJEXT) entry.$(OBJEXT) get.$(OBJEXT) \ keyword.$(OBJEXT) nestlevel.$(OBJEXT) options.$(OBJEXT) \ parse.$(OBJEXT) read.$(OBJEXT) sort.$(OBJEXT) \ strlist.$(OBJEXT) vstring.$(OBJEXT) tm_workspace.$(OBJEXT) \ @@ -80,15 +90,29 @@ 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) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +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_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +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_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libtagmanager_a_SOURCES) DIST_SOURCES = $(am__libtagmanager_a_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -100,13 +124,42 @@ ps-recursive uninstall-recursive 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 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@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -184,6 +237,8 @@ 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@ @@ -251,9 +306,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = include INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -# -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ -# -DGDK_PIXBUF_DEPRECATED \ -# -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED +AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\" # regex.c is the GNU regex implementation needed for Windows EXTRA_DIST = regex.c @@ -276,6 +329,7 @@ strlist.h\ args.c\ args.h\ + abc.c\ basic.c\ c.c\ conf.c\ @@ -303,9 +357,12 @@ python.c\ tcl.c\ sh.c\ + txt2tags.c\ vhdl.c\ + verilog.c\ actionscript.c\ nsis.c\ + r.c \ ctags.c\ entry.c\ get.c\ @@ -341,9 +398,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tagmanager/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tagmanager/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tagmanager/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu tagmanager/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -361,13 +418,14 @@ 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): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) libtagmanager.a: $(libtagmanager_a_OBJECTS) $(libtagmanager_a_DEPENDENCIES) - -rm -f libtagmanager.a - $(libtagmanager_a_AR) libtagmanager.a $(libtagmanager_a_OBJECTS) $(libtagmanager_a_LIBADD) - $(RANLIB) libtagmanager.a + $(AM_V_at)-rm -f libtagmanager.a + $(AM_V_AR)$(libtagmanager_a_AR) libtagmanager.a $(libtagmanager_a_OBJECTS) $(libtagmanager_a_LIBADD) + $(AM_V_at)$(RANLIB) libtagmanager.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -375,6 +433,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actionscript.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/args.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asm.Po@am__quote@ @@ -407,6 +466,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/php.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/python.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/r.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rest.Po@am__quote@ @@ -424,26 +484,31 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tm_tagmanager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tm_work_object.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tm_workspace.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2tags.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verilog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vhdl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vstring.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@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 +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -461,7 +526,7 @@ # (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): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -478,7 +543,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -486,7 +551,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -512,16 +577,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -536,7 +601,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -548,7 +613,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -557,29 +622,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -600,29 +670,44 @@ 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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + 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="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -652,6 +737,7 @@ 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" @@ -673,6 +759,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -681,18 +769,28 @@ 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 @@ -715,8 +813,8 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -733,6 +831,7 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am + # 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-0.18/tagmanager/makefile.win32 geany-0.19/tagmanager/makefile.win32 --- geany-0.18/tagmanager/makefile.win32 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/tagmanager/makefile.win32 2010-02-21 14:54:53.000000000 +0000 @@ -39,13 +39,13 @@ clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.o \ +$(COMPLIB): abc.o args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ actionscript.o nsis.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ -parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o css.o \ +parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o txt2tags.o css.o \ vstring.o regex.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ -tm_symbol.o tm_file_entry.o tm_tagmanager.o +tm_symbol.o tm_file_entry.o tm_tagmanager.o r.o $(AR) rc $@ $^ $(RANLIB) $@ diff -Nru geany-0.18/tagmanager/nestlevel.c geany-0.19/tagmanager/nestlevel.c --- geany-0.18/tagmanager/nestlevel.c 2009-05-12 16:55:13.000000000 +0100 +++ geany-0.19/tagmanager/nestlevel.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* -* $Id: nestlevel.c 3788 2009-05-12 15:55:13Z ntrel $ +* $Id: nestlevel.c 4518 2010-01-01 22:55:18Z eht16 $ * * Copyright (c) 1999-2002, Darren Hiebert -* Copyright 2009 Nick Treleaven +* Copyright 2009-2010 Nick Treleaven * * This source code is released for free distribution under the terms of the * GNU General Public License. diff -Nru geany-0.18/tagmanager/nestlevel.h geany-0.19/tagmanager/nestlevel.h --- geany-0.18/tagmanager/nestlevel.h 2009-05-12 16:55:13.000000000 +0100 +++ geany-0.19/tagmanager/nestlevel.h 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* -* $Id: nestlevel.h 3788 2009-05-12 15:55:13Z ntrel $ +* $Id: nestlevel.h 4518 2010-01-01 22:55:18Z eht16 $ * * Copyright (c) 1999-2002, Darren Hiebert -* Copyright 2009 Nick Treleaven +* Copyright 2009-2010 Nick Treleaven * * This source code is released for free distribution under the terms of the * GNU General Public License. diff -Nru geany-0.18/tagmanager/nsis.c geany-0.19/tagmanager/nsis.c --- geany-0.18/tagmanager/nsis.c 2009-04-21 21:52:19.000000000 +0100 +++ geany-0.19/tagmanager/nsis.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,8 +1,8 @@ /* -* $Id: nsis.c 3716 2009-04-21 20:52:19Z eht16 $ +* $Id: nsis.c 4518 2010-01-01 22:55:18Z eht16 $ * * Copyright (c) 2000-2002, Darren Hiebert -* Copyright (c) 2009, Enrico Tröger +* Copyright (c) 2009-2010, Enrico Tröger * * This source code is released for free distribution under the terms of the * GNU General Public License. diff -Nru geany-0.18/tagmanager/parse.c geany-0.19/tagmanager/parse.c --- geany-0.18/tagmanager/parse.c 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.19/tagmanager/parse.c 2010-04-18 22:42:38.000000000 +0100 @@ -32,6 +32,7 @@ parserDefinition** LanguageTable = NULL; static unsigned int LanguageCount = 0; tagEntryFunction TagEntryFunction = NULL; +tagEntrySetArglistFunction TagEntrySetArglistFunction = NULL; /* * FUNCTION DEFINITIONS diff -Nru geany-0.18/tagmanager/parse.h geany-0.19/tagmanager/parse.h --- geany-0.18/tagmanager/parse.h 2008-02-28 16:06:04.000000000 +0000 +++ geany-0.19/tagmanager/parse.h 2010-04-18 22:42:38.000000000 +0100 @@ -37,6 +37,7 @@ typedef boolean (*rescanParser) (const unsigned int passCount); typedef void (*parserInitialize) (langType language); typedef int (*tagEntryFunction) (const tagEntryInfo *const tag); +typedef void (*tagEntrySetArglistFunction) (const char *tag_name, const char *arglist); typedef struct sKindOption { boolean enabled; /* are tags for kind enabled? */ @@ -128,6 +129,7 @@ /* Extra stuff for Tag Manager */ extern tagEntryFunction TagEntryFunction; +extern tagEntrySetArglistFunction TagEntrySetArglistFunction; extern void setTagEntryFunction(tagEntryFunction entry_function); #endif /* _PARSE_H */ diff -Nru geany-0.18/tagmanager/parsers.h geany-0.19/tagmanager/parsers.h --- geany-0.18/tagmanager/parsers.h 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/tagmanager/parsers.h 2010-02-21 14:54:53.000000000 +0000 @@ -51,7 +51,11 @@ ValaParser, \ ActionScriptParser, \ NsisParser, \ - MarkdownParser + MarkdownParser, \ + Txt2tagsParser, \ + AbcParser, \ + VerilogParser, \ + RParser /* langType of each parser 0 CParser @@ -91,6 +95,10 @@ 34 ActionScriptParser 35 NsisParser 36 MarkdownParser +37 Txt2tagsParser +38 AbcParser +39 Verilog +40 RParser */ #endif /* _PARSERS_H */ diff -Nru geany-0.18/tagmanager/pascal.c geany-0.19/tagmanager/pascal.c --- geany-0.18/tagmanager/pascal.c 2009-06-12 13:21:29.000000000 +0100 +++ geany-0.19/tagmanager/pascal.c 2010-04-19 21:42:23.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: pascal.c 3860 2009-06-12 12:21:29Z ntrel $ +* $Id: pascal.c 4838 2010-04-19 20:42:23Z eht16 $ * * Copyright (c) 2001-2002, Darren Hiebert * @@ -285,8 +285,9 @@ for (cp = dbp ; *cp != '\0' && !endtoken (*cp) ; cp++) continue; vStringNCopyS (name, (const char*) dbp, cp - dbp); - eFree(arglist); - if (kind == K_FUNCTION) + if (arglist != NULL) + eFree(arglist); + if (kind == K_FUNCTION && vartype != NULL) eFree(vartype); parseArglist((const char*) cp, &arglist, (kind == K_FUNCTION) ? &vartype : NULL); createPascalTag (&tag, name, kind, arglist, (kind == K_FUNCTION) ? vartype : NULL); @@ -337,8 +338,10 @@ } } /* while not eof */ } - eFree(arglist); - eFree(vartype); + if (arglist != NULL) + eFree(arglist); + if (vartype != NULL) + eFree(vartype); vStringDelete(name); } diff -Nru geany-0.18/tagmanager/perl.c geany-0.19/tagmanager/perl.c --- geany-0.18/tagmanager/perl.c 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.19/tagmanager/perl.c 2009-11-10 19:05:51.000000000 +0000 @@ -1,6 +1,7 @@ /* +* $Id: perl.c 4420 2009-11-10 19:05:51Z ntrel $ * -* Copyright (c) 2000-2001, Darren Hiebert +* Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -12,55 +13,155 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include +#include "entry.h" +#include "options.h" #include "read.h" +#include "main.h" #include "vstring.h" +#define TRACE_PERL_C 0 +#define TRACE if (TRACE_PERL_C) printf("perl.c:%d: ", __LINE__), printf + /* * DATA DEFINITIONS */ typedef enum { - K_SUBROUTINE, - K_PACKAGE, - K_LOCAL, - K_MY, - K_OUR + K_NONE = -1, + K_CONSTANT, + K_FORMAT, + K_LABEL, + K_PACKAGE, + K_SUBROUTINE, + K_SUBROUTINE_DECLARATION } perlKind; static kindOption PerlKinds [] = { - { TRUE, 'f', "function", "functions" }, - { TRUE, 'c', "class", "packages" }, - { TRUE, 'l', "macro", "local variables" }, - { TRUE, 'm', "member", "my variables" }, - { TRUE, 'v', "variable", "our variables" } + { TRUE, 'e', "enum", "constants" }, + { TRUE, 'o', "other", "formats" }, + { TRUE, 'm', "macro", "labels" }, + { TRUE, 'p', "package", "packages" }, + { TRUE, 'f', "function", "subroutines" }, + { FALSE, 'p', "prototype", "subroutine declarations" }, }; /* * FUNCTION DEFINITIONS */ -static const unsigned char *createTagString(const unsigned char *str, int type) +static boolean isIdentifier1 (int c) { - vString *n = vStringNew(); - while (! isspace ((int) *str) && *str != '\0' && *str != '=' && *str != ';' && - *str != ',' && *str != ')' && *str != '$') - { - vStringPut (n, (int) *str); - str++; - } - - vStringTerminate (n); - if (vStringLength (n) > 0) - makeSimpleTag (n, PerlKinds, type); - vStringDelete (n); - -/* if ((*(const char*)str) == ')') - return str-1; - else -*/ return str; + return (boolean) (isalpha (c) || c == '_'); +} + +static boolean isIdentifier (int c) +{ + return (boolean) (isalnum (c) || c == '_'); +} + +static boolean isPodWord (const char *word) +{ + boolean result = FALSE; + if (isalpha (*word)) + { + const char *const pods [] = { + "head1", "head2", "head3", "head4", "over", "item", "back", + "pod", "begin", "end", "for" + }; + const size_t count = sizeof (pods) / sizeof (pods [0]); + const char *white = strpbrk (word, " \t"); + const size_t len = (white!=NULL) ? (size_t)(white-word) : strlen (word); + char *const id = (char*) eMalloc (len + 1); + size_t i; + strncpy (id, word, len); + id [len] = '\0'; + for (i = 0 ; i < count && ! result ; ++i) + { + if (strcmp (id, pods [i]) == 0) + result = TRUE; + } + eFree (id); + } + return result; +} + +/* + * Perl subroutine declaration may look like one of the following: + * + * sub abc; + * sub abc :attr; + * sub abc (proto); + * sub abc (proto) :attr; + * + * Note that there may be more than one attribute. Attributes may + * have things in parentheses (they look like arguments). Anything + * inside of those parentheses goes. Prototypes may contain semi-colons. + * The matching end when we encounter (outside of any parentheses) either + * a semi-colon (that'd be a declaration) or an left curly brace + * (definition). + * + * This is pretty complicated parsing (plus we all know that only perl can + * parse Perl), so we are only promising best effort here. + * + * If we can't determine what this is (due to a file ending, for example), + * we will return FALSE. + */ +static boolean isSubroutineDeclaration (const unsigned char *cp) +{ + boolean attr = FALSE; + int nparens = 0; + + do { + for ( ; *cp; ++cp) { +SUB_DECL_SWITCH: + switch (*cp) { + case ':': + if (nparens) + break; + else if (TRUE == attr) + return FALSE; /* Invalid attribute name */ + else + attr = TRUE; + break; + case '(': + ++nparens; + break; + case ')': + --nparens; + break; + case ' ': + case '\t': + break; + case ';': + if (!nparens) + return TRUE; + case '{': + if (!nparens) + return FALSE; + default: + if (attr) { + if (isIdentifier1(*cp)) { + cp++; + while (isIdentifier (*cp)) + cp++; + attr = FALSE; + goto SUB_DECL_SWITCH; /* Instead of --cp; */ + } else { + return FALSE; + } + } else if (nparens) { + break; + } else { + return FALSE; + } + } + } + } while (NULL != (cp = fileReadLine ())); + + return FALSE; } /* Algorithm adapted from from GNU etags. @@ -69,163 +170,213 @@ */ static void findPerlTags (void) { - vString *name = vStringNew (); - boolean skipPodDoc = FALSE; - const unsigned char *line; - perlKind kind; - - while ((line = fileReadLine ()) != NULL) - { - const unsigned char *cp = line; + vString *name = vStringNew (); + vString *package = NULL; + boolean skipPodDoc = FALSE; + const unsigned char *line; - if (skipPodDoc) - { - if (strcmp ((const char*) line, "=cut") == 0) - skipPodDoc = FALSE; - continue; - } - else if (line [0] == '=') + while ((line = fileReadLine ()) != NULL) { - skipPodDoc = (boolean) (strncmp ( - (const char*) line + 1, "cut", (size_t) 3) != 0); - continue; - } - else if (strcmp ((const char*) line, "__DATA__") == 0) - break; - else if (strcmp ((const char*) line, "__END__") == 0) - break; - else if (line [0] == '#') - continue; + boolean spaceRequired = FALSE; + boolean qualified = FALSE; + const unsigned char *cp = line; + perlKind kind = K_NONE; + tagEntryInfo e; - while (isspace (*cp)) - cp++; - - if (strncmp((const char*) cp, "my", (size_t) 2) == 0) - { - cp += 2; - while (isspace (*cp)) cp++; + if (skipPodDoc) + { + if (strncmp ((const char*) line, "=cut", (size_t) 4) == 0) + skipPodDoc = FALSE; + continue; + } + else if (line [0] == '=') + { + skipPodDoc = isPodWord ((const char*)line + 1); + continue; + } + else if (strcmp ((const char*) line, "__DATA__") == 0) + break; + else if (strcmp ((const char*) line, "__END__") == 0) + break; + else if (line [0] == '#') + continue; - /* parse something like my($bla) */ - if (*(const char*) cp == '(') - { + while (isspace (*cp)) cp++; - while (*(const char*) cp != ')') + + if (strncmp((const char*) cp, "sub", (size_t) 3) == 0) + { + TRACE("this looks like a sub\n"); + cp += 3; + kind = K_SUBROUTINE; + spaceRequired = TRUE; + qualified = TRUE; + } + else if (strncmp((const char*) cp, "use", (size_t) 3) == 0) + { + cp += 3; + if (!isspace(*cp)) + continue; + while (*cp && isspace (*cp)) + ++cp; + if (strncmp((const char*) cp, "constant", (size_t) 8) != 0) + continue; + cp += 8; + kind = K_CONSTANT; + spaceRequired = TRUE; + qualified = TRUE; + } + else if (strncmp((const char*) cp, "package", (size_t) 7) == 0) + { + /* This will point to space after 'package' so that a tag + can be made */ + const unsigned char *space = cp += 7; + + if (package == NULL) + package = vStringNew (); + else + vStringClear (package); + while (isspace (*cp)) + cp++; + while ((int) *cp != ';' && !isspace ((int) *cp)) { - while (isspace (*(const char*) cp)) cp++; - if (*(const char*) cp == ',') cp++; /* to skip ',' */ - while (isspace (*(const char*) cp)) cp++; - cp++; /* to skip $ sign */ - cp = createTagString(cp, K_MY); - while (isspace (*(const char*) cp)) cp++; + vStringPut (package, (int) *cp); + cp++; } - } - /* parse my $bla */ - else - { - cp++; /* to skip the $ sign */ - - if (! isalpha (*(const char*) cp)) continue; + vStringCatS (package, "::"); - createTagString (cp, K_MY); + cp = space; /* Rewind */ + kind = K_PACKAGE; + spaceRequired = TRUE; + qualified = TRUE; } - } - else if (strncmp((const char*) cp, "our", (size_t) 3) == 0) - { - cp += 3; - while (isspace (*cp)) cp++; - - /* parse something like my($bla) */ - if (*(const char*) cp == '(') - { - cp++; - while (*(const char*) cp != ')') + else if (strncmp((const char*) cp, "format", (size_t) 6) == 0) + { + cp += 6; + kind = K_FORMAT; + spaceRequired = TRUE; + qualified = TRUE; + } + else + { + if (isIdentifier1 (*cp)) { - while (isspace (*(const char*) cp)) cp++; - if (*(const char*) cp == ',') cp++; /* to skip ',' */ - while (isspace (*(const char*) cp)) cp++; - cp++; /* to skip $ sign */ - cp = createTagString(cp, K_OUR); - while (isspace (*(const char*) cp)) cp++; + const unsigned char *p = cp; + while (isIdentifier (*p)) + ++p; + while (isspace (*p)) + ++p; + if ((int) *p == ':' && (int) *(p + 1) != ':') + kind = K_LABEL; } - } - /* parse my $bla */ - else + } + if (kind != K_NONE) { - cp++; /* to skip the $ sign */ - - if (! isalpha (*(const char*) cp)) continue; + TRACE("cp0: %s\n", (const char *) cp); + if (spaceRequired && *cp && !isspace (*cp)) + continue; + + TRACE("cp1: %s\n", (const char *) cp); + while (isspace (*cp)) + cp++; + + while (!*cp || '#' == *cp) { /* Gobble up empty lines + and comments */ + cp = fileReadLine (); + if (!cp) + goto END_MAIN_WHILE; + while (isspace (*cp)) + cp++; + } - createTagString (cp, K_OUR); - } - } - else if (strncmp((const char*) cp, "local", (size_t) 5) == 0) - { - cp += 5; - while (isspace (*cp)) cp++; + while (isIdentifier (*cp) || (K_PACKAGE == kind && ':' == *cp)) + { + vStringPut (name, (int) *cp); + cp++; + } - /* parse something like my($bla) */ - if (*(const char*) cp == '(') - { - cp++; - while (*(const char*) cp != ')') + if (K_FORMAT == kind && + vStringLength (name) == 0 && /* cp did not advance */ + '=' == *cp) { - while (isspace (*(const char*) cp)) cp++; - if (*(const char*) cp == ',') cp++; /* to skip ',' */ - while (isspace (*(const char*) cp)) cp++; - cp++; /* to skip $ sign */ - cp = createTagString(cp, K_LOCAL); - while (isspace (*(const char*) cp)) cp++; + /* format's name is optional. If it's omitted, 'STDOUT' + is assumed. */ + vStringCatS (name, "STDOUT"); } - } - /* parse my $bla */ - else - { - cp++; /* to skip the $ sign */ - if (! isalpha (*(const char*) cp)) continue; + vStringTerminate (name); + TRACE("name: %s\n", name->buffer); - createTagString (cp, K_LOCAL); + if (0 == vStringLength(name)) { + vStringClear(name); + continue; + } + + if (K_SUBROUTINE == kind) + { + /* + * isSubroutineDeclaration() may consume several lines. So + * we record line positions. + */ + initTagEntry(&e, vStringValue(name)); + + if (TRUE == isSubroutineDeclaration(cp)) { + if (TRUE == PerlKinds[K_SUBROUTINE_DECLARATION].enabled) { + kind = K_SUBROUTINE_DECLARATION; + } else { + vStringClear (name); + continue; + } + } + + e.kind = PerlKinds[kind].letter; + e.kindName = PerlKinds[kind].name; + + makeTagEntry(&e); + + if (Option.include.qualifiedTags && qualified && + package != NULL && vStringLength (package) > 0) + { + vString *const qualifiedName = vStringNew (); + vStringCopy (qualifiedName, package); + vStringCat (qualifiedName, name); + e.name = vStringValue(qualifiedName); + makeTagEntry(&e); + vStringDelete (qualifiedName); + } + } else if (vStringLength (name) > 0) + { + makeSimpleTag (name, PerlKinds, kind); + if (Option.include.qualifiedTags && qualified && + K_PACKAGE != kind && + package != NULL && vStringLength (package) > 0) + { + vString *const qualifiedName = vStringNew (); + vStringCopy (qualifiedName, package); + vStringCat (qualifiedName, name); + makeSimpleTag (qualifiedName, PerlKinds, kind); + vStringDelete (qualifiedName); + } + } + vStringClear (name); } } - else if (strncmp((const char*) cp, "sub", (size_t) 3) == 0 || - strncmp((const char*) cp, "package", (size_t) 7) == 0) - { - if (strncmp((const char*) cp, "sub", (size_t) 3) == 0) - { - cp += 3; - kind = K_SUBROUTINE; - } else { - cp += 7; - kind = K_PACKAGE; - } - if (!isspace(*cp)) /* woops, not followed by a space */ - continue; - - while (isspace (*cp)) - cp++; - while (! isspace ((int) *cp) && *cp != '\0' && *cp != '{' && *cp != '(' && *cp != ';') - { - vStringPut (name, (int) *cp); - cp++; - } - vStringTerminate (name); - if (vStringLength (name) > 0) - makeSimpleTag (name, PerlKinds, kind); - vStringClear (name); - } - } - vStringDelete (name); + +END_MAIN_WHILE: + vStringDelete (name); + if (package != NULL) + vStringDelete (package); } extern parserDefinition* PerlParser (void) { - static const char *const extensions [] = { "pl", "pm", "perl", NULL }; - parserDefinition* def = parserNew ("Perl"); - def->kinds = PerlKinds; - def->kindCount = KIND_COUNT (PerlKinds); - def->extensions = extensions; - def->parser = findPerlTags; - return def; + static const char *const extensions [] = { "pl", "pm", "plx", "perl", NULL }; + parserDefinition* def = parserNew ("Perl"); + def->kinds = PerlKinds; + def->kindCount = KIND_COUNT (PerlKinds); + def->extensions = extensions; + def->parser = findPerlTags; + return def; } -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ diff -Nru geany-0.18/tagmanager/php.c geany-0.19/tagmanager/php.c --- geany-0.18/tagmanager/php.c 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.19/tagmanager/php.c 2010-04-17 17:12:32.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: php.c 2287 2008-02-27 13:17:29Z eht16 $ +* $Id: php.c 4830 2010-04-17 16:12:32Z eht16 $ * * Copyright (c) 2000, Jesus Castagnetto * @@ -19,7 +19,7 @@ #include "general.h" /* must always come first */ #include - +#include "main.h" #include "parse.h" #include "read.h" #include "vstring.h" @@ -67,20 +67,24 @@ #define ALPHA "[:alpha:]" #define ALNUM "[:alnum:]" +static void function_cb(const char *line, const regexMatch *matches, unsigned int count); static void installPHPRegex (const langType language) { - addTagRegex(language, "(^|[ \t])class[ \t]+([" ALPHA "_][" ALNUM "_]*)", - "\\2", "c,class,classes", NULL); - addTagRegex(language, "(^|[ \t])interface[ \t]+([" ALPHA "_][" ALNUM "_]*)", - "\\2", "i,interface,interfaces", NULL); - addTagRegex(language, "(^|[ \t])define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)", - "\\2", "d,macro,constant definitions", NULL); - addTagRegex(language, "(^|[ \t])function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)", - "\\2", "f,function,functions", NULL); - addTagRegex(language, "(^|[ \t])(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=", - "\\3", "v,variable,variables", NULL); - addTagRegex(language, "(^|[ \t])(var|public|protected|private|static)[ \t]+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", + addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)", + "\\3", "c,class,classes", NULL); + addTagRegex(language, "^[ \t]*interface[ \t]+([" ALPHA "_][" ALNUM "_]*)", + "\\1", "i,interface,interfaces", NULL); + addTagRegex(language, "^[ \t]*define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)", + "\\1", "m,macro,macros", NULL); + addTagRegex(language, "^[ \t]*const[ \t]*([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", + "\\1", "m,macro,macros", NULL); + addCallbackRegex(language, + "^[ \t]*[(public|protected|private|static)[ \t]*]*[ \t]*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\\(.*\\))", + NULL, function_cb); + addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=", + "\\2", "v,variable,variables", NULL); + addTagRegex(language, "^[ \t]*((var|public|protected|private|static)[ \t]+)+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", "\\3", "v,variable,variables", NULL); /* function regex is covered by PHP regex */ @@ -92,6 +96,39 @@ "\\3", "j,jsfunction,javascript functions", NULL); } + +static void function_cb(const char *line, const regexMatch *matches, unsigned int count) +{ + char *name, *arglist; + char kind = 'f'; + static char *kindName = "function"; + tagEntryInfo e; + const regexMatch *match_funcname = NULL; + const regexMatch *match_arglist = NULL; + + if (count > 2) + { + match_funcname = &matches[count - 2]; + match_arglist = &matches[count - 1]; + } + + if (match_funcname != NULL) + { + name = xMalloc(match_funcname->length + 1, char); + strncpy(name, line + match_funcname->start, match_funcname->length); + *(name+match_funcname->length) = '\x0'; + arglist = xMalloc(match_arglist->length + 1, char); + strncpy(arglist, line + match_arglist->start, match_arglist->length); + *(arglist+match_arglist->length) = '\x0'; + + initTagEntry (&e, name); + e.kind = kind; + e.kindName = kindName; + e.extensionFields.arglist = arglist; + makeTagEntry (&e); + } +} + /* Create parser definition structure */ extern parserDefinition* PhpParser (void) { diff -Nru geany-0.18/tagmanager/python.c geany-0.19/tagmanager/python.c --- geany-0.18/tagmanager/python.c 2009-06-01 16:41:24.000000000 +0100 +++ geany-0.19/tagmanager/python.c 2010-04-18 22:42:58.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: python.c 3831 2009-06-01 15:41:24Z ntrel $ +* $Id: python.c 4835 2010-04-18 21:42:58Z eht16 $ * * Copyright (c) 2000-2003, Darren Hiebert * @@ -57,6 +57,30 @@ return (boolean) (isalnum (c) || c == '_'); } +static const char *get_class_name_from_parent (const char *parent) +{ + const char *result; + + if (parent == NULL) + return NULL; + + result = strrchr (parent, '.'); + if (result != NULL) + { + result++; + parent = result; + } + + result = strrchr (parent, '/'); + if (result != NULL) + result++; + else + result = parent; + + return result; +} + + /* Given a string with the contents of a line directly after the "def" keyword, * extract all relevant information and create a tag. */ @@ -69,6 +93,13 @@ tag.kindName = "function"; tag.kind = 'f'; tag.extensionFields.arglist = arglist; + /* add argument list of __init__() methods to the class tag */ + if (strcmp (vStringValue (function), "__init__") == 0 && parent != NULL) + { + const char *parent_tag_name = get_class_name_from_parent (vStringValue (parent)); + if (parent_tag_name != NULL) + setTagArglistByName (parent_tag_name, arglist); + } if (vStringLength (parent) > 0) { @@ -166,7 +197,7 @@ { for (; *cp; cp++) { - if (*cp == '"' || *cp == '\'') + if (*cp == '"' || *cp == '\'' || *cp == '#') { cp = skipString(cp); if (!*cp) break; @@ -324,7 +355,8 @@ cp = parseIdentifier (cp, def); arglist = parseArglist (cp); makeFunctionTag (def, parent, is_class_parent, arglist); - eFree (arglist); + if (arglist != NULL) + eFree (arglist); } /* Get the combined name of a nested symbol. Classes are separated with ".", @@ -534,6 +566,49 @@ return NULL; } +/* checks if there is a lambda at position of cp, and return its argument list + * if so. + * We don't return the lambda name since it is useless for now since we already + * know it when we call this function, and it would be a little slower. */ +static boolean varIsLambda (const char *cp, char **arglist) +{ + boolean is_lambda = FALSE; + + cp = skipSpace (cp); + cp = skipIdentifier (cp); /* skip the lambda's name */ + cp = skipSpace (cp); + if (*cp == '=') + { + cp++; + cp = skipSpace (cp); + if (strncmp (cp, "lambda", 6) == 0) + { + const char *tmp; + + cp += 6; /* skip the lambda */ + tmp = skipSpace (cp); + /* check if there is a space after lambda to detect assignations + * starting with 'lambdaXXX' */ + if (tmp != cp) + { + vString *args = vStringNew (); + + cp = tmp; + vStringPut (args, '('); + for (; *cp != 0 && *cp != ':'; cp++) + vStringPut (args, *cp); + vStringPut (args, ')'); + vStringTerminate (args); + if (arglist) + *arglist = strdup (vStringValue (args)); + vStringDelete (args); + is_lambda = TRUE; + } + } + } + return is_lambda; +} + static void findPythonTags (void) { vString *const continuation = vStringNew (); @@ -656,6 +731,7 @@ if (variable) { const char *start = variable; + char *arglist; boolean parent_is_class; vStringClear (name); @@ -667,11 +743,22 @@ vStringTerminate (name); parent_is_class = constructParentString(nesting_levels, indent, parent); - /* skip variables in methods */ - if (! parent_is_class && vStringLength(parent) > 0) - continue; + if (varIsLambda (variable, &arglist)) + { + /* show class members or top-level script lambdas only */ + if (parent_is_class || vStringLength(parent) == 0) + makeFunctionTag (name, parent, parent_is_class, arglist); + if (arglist != NULL) + eFree (arglist); + } + else + { + /* skip variables in methods */ + if (! parent_is_class && vStringLength(parent) > 0) + continue; - makeVariableTag (name, parent); + makeVariableTag (name, parent); + } } /* Find and parse imports */ parseImports(line); diff -Nru geany-0.18/tagmanager/r.c geany-0.19/tagmanager/r.c --- geany-0.18/tagmanager/r.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/tagmanager/r.c 2010-02-21 14:54:53.000000000 +0000 @@ -0,0 +1,197 @@ +/* +* $Id: r.c 4685 2010-02-21 14:54:53Z eht16 $ +* +* Copyright (c) 2003-2004, Ascher Stefan +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for R language files. +* R is a programming language for statistical computing. +* R is GPL Software, get it from http://www.r-project.org/ +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include +#include /* to define isalpha(), isalnum(), isspace() */ + +#include "entry.h" +#include "read.h" +#include "vstring.h" + +/*#define R_REGEX*/ + +#define SKIPSPACE(ch) while (isspace((int)*ch)) \ + ch++ + +#ifndef R_REGEX +static kindOption RKinds [] = { + { TRUE, 'f', "function", "functions" }, + { TRUE, 's', "other", "libraries" } +}; +#endif + +#ifdef R_REGEX +static void installRRegex (const langType language) +{ + /* This is a function, looks as follows: + * itent <- function(arg1, arg2) { + * do_something; + * } + */ + addTagRegex (language, + "^[ \t]*([.a-zA-Z0-9_]+)([ \t]*)<-([ \t]*)function", "\\1", "f,function", NULL); + /* This loads someting, e.g. a library, simply: library(libname) */ + addTagRegex (language, + "^[ \t]*(library|source|load|data)[\\(]([a-zA-Z0-9_]+)[\\)]", "\\2", "s,other", NULL); +} +#else +static void makeRTag(const vString* const name, int kind) +{ + tagEntryInfo e; + initTagEntry(&e, vStringValue(name)); + + e.kindName = RKinds[kind].name; + e.kind = RKinds[kind].letter; + + makeTagEntry(&e); +} + +extern void createRTags(void) +{ + vString *vLine = vStringNew(); + vString *name = vStringNew(); + int ikind; + const unsigned char *line; + + while ((line = fileReadLine()) != NULL) + { + const unsigned char *cp = (const unsigned char*)line; + + vStringClear(name); + while ((*cp != '\0') && (*cp != '#')) { + /* iterate to the end of line or to a comment */ + ikind = -1; + switch (*cp) { + case 'l': + case 's': + if (strncasecmp((const char*)cp, "library", (size_t)7) == 0) { + /* load a library: library(tools) */ + cp += 7; + SKIPSPACE(cp); + if (*cp == '(') + ikind = 1; + else + cp -= 7; + } else if (strncasecmp((const char*)cp, "source", (size_t)6) == 0) { + /* load a source file: source("myfile.r") */ + cp += 6; + SKIPSPACE(cp); + if (*cp == '(') + ikind = 2; + else + cp -= 6; + } + if (ikind != -1) { + cp++; + + vStringClear(name); + while ((!isspace((int)*cp)) && *cp != '\0' && *cp != ')') { + vStringPut(name, (int)*cp); + cp++; + } + vStringTerminate(name); + + /* if the string really exists, make a tag of it */ + if (vStringLength(name) > 0) + makeRTag(name, ikind); + + /* prepare for the next iteration */ + vStringClear(name); + } else { + vStringPut(name, (int)*cp); + cp++; + } + break; + case '<': + cp++; + if (*cp == '-') { + /* assignment: ident <- someval */ + cp++; + SKIPSPACE(cp); + + if (*cp == '\0') { + /* not in this line, read next */ + /* sometimes functions are declared this way: + ident <- + function(...) + { + ... + } + I don't know if there is a reason to write the function keyword + in a new line + */ + if ((line = fileReadLine()) != NULL) { + cp = (const unsigned char*)line; + SKIPSPACE(cp); + } + } + + if (strncasecmp((const char*)cp, "function", (size_t)8) == 0) { + /* it's a function: ident <- function(args) */ + cp += 8; + vStringTerminate(name); + /* if the string really exists, make a tag of it */ + if (vStringLength(name) > 0) + makeRTag(name, 0); + + /* prepare for the next iteration */ + vStringClear(name); + break; + } + } + case ' ': + case '\x009': + /* skip whitespace */ + cp++; + break; + default: + /* collect all characters that could be a part of an identifier */ + vStringPut(name, (int)*cp); + cp++; + break; + } + } + } + + vStringDelete(name); + vStringDelete(vLine); +} +#endif + +extern parserDefinition* RParser (void) +{ + /* *.r: R files + * *.s;*.q: S files + */ + static const char *const extensions [] = { "r", "s", "q", NULL }; + parserDefinition* const def = parserNew ("R"); +#ifndef R_REGEX + def->kinds = RKinds; + def->kindCount = 4; +#endif + def->extensions = extensions; +#ifndef R_REGEX + def->parser = createRTags; +#else + def->initialize = installRRegex; + def->regex = TRUE; +#endif + return def; +} + +/* vi:set tabstop=8 shiftwidth=4: */ diff -Nru geany-0.18/tagmanager/rest.c geany-0.19/tagmanager/rest.c --- geany-0.18/tagmanager/rest.c 2009-05-12 16:55:13.000000000 +0100 +++ geany-0.19/tagmanager/rest.c 2010-01-01 22:55:18.000000000 +0000 @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2007-2009, Nick Treleaven +* Copyright (c) 2007-2010, Nick Treleaven * * This source code is released for free distribution under the terms of the * GNU General Public License. diff -Nru geany-0.18/tagmanager/sort.c geany-0.19/tagmanager/sort.c --- geany-0.18/tagmanager/sort.c 2008-02-20 11:24:23.000000000 +0000 +++ geany-0.19/tagmanager/sort.c 2010-05-30 18:47:54.000000000 +0100 @@ -88,7 +88,7 @@ #endif verbose ("system (\"%s\")\n", cmd); ret = system (cmd); - free (cmd); + g_free (cmd); } if (ret != 0) diff -Nru geany-0.18/tagmanager/tm_project.c geany-0.19/tagmanager/tm_project.c --- geany-0.18/tagmanager/tm_project.c 2009-02-24 18:27:01.000000000 +0000 +++ geany-0.19/tagmanager/tm_project.c 2010-06-07 18:43:47.000000000 +0100 @@ -97,7 +97,6 @@ g_warning("Unable to init project file %s", path); g_free(project->dir); g_free(path); - g_free(path); return FALSE; } if (! tm_workspace_add_object(TM_WORK_OBJECT(project))) diff -Nru geany-0.18/tagmanager/tm_source_file.c geany-0.19/tagmanager/tm_source_file.c --- geany-0.18/tagmanager/tm_source_file.c 2009-02-27 14:06:06.000000000 +0000 +++ geany-0.19/tagmanager/tm_source_file.c 2010-04-18 22:42:38.000000000 +0100 @@ -55,6 +55,8 @@ installLanguageMapDefaults(); if (NULL == TagEntryFunction) TagEntryFunction = tm_source_file_tags; + if (NULL == TagEntrySetArglistFunction) + TagEntrySetArglistFunction = tm_source_file_set_tag_arglist; } if (name == NULL) @@ -120,6 +122,8 @@ installLanguageMapDefaults(); if (NULL == TagEntryFunction) TagEntryFunction = tm_source_file_tags; + if (NULL == TagEntrySetArglistFunction) + TagEntrySetArglistFunction = tm_source_file_set_tag_arglist; } current_source_file = source_file; @@ -178,6 +182,8 @@ installLanguageMapDefaults(); if (NULL == TagEntryFunction) TagEntryFunction = tm_source_file_tags; + if (NULL == TagEntrySetArglistFunction) + TagEntrySetArglistFunction = tm_source_file_set_tag_arglist; } current_source_file = source_file; if (LANG_AUTO == source_file->lang) @@ -225,6 +231,28 @@ return status; } +void tm_source_file_set_tag_arglist(const char *tag_name, const char *arglist) +{ + int count; + TMTag **tags, *tag; + + if (NULL == arglist || + NULL == tag_name || + NULL == current_source_file || + NULL == current_source_file->work_object.tags_array) + { + return; + } + + tags = tm_tags_find(current_source_file->work_object.tags_array, tag_name, FALSE, &count); + if (tags != NULL && count == 1) + { + tag = tags[0]; + g_free(tag->atts.entry.arglist); + tag->atts.entry.arglist = g_strdup(arglist); + } +} + int tm_source_file_tags(const tagEntryInfo *tag) { if (NULL == current_source_file) @@ -319,7 +347,23 @@ installLanguageMapDefaults(); if (NULL == TagEntryFunction) TagEntryFunction = tm_source_file_tags; + if (NULL == TagEntrySetArglistFunction) + TagEntrySetArglistFunction = tm_source_file_set_tag_arglist; } return getLanguageName(lang); } +gint tm_source_file_get_named_lang(const gchar *name) +{ + if (NULL == LanguageTable) + { + initializeParsing(); + installLanguageMapDefaults(); + if (NULL == TagEntryFunction) + TagEntryFunction = tm_source_file_tags; + if (NULL == TagEntrySetArglistFunction) + TagEntrySetArglistFunction = tm_source_file_set_tag_arglist; + } + return getNamedLanguage(name); +} + diff -Nru geany-0.18/tagmanager/tm_tag.c geany-0.19/tagmanager/tm_tag.c --- geany-0.18/tagmanager/tm_tag.c 2009-02-24 18:27:01.000000000 +0000 +++ geany-0.19/tagmanager/tm_tag.c 2009-11-10 19:05:51.000000000 +0000 @@ -118,6 +118,9 @@ else if (cmp < 0) break; } + /* other is not checked above as it is last, not sorted alphabetically */ + if (strcmp(tag_name, "other") == 0) + return tm_tag_other_t; #ifdef TM_DEBUG fprintf(stderr, "Unknown tag type %s\n", tag_name); #endif diff -Nru geany-0.18/tagmanager/tm_workspace.c geany-0.19/tagmanager/tm_workspace.c --- geany-0.18/tagmanager/tm_workspace.c 2009-06-10 13:36:13.000000000 +0100 +++ geany-0.19/tagmanager/tm_workspace.c 2010-06-06 18:14:35.000000000 +0100 @@ -147,14 +147,17 @@ TMTag *tag; gboolean format_pipe = FALSE; - if (NULL == (fp = g_fopen(tags_file, "r"))) - return FALSE; if (NULL == theWorkspace) return FALSE; + if (NULL == (fp = g_fopen(tags_file, "r"))) + return FALSE; if (NULL == theWorkspace->global_tags) theWorkspace->global_tags = g_ptr_array_new(); if ((NULL == fgets((gchar*) buf, BUFSIZ, fp)) || ('\0' == *buf)) + { + fclose(fp); return FALSE; /* early out on error */ + } else { /* We read the first line for the format specification. */ if (buf[0] == '#' && strstr((gchar*) buf, "format=pipe") != NULL) @@ -281,7 +284,11 @@ #endif if (NULL == theWorkspace || NULL == (fp = g_fopen(temp_file, "w"))) + { + g_free(temp_file); + g_free(temp_file2); return FALSE; + } includes_files_hash = g_hash_table_new_full (tm_file_inode_hash, g_direct_equal, diff -Nru geany-0.18/tagmanager/txt2tags.c geany-0.19/tagmanager/txt2tags.c --- geany-0.18/tagmanager/txt2tags.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/tagmanager/txt2tags.c 2010-04-17 15:34:41.000000000 +0100 @@ -0,0 +1,133 @@ +/* +* Copyright (c) 2009, Eric Forgeot +* +* Based on work by Jon Strait +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for Txt2tags files. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include +#include + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ + +typedef enum { + K_SECTION = 0, K_HEADER +} Txt2tagsKind; + +static kindOption Txt2tagsKinds[] = { + { TRUE, 'm', "member", "sections" }, + { TRUE, 's', "struct", "header1"} +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static void parse_title (vString* const name, const char control_char) +{ + char *text = vStringValue(name); + char *p = text; + int offset_start = 0; + boolean in_or_after_title = FALSE; + + while (p != NULL && *p != '\0') + { + if (*p == control_char) + { + if (in_or_after_title) + break; + else + offset_start++; + } + else + in_or_after_title = TRUE; + p++; + } + *p = '\0'; + vStringCopyS(name, text + offset_start); + vStringStripLeading(name); + vStringStripTrailing(name); +} + +static void makeTxt2tagsTag (const vString* const name, boolean name_before, Txt2tagsKind type) +{ + tagEntryInfo e; + kindOption *kind = &Txt2tagsKinds[type]; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; /* we want the line before the underline chars */ + e.kindName = kind->name; + e.kind = kind->letter; + + makeTagEntry(&e); +} + +static void findTxt2tagsTags (void) +{ + vString *name = vStringNew(); + const unsigned char *line; + + while ((line = fileReadLine()) != NULL) + { + /*int name_len = vStringLength(name);*/ + + /* underlines must be the same length or more */ + /*if (name_len > 0 && (line[0] == '=' || line[0] == '-') && issame((const char*) line)) + { + makeTxt2tagsTag(name, TRUE); + }*/ + if (line[0] == '=' || line[0] == '+') { + /*vStringClear(name);*/ + vStringCatS(name, (const char *) line); + vStringTerminate(name); + parse_title(name, line[0]); + makeTxt2tagsTag(name, FALSE, K_SECTION); + } + /* TODO what exactly should this match? + * K_HEADER ('struct') isn't matched in src/symbols.c */ + else if (strcmp((char*)line, "°") == 0) { + /*vStringClear(name);*/ + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeTxt2tagsTag(name, FALSE, K_HEADER); + } + else { + vStringClear (name); + if (! isspace(*line)) + vStringCatS(name, (const char*) line); + vStringTerminate(name); + } + } + vStringDelete (name); +} + +extern parserDefinition* Txt2tagsParser (void) +{ + static const char *const patterns [] = { "*.t2t", NULL }; + static const char *const extensions [] = { "t2t", NULL }; + parserDefinition* const def = parserNew ("Txt2tags"); + + def->kinds = Txt2tagsKinds; + def->kindCount = KIND_COUNT (Txt2tagsKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findTxt2tagsTags; + return def; +} + diff -Nru geany-0.18/tagmanager/verilog.c geany-0.19/tagmanager/verilog.c --- geany-0.18/tagmanager/verilog.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.19/tagmanager/verilog.c 2009-12-07 17:51:37.000000000 +0000 @@ -0,0 +1,339 @@ +/* +* $Id: verilog.c 4474 2009-12-07 17:51:37Z ntrel $ +* +* Copyright (c) 2003, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for the Verilog HDL +* (Hardware Description Language). +* +* Language definition documents: +* http://www.eg.bucknell.edu/~cs320/verilog/verilog-manual.html +* http://www.sutherland-hdl.com/on-line_ref_guide/vlog_ref_top.html +* http://www.verilog.com/VerilogBNF.html +* http://eesun.free.fr/DOC/VERILOG/verilog_manual1.html +*/ + +/* + * INCLUDE FILES + */ +#include "general.h" /* must always come first */ + +#include +#include + +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "vstring.h" +#include "get.h" + +/* + * DATA DECLARATIONS + */ +typedef enum eException { ExceptionNone, ExceptionEOF } exception_t; + +typedef enum { + K_UNDEFINED = -1, + K_CONSTANT, + K_EVENT, + K_FUNCTION, + K_MODULE, + K_NET, + K_PORT, + K_REGISTER, + K_TASK +} verilogKind; + +typedef struct { + const char *keyword; + verilogKind kind; +} keywordAssoc; + +/* + * DATA DEFINITIONS + */ +static int Ungetc; +static int Lang_verilog; +static jmp_buf Exception; + +static kindOption VerilogKinds [] = { + { TRUE, 'c', "variable", "constants (define, parameter, specparam)" }, + { TRUE, 'e', "typedef", "events" }, + { TRUE, 'f', "function", "functions" }, + { TRUE, 'm', "class", "modules" }, + { TRUE, 'n', "variable", "net data types" }, + { TRUE, 'p', "variable", "ports" }, + { TRUE, 'r', "variable", "register data types" }, + { TRUE, 't', "function", "tasks" } +}; + +static keywordAssoc VerilogKeywordTable [] = { + { "`define", K_CONSTANT }, + { "event", K_EVENT }, + { "function", K_FUNCTION }, + { "inout", K_PORT }, + { "input", K_PORT }, + { "integer", K_REGISTER }, + { "module", K_MODULE }, + { "output", K_PORT }, + { "parameter", K_CONSTANT }, + { "real", K_REGISTER }, + { "realtime", K_REGISTER }, + { "reg", K_REGISTER }, + { "specparam", K_CONSTANT }, + { "supply0", K_NET }, + { "supply1", K_NET }, + { "task", K_TASK }, + { "time", K_REGISTER }, + { "tri0", K_NET }, + { "tri1", K_NET }, + { "triand", K_NET }, + { "tri", K_NET }, + { "trior", K_NET }, + { "trireg", K_NET }, + { "wand", K_NET }, + { "wire", K_NET }, + { "wor", K_NET } +}; + +/* + * FUNCTION DEFINITIONS + */ + +static void initialize (const langType language) +{ + size_t i; + const size_t count = + sizeof (VerilogKeywordTable) / sizeof (VerilogKeywordTable [0]); + Lang_verilog = language; + for (i = 0 ; i < count ; ++i) + { + const keywordAssoc* const p = &VerilogKeywordTable [i]; + addKeyword (p->keyword, language, (int) p->kind); + } +} + +static void vUngetc (int c) +{ + Assert (Ungetc == '\0'); + Ungetc = c; +} + +static int vGetc (void) +{ + int c; + if (Ungetc == '\0') + c = fileGetc (); + else + { + c = Ungetc; + Ungetc = '\0'; + } + if (c == '/') + { + int c2 = fileGetc (); + if (c2 == EOF) + longjmp (Exception, (int) ExceptionEOF); + else if (c2 == '/') /* strip comment until end-of-line */ + { + do + c = fileGetc (); + while (c != '\n' && c != EOF); + } + else if (c2 == '*') /* strip block comment */ + { + c = skipOverCComment(); + } + else + { + fileUngetc (c2); + } + } + else if (c == '"') /* strip string contents */ + { + int c2; + do + c2 = fileGetc (); + while (c2 != '"' && c2 != EOF); + c = '@'; + } + if (c == EOF) + longjmp (Exception, (int) ExceptionEOF); + return c; +} + +static boolean isIdentifierCharacter (const int c) +{ + return (boolean)(isalnum (c) || c == '_' || c == '`'); +} + +static int skipWhite (int c) +{ + while (isspace (c)) + c = vGetc (); + return c; +} + +static int skipPastMatch (const char *const pair) +{ + const int begin = pair [0], end = pair [1]; + int matchLevel = 1; + int c; + do + { + c = vGetc (); + if (c == begin) + ++matchLevel; + else if (c == end) + --matchLevel; + } + while (matchLevel > 0); + return vGetc (); +} + +static boolean readIdentifier (vString *const name, int c) +{ + vStringClear (name); + if (isIdentifierCharacter (c)) + { + while (isIdentifierCharacter (c)) + { + vStringPut (name, c); + c = vGetc (); + } + vUngetc (c); + vStringTerminate (name); + } + return (boolean)(name->length > 0); +} + +static void tagNameList (const verilogKind kind, int c) +{ + vString *name = vStringNew (); + boolean repeat; + Assert (isIdentifierCharacter (c)); + do + { + repeat = FALSE; + if (isIdentifierCharacter (c)) + { + readIdentifier (name, c); + makeSimpleTag (name, VerilogKinds, kind); + } + else + break; + c = skipWhite (vGetc ()); + if (c == '[') + c = skipPastMatch ("[]"); + c = skipWhite (c); + if (c == '=') + { + if (c == '{') + skipPastMatch ("{}"); + else + { + do + c = vGetc (); + while (c != ',' && c != ';'); + } + } + if (c == ',') + { + c = skipWhite (vGetc ()); + repeat = TRUE; + } + else + repeat = FALSE; + } while (repeat); + vStringDelete (name); + vUngetc (c); +} + +static void findTag (vString *const name) +{ + const verilogKind kind = (verilogKind) lookupKeyword (vStringValue (name), Lang_verilog); + if (kind == K_CONSTANT && vStringItem (name, 0) == '`') + { + /* Bug #961001: Verilog compiler directives are line-based. */ + int c = skipWhite (vGetc ()); + readIdentifier (name, c); + makeSimpleTag (name, VerilogKinds, kind); + /* Skip the rest of the line. */ + do { + c = vGetc(); + } while (c != '\n'); + vUngetc (c); + } + else if (kind != K_UNDEFINED) + { + int c = skipWhite (vGetc ()); + + /* Many keywords can have bit width. + * reg [3:0] net_name; + * inout [(`DBUSWIDTH-1):0] databus; + */ + if (c == '(') + c = skipPastMatch ("()"); + c = skipWhite (c); + if (c == '[') + c = skipPastMatch ("[]"); + c = skipWhite (c); + if (c == '#') + { + c = vGetc (); + if (c == '(') + c = skipPastMatch ("()"); + } + c = skipWhite (c); + if (isIdentifierCharacter (c)) + tagNameList (kind, c); + } +} + +static void findVerilogTags (void) +{ + vString *const name = vStringNew (); + volatile boolean newStatement = TRUE; + volatile int c = '\0'; + exception_t exception = (exception_t) setjmp (Exception); + + if (exception == ExceptionNone) while (c != EOF) + { + c = vGetc (); + switch (c) + { + case ';': + case '\n': + newStatement = TRUE; + break; + + case ' ': + case '\t': + break; + + default: + if (newStatement && readIdentifier (name, c)) + findTag (name); + newStatement = FALSE; + break; + } + } + vStringDelete (name); +} + +extern parserDefinition* VerilogParser (void) +{ + static const char *const extensions [] = { "v", NULL }; + parserDefinition* def = parserNew ("Verilog"); + def->kinds = VerilogKinds; + def->kindCount = KIND_COUNT (VerilogKinds); + def->extensions = extensions; + def->parser = findVerilogTags; + def->initialize = initialize; + return def; +} + +/* vi:set tabstop=4 shiftwidth=4: */ diff -Nru geany-0.18/tagmanager/vhdl.c geany-0.19/tagmanager/vhdl.c --- geany-0.18/tagmanager/vhdl.c 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.19/tagmanager/vhdl.c 2009-11-26 12:33:28.000000000 +0000 @@ -43,7 +43,8 @@ K_PROCESS, K_ENTITY, K_ARCHITECTURE, - K_PORT + K_PORT, + K_ALIAS } vhdlKind; typedef struct { @@ -63,23 +64,23 @@ static vString* TagName=NULL; static kindOption VhdlKinds [] = { - { TRUE, 'c', "constant", "constants" }, - { TRUE, 't', "type", "types" }, + { TRUE, 'c', "variable", "constants" }, + { TRUE, 't', "typedef", "types" }, { TRUE, 'v', "variable", "variables" }, { TRUE, 'a', "atribute", "atributes" }, - { TRUE, 's', "signal", "signals" }, + { TRUE, 's', "variable", "signals" }, { TRUE, 'f', "function", "functions" }, - { TRUE, 'p', "procedure", "procedure" }, - { TRUE, 'k', "component", "components" }, - { TRUE, 'l', "package", "packages" }, - { TRUE, 'm', "process", "process" }, - { TRUE, 'n', "entity", "entity" }, - { TRUE, 'o', "architecture", "architecture" }, - { TRUE, 'u', "port", "ports" } -}; + { TRUE, 'p', "function", "procedure" }, + { TRUE, 'k', "member", "components" }, + { TRUE, 'l', "namespace", "packages" }, + { TRUE, 'm', "member", "process" }, + { TRUE, 'n', "class", "entity" }, + { TRUE, 'o', "struct", "architecture" }, + { TRUE, 'u', "port", "ports" }, + { TRUE, 'v', "typedef", "alias" } + }; static keywordAssoc VhdlKeywordTable [] = { - { "variable", K_VARIABLE }, { "constant", K_CONSTANT }, { "variable", K_VARIABLE }, { "type", K_TYPE }, @@ -94,7 +95,8 @@ { "architecture", K_ARCHITECTURE }, { "inout", K_PORT }, { "in", K_PORT }, - { "out", K_PORT } + { "out", K_PORT }, + { "alias", K_ALIAS } }; diff -Nru geany-0.18/tagmanager/vstring.c geany-0.19/tagmanager/vstring.c --- geany-0.18/tagmanager/vstring.c 2007-09-28 18:06:09.000000000 +0100 +++ geany-0.19/tagmanager/vstring.c 2010-04-27 12:52:51.000000000 +0100 @@ -171,8 +171,8 @@ */ extern void vStringStripTrailing (vString *const string) { - while (isspace ((int) string->buffer [string->length - 1]) && - string->length > 0) + while (string->length > 0 && + isspace ((int) string->buffer [string->length - 1])) { string->length--; string->buffer [string->length] = '\0'; diff -Nru geany-0.18/THANKS geany-0.19/THANKS --- geany-0.18/THANKS 2009-07-30 12:29:53.000000000 +0100 +++ geany-0.19/THANKS 2010-05-24 10:59:16.000000000 +0100 @@ -45,7 +45,7 @@ Matti Mårds - create PHP tags script Robert McGinley - Documentation improvements Felipe Pena - Missing PHP keywords -Colomban Wendling - GLSL filetype patch +Colomban Wendling - various patches Timothy Boronczyk - scroll_stop_at_last_line GUI pref patch Jason Oster - various patches Andrew Rowland - R filetype patch @@ -59,19 +59,32 @@ Guillaume de Rorthais - Auto-close brackets/braces/quotes patch Tyler Mulligan - Close All toolbar icon Philipp Gildein - Ada filetype patch -Thomas Martitz - Multiple %cursor% wildcards in Snippets patch +Thomas Martitz - Multiple %cursor% in Snippets, typeahead sidebar patch David Gleich - Send Selection to Terminal patch Chris Macksey - ActionScript filetype patch Simon Treny - Documents sidebar stock icons patch Elias Pschernig - Recent Projects menu patch Jesse Mayes - Tango'ish Save All icon -Eugene Arshinov - Reload color schemes, split lines KB patches +Eugene Arshinov - Reload color schemes, split lines KB patches, and more Jon Strait - Markdown filetype patch +Forgeot Eric - Txt2Tags filetype patch +Lex Trotman gmailcom> - Build commands configuration improvements, and more +Ross McKay zetaorgau> - ASP preferred language option +Alexey Antipov <1a_antipov(at)mail(dot)ru> - Apply file open encoding only to non-Unicode files +Jörn Reder - --socket-file command line option patch +Kelvin Gardiner - VHDL symbol list patch, Verilog filetype +Jon Senior - R tagmanager parser patch +Can Koy - Multiple changes/improvements +Yoann Le Montagner - set VTE bold color +Dimitar Zhekov - matching brace improvements patch +Ondrej Donek - Support for creating PHP classes with the classbuilder plugin +Daniel Marjamaki - Small improvements Translators: ------------ These people have translated Geany to foreign languages. -Yura Semashko - be_BY +Marcos Costales - be_BY Dilyan Rusev - bg Toni Garcia-Navarro - ca_ES Petr Messner - cs_CZ @@ -84,11 +97,13 @@ Damián Viano - es Antonio Jiménez González - es Nacho Cabanes - es +Lucas Vieites Harri Koskinen - fi Jari Rahkonen - fi Jean-Philippe Moal - fr Roland Baudin - fr Lionel Fuentes - fr +José Manuel Castroagudín Silva - gl Gabor Kmetyko aka kilo - hu M.Baldinelli - it Dario Santomarco - it @@ -97,6 +112,8 @@ Park Jang-heon - ko Laurent Hoeltgen - lb Kurt De Bree - nl +Peter Scholtens < - nl +Ayke van Laethem - nl Jacek Wolszczak - pl_PL Jarosław Foksa - pl_PL Krzysztof Troska - pl_PL @@ -108,12 +125,13 @@ stat.c - ru_RU Andrew Drynov - ru_RU John Wehin - ru_RU -Jože Klepec - sl_SI +Jože Klepec - sl Tony Mattsson - sv Gürkan Gür - uk Clytie Siddall - vi_VN Dormouse Young - zh_CN +Xhacker Liu - zh_CN KoViCH - zh_TW Projects: diff -Nru geany-0.18/TODO geany-0.19/TODO --- geany-0.18/TODO 2009-07-16 15:41:59.000000000 +0100 +++ geany-0.19/TODO 2010-05-11 12:56:55.000000000 +0100 @@ -7,19 +7,16 @@ Next version or later: + o better file template {filename} wildcard replacement +{BASENAME} o documentation: list and explain filetype modes o common default highlighting styles configurable for all programming languages (done for C-like filetypes using filetypes.common named styles) - o configurable filetype and project make commands (e.g. using - bud for D) - see the build-system SVN branch - o (custom filetypes) - o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) + o (better custom filetype support) + o (custom template insertion - so user can add licenses, etc) o (selectable menu of arguments to use for Make, from Make Custom) o (DBUS) - o (sci macro support) - o (better search & replace regex support e.g. multiline - use - SCI_GETCHARACTERPOINTER and GNU regex?) + o (sci macro support - as a plugin?) o (parsing tags from a memory buffer instead of a file on disk) o (tango-like icons for the symbol list) o (per-workspace instances with socket support?) @@ -29,8 +26,6 @@ o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs, GeanyKeyCommand enum into groups) o review documentation - o review any hidden prefs/compile time constants that could be in the - Prefs dialog, e.g. invert_all syntax highlighting pref Wishlist @@ -41,5 +36,6 @@ function_name(arguments) syntax - see python.c:parseArglist()) o (better tags support for popular languages? - this is a moving target...) + o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) o Some kind of support for CTags tags files o Python plugin interface (different concept from Lua scripting) diff -Nru geany-0.18/win32-config.h geany-0.19/win32-config.h --- geany-0.18/win32-config.h 2009-05-02 20:12:15.000000000 +0100 +++ geany-0.19/win32-config.h 2009-08-16 22:49:09.000000000 +0100 @@ -314,7 +314,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "0.18" +#define VERSION "0.19" #define REVISION "-1" diff -Nru geany-0.18/wscript geany-0.19/wscript --- geany-0.18/wscript 2009-08-13 22:59:33.000000000 +0100 +++ geany-0.19/wscript 2010-06-06 19:36:23.000000000 +0100 @@ -3,8 +3,8 @@ # # WAF build script - this file is part of Geany, a fast and lightweight IDE # -# Copyright 2008-2009 Enrico Tröger -# Copyright 2008-2009 Nick Treleaven +# Copyright 2008-2010 Enrico Tröger +# Copyright 2008-2010 Nick Treleaven # # 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 @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: wscript 4079 2009-08-13 21:59:33Z eht16 $ +# $Id: wscript 5006 2010-06-06 18:36:23Z eht16 $ """ This is a WAF build script (http://code.google.com/p/waf/). @@ -35,7 +35,7 @@ Known issues: Dependency handling is buggy, e.g. if src/document.h is changed, depending source files are not rebuilt (maybe Waf bug). -The code of this file itself loosely follows PEP 8 with some exceptions +The code of this file itself loosely follows PEP 8 with some exceptions (line width 100 characters and some other minor things). Requires WAF 1.5.7 and Python 2.4 (or later). @@ -51,17 +51,18 @@ import shutil import tempfile from distutils import version +from TaskGen import taskgen, feature APPNAME = 'geany' -VERSION = '0.18' +VERSION = '0.19' srcdir = '.' blddir = '_build_' tagmanager_sources = [ - 'tagmanager/args.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c', + 'tagmanager/args.c', 'tagmanager/abc.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c', 'tagmanager/basic.c', 'tagmanager/c.c', 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c', 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', @@ -69,13 +70,14 @@ 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', 'tagmanager/make.c', 'tagmanager/markdown.c', 'tagmanager/matlab.c', 'tagmanager/nsis.c', 'tagmanager/nestlevel.c', 'tagmanager/options.c', - 'tagmanager/parse.c', 'tagmanager/pascal.c', + 'tagmanager/parse.c', 'tagmanager/pascal.c', 'tagmanager/r.c', 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', - 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/tcl.c', 'tagmanager/tm_file_entry.c', + 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/txt2tags.c', 'tagmanager/tcl.c', + 'tagmanager/tm_file_entry.c', 'tagmanager/tm_project.c', 'tagmanager/tm_source_file.c', 'tagmanager/tm_symbol.c', 'tagmanager/tm_tag.c', 'tagmanager/tm_tagmanager.c', 'tagmanager/tm_work_object.c', - 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/vstring.c' ] + 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/verilog.c', 'tagmanager/vstring.c' ] scintilla_sources = [ 'scintilla/AutoComplete.cxx', 'scintilla/CallTip.cxx', 'scintilla/CellBuffer.cxx', @@ -85,19 +87,19 @@ 'scintilla/KeyWords.cxx', 'scintilla/LexAda.cxx', 'scintilla/LexAsm.cxx', 'scintilla/LexBash.cxx', 'scintilla/LexBasic.cxx', 'scintilla/LexCaml.cxx', 'scintilla/LexCmake.cxx', 'scintilla/LexCPP.cxx', - 'scintilla/LexCrontab.cxx', 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx', + 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx', 'scintilla/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx', 'scintilla/LexLua.cxx', 'scintilla/LexMarkdown.cxx', 'scintilla/LexMatlab.cxx', 'scintilla/LexNsis.cxx', 'scintilla/LexOthers.cxx', 'scintilla/LexPascal.cxx', 'scintilla/LexPerl.cxx', 'scintilla/LexPython.cxx', 'scintilla/LexR.cxx', 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', 'scintilla/LexTCL.cxx', - 'scintilla/LexVHDL.cxx', 'scintilla/LexYAML.cxx', + 'scintilla/LexVHDL.cxx', 'scintilla/LexVerilog.cxx', 'scintilla/LexYAML.cxx', 'scintilla/LineMarker.cxx', 'scintilla/PerLine.cxx', 'scintilla/PlatGTK.cxx', 'scintilla/PositionCache.cxx', 'scintilla/PropSet.cxx', 'scintilla/RESearch.cxx', 'scintilla/RunStyles.cxx', 'scintilla/ScintillaBase.cxx', 'scintilla/ScintillaGTK.cxx', - 'scintilla/scintilla-marshal.c', 'scintilla/StyleContext.cxx', 'scintilla/Style.cxx', + 'scintilla/scintilla-marshal.c', 'scintilla/Selection.cxx', 'scintilla/StyleContext.cxx', 'scintilla/Style.cxx', 'scintilla/UniConversion.cxx', 'scintilla/ViewStyle.cxx', 'scintilla/WindowAccessor.cxx', 'scintilla/XPM.cxx' ] @@ -108,21 +110,29 @@ 'src/highlighting.c', 'src/interface.c', 'src/keybindings.c', 'src/keyfile.c', 'src/log.c', 'src/main.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', 'src/plugins.c', 'src/pluginutils.c', 'src/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.c', - 'src/queue.c', 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/stash.c', + 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/stash.c', 'src/symbols.c', - 'src/templates.c', 'src/toolbar.c', 'src/tools.c', 'src/treeviews.c', + 'src/templates.c', 'src/toolbar.c', 'src/tools.c', 'src/sidebar.c', 'src/ui_utils.c', 'src/utils.c' ] def configure(conf): + def in_git(): + cmd = 'git ls-files >/dev/null 2>&1' + return (Utils.exec_command(cmd) == 0) + + def in_svn(): + return os.path.exists('.svn') + def conf_get_svn_rev(): # try GIT - if os.path.exists('.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' ] + 'git svn find-rev master 2>/dev/null' + ] for c in cmds: try: stdout = Utils.cmd_output(c) @@ -131,7 +141,7 @@ except: pass # try SVN - elif os.path.exists('.svn'): + elif in_svn(): try: _env = None if is_win32 else {'LANG' : 'C'} stdout = Utils.cmd_output(cmd='svn info --non-interactive', silent=True, env=_env) @@ -194,9 +204,11 @@ # we don't require intltool on Windows (it would require Perl) though it works well try: conf.check_tool('intltool') - except: - pass - + if 'LINGUAS' in os.environ: + conf.env['LINGUAS'] = os.environ['LINGUAS'] + except Configure.ConfigurationError: + if not is_win32: + raise # GTK / GIO version check conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', @@ -272,8 +284,11 @@ conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG'.split()) conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H') + conf.env.append_value('CCFLAGS', '-DGTK') # Scintilla needs this + # for now define GEANY_PRIVATE for all files, even though it should just be for src/*. + conf.env.append_value('CCFLAGS', '-DGEANY_PRIVATE') # Scintilla flags - conf.env.append_value('CXXFLAGS', + conf.env.append_value('CXXFLAGS', '-DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE'.split()) @@ -287,10 +302,10 @@ opt.add_option('--disable-plugins', action='store_true', default=False, help='compile without plugin support [default: No]', dest='no_plugins') opt.add_option('--disable-socket', action='store_true', default=False, - help='compile without support to detect a running instance [[default: No]', + help='compile without support to detect a running instance [[default: No]', dest='no_socket') opt.add_option('--disable-vte', action='store_true', default=target_is_win32(os.environ), - help='compile without support for an embedded virtual terminal [[default: No]', + help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte') opt.add_option('--enable-gnu-regex', action='store_true', default=False, help='compile with included GNU regex library [default: No]', dest='gnu_regex') @@ -325,6 +340,7 @@ features = 'cc cshlib', source = 'plugins/' + plugin_name + '.c', includes = '. plugins/ src/ scintilla/include tagmanager/include', + defines = 'G_LOG_DOMAIN="%s"' % plugin_name, target = plugin_name, uselib = 'GTK', install_path = instpath @@ -340,6 +356,7 @@ name = 'tagmanager', target = 'tagmanager', includes = '. tagmanager/ tagmanager/include/', + defines = 'G_LOG_DOMAIN="Tagmanager"', uselib = 'GTK', install_path = None # do not install this library ) @@ -367,6 +384,7 @@ target = 'geany', source = geany_sources, includes = '. src/ scintilla/include/ tagmanager/include/', + defines = 'G_LOG_DOMAIN="Geany"', uselib = 'GTK GIO WIN32', uselib_local = 'scintilla tagmanager', add_objects = 'geany-rc' if is_win32 else None @@ -466,11 +484,11 @@ if not is_win32: # Headers bld.install_files('${PREFIX}/include/geany', ''' - src/dialogs.h src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h - src/highlighting.h src/keybindings.h src/main.h src/msgwindow.h src/plugindata.h - src/plugins.h src/prefs.h src/project.h src/sciwrappers.h src/search.h src/support.h - src/templates.h src/toolbar.h src/ui_utils.h src/utils.h plugins/pluginmacros.h - plugins/geanyplugin.h plugins/geanyfunctions.h ''') + src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h + src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h + src/prefs.h src/project.h src/search.h src/stash.h src/support.h + src/templates.h src/toolbar.h src/ui_utils.h src/utils.h + plugins/geanyplugin.h plugins/geanyfunctions.h''') bld.install_files('${PREFIX}/include/geany/scintilla', ''' scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h ''') @@ -500,6 +518,7 @@ bld.install_files('${DATADIR}/%s' % dir, 'data/*.tags') bld.install_files('${DATADIR}/%s' % dir, 'data/snippets.conf') bld.install_files('${DATADIR}/%s' % dir, 'data/ui_toolbar.xml') + bld.install_files('${DATADIR}/%s/templates/files' % dir, 'data/templates/files/*.*') bld.install_as('${DATADIR}/%s/GPL-2' % dir, 'COPYING') # Icons bld.install_files('${PREFIX}/share/icons' @@ -509,6 +528,26 @@ bld.install_files('${DATADIR}/icons/hicolor/scalable/apps', 'icons/scalable/*.svg') +@taskgen +@feature('intltool_po') +def write_linguas_file(self): + linguas = '' + if 'LINGUAS' in Build.bld.env: + files = Build.bld.env['LINGUAS'] + for po_filename in files.split(' '): + if os.path.exists('po/%s.po' % po_filename): + linguas += '%s ' % po_filename + else: + files = os.listdir('%s/po' % self.path.abspath()) + files.sort() + for f in files: + if f.endswith('.po'): + linguas += '%s ' % f[:-3] + f = open("po/LINGUAS", "w") + f.write('# This file is autogenerated. Do not edit.\n%s\n' % linguas) + f.close() + + def shutdown(): is_win32 = False if not Build.bld else target_is_win32(Build.bld.env) # the following code was taken from midori's WAF script, thanks